From f771e74c3867c2e16d0c9d5187a2e115345b9048 Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Mon, 3 Jun 2013 17:46:53 -0700 Subject: Adding a content root variable to the templates. The content root is used to specify the location of the static content. It is currently hard-coded to my desktop, but it will be updated after a config system is introduced. --- src/templates/macros/common-page.ftl | 6 +++--- src/templates/macros/common.ftl | 2 ++ src/templates/macros/noticebox.ftl | 2 +- src/templates/templates/nav.ftl | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/templates/macros/common-page.ftl b/src/templates/macros/common-page.ftl index eaef04f..560fa48 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/common.ftl b/src/templates/macros/common.ftl index 7e8a2d5..ab0d769 100644 --- a/src/templates/macros/common.ftl +++ b/src/templates/macros/common.ftl @@ -1,2 +1,4 @@ <#include "content.ftl"> <#include "noticebox.ftl"> + +<#assign contentroot = "http://localhost/~jesterpm/growcontent"> diff --git a/src/templates/macros/noticebox.ftl b/src/templates/macros/noticebox.ftl index e1d75a5..43c36c3 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/templates/nav.ftl b/src/templates/templates/nav.ftl index 285fbde..ae9517c 100644 --- a/src/templates/templates/nav.ftl +++ b/src/templates/templates/nav.ftl @@ -7,7 +7,7 @@
-

Grow Process

+

Grow Process