diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2013-09-08 09:41:58 -0700 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2013-09-08 09:41:58 -0700 |
| commit | 2872d474307595a96ab4373c1294d1b316ec0ae8 (patch) | |
| tree | 68cf23736e2744e34b4148fb25f1018bacbb84cc /src | |
| parent | f52631c68f403cc7bb6cb73e094e121080cce83d (diff) | |
Fixing Brad's UX comments.
* Hero Graphic
* Google fonts
* Stylized login page
* Vertical alignment on tool tip (noticebar)
* Logo links to home or account.
Diffstat (limited to 'src')
| -rw-r--r-- | src/templates/macros/common-page.ftl | 1 | ||||
| -rw-r--r-- | src/templates/pages/index.html.ftl | 6 | ||||
| -rw-r--r-- | src/templates/pages/login.html.ftl | 8 | ||||
| -rw-r--r-- | src/templates/templates/nav.ftl | 8 |
4 files changed, 14 insertions, 9 deletions
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 @@ <head> <title>Grow Process</title> + <link href="http://fonts.googleapis.com/css?family=Arvo:400,700" rel="stylesheet"> <link rel="stylesheet" href="${staticRoot}/style.css" /> <script src="${staticRoot}/scripts/jquery.min.js"></script> <script src="${staticRoot}/scripts/jquery-ui.js"></script> 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. - </@noticebox> - <@content> <img src="${staticRoot}/images/about-grow.png" /> 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> <p>Welcome! You will need to login with your Foursquare Church InFellowship login.</p> - <p>If you do not already have an account, - <a href="${dynamicRoot}/newaccount.html">create one here</a>.</p> + <p> + If you do not already have an account, + <a href="https://pfseawa.infellowship.com/UserLogin/New">create one here</a>. + After you receive your confirmation email, come back to this site to begin the + assessment. + </p> <form action="${dynamicRoot}/account/authenticate?redirect=${redirect!""}" method="post"> <p><label for="emailField">Email:</label> <input id="emailField" type="text" name="email" /></p> <p><label for="passwordField">Password:</label> <input id="passwordField" type="password" name="password" /></p> 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 @@ </#macro> <header> - <h1><img src="${staticRoot}/images/logo.png"> Grow Process</h1> + <h1> + <#if user??> + <a href="${dynamicRoot}/account"><img src="${staticRoot}/images/logo.png"> Grow Process</a> + <#else> + <a href="${dynamicRoot}/index.html"><img src="${staticRoot}/images/logo.png"> Grow Process</a> + </#if> + </h1> <nav class="primary"> <ul> |