diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2013-09-10 00:20:37 -0700 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2013-09-10 00:20:37 -0700 |
| commit | 95d5b953aa8d993125f1ced10f673d9acd4e2f77 (patch) | |
| tree | 5bd33c6bc68c223cff8ae32b2298193e74ec35de /src | |
| parent | 5306005833083589d0f93b0966b458da969e5f38 (diff) | |
Various UX Fixes.
* Take Assessment link now goes to /account
* Fixed alignment on slider question labels
* Prefixed numbers less than 10 with a zero in the HMS macro
Diffstat (limited to 'src')
| -rw-r--r-- | src/templates/macros/hms.ftl | 12 | ||||
| -rw-r--r-- | src/templates/templates/nav.ftl | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/templates/macros/hms.ftl b/src/templates/macros/hms.ftl index f9662af..339b8a9 100644 --- a/src/templates/macros/hms.ftl +++ b/src/templates/macros/hms.ftl @@ -3,6 +3,18 @@ <#assign m = (seconds % 3600 / 60)?int /> <#assign s = (seconds % 3600 % 60)?int /> + <#if (h < 10)> + <#assign h = "0${h}" /> + </#if> + + <#if (m < 10)> + <#assign m = "0${m}" /> + </#if> + + <#if (s < 10)> + <#assign s = "0${s}" /> + </#if> + <#if (seconds >= 3600)> ${h}:${m}:${s} <#elseif (seconds >= 60)> diff --git a/src/templates/templates/nav.ftl b/src/templates/templates/nav.ftl index 369a0ba..0495171 100644 --- a/src/templates/templates/nav.ftl +++ b/src/templates/templates/nav.ftl @@ -21,7 +21,7 @@ <@navLink href="${dynamicRoot}/about.html">About</@navLink> <@navLink href="${dynamicRoot}/contact.html">Contact</@navLink> <#if user??> - <@navLink href="${dynamicRoot}/account/assessment">Take Assessment</@navLink> + <@navLink href="${dynamicRoot}/account">Take Assessment</@navLink> <#else> <@navLink href="${dynamicRoot}/login.html">Login / Sign Up</@navLink> </#if> |