diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2013-06-09 17:35:48 -0700 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2013-06-09 17:35:48 -0700 |
| commit | 69e2512750dd75fce43a21226979996c3cd7da1d (patch) | |
| tree | 691dca375161583393ce32bb0869cb7449255118 /src/templates | |
| parent | f4c2eb2dafbca580319a9f50ef4f5dd68d658702 (diff) | |
Configuration Changes
Fixing a bug in the config class and updating all templates and pages to
use the dynamicRoot and staticRoot config values to prefix URLs.
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/macros/common-page.ftl | 6 | ||||
| -rw-r--r-- | src/templates/macros/noticebox.ftl | 2 | ||||
| -rw-r--r-- | src/templates/pages/about.html.ftl | 2 | ||||
| -rw-r--r-- | src/templates/pages/index.html.ftl | 2 | ||||
| -rw-r--r-- | src/templates/pages/login.html.ftl | 2 | ||||
| -rw-r--r-- | src/templates/templates/footer.ftl | 6 | ||||
| -rw-r--r-- | src/templates/templates/nav.ftl | 12 | ||||
| -rw-r--r-- | src/templates/templates/question-image.ftl | 4 | ||||
| -rw-r--r-- | src/templates/templates/survey.ftl | 6 |
9 files changed, 20 insertions, 22 deletions
diff --git a/src/templates/macros/common-page.ftl b/src/templates/macros/common-page.ftl index 1a5c3d3..5fa2740 100644 --- a/src/templates/macros/common-page.ftl +++ b/src/templates/macros/common-page.ftl @@ -4,9 +4,9 @@ <head> <title>Grow Process</title> - <link rel="stylesheet" href="${contentroot}/style.css" /> - <script src="${contentroot}/scripts/jquery.min.js"></script> - <script src="${contentroot}/scripts/growth.js"></script> + <link rel="stylesheet" href="${staticRoot}/style.css" /> + <script src="${staticRoot}/scripts/jquery.min.js"></script> + <script src="${staticRoot}/scripts/growth.js"></script> </head> <body> <div id="notfooter"> diff --git a/src/templates/macros/noticebox.ftl b/src/templates/macros/noticebox.ftl index 43c36c3..eca1428 100644 --- a/src/templates/macros/noticebox.ftl +++ b/src/templates/macros/noticebox.ftl @@ -1,7 +1,7 @@ <#macro noticebox> <div id="middlebar"> <div id="noticebox"> - <img class="icon" src="${contentroot}/images/noticeicon.png"> + <img class="icon" src="${staticRoot}/images/noticeicon.png"> <p> <#nested> </p> diff --git a/src/templates/pages/about.html.ftl b/src/templates/pages/about.html.ftl index 65a1f1d..3ab2bc0 100644 --- a/src/templates/pages/about.html.ftl +++ b/src/templates/pages/about.html.ftl @@ -9,8 +9,6 @@ </@noticebox> <@content> - <img src="images/buckets.png" /> - <h1>About</h1> <p> Curabitur mattis molestie ligula, ac vestibulum Curabitur diff --git a/src/templates/pages/index.html.ftl b/src/templates/pages/index.html.ftl index 44f9dce..4e6ea73 100644 --- a/src/templates/pages/index.html.ftl +++ b/src/templates/pages/index.html.ftl @@ -11,7 +11,7 @@ </@noticebox> <@content> - <img src="images/buckets.png" /> + <img src="${staticRoot}/images/buckets.png" /> <h1>Grow "Buckets"</h1> <p> diff --git a/src/templates/pages/login.html.ftl b/src/templates/pages/login.html.ftl index 29e30e9..590649c 100644 --- a/src/templates/pages/login.html.ftl +++ b/src/templates/pages/login.html.ftl @@ -12,7 +12,7 @@ <@content> <p>Welcome! You will need to login with your Foursquare Church InFellowship login.</p> - <form action="login.html" method="post"> + <form action="${dynamicRoot}/login.html" 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> <p><input type="submit" value="Login" /></p> diff --git a/src/templates/templates/footer.ftl b/src/templates/templates/footer.ftl index c7f6ca6..64d6d47 100644 --- a/src/templates/templates/footer.ftl +++ b/src/templates/templates/footer.ftl @@ -1,9 +1,9 @@ <footer> <div class="left"> ©2012 Grow Process - <a href="index.html">Home</a> - <a href="about.html">About</a> - <a href="contact.html">Contact</a> + <a href="${dynamicRoot}/index.html">Home</a> + <a href="${dynamicRoot}/about.html">About</a> + <a href="${dynamicRoot}/contact.html">Contact</a> </div> <div class="right"> diff --git a/src/templates/templates/nav.ftl b/src/templates/templates/nav.ftl index cf2562c..cef283e 100644 --- a/src/templates/templates/nav.ftl +++ b/src/templates/templates/nav.ftl @@ -7,17 +7,17 @@ </#macro> <header> - <h1><img src="${contentroot}/images/logo.png"> Grow Process</h1> + <h1><img src="${staticRoot}/images/logo.png"> Grow Process</h1> <nav class="primary"> <ul> - <@navLink href="/index.html">Home</@navLink> - <@navLink href="/about.html">About</@navLink> - <@navLink href="/contact.html">Contact</@navLink> + <@navLink href="${dynamicRoot}/index.html">Home</@navLink> + <@navLink href="${dynamicRoot}/about.html">About</@navLink> + <@navLink href="${dynamicRoot}/contact.html">Contact</@navLink> <#if user??> - <@navLink href="/account/assessment">Take Assessment</@navLink> + <@navLink href="${dynamicRoot}/account/assessment">Take Assessment</@navLink> <#else> - <@navLink href="/login.html">Login / Sign Up</@navLink> + <@navLink href="${dynamicRoot}/login.html">Login / Sign Up</@navLink> </#if> </ul> </nav> diff --git a/src/templates/templates/question-image.ftl b/src/templates/templates/question-image.ftl index 63f0616..f117256 100644 --- a/src/templates/templates/question-image.ftl +++ b/src/templates/templates/question-image.ftl @@ -1,9 +1,9 @@ <div class="imageQuestion question"> <#list question.answers?keys as answerid> <#if selectedAnswerId?? && answerid == selectedAnswerId> - <a href="#" class="answer" id="${answerid}" onclick="selectAnswer(this)" class="selected"><img src="images/${question.id}-${answerid}.png" alt="${question.answers[answerid]!}" /></a> + <a href="#" class="answer" id="${answerid}" onclick="selectAnswer(this)" class="selected"><img src="${staticRoot}/images/${question.id}-${answerid}.png" alt="${question.answers[answerid]!}" /></a> <#else> - <a href="#" class="answer" id="${answerid}" onclick="selectAnswer(this)" class="answer"><img src="images/${question.id}-${answerid}.png" alt="${question.answers[answerid]!}" /></a> + <a href="#" class="answer" id="${answerid}" onclick="selectAnswer(this)" class="answer"><img src="${staticRoot}/images/${question.id}-${answerid}.png" alt="${question.answers[answerid]!}" /></a> </#if> </#list> </div> diff --git a/src/templates/templates/survey.ftl b/src/templates/templates/survey.ftl index a1eb18d..9ea47d5 100644 --- a/src/templates/templates/survey.ftl +++ b/src/templates/templates/survey.ftl @@ -13,16 +13,16 @@ </div> <div id="content"> - <form id="questionForm" action="/account/assessment/question/${question.id}" method="post"> + <form id="questionForm" action="${dynamicRoot}/account/assessment/question/${question.id}" method="post"> <input id="answerField" type="hidden" name="answer" value="${selectedAnswerId!}" /> <div id="previous"> <a href="#" onclick="previousQuestion();return false;"> - <img src="${contentroot}/images/previous.png" alt="Previous Question" /> + <img src="${staticRoot}/images/previous.png" alt="Previous Question" /> </a> </div> <div id="next"> <a href="#" onclick="nextQuestion();return false;"> - <img src="${contentroot}/images/next.png" alt="Next Question" /> + <img src="${staticRoot}/images/next.png" alt="Next Question" /> </a> </div> <article> |