diff --git a/.gitignore b/.gitignore index 49c74b4ba..4e8dc6fcf 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,4 @@ target src/main/resources/ src/test/resources/ -*.iml \ No newline at end of file +*.iml diff --git a/NOTICE b/NOTICE index d05773491..b5ad17f0a 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Open Bank Project - Transparency / Social Finance Web Application -Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/resources/props/sample.props.template b/src/main/resources/props/sample.props.template index 1d71cd22d..1e882ffc8 100644 --- a/src/main/resources/props/sample.props.template +++ b/src/main/resources/props/sample.props.template @@ -1,22 +1,23 @@ #this is a sample props file you should edit and rename #see https://www.assembla.com/wiki/show/liftweb/Properties for all the naming options, or just use "default.props" in this same folder +### OBP-API configuration + + +### base configuration + #which data connector to use - -#connector=mongodb -#connector=rest -#connector=... connector=mapped +#connector=mongodb +#connector=... -#if connector is mapped, set a database backend -db.driver=org.postgresql.Driver -#you can also use a no config needed h2 database by setting db.driver=org.h2.Driver and not including db.url - +#you can use a no config needed h2 database by setting db.driver=org.h2.Driver and not including db.url +#db.driver=org.postgresql.Driver +#db.driver=org.h2.Driver #be sure to create your database and update the line below! db.url=jdbc:postgresql://localhost:5432/dbname?user=dbusername&password=thepassword - - +#our own remotely accessible URL #this is needed for oauth to work. it's important to access the api over this url, e.g. # if this is 127.0.0.1 don't use localhost to access it. # (this needs to be an URL) @@ -25,9 +26,10 @@ hostname=http://127.0.0.1:8080 #this is only useful for running the api locally via RunWebApp #if you use it, make sure this matches your hostname port! #if you want to change the port when running via the command line, use "mvn -Djetty.port=8089 jetty:run" instead -dev.port=8089 +dev.port=8080 -#mail server config: not need in dev mode, but important for production +#sending mail out +#not need in dev mode, but important for production mail.api.consumer.registered.sender.address=no-reply@example.com mail.api.consumer.registered.notification.addresses=you@example.com mail.smtp.host=127.0.0.1 @@ -36,15 +38,9 @@ mail.smtp.port=25 #oauth token timeout token_expiration_weeks=4 -#secret key that allows access to api calls to get info about oauth tokens. You should change this -#to your own secret key -BankMockKey=change_me -#secret key that allows access to the "add cash transactions" API. You should change this to your own secret key -cashApplicationKey=change_me -#secret key that allows access to the "add transactions" API. You should change this to your own secret key -importer_secret=change_me +### sandbox #set this to true if you want to allow users to create sandbox test accounts with a starting balance allow_sandbox_account_creation=true @@ -55,16 +51,22 @@ allow_sandbox_data_import=true #secret key that allows access to the "data import" api. You should change this to your own secret key sandbox_data_import_secret=change_me -### features + + +### api features + +#secret key that allows access to the "add cash transactions" api. You should change this to your own secret key +cashApplicationKey=change_me #set this to false if you don't want the api payments call to work (starting with v1.2.1) payments_enabled=true #transaction requests are replacing simple payments starting from 1.4.0 -#(and set a connector per feature. Will be expanded to several other features as well) transactionRequests_enabled=true transactionRequests_connector=mapped + + ### management modules #rabbitMQ settings (used to communicate with HBCI project) @@ -72,11 +74,32 @@ connection.host=localhost connection.user=theusername connection.password=thepassword -#set this to true if you want to have the api to send a message to the hbci project to refresh transactions for an account -messageQueue.updateBankAccountsTransaction=false +#secret key that allows access to the "add transactions" api. You should change this to your own secret key +importer_secret=change_me + +#set this to true if you want to have the api send a message to the hbci project to refresh transactions for an account +messageQueue.updateBankAccountsTransaction=true + +#the minimum time between updates in hours +messageQueue.updateTransactionsInterval=1 #set this to true if you want to have the api listen for "create account" messages from the hbci project messageQueue.createBankAccounts=true -#set this to true if you want to allow users to delete accounts -allow_account_deletion=true \ No newline at end of file +#set this to true if you want to allow users to delete accounts (local ones like HBCI connected) +allow_account_deletion=true + +#secret key that allows access to api calls to get info about oauth tokens. You should change this +#to your own secret key +BankMockKey=change_me + + + +### web interface configuration +webui_header_theme_color = #53C4EF +webui_header_logo_left_url = /media/images/logo.png +webui_header_logo_right_url = +webui_index_page_about_section_background_image_url = /media/images/about-background.jpg +webui_index_page_about_section_text =

\ + Welcome to the API Sandbox powered by the Open Bank Project!
\ +

\ No newline at end of file diff --git a/src/main/scala/bootstrap/liftweb/Boot.scala b/src/main/scala/bootstrap/liftweb/Boot.scala index bd052e9b5..5658211a4 100755 --- a/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/src/main/scala/bootstrap/liftweb/Boot.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/OBPAPI1.0.scala b/src/main/scala/code/api/OBPAPI1.0.scala index 8a7d40d58..9ef47db78 100644 --- a/src/main/scala/code/api/OBPAPI1.0.scala +++ b/src/main/scala/code/api/OBPAPI1.0.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/OBPAPI1.1.scala b/src/main/scala/code/api/OBPAPI1.1.scala index 7ec80ed9f..7f9f76553 100644 --- a/src/main/scala/code/api/OBPAPI1.1.scala +++ b/src/main/scala/code/api/OBPAPI1.1.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/OBPRestHelper.scala b/src/main/scala/code/api/OBPRestHelper.scala index ab1fd0ef7..fe22f121a 100644 --- a/src/main/scala/code/api/OBPRestHelper.scala +++ b/src/main/scala/code/api/OBPRestHelper.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/bankmock.scala b/src/main/scala/code/api/bankmock.scala index e5b63752c..5771ac922 100644 --- a/src/main/scala/code/api/bankmock.scala +++ b/src/main/scala/code/api/bankmock.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/metrics.scala b/src/main/scala/code/api/metrics.scala index e0a13a3c2..b373e23d9 100644 --- a/src/main/scala/code/api/metrics.scala +++ b/src/main/scala/code/api/metrics.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/util/APIUtil.scala b/src/main/scala/code/api/util/APIUtil.scala index 1b701a62a..b8a895ce8 100644 --- a/src/main/scala/code/api/util/APIUtil.scala +++ b/src/main/scala/code/api/util/APIUtil.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/v1_2/JSONFactory1.2.scala b/src/main/scala/code/api/v1_2/JSONFactory1.2.scala index 7307ef5ff..6dd55b819 100644 --- a/src/main/scala/code/api/v1_2/JSONFactory1.2.scala +++ b/src/main/scala/code/api/v1_2/JSONFactory1.2.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/v1_2/OBPAPI1.2.scala b/src/main/scala/code/api/v1_2/OBPAPI1.2.scala index 3b1060438..06108927d 100644 --- a/src/main/scala/code/api/v1_2/OBPAPI1.2.scala +++ b/src/main/scala/code/api/v1_2/OBPAPI1.2.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/v1_2_1/JSONFactory1.2.1.scala b/src/main/scala/code/api/v1_2_1/JSONFactory1.2.1.scala index 6801dfa77..c6583f154 100644 --- a/src/main/scala/code/api/v1_2_1/JSONFactory1.2.1.scala +++ b/src/main/scala/code/api/v1_2_1/JSONFactory1.2.1.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala b/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala index e3a3ac489..283865639 100644 --- a/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala +++ b/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/bankconnectors/Connector.scala b/src/main/scala/code/bankconnectors/Connector.scala index 14e2d8f4a..61457f23d 100644 --- a/src/main/scala/code/bankconnectors/Connector.scala +++ b/src/main/scala/code/bankconnectors/Connector.scala @@ -1,13 +1,10 @@ package code.bankconnectors import code.management.ImporterAPI.ImporterTransaction -import code.model.dataAccess.MappedBankAccount import code.tesobe.CashTransaction import code.transactionrequests.TransactionRequests import code.transactionrequests.TransactionRequests.{TransactionRequestChallenge, TransactionRequest, TransactionRequestId, TransactionRequestBody} import code.util.Helper._ -import com.javafx.tools.doclets.formats.html.markup.DocType -import com.tesobe.model.CreateBankAccount import net.liftweb.common.{Full, Empty, Box} import code.model._ import net.liftweb.util.Helpers._ diff --git a/src/main/scala/code/metrics/MongoAPIMetric.scala b/src/main/scala/code/metrics/MongoAPIMetric.scala index eae5d93b0..ae2f327dd 100644 --- a/src/main/scala/code/metrics/MongoAPIMetric.scala +++ b/src/main/scala/code/metrics/MongoAPIMetric.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/BankingData.scala b/src/main/scala/code/model/BankingData.scala index 0c8dcf58e..11ca14256 100644 --- a/src/main/scala/code/model/BankingData.scala +++ b/src/main/scala/code/model/BankingData.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/Metadata.scala b/src/main/scala/code/model/Metadata.scala index b0c88feae..50f94986a 100644 --- a/src/main/scala/code/model/Metadata.scala +++ b/src/main/scala/code/model/Metadata.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/ModeratedBankingData.scala b/src/main/scala/code/model/ModeratedBankingData.scala index 5b323104c..0cd599b2a 100644 --- a/src/main/scala/code/model/ModeratedBankingData.scala +++ b/src/main/scala/code/model/ModeratedBankingData.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/OAuth.scala b/src/main/scala/code/model/OAuth.scala index 1552d99f2..814b1d5af 100644 --- a/src/main/scala/code/model/OAuth.scala +++ b/src/main/scala/code/model/OAuth.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/User.scala b/src/main/scala/code/model/User.scala index 8374ac5f9..777d62c2c 100644 --- a/src/main/scala/code/model/User.scala +++ b/src/main/scala/code/model/User.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/View.scala b/src/main/scala/code/model/View.scala index cd5ed6ac0..b43567f76 100644 --- a/src/main/scala/code/model/View.scala +++ b/src/main/scala/code/model/View.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/dataAccess/APIUser.scala b/src/main/scala/code/model/dataAccess/APIUser.scala index f4a2c3b04..b2f99f5d5 100644 --- a/src/main/scala/code/model/dataAccess/APIUser.scala +++ b/src/main/scala/code/model/dataAccess/APIUser.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/dataAccess/Account.scala b/src/main/scala/code/model/dataAccess/Account.scala index f5411fb1d..f41381ef9 100644 --- a/src/main/scala/code/model/dataAccess/Account.scala +++ b/src/main/scala/code/model/dataAccess/Account.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/dataAccess/Admin.scala b/src/main/scala/code/model/dataAccess/Admin.scala index fce39e02b..682648294 100644 --- a/src/main/scala/code/model/dataAccess/Admin.scala +++ b/src/main/scala/code/model/dataAccess/Admin.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala b/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala index 8b0e0a53e..d9856261c 100644 --- a/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala +++ b/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/dataAccess/MongoConfig.scala b/src/main/scala/code/model/dataAccess/MongoConfig.scala index dd66201d3..48cde8daf 100644 --- a/src/main/scala/code/model/dataAccess/MongoConfig.scala +++ b/src/main/scala/code/model/dataAccess/MongoConfig.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/dataAccess/OBPTransaction.scala b/src/main/scala/code/model/dataAccess/OBPTransaction.scala index 622051e44..12dfec31e 100644 --- a/src/main/scala/code/model/dataAccess/OBPTransaction.scala +++ b/src/main/scala/code/model/dataAccess/OBPTransaction.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/dataAccess/OBPUser.scala b/src/main/scala/code/model/dataAccess/OBPUser.scala index a608edc3a..7abdc1fac 100755 --- a/src/main/scala/code/model/dataAccess/OBPUser.scala +++ b/src/main/scala/code/model/dataAccess/OBPUser.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -36,12 +36,7 @@ import net.liftweb.util.Mailer.{BCC, To, Subject, From} import net.liftweb.util._ import net.liftweb.common._ import scala.xml.NodeSeq -import net.liftweb.http.{SessionVar,Templates} -import code.model.User -import net.liftweb.json.JsonDSL._ -import net.liftweb.http.SHtml -import net.liftweb.http.S -import com.mongodb.DBObject +import net.liftweb.http.{SHtml, SessionVar, Templates, S} import net.liftweb.http.js.JsCmds.FocusOnLoad @@ -116,24 +111,25 @@ import net.liftweb.util.Helpers._ override def skipEmailValidation = true override def loginXhtml = { - import net.liftweb.http.js.JsCmds.Noop val loginXml = Templates(List("templates-hidden","_login")).map({ "form [action]" #> {S.uri} & - "#loginText * " #> {S.??("log.in")} & - "#emailAddressText * " #> {S.??("email.address")} & - "#passwordText * " #> {S.??("password")} & + "#loginText * " #> {S.?("log.in")} & + "#emailAddressText * " #> {S.?("email.address")} & + "#passwordText * " #> {S.?("password")} & "#recoverPasswordLink * " #> { "a [href]" #> {lostPasswordPath.mkString("/", "/", "")} & - "a *" #> {S.??("recover.password")} + "a *" #> {S.?("recover.password")} } & "#SignUpLink * " #> { "a [href]" #> {OBPUser.signUpPath.foldLeft("")(_ + "/" + _)} & - "a *" #> {S.??("sign.up")} + "a *" #> {S.?("sign.up")} } }) - SHtml.span(loginXml getOrElse NodeSeq.Empty,Noop) + +
{loginXml getOrElse NodeSeq.Empty}
} + /** * Overriden to use the hostname set in the props file */ @@ -161,6 +157,35 @@ import net.liftweb.util.Helpers._ } } + override def lostPasswordXhtml = { +
+
+ +
+
+ } + + override def lostPassword = { + bind("user", lostPasswordXhtml, + "email" -> SHtml.text("", sendPasswordReset _), + "submit" -> lostPasswordSubmitButton(S.?("submit"))) + } + + //override def def passwordResetMailBody(user: TheUserType, resetLink: String): Elem = { } + /** * Overriden to use the hostname set in the props file */ @@ -186,18 +211,23 @@ import net.liftweb.util.Helpers._ } override def signupXhtml (user:OBPUser) = { -
- - - - - {localForm(user, false, signupFields)} - - - - -
{ S.?("sign.up") }
 
-
+
+
+
+
+ + + + + {localForm(user, false, signupFields)} + + + + +
{ S.?("sign.up") }
 
+
+
+
} //overridden to allow a redirection if login fails @@ -232,6 +262,7 @@ import net.liftweb.util.Helpers._ case _ => { info("failed: " + failedLoginRedirect.get) failedLoginRedirect.get.foreach(S.redirectTo(_)) + S.error("login", S.?("Invalid Username or Password")) } } } @@ -239,7 +270,7 @@ import net.liftweb.util.Helpers._ bind("user", loginXhtml, "email" -> (FocusOnLoad()), "password" -> (), - "submit" -> loginSubmitButton(S.??("log.in"))) + "submit" -> loginSubmitButton(S.?("log.in"))) } //overridden to allow redirect to loginRedirect after signup. This is mostly to allow @@ -268,7 +299,9 @@ import net.liftweb.util.Helpers._ S.redirectTo(redir) }) - case xs => S.error(xs) ; signupFunc(Full(innerSignup _)) + case xs => + xs.foreach(e => S.error("signup", e.msg)) + signupFunc(Full(innerSignup _)) } } @@ -278,6 +311,4 @@ import net.liftweb.util.Helpers._ innerSignup } - - } \ No newline at end of file diff --git a/src/main/scala/code/model/dataAccess/UpdatesRequestSender.scala b/src/main/scala/code/model/dataAccess/UpdatesRequestSender.scala index bbcfedb7b..b32ba745d 100644 --- a/src/main/scala/code/model/dataAccess/UpdatesRequestSender.scala +++ b/src/main/scala/code/model/dataAccess/UpdatesRequestSender.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/model/dataAccess/view.scala b/src/main/scala/code/model/dataAccess/view.scala index 0cd4cac45..79795cb20 100644 --- a/src/main/scala/code/model/dataAccess/view.scala +++ b/src/main/scala/code/model/dataAccess/view.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/snippet/ConsumerRegistration.scala b/src/main/scala/code/snippet/ConsumerRegistration.scala index 66c358f1a..5ed39fede 100644 --- a/src/main/scala/code/snippet/ConsumerRegistration.scala +++ b/src/main/scala/code/snippet/ConsumerRegistration.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -44,7 +44,7 @@ import code.util.Helper.NOOP_SELECTOR class ConsumerRegistration extends Loggable { //TODO: for security reasons this snippet and the template must be re-factored - //to use the lift build in form function(SHtml._) so we can hide to what + //to use the lift built-in form function(SHtml._) so we can hide to what //the input fields are mapped to in the server side !! private object nameVar extends RequestVar("") diff --git a/src/main/scala/code/snippet/Login.scala b/src/main/scala/code/snippet/Login.scala index 64f9cd826..b58700eff 100644 --- a/src/main/scala/code/snippet/Login.scala +++ b/src/main/scala/code/snippet/Login.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -28,7 +28,7 @@ Berlin 13359, Germany Everett Sochowski : everett AT tesobe DOT com Ayoub Benali: ayoub AT tesobe DOT com - */ +*/ package code.snippet diff --git a/src/main/scala/code/snippet/Nav.scala b/src/main/scala/code/snippet/Nav.scala index 5f90c581a..8db0edaa6 100644 --- a/src/main/scala/code/snippet/Nav.scala +++ b/src/main/scala/code/snippet/Nav.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/scala/code/snippet/WebUI.scala b/src/main/scala/code/snippet/WebUI.scala new file mode 100644 index 000000000..a6845838e --- /dev/null +++ b/src/main/scala/code/snippet/WebUI.scala @@ -0,0 +1,53 @@ +/** +Open Bank Project - API +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + +*/ + +package code.snippet + +import net.liftweb.util.Helpers._ +import net.liftweb.util.{CssSel, Props} + +import scala.xml.NodeSeq + +class WebUI { + def headerLogoLeft = { + "img [src]" #> Props.get("webui_header_logo_left_url", "") + } + def headerLogoRight: CssSel = { + "img [src]" #> Props.get("webui_header_logo_right_url", "") + } + def aboutBackground: CssSel = { + "#main-about [style]" #> ("background-image: url(" + Props.get("webui_index_page_about_section_background_image_url", "") + ");") + } + def aboutText: CssSel = { + ".about-text *" #> scala.xml.Unparsed(Props.get("webui_index_page_about_section_text", "")) + } +} diff --git a/src/main/webapp/consumer-registration.html b/src/main/webapp/consumer-registration.html index 546fe6e55..fe33e50e4 100644 --- a/src/main/webapp/consumer-registration.html +++ b/src/main/webapp/consumer-registration.html @@ -1,6 +1,6 @@
-
-
-

Register your application

+
+ -
-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Thank you for registering to use the Open Bank API. Here is your developer information. Please save it in a secure location. -
- Application Type - - web -
- Application Name - - ABC -
- User authentication URL - - ABC -
- Developer Email - - abc@example.com -
- App Description - - ABCDEF -
- Consumer Key - - 23432432432432 -
- Consumer Secret - - 3334543543543 -
-
+
+
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Thank you for registering to use the Open Bank API. Here is your developer information. Please save it in a secure location. +
+ Application Type + + web +
+ Application Name + + ABC +
+ Developer Email + + abc@example.com +
+ App Description + + ABCDEF +
+ Consumer Key + + 23432432432432 +
+ Consumer Secret + + 3334543543543 +
+
+
\ No newline at end of file diff --git a/src/main/webapp/create-sandbox-account.html b/src/main/webapp/create-sandbox-account.html index d0f6649c3..39348f72e 100644 --- a/src/main/webapp/create-sandbox-account.html +++ b/src/main/webapp/create-sandbox-account.html @@ -1,6 +1,6 @@
-
- This form is designed to allow developers to create test accounts. When an account is created, - a view with VIEW_ID "owner" will be created, and access to this view will be granted to the user - (you) who created it. If you wish, you may then populate the account with transactions using the - v1.2.1 payments API. - If you wish to do this, you will probably want to create some other accounts to send payments to and receive - payments from. -
-
- Create a new test bank account: -
-
- -
+
+
+ This form is designed to allow developers to create test accounts. When an account is created, + a view with VIEW_ID "owner" will be created, and access to this view will be granted to the user + (you) who created it. If you wish, you may then populate the account with transactions using the + v1.2.1 payments API. + If you wish to do this, you will probably want to create some other accounts to send payments to and receive + payments from. +
+
+ Create a new test bank account: +
+
+ +
-
+
- +
+ +
-
+
\ No newline at end of file diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index c2d3c7d59..90b080a34 100755 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -1,6 +1,6 @@ -
-

- Welcome to The Open Bank Project API. +

+
+
+
+
+
+
+ +
+

Get Started

- The Open Bank Project is an open source API and App store for banks that empowers financial - institutions to securely and rapidly enhance their digital offerings using an ecosystem of 3rd - party applications and services. +

+ To get started please: +

    +
  1. Register as an API user here
    2. +
  2. Register one or more developer keys here
    3. +
  3. See the documentation here
    4. +
+

- Find more information about the project at openbankproject.com. -

+
+ +

Questions?

+ +

+ Please email: contact AT openbankproject DOT com or tweet @OpenBankProject +

+ +
+ +
+ + +
diff --git a/src/main/webapp/media/css/toastr.min.css b/src/main/webapp/media/css/toastr.min.css new file mode 100644 index 000000000..613c47bac --- /dev/null +++ b/src/main/webapp/media/css/toastr.min.css @@ -0,0 +1 @@ +.toast-title{font-weight:700}.toast-message{-ms-word-wrap:break-word;word-wrap:break-word}.toast-message a,.toast-message label{color:#fff}.toast-message a:hover{color:#ccc;text-decoration:none}.toast-close-button{position:relative;right:-.3em;top:-.3em;float:right;font-size:20px;font-weight:700;color:#fff;-webkit-text-shadow:0 1px 0 #fff;text-shadow:0 1px 0 #fff;opacity:.8;-ms-filter:alpha(Opacity=80);filter:alpha(opacity=80)}.toast-close-button:focus,.toast-close-button:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;-ms-filter:alpha(Opacity=40);filter:alpha(opacity=40)}button.toast-close-button{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.toast-top-center{top:0;right:0;width:100%}.toast-bottom-center{bottom:0;right:0;width:100%}.toast-top-full-width{top:0;right:0;width:100%}.toast-bottom-full-width{bottom:0;right:0;width:100%}.toast-top-left{top:12px;left:12px}.toast-top-right{top:12px;right:12px}.toast-bottom-right{right:12px;bottom:12px}.toast-bottom-left{bottom:12px;left:12px}#toast-container{position:fixed;z-index:999999}#toast-container *{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}#toast-container>div{position:relative;overflow:hidden;margin:0 0 6px;padding:15px 15px 15px 50px;width:300px;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-position:15px center;background-repeat:no-repeat;-moz-box-shadow:0 0 12px #999;-webkit-box-shadow:0 0 12px #999;box-shadow:0 0 12px #999;color:#fff;opacity:.8;-ms-filter:alpha(Opacity=80);filter:alpha(opacity=80)}#toast-container>:hover{-moz-box-shadow:0 0 12px #000;-webkit-box-shadow:0 0 12px #000;box-shadow:0 0 12px #000;opacity:1;-ms-filter:alpha(Opacity=100);filter:alpha(opacity=100);cursor:pointer}#toast-container>.toast-info{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=)!important}#toast-container>.toast-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=)!important}#toast-container>.toast-success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==)!important}#toast-container>.toast-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=)!important}#toast-container.toast-bottom-center>div,#toast-container.toast-top-center>div{width:300px;margin:auto}#toast-container.toast-bottom-full-width>div,#toast-container.toast-top-full-width>div{width:96%;margin:auto}.toast{background-color:#030303}.toast-success{background-color:#51a351}.toast-error{background-color:#bd362f}.toast-info{background-color:#2f96b4}.toast-warning{background-color:#f89406}.toast-progress{position:absolute;left:0;bottom:0;height:4px;background-color:#000;opacity:.4;-ms-filter:alpha(Opacity=40);filter:alpha(opacity=40)}@media all and (max-width:240px){#toast-container>div{padding:8px 8px 8px 50px;width:11em}#toast-container .toast-close-button{right:-.2em;top:-.2em}}@media all and (min-width:241px) and (max-width:480px){#toast-container>div{padding:8px 8px 8px 50px;width:18em}#toast-container .toast-close-button{right:-.2em;top:-.2em}}@media all and (min-width:481px) and (max-width:768px){#toast-container>div{padding:15px 15px 15px 50px;width:25em}} \ No newline at end of file diff --git a/src/main/webapp/media/css/website.css b/src/main/webapp/media/css/website.css index 46d34a346..d732d3b7f 100644 --- a/src/main/webapp/media/css/website.css +++ b/src/main/webapp/media/css/website.css @@ -1,23 +1,18 @@ @import url('reset.css'); - -@media all and (min-width : 300px) and (max-width : 999px) { - #signupForm td input{ - width: 150px; - } -} -@media all and (min-width: 1000px) { - #signupForm td input{ - width: 200px; - } -} +@import url('bnpp-fonts.css'); body { - font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; - font-weight: 300; + font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + font-weight: 400; +} + +html { + height: 100% } a { - color: #1C8B77; + color: #666666; + text-decoration: none; } a:hover { @@ -87,8 +82,17 @@ input.submit { #header { overflow: auto; - padding: 45px 0 40px; - background: transparent url(../images/header.png) repeat-x 50% 100%; + padding: 0px 0 20px; +} + +#header-decoration { + background-color: #53C4EF; + width: 100%; + height: 35px; +} + +#lift__noticesContainer__ { + display: none; } #accountShortDiscription { @@ -101,56 +105,167 @@ input.submit { } #nav { - overflow: auto; - padding: 3px 0 0; - background: transparent url(../images/nav.png) repeat-x 50% 50%; -} - -#about_text { - text-align: justify; - width: 500px; - margin-top: 15px; - float: left; - margin-left: 20px; - margin-right: 20px; + padding: 4px 10px 0 10px; + background: #EEEEEE; + height: 40px; } #nav ul { - float: left; + height: 40px; + } #nav ul li { float: left; - margin: 0 0 0 3px; + margin: 3px 0 0 3px; + height: 100%; +} + +#nav ul li:nth-child(1):before { + background-image: url(../images/nav-home-icon.png); + content: " "; + height: 25px; + width: 25px; + display: inline-block; + margin-right: -5px; + float: left; +} + +#nav ul li:nth-child(2) a:after, +#nav ul li:nth-child(3) a:after, +#nav ul li:nth-child(4) a:after, +#nav ul li:nth-child(5) a:after, +#nav ul li:nth-child(6) a:after { + position: absolute; + display: block; + width: 2px; + height: 39px; + margin-top: -26px; /* position ::after item vertically */ + margin-left: -20px; /* position ::after item horizontally */ + content: " "; + background-image: url(../images/nav-separator.png); } #nav ul li a { - display: block; + display: inline-block; padding: 8px 20px 10px; border-radius: 5px 5px 0 0; - background: transparent url(../images/nav-item.png) repeat-x 50% 50%; - color: #ffffff; + color: darkgray; text-decoration: none; font-size: 14px; - text-shadow: 1px 1px 1px #666666; } #nav ul li a.selected { float: left; - background-image: url(../images/nav-selected.png); - color: #333333; text-shadow: none; + color: #101010; } -#logo { +#nav .nav-login-state-item { + float: right; + margin-right: 10px; + color: darkgray; +} + +#nav .nav-login-state-item .logout { + color: black; +} + +#logo-left { + margin: 20px 0 0 120px; float: left; - overflow: hidden; - width: 279px; - height: 38px; - margin: 0 0 0 10px; - background: transparent url(../images/logo.png) no-repeat 50% 0; - text-indent: -9999em; - cursor: pointer; + display: inline-block; +} + +#logo-right { + margin: 20px 120px 0 0; + float: right; + display: inline-block; +} + +#main { + color: #333333; +} + +#main-about { + padding-top: 70px; + /* background-image: url(../images/bnpp/bnpp-background.jpg); */ + min-height: 463px; +} + +#main-about p.about-text { + padding: 10px 180px 40px 180px; + font-size: 20px; + line-height: 1.5em; + color: white; + text-align: center; + font-weight: 200; +} + +#main-about p.about-text a { + color: lightgray; +} + +#main-links { + background-color: #3C3C3C; + text-align: center; + height: 105px; +} + +#main-links a { + padding: 5px 25px 5px 25px; + display: inline-block; + text-decoration: none; + color: white; + border: 2px solid gray; + border-radius: 25px; + margin: 30px 20px 0px 20px; +} + +#main-sandbox { + background-color: #9A9A9A; + color: #333333; + padding: 25px 50px 100px 100px; + text-align: left; +} + +#main-sandbox h1 { + color: white; + font-size: 35px; + margin-bottom: 15px; + margin-left: -5px; + margin-top: 15px; +} + +#main-partners { + width: 900px; + padding: 30px 50px 0px 100px; + margin-top: 90px; + margin-left: auto; + margin-right: auto; + + text-align: justify; + -ms-text-justify: distribute-all-lines; + text-justify: distribute-all-lines; +} + +#main-partners img { + width: 150px; +} + +#main-partners a { + vertical-align: top; + display: inline-block; + *display: inline; + /* zoom: 1; */ + margin: 0px 30px 75px 0px; +} + +.stretch { + width: 100%; + display: inline-block; + font-size: 0; + line-height: 0 } .account-upper{ @@ -191,6 +306,7 @@ input.submit { .account form.login .buttons { margin-top: 30px; height: 2em; + display: flex; } .account form.login .field input { @@ -211,7 +327,6 @@ input.submit { .account form.login .button-field { height: 2em; - float: left; } .account form.login .button .submit { @@ -237,43 +352,52 @@ input.submit { width: 100%; background: #ffffff; border: 1px solid #CCC; - border-radius: 3px; + border-radius: 6px; padding: 2px; height: 1.8em; } .account-in-content form.login .button .signup { - border: 1px solid gray; - border-radius: 3px; - padding: 10px 20px; - color: gray; + border: 1px solid white; + border-radius: 20px; + padding: 2px 18px; + color: #535456; font-size: 20px; cursor: pointer; text-decoration: none; display: inline-block; float: right; margin: 0; + text-transform: uppercase; + background-color: white; + font-weight: 500; + height: 26px; } .account-in-content form.login .button .submit { - background: #C1E7E1; - border: 1px solid #22a890; - border-radius: 3px; - padding: 10px 20px; - color: white; - font-size: 20px; + background: white; + border: gray; + border-radius: 20px; + padding: 7px 20px; + color: #535456; + font-size: 18px; cursor: pointer; text-decoration: none; display: inline-block; height: initial; margin: 0; + width: inherit; + text-transform: uppercase; + font-weight: 500; + font-family: inherit; } .account-in-content form.login .field .forgot { float: right; - margin: 1px 8px 0 0; + margin: 1px 6px 0 0; padding: 2px 0 0; - font-size: 11px; + font-size: 12px; + color: white; } .account-upper form.login { @@ -305,32 +429,93 @@ input.submit { } .account-in-content form.login .field label { - font-size: 12px; + /* font-size: 12px; */ } .account-in-content form.login .field input { font-size: 14px; } +.account-in-content form.forgotPassword { + padding-top: 20px; + width: 470px; +} -#content { - padding: 20px 0 40px; - font-size: 16px; - line-height: 1.3em; +.account-in-content form.forgotPassword .buttons { + margin-top: 30px; + height: 2em; + display: flex; } table { - width: 100%; - margin: 0 0 40px; + width: 90%; + margin: 0 0 20px; border-collapse: collapse; - clear : both; + clear: both; + color: black; + /* border: none; */ + margin-left: auto; + margin-right: auto; +} + +table th, +table td { + text-align: left; +} + +table tbody tr { + /* background: #459860; */ +} + +table tbody tr:nth-child(even) { + /* background: #459860; */ +} + +table td { + padding: 15px 0px 15px 14px; + /* border-top: 2px solid #ffffff; */ + line-height: 1em; + font-size: 15px; + /* vertical-align: top; */ + /* color: white; */ +} + +table th { + overflow: auto; + padding: 0 0 10px 8px; + border-bottom: 2px solid #cbcbcb; +} + +section#content { + font-size: 20px; + line-height: 1.5em; + text-align: center; + color: white; } /* don't add spacing after last table in a transaction list */ -#content div div:last-of-type table { +section#content div div:last-of-type table { margin-bottom: 0px; } +section#content form { + color: white; + /* width: 85%; */ + margin-left: auto; + margin-right: auto; + font-size: 16px; + margin-top: 0px; +} + +/* for lift generated forms */ +section#content>form>table { + background-color: #53C4EF; + padding: 10px; + color: white; + max-width: 50%; + margin-top: 50px; +} + #verifier { margin-top: 30px; font-weight: bold; @@ -338,8 +523,10 @@ table { text-align: center; } -#signupForm tr td:first-child { - width: 170px; +#signupForm tr:first-child td { + width: 150px; + font-size: 18px; + color: white; } #signupForm td span input{ @@ -354,216 +541,110 @@ table { } #signupForm td input[type=submit]{ - width:85px; + /* width:85px; */ } -table th, -table td { - text-align: left; +.signup-error { + margin-bottom: 10px; + color: red; } -table tbody tr { - background: #f3f9f8; +#registerAppSection { + background-color: #53C4EF; + padding: 10px; + color: white; + max-width: 85%; + margin-top: 50px; + display: inline-block; + margin-left: auto; + margin-right: auto; } -table tbody tr:nth-child(even) { - background: #f2f8f1; +#registerAppSection h1 { + text-align: left; + margin-left: 2%; + margin-bottom: 40px; + font-size: 20px; + line-height: 1.5em; } -table td { - padding: 14px 10px; - border-top: 2px solid #ffffff; - line-height: 1em; - font-size: 13px; - vertical-align: top; +#registerAppSection .success { + /* font-size: 20px !important; */ + margin-bottom: 25px; } -table th { - overflow: auto; - padding: 0 0 10px 8px; - border-bottom: 2px solid #cbcbcb; +div.registration { + padding: 30px 0 50px 0; + /* width: 84%; */ } -table.management th { - padding-left: 0px; +form.register { + /* color: #555555; */ + width: 96%; + margin-left: auto; + margin-right: auto; + margin-top: 30px; } -table.transactions th h5.date { - float: left; +form div.form-column { + float: left; + width: 50%; + display: flex; + flex-direction: column; + margin-top: 20px; + margin-bottom: 20px; + /* color: #555555; */ } -table.transactions th h6.balance { - float: right; +form div.form-column div { + display: inline-flex; + margin-bottom: 16px; } -table.transactions th .balance .text { - color: #999999; - padding: 0 10px 0 0; - font-size: 0.8em; +form label { + font-size: 16px; + min-width: 144px; + display: inline-flex; + text-align: left; + margin-right: 5px; } -table.transactions td.icon { - width: 20px; +form input[type=text], form select { + width: 60%; } -table.transactions td.icon .out, -table.transactions td.icon .in { - overflow: hidden; - width: 14px; - height: 14px; - background-color: transparent; - background-position: 50% 50%; - background-repeat: no-repeat; - text-indent: -9999em; +form input, form select { + border-radius: 5px; + border: solid 1px white; + height: 28px; + /* margin-bottom: 16px; */ + color: #535456; + background-color: white; + font-size: 17px; + display: inline-block; } -table.transactions td.icon .out { - background-image: url(../images/transaction-out.png); +form.register textarea { + width: 80%; + border-radius: 5px; + border: solid 1px white; + height: 100px; } -table.transactions td.icon .in { - background-image: url(../images/transaction-in.png); +form.register div.submit { + margin-left: auto; + margin-top: 25px; } -table.transactions td.symbol { - width: 10px; - padding-right: 5px; - text-align: center; - font-weight: bold; +form input[type=submit] { + font-size: 18px; + height: 30px; + border-radius: 20px; + text-transform: uppercase; + text-align: left; + padding: 2px 20px 0px 20px; } -table.transactions td.amount { - padding-left: 5px; - width: 100px; -} - -table.transactions td.name { - width: 160px; -} - -table.transactions td.extra { - width: 350px; -} - -table.transactions td.comments { - width: 30px; - padding-top: 10px; - text-align: right; -} - -table.transactions td.comments .comment { - display: inline-block; - background: transparent url(../images/comment.png) no-repeat 50% 0; - width: 13px; - height: 9px; - padding: 3px 3px 6px 4px; - color: #333333; - text-align: center; - line-height: 1em; - font-size: 9px; -} - -table.management th a.sort { - margin: 0 0 0 3px; -} - -td a.upload { - display: inline-block; - padding: 5px 5px 6px 30px; - border: 1px dotted #cccccc; - border-radius: 5px; - background: #ffffff url(../images/upload-off.png) no-repeat 5px 5px; - line-height: 22px; - white-space: nowrap; - font-size: 12px; - text-decoration: none; - color: #999999; -} - -table.management td a.upload:hover { - background-image: url(../images/upload-on.png); - text-decoration: underline; - color: #666666; -} - -table.management td span.upload { - display: inline-block; - padding: 2px; - border: 1px solid #cccccc; - border-radius: 5px; - background: #ffffff; - line-height: 0; - font-size: 0; -} - -table.management td span.upload img { - height: 30px; -} - -table.management th { - font-size: 14px; -} - -table.management th.account { - width: 155px; -} - -table.management td.account { - padding-right: 15px; -} - -table.management th.public { - width: 120px; -} - -table.management td.public { - padding-left: 0; - line-height: 16px; - font-size: 12px; -} - -table.management th.private { - width: 120px; -} - -table.management td.private { - padding-left: 0; - line-height: 16px; - font-size: 12px; -} - -table.management th.website { - width: 150px; -} - -table.management td.website { - padding-left: 0; - line-height: 16px; - font-size: 12px; -} - -table.management th.information { - width: 200px; -} - -table.management td.information { - padding-left: 0; - line-height: 16px; - font-size: 12px; -} - -table.management th.image { - width: 120px; -} - -table.management td.image { - padding-top: 3px; - padding-bottom: 2px; - padding-left: 0; - text-align: right; -} - - div.extra_account_logo { float: left; } @@ -588,29 +669,52 @@ span.alias_indicator_private { padding: 2px; } - #footer { - background: #f0f0f0; - border-top: 1px dotted #cccccc; - border-radius: 0 0 8px 8px; - padding: 10px 0 13px; + padding: 100px 0px 15px 50px; + font-size: 10px; + color: #B3B3B3; + margin-bottom: 40px; } #footer p { color: #999999; - font-size: 11px; text-align: center; line-height: 1.5 } -#authorizeSection{ - background-color: #f0f0f0; - border-radius: 12px; - padding: 10px; - color: black; - width: 450px; - max-width: 80%; - margin-left: auto; - margin-right: auto; + +#authorizeSection { + background-color: #53C4EF; + padding: 10px; + color: white; + max-width: 85%; + margin-top: 50px; + display: inline-block; + margin-left: auto; + margin-right: auto; +} + +#authorizeSection form.login { + padding-top: 20px; + width: 400px; +} + +.signupSection { + padding: 30px 0px 30px 0px !important; + width: 60%; +} + +.signupSection form input[type=text], +.signupSection form select, +.signupSection form input[type=password] { + width: 80%; +} +.signupSection form tr td { + color: white; +} + +#userAccess { + padding: 5px; + /* width: 400px; */ } .login-error { @@ -618,13 +722,10 @@ span.alias_indicator_private { color: red; } -#authorizeSection form.login { - padding-top: 20px; - width: 400px; -} span.edit_error_class { color: red; } + #accountList { margin-top: 5px; float : right; @@ -661,38 +762,37 @@ span.edit_error_class { margin-bottom: 5px; } -li.comment -{ +li.comment { padding : 14px 10px; border-top: 2px solid white; background: #f3f9f8; line-height: 1em; font-size: 13px; } -#comment_list -{ + +#comment_list { margin-top: 10px; } -div#addCommentbloc -{ + +div#addCommentbloc { margin-top: 15px; } -#submitComment -{ + +#submitComment { display: block; } -#lastUpdate -{ + +#lastUpdate { margin-top: 5px; font-size: 13px; display: block; } -#account_details -{ + +#account_details { margin-bottom: 25px; } -a#feedBack -{ + +a#feedBack { display: block; position: fixed; left:0; @@ -702,57 +802,79 @@ a#feedBack background: url(../images/feedback-button.gif); cursor: pointer; } -span#registrationDetails -{ + +span#registrationDetails { font-size: 10px; } -.error -{ + +.error { color:red; } -img.moreInfoIcon -{ - margin-left: 5px; + +img.moreInfoIcon { + margin-left: 6px; + margin-top: 7px; + width: 18px; + height: 18px; } -span#submissionMessage -{ + +span#submissionMessage { display: block; } -span#submissionSuccess, span#submissionFailed -{ + +span#submissionSuccess, span#submissionFailed { display: block; padding: 15px 20px; background: #66ee55; } -span#submissionFailed -{ + +span#submissionFailed { background: #ff3311; } -span#accountsMsg -{ + +span#accountsMsg { font-size: 13px; } -#registration-errors{ + +#registration-errors { color: red; - border: solid 1px red; - margin: 20px; - padding: 15px; + /* border: solid 1px red; */ + margin: 0; + /* padding: 15px; */ } #oauth-done-thanks { margin: 30px; + color: black; } -#create-account-form-container { - margin-left: 50px; - margin-top: 30px; +#create-sandbox-account { + background-color: #53C4EF; + padding: 20px; + color: white; + max-width: 85%; + margin-top: 50px; + display: inline-block; } -#create-account-form-container input { - margin-top: 5px; +#create-sandbox-account form label { + min-width: 190px; +} + +#create-sandbox-account form div.submit { + margin-left: auto; +} + +#create-sandbox-account form div.form-column.middle { + margin-left: 25%; +} + +#create-account-explanation a { + color: lightgray; } #create-account-instructions { + margin-top: 30px; margin-left: 10px; } @@ -765,7 +887,7 @@ span#accountsMsg #account-created-successfully { margin-left: 50px; margin-top: 10px; - color: green; + color: lightgreen; } #admin-logout { diff --git a/src/main/webapp/media/images/OBP_logo_simple.png b/src/main/webapp/media/images/OBP_logo_simple.png deleted file mode 100644 index e0aed9f0d..000000000 Binary files a/src/main/webapp/media/images/OBP_logo_simple.png and /dev/null differ diff --git a/src/main/webapp/media/images/OpenBankProject_logo.jpg b/src/main/webapp/media/images/OpenBankProject_logo.jpg deleted file mode 100644 index f036721f6..000000000 Binary files a/src/main/webapp/media/images/OpenBankProject_logo.jpg and /dev/null differ diff --git a/src/main/webapp/media/images/about-background.jpg b/src/main/webapp/media/images/about-background.jpg new file mode 100644 index 000000000..bb783956b Binary files /dev/null and b/src/main/webapp/media/images/about-background.jpg differ diff --git a/src/main/webapp/media/images/logo.png b/src/main/webapp/media/images/logo.png index 1833a4006..bba526602 100644 Binary files a/src/main/webapp/media/images/logo.png and b/src/main/webapp/media/images/logo.png differ diff --git a/src/main/webapp/media/images/logo_smaller.png b/src/main/webapp/media/images/logo_smaller.png deleted file mode 100644 index bba526602..000000000 Binary files a/src/main/webapp/media/images/logo_smaller.png and /dev/null differ diff --git a/src/main/webapp/media/images/logo_stacked.png b/src/main/webapp/media/images/logo_stacked.png new file mode 100644 index 000000000..81229e6aa Binary files /dev/null and b/src/main/webapp/media/images/logo_stacked.png differ diff --git a/src/main/webapp/media/images/moreInfo.png b/src/main/webapp/media/images/moreInfo.png index ac59994dd..07f55a6d0 100644 Binary files a/src/main/webapp/media/images/moreInfo.png and b/src/main/webapp/media/images/moreInfo.png differ diff --git a/src/main/webapp/media/images/nav-home-icon.png b/src/main/webapp/media/images/nav-home-icon.png new file mode 100644 index 000000000..75e0744c5 Binary files /dev/null and b/src/main/webapp/media/images/nav-home-icon.png differ diff --git a/src/main/webapp/media/images/nav-separator.png b/src/main/webapp/media/images/nav-separator.png new file mode 100644 index 000000000..5828bd5f8 Binary files /dev/null and b/src/main/webapp/media/images/nav-separator.png differ diff --git a/src/main/webapp/media/images/previous/logo.png b/src/main/webapp/media/images/previous/logo.png deleted file mode 100644 index 1833a4006..000000000 Binary files a/src/main/webapp/media/images/previous/logo.png and /dev/null differ diff --git a/src/main/webapp/media/js/toastr.min.js b/src/main/webapp/media/js/toastr.min.js new file mode 100644 index 000000000..ab9c66c1e --- /dev/null +++ b/src/main/webapp/media/js/toastr.min.js @@ -0,0 +1,2 @@ +!function(e){e(["jquery"],function(e){return function(){function t(e,t,n){return f({type:O.error,iconClass:g().iconClasses.error,message:e,optionsOverride:n,title:t})}function n(t,n){return t||(t=g()),v=e("#"+t.containerId),v.length?v:(n&&(v=c(t)),v)}function i(e,t,n){return f({type:O.info,iconClass:g().iconClasses.info,message:e,optionsOverride:n,title:t})}function o(e){w=e}function s(e,t,n){return f({type:O.success,iconClass:g().iconClasses.success,message:e,optionsOverride:n,title:t})}function a(e,t,n){return f({type:O.warning,iconClass:g().iconClasses.warning,message:e,optionsOverride:n,title:t})}function r(e){var t=g();v||n(t),l(e,t)||u(t)}function d(t){var i=g();return v||n(i),t&&0===e(":focus",t).length?void h(t):void(v.children().length&&v.remove())}function u(t){for(var n=v.children(),i=n.length-1;i>=0;i--)l(e(n[i]),t)}function l(t,n){return t&&0===e(":focus",t).length?(t[n.hideMethod]({duration:n.hideDuration,easing:n.hideEasing,complete:function(){h(t)}}),!0):!1}function c(t){return v=e("
").attr("id",t.containerId).addClass(t.positionClass).attr("aria-live","polite").attr("role","alert"),v.appendTo(e(t.target)),v}function p(){return{tapToDismiss:!0,toastClass:"toast",containerId:"toast-container",debug:!1,showMethod:"fadeIn",showDuration:300,showEasing:"swing",onShown:void 0,hideMethod:"fadeOut",hideDuration:1e3,hideEasing:"swing",onHidden:void 0,extendedTimeOut:1e3,iconClasses:{error:"toast-error",info:"toast-info",success:"toast-success",warning:"toast-warning"},iconClass:"toast-info",positionClass:"toast-top-right",timeOut:5e3,titleClass:"toast-title",messageClass:"toast-message",target:"body",closeHtml:'',newestOnTop:!0,preventDuplicates:!1,progressBar:!1}}function m(e){w&&w(e)}function f(t){function i(t){return!e(":focus",l).length||t?(clearTimeout(O.intervalId),l[r.hideMethod]({duration:r.hideDuration,easing:r.hideEasing,complete:function(){h(l),r.onHidden&&"hidden"!==b.state&&r.onHidden(),b.state="hidden",b.endTime=new Date,m(b)}})):void 0}function o(){(r.timeOut>0||r.extendedTimeOut>0)&&(u=setTimeout(i,r.extendedTimeOut),O.maxHideTime=parseFloat(r.extendedTimeOut),O.hideEta=(new Date).getTime()+O.maxHideTime)}function s(){clearTimeout(u),O.hideEta=0,l.stop(!0,!0)[r.showMethod]({duration:r.showDuration,easing:r.showEasing})}function a(){var e=(O.hideEta-(new Date).getTime())/O.maxHideTime*100;f.width(e+"%")}var r=g(),d=t.iconClass||r.iconClass;if("undefined"!=typeof t.optionsOverride&&(r=e.extend(r,t.optionsOverride),d=t.optionsOverride.iconClass||d),r.preventDuplicates){if(t.message===C)return;C=t.message}T++,v=n(r,!0);var u=null,l=e("
"),c=e("
"),p=e("
"),f=e("
"),w=e(r.closeHtml),O={intervalId:null,hideEta:null,maxHideTime:null},b={toastId:T,state:"visible",startTime:new Date,options:r,map:t};return t.iconClass&&l.addClass(r.toastClass).addClass(d),t.title&&(c.append(t.title).addClass(r.titleClass),l.append(c)),t.message&&(p.append(t.message).addClass(r.messageClass),l.append(p)),r.closeButton&&(w.addClass("toast-close-button").attr("role","button"),l.prepend(w)),r.progressBar&&(f.addClass("toast-progress"),l.prepend(f)),l.hide(),r.newestOnTop?v.prepend(l):v.append(l),l[r.showMethod]({duration:r.showDuration,easing:r.showEasing,complete:r.onShown}),r.timeOut>0&&(u=setTimeout(i,r.timeOut),O.maxHideTime=parseFloat(r.timeOut),O.hideEta=(new Date).getTime()+O.maxHideTime,r.progressBar&&(O.intervalId=setInterval(a,10))),l.hover(s,o),!r.onclick&&r.tapToDismiss&&l.click(i),r.closeButton&&w&&w.click(function(e){e.stopPropagation?e.stopPropagation():void 0!==e.cancelBubble&&e.cancelBubble!==!0&&(e.cancelBubble=!0),i(!0)}),r.onclick&&l.click(function(){r.onclick(),i()}),m(b),r.debug&&console&&console.log(b),l}function g(){return e.extend({},p(),b.options)}function h(e){v||(v=n()),e.is(":visible")||(e.remove(),e=null,0===v.children().length&&(v.remove(),C=void 0))}var v,w,C,T=0,O={error:"error",info:"info",success:"success",warning:"warning"},b={clear:r,remove:d,error:t,getContainer:n,info:i,options:{},subscribe:o,success:s,version:"2.1.0",warning:a};return b}()})}("function"==typeof define&&define.amd?define:function(e,t){"undefined"!=typeof module&&module.exports?module.exports=t(require("jquery")):window.toastr=t(window.jQuery)}); +//# sourceMappingURL=toastr.js.map diff --git a/src/main/webapp/metrics.html b/src/main/webapp/metrics.html index 83597985c..e00aa57a0 100644 --- a/src/main/webapp/metrics.html +++ b/src/main/webapp/metrics.html @@ -1,6 +1,6 @@ +
+
+ - - \ No newline at end of file +
\ No newline at end of file diff --git a/src/main/webapp/templates-hidden/_login.html b/src/main/webapp/templates-hidden/_login.html index 3477c6bb4..61ccbce3d 100644 --- a/src/main/webapp/templates-hidden/_login.html +++ b/src/main/webapp/templates-hidden/_login.html @@ -1,30 +1,10 @@ -
-
- - - - - - - - - - - - - - - - - - - -
login
e-mail address
password
- -
-
-
\ No newline at end of file +
+
+ +
+
diff --git a/src/main/webapp/templates-hidden/_login_form.html b/src/main/webapp/templates-hidden/_login_form.html new file mode 100644 index 000000000..60b9c1873 --- /dev/null +++ b/src/main/webapp/templates-hidden/_login_form.html @@ -0,0 +1,19 @@ + \ No newline at end of file diff --git a/src/main/webapp/templates-hidden/default.html b/src/main/webapp/templates-hidden/default.html index fee6148ff..d1531649e 100755 --- a/src/main/webapp/templates-hidden/default.html +++ b/src/main/webapp/templates-hidden/default.html @@ -1,6 +1,6 @@ - - - - Open Bank Project: %*% + + + + Open Bank Project: %*% - - - - - -
- + +
+ + The main content gets bound here +
+ +
+
- - \ No newline at end of file + + diff --git a/src/test/scala/RunWebApp.scala b/src/test/scala/RunWebApp.scala index 504c0dc28..a7cdd7d41 100755 --- a/src/test/scala/RunWebApp.scala +++ b/src/test/scala/RunWebApp.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/test/scala/code/AppTest.scala b/src/test/scala/code/AppTest.scala index e0d85c72b..d908bd40d 100755 --- a/src/test/scala/code/AppTest.scala +++ b/src/test/scala/code/AppTest.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/test/scala/code/api/API121Test.scala b/src/test/scala/code/api/API121Test.scala index b3c0edd05..13b4edafb 100644 --- a/src/test/scala/code/api/API121Test.scala +++ b/src/test/scala/code/api/API121Test.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/test/scala/code/api/API12Test.scala b/src/test/scala/code/api/API12Test.scala index 91a7f72ab..46ae8cb90 100644 --- a/src/test/scala/code/api/API12Test.scala +++ b/src/test/scala/code/api/API12Test.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/test/scala/code/api/OAuthClient.scala b/src/test/scala/code/api/OAuthClient.scala index 8b2aad0e2..a1edfce31 100644 --- a/src/test/scala/code/api/OAuthClient.scala +++ b/src/test/scala/code/api/OAuthClient.scala @@ -1,6 +1,6 @@ /** -Open Bank Project - Transparency / Social Finance Web Application -Copyright (C) 2011, 2015, TESOBE / Music Pictures Ltd +Open Bank Project - API +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/test/scala/code/api/SendServerRequests.scala b/src/test/scala/code/api/SendServerRequests.scala index 24114189a..1ba01a28b 100644 --- a/src/test/scala/code/api/SendServerRequests.scala +++ b/src/test/scala/code/api/SendServerRequests.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2014, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/test/scala/code/api/ServerSetup.scala b/src/test/scala/code/api/ServerSetup.scala index fa320f902..990e0fac1 100644 --- a/src/test/scala/code/api/ServerSetup.scala +++ b/src/test/scala/code/api/ServerSetup.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/test/scala/code/api/oauthTest.scala b/src/test/scala/code/api/oauthTest.scala index 7a226b85d..42bdd05c1 100644 --- a/src/test/scala/code/api/oauthTest.scala +++ b/src/test/scala/code/api/oauthTest.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/src/test/scala/code/api/v1_4_0/TransactionRequestsTest.scala b/src/test/scala/code/api/v1_4_0/TransactionRequestsTest.scala index f651343db..32e6cd676 100644 --- a/src/test/scala/code/api/v1_4_0/TransactionRequestsTest.scala +++ b/src/test/scala/code/api/v1_4_0/TransactionRequestsTest.scala @@ -261,7 +261,7 @@ class TransactionRequestsTest extends ServerSetupWithTestData with DefaultUsers challenge.size should not equal(0) //3. TODO: answer challenge and check if transaction is being created - + } /* diff --git a/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala b/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala index c3db08c25..4fd795b2a 100644 --- a/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala +++ b/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011, 2013, TESOBE / Music Pictures Ltd +Copyright (C) 2011-2015, TESOBE / Music Pictures Ltd This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by