Cleaning up content macro. Adding favicon. Fixing static content.

11 files changed, 26 insertions, 35 deletions

diff --git a/src/templates/macros/common.ftl b/src/templates/macros/common.ftl
index 966afdb..513fc57 100644
--- a/src/templates/macros/common.ftl
+++ b/src/templates/macros/common.ftl
@@ -1,5 +1,4 @@
 <#include "content.ftl">
-<#include "textcontent.ftl">
 <#include "noticebox.ftl">
 
 <#assign dynamicRoot = "">
diff --git a/src/templates/macros/content.ftl b/src/templates/macros/content.ftl
index dc474f0..eaf0b17 100644
--- a/src/templates/macros/content.ftl
+++ b/src/templates/macros/content.ftl
@@ -1,6 +1,6 @@
-<#macro content>
+<#macro content class="">
     <div id="content">
-        <article>
+        <article class="${class}">
             <#nested>
         </article>
     </div>
diff --git a/src/templates/macros/noticebox.ftl b/src/templates/macros/noticebox.ftl
index eca1428..9cd99f9 100644
--- a/src/templates/macros/noticebox.ftl
+++ b/src/templates/macros/noticebox.ftl
@@ -1,6 +1,6 @@
-<#macro noticebox>
+<#macro noticebox class="">
     <div id="middlebar">
-        <div id="noticebox">
+        <div id="noticebox" class="${class}">
             <img class="icon" src="${staticRoot}/images/noticeicon.png">
             <p>
                 <#nested>
diff --git a/src/templates/macros/textcontent.ftl b/src/templates/macros/textcontent.ftl
deleted file mode 100644
index 408c05c..0000000
--- a/src/templates/macros/textcontent.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#macro textcontent>
-    <div id="content">
-        <article class="text">
-            <#nested>
-        </article>
-    </div>
-</#macro>
-
diff --git a/src/templates/pages/about.html.ftl b/src/templates/pages/about.html.ftl
index 63cd366..a28b355 100644
--- a/src/templates/pages/about.html.ftl
+++ b/src/templates/pages/about.html.ftl
@@ -5,7 +5,7 @@
     <@noticebox>
     </@noticebox>
 
-    <@textcontent>
+    <@content class="text">
         <h1>About</h1>
 
         <p>
@@ -15,7 +15,7 @@
         </p>
 
         <p>
-            Disciple means “learner” and our goal is to help you be an
+            Disciple means "learner" and our goal is to help you be an
             effective learner and grow in the knowledge of Jesus Christ, the
             Word of God, the essentials of your faith that will cause the
             transformation God promises you will experience.  And that
@@ -60,11 +60,11 @@
         </p>
 
         <p>
-            Now it’s your turn to act!  Get started now in your journey by
+            Now it's your turn to act!  Get started now in your journey by
             taking the GROW assessment. Identify your starting place as a
             Seeker, Believer, Disciple or Teacher and be a disciple.
         </p>
-    </@textcontent>
+    </@content>
 
     <#include "/templates/getstarted-button.ftl">
 </@commonpage>
diff --git a/src/templates/pages/assessment.html.ftl b/src/templates/pages/assessment.html.ftl
index 7903382..3737dc6 100644
--- a/src/templates/pages/assessment.html.ftl
+++ b/src/templates/pages/assessment.html.ftl
@@ -5,7 +5,7 @@
     <@noticebox>
     </@noticebox>
 
-    <@textcontent>
+    <@content class="text">
         <h1>Assessment</h1>
 
         <p>
@@ -15,8 +15,7 @@
         </p>
 
         <p>
-            <!-- TODO: Insert Image Here -->
-            **************** Insert the image here. *************************
+            <img src="${staticRoot}/images/about-grow.png" alt="Growth Process" />
         </p>
 
         <p>
@@ -31,10 +30,10 @@
         </p>
 
         <p>
