From d76a0b89ebe407fc2693abcda498220c348189ee Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Tue, 10 Sep 2013 00:20:37 -0700
Subject: 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
---
 src/templates/macros/hms.ftl    | 12 ++++++++++++
 src/templates/templates/nav.ftl |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

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>
-- 
cgit v1.2.3