From 69e2512750dd75fce43a21226979996c3cd7da1d Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Sun, 9 Jun 2013 17:35:48 -0700 Subject: 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. --- src/templates/macros/common-page.ftl | 6 +++--- src/templates/macros/noticebox.ftl | 2 +- src/templates/pages/about.html.ftl | 2 -- src/templates/pages/index.html.ftl | 2 +- src/templates/pages/login.html.ftl | 2 +- src/templates/templates/footer.ftl | 6 +++--- src/templates/templates/nav.ftl | 12 ++++++------ src/templates/templates/question-image.ftl | 4 ++-- src/templates/templates/survey.ftl | 6 +++--- 9 files changed, 20 insertions(+), 22 deletions(-) (limited to 'src/templates') 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 @@ Grow Process - - - + + +
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>
- +

<#nested>

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 @@ <@content> - -

About

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 @@ <@content> - +

Grow "Buckets"

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>

Welcome! You will need to login with your Foursquare Church InFellowship login.

-
+

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 @@