From cb902da50bd75b623a47727e62c0c69913422bfd Mon Sep 17 00:00:00 2001 From: Pacien TRAN-GIRARD Date: Sun, 8 Feb 2015 00:17:21 +0100 Subject: Authentication draft --- app/views/templates/ebe.scala.html | 4 ++-- app/views/templates/main.scala.html | 20 +++++++++++--------- app/views/templates/pepal.scala.html | 4 ++-- 3 files changed, 15 insertions(+), 13 deletions(-) (limited to 'app/views/templates') diff --git a/app/views/templates/ebe.scala.html b/app/views/templates/ebe.scala.html index 2bab310..8e8fc8e 100644 --- a/app/views/templates/ebe.scala.html +++ b/app/views/templates/ebe.scala.html @@ -1,3 +1,3 @@ -@(title: String)(content: Html)(implicit flash: Flash) +@(title: String)(accountData: Option[models.Views.Account] = None)(content: Html)(implicit flash: Flash, token: play.filters.csrf.CSRF.Token) -@templates.main{@fragments.ebeLogo()}{@fragments.ebeSlogan()}(title)(content) +@templates.main{@fragments.branding.ebeLogo()}{@fragments.branding.ebeSlogan()}(title)(accountData)(content) diff --git a/app/views/templates/main.scala.html b/app/views/templates/main.scala.html index 278b205..5ec9da2 100644 --- a/app/views/templates/main.scala.html +++ b/app/views/templates/main.scala.html @@ -1,4 +1,4 @@ -@(logo: Html)(slogan: Html)(title: String)(content: Html)(implicit flash: Flash) +@(logo: Html)(slogan: Html)(title: String)(accountData: Option[models.Views.Account] = None)(content: Html)(implicit flash: Flash, token: play.filters.csrf.CSRF.Token) @@ -22,12 +22,14 @@ - - + @if(accountData.isDefined) { + + + } -
+