-            Let’s get with your personal GROW assessment now, it will only take a few minutes.
+            Let's get with your personal GROW assessment now, it will only take a few minutes.
         </p>
 
-    </@textcontent>
+    </@content>
 
     <div id="getstarted">
         <a class="greenbutton" href="${dynamicRoot}/account/assessment">Begin Assessment &#x2799;</a>
diff --git a/src/templates/pages/contact.html.ftl b/src/templates/pages/contact.html.ftl
index 40499cc..d8a0a29 100644
--- a/src/templates/pages/contact.html.ftl
+++ b/src/templates/pages/contact.html.ftl
@@ -5,7 +5,7 @@
     <@noticebox>
     </@noticebox>
 
-    <@textcontent>
+    <@content class="text">
         <h1>Contact Us</h1>
 
         <p>
@@ -30,7 +30,7 @@
         <p><input type="submit" value="Send" /></p>
         </form>
 
-    </@textcontent>
+    </@content>
 
 </@commonpage>
 
diff --git a/src/templates/pages/index.html.ftl b/src/templates/pages/index.html.ftl
index 2788e8f..2057ea6 100644
--- a/src/templates/pages/index.html.ftl
+++ b/src/templates/pages/index.html.ftl
@@ -21,7 +21,7 @@
             GROW process is an on-line application and network to help you GROW
             as a follower of Jesus Christ.  
         </p>
-            Let’s join together in a spiritual formation journey and begin the
+            Let's join together in a spiritual formation journey and begin the
             discipleship process that will transform your life.
         </p>
     </@content>
diff --git a/src/templates/pages/login.html.ftl b/src/templates/pages/login.html.ftl
index 2a27858..e5d963f 100644
--- a/src/templates/pages/login.html.ftl
+++ b/src/templates/pages/login.html.ftl
@@ -2,13 +2,14 @@
 <#include "/macros/common-page.ftl">
 
 <@commonpage>
-    <@noticebox>
-        <#if errorMessage??>
+    <#if errorMessage??>
+        <@noticebox class="visible">
             ${errorMessage?html}
-        <#else>
-            Welcome!
-        </#if>
-    </@noticebox>
+        </@noticebox>
+    <#else>
+        <@noticebox>
+        </@noticebox>
+    </#if>
 
     <@content>
         <p>Welcome! You will need to login with your Foursquare Church InFellowship login.</p>
diff --git a/src/templates/templates/assessment-results.ftl b/src/templates/templates/assessment-results.ftl
index 98918ba..491b8a2 100644
--- a/src/templates/templates/assessment-results.ftl
+++ b/src/templates/templates/assessment-results.ftl
@@ -5,7 +5,7 @@
     <@noticebox>
     </@noticebox>
 
-    <@textcontent>
+    <@content class="text">
         <p>Congratulations for completing your GROW assessment!</p>
 
         <p>Based on your responses you have been identified as a ${stage?cap_first}.</p>
@@ -22,7 +22,7 @@
             will produce positive quantifiable and quality results in your life, as
             you learn, and then apply this learning in your life.
         </p>
-    </@textcontent>
+    </@content>
 
     <div id="getstarted">
         <a class="greenbutton" href="${dynamicRoot}/account/training/${stage?lower_case}">Begin GROWing &#x2799;</a>
diff --git a/src/templates/templates/stage-complete.ftl b/src/templates/templates/stage-complete.ftl
index ed04681..4861015 100644
--- a/src/templates/templates/stage-complete.ftl
+++ b/src/templates/templates/stage-complete.ftl
@@ -5,7 +5,7 @@
     <@noticebox>
     </@noticebox>
 
-    <@textcontent>
+    <@content class="text">
         <h1>Congratulations!</h1>
 
         <p>
@@ -48,7 +48,7 @@
             has for you.
         </p>
 
-    </@textcontent>
+    </@content>
 
     <div id="getstarted">
         <a class="greenbutton" href="${dynamicRoot}/account/training/${nextstage}">Continue GROWing &#x2799;</a>