From af6f25a8b2d6544e375e01135ac29f55dbae2012 Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Sun, 8 Sep 2013 09:41:58 -0700 Subject: Fixing Brad's UX comments. * Hero Graphic * Google fonts * Stylized login page * Vertical alignment on tool tip (noticebar) * Logo links to home or account. --- src/templates/macros/common-page.ftl | 1 + src/templates/pages/index.html.ftl | 6 ------ src/templates/pages/login.html.ftl | 8 ++++++-- src/templates/templates/nav.ftl | 8 +++++++- 4 files changed, 14 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/templates/macros/common-page.ftl b/src/templates/macros/common-page.ftl index 9b4323d..92b508f 100644 --- a/src/templates/macros/common-page.ftl +++ b/src/templates/macros/common-page.ftl @@ -4,6 +4,7 @@ Grow Process + diff --git a/src/templates/pages/index.html.ftl b/src/templates/pages/index.html.ftl index 9f0a05e..2571926 100644 --- a/src/templates/pages/index.html.ftl +++ b/src/templates/pages/index.html.ftl @@ -4,12 +4,6 @@ <@commonpage> <#include "/templates/index-hero.ftl"> - <@noticebox> - The Grow Process focuses on the topic that you want to learn - about. Out 'Assessment' test will give you the right courses - fit for your level. - - <@content> diff --git a/src/templates/pages/login.html.ftl b/src/templates/pages/login.html.ftl index e5d963f..f15080d 100644 --- a/src/templates/pages/login.html.ftl +++ b/src/templates/pages/login.html.ftl @@ -13,8 +13,12 @@ <@content>

Welcome! You will need to login with your Foursquare Church InFellowship login.

-

If you do not already have an account, - create one here.

+

+ If you do not already have an account, + create one here. + After you receive your confirmation email, come back to this site to begin the + assessment. +

diff --git a/src/templates/templates/nav.ftl b/src/templates/templates/nav.ftl index 07148eb..369a0ba 100644 --- a/src/templates/templates/nav.ftl +++ b/src/templates/templates/nav.ftl @@ -7,7 +7,13 @@
-

Grow Process

+

+ <#if user??> + Grow Process + <#else> + Grow Process + +