3 files changed, 36 insertions, 9 deletions

diff --git a/app/views/pages/ebeHomepage.scala.html b/app/views/pages/ebeHomepage.scala.html
index da1fb08..d4fe80a 100644
--- a/app/views/pages/ebeHomepage.scala.html
+++ b/app/views/pages/ebeHomepage.scala.html
@@ -1,6 +1,6 @@
-@()(implicit flash: Flash)
+@()(implicit request : AuthRequest[AnyContent], flash: Flash, token: play.filters.csrf.CSRF.Token)
 
-@templates.ebe("eBé") {
+@templates.ebe("eBé")(request.account) {
 
         <div class="action-buttons pure-g">
         @fragments.ebeMainActions()
@@ -13,7 +13,7 @@
                         <div class="l-box">
                                 <h3 class="information-head">Get started today</h3>
                                 <p>
-                                        With @fragments.ebeLogo(), the leading online auction platform, buy or sell items in a few clicks!
+                                        With @fragments.branding.ebeLogo(), the leading online auction platform, buy or sell items in a few clicks!
                                 </p>
                         </div>
                 </div>
@@ -22,7 +22,7 @@
                         <div class="l-box">
                                 <h3 class="information-head">Buy and sell with confidence</h3>
                                 <p>
-                                        @fragments.ebeLogo() guarantees all transactions for both buyers and sellers.
+                                        @fragments.branding.ebeLogo() guarantees all transactions for both buyers and sellers.
                                 </p>
                         </div>
                 </div>
@@ -40,7 +40,7 @@
                         <div class="l-box">
                                 <h3 class="information-head">Secure transactions</h3>
                                 <p>
-                                        With @fragments.ebeLogo(), you are not required to give any personal information to any buyer or seller.
+                                        With @fragments.branding.ebeLogo(), you are not required to give any personal information to any buyer or seller.
                                 </p>
                         </div>
                 </div>
diff --git a/app/views/pages/loginForm.scala.html b/app/views/pages/loginForm.scala.html
new file mode 100644
index 0000000..5e4d8e5
--- /dev/null
+++ b/app/views/pages/loginForm.scala.html
@@ -0,0 +1,27 @@
+@(loginForm: Form[LoginData])(implicit flash: Flash, token: play.filters.csrf.CSRF.Token)
+
+@templates.ebe("Log in")() {
+
+        <div class="pure-g">
+                <div class="pure-u-1 pure-u-lg-1-3 centered">
+
+                        <h2>Log in</h2>
+
+                        @views.html.fragments.forms.globalErrors(loginForm)
+
+                        @helper.form(action = routes.Auth.loginSubmit(), 'class -> "pure-form") {
+
+                                @helper.CSRF.formField
+
+                                <fieldset class="pure-group">
+                                        @views.html.fragments.forms.inputField(loginForm("username"), "text", "Username")
+                                        @views.html.fragments.forms.inputField(loginForm("password"), "password", "Password")
+                                </fieldset>
+
+                                <button type="submit" class="pure-button pure-input-1 pure-button-primary">Log in</button>
+                        }
+
+                </div>
+        </div>
+
+}
diff --git a/app/views/pages/pepalHomepage.scala.html b/app/views/pages/pepalHomepage.scala.html
index b4a8e9c..9f4b227 100644
--- a/app/views/pages/pepalHomepage.scala.html
+++ b/app/views/pages/pepalHomepage.scala.html
@@ -1,6 +1,6 @@
-@()(implicit flash: Flash)
+@()(implicit request : AuthRequest[AnyContent], flash: Flash, token: play.filters.csrf.CSRF.Token)
 
-@templates.pepal("PéPal") {
+@templates.pepal("PéPal")(request.account) {
 
         <div class="action-buttons pure-g">
         @fragments.pepalMainActions()
@@ -13,7 +13,7 @@
                         <div class="l-box">
                                 <h3 class="information-head">Get started today</h3>
                                 <p>
-                                        With @fragments.pepalLogo(), the leading online payment solution, buy or sell items on the web in a few clicks!
+                                        With @fragments.branding.pepalLogo(), the leading online payment solution, buy or sell items on the web in a few clicks!
                                 </p>
                         </div>
                 </div>
@@ -40,7 +40,7 @@
                         <div class="l-box">
                                 <h3 class="information-head">Secure transactions</h3>
                                 <p>
-                                        With @fragments.pepalLogo(), you are not required to give any personal information to any buyer or seller.
+                                        With @fragments.branding.pepalLogo(), you are not required to give any personal information to any buyer or seller.
                                 </p>
                         </div>
                 </div>