From 52539d7aaba96b7997a3c5a07e4a1ad234af7d04 Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Sun, 4 Aug 2013 16:09:29 -0700 Subject: Committing everything since its long overdue. --- src/templates/macros/common-page.ftl | 1 + src/templates/macros/common.ftl | 3 +- src/templates/pages/contact.html.ftl | 0 src/templates/pages/video.html.ftl | 0 src/templates/templates/question-image.ftl | 4 +- src/templates/templates/question-quad.ftl | 16 +++++++ src/templates/templates/question-slider.ftl | 16 +++++++ src/templates/templates/survey.ftl | 9 ++++ src/templates/templates/training.ftl | 71 +++++++++++++++++++++++++++++ 9 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 src/templates/pages/contact.html.ftl create mode 100644 src/templates/pages/video.html.ftl create mode 100644 src/templates/templates/question-quad.ftl create mode 100644 src/templates/templates/question-slider.ftl create mode 100644 src/templates/templates/training.ftl (limited to 'src/templates') diff --git a/src/templates/macros/common-page.ftl b/src/templates/macros/common-page.ftl index 5fa2740..9b4323d 100644 --- a/src/templates/macros/common-page.ftl +++ b/src/templates/macros/common-page.ftl @@ -6,6 +6,7 @@ + diff --git a/src/templates/macros/common.ftl b/src/templates/macros/common.ftl index ab0d769..513fc57 100644 --- a/src/templates/macros/common.ftl +++ b/src/templates/macros/common.ftl @@ -1,4 +1,5 @@ <#include "content.ftl"> <#include "noticebox.ftl"> -<#assign contentroot = "http://localhost/~jesterpm/growcontent"> +<#assign dynamicRoot = ""> +<#assign staticRoot = ""> diff --git a/src/templates/pages/contact.html.ftl b/src/templates/pages/contact.html.ftl new file mode 100644 index 0000000..e69de29 diff --git a/src/templates/pages/video.html.ftl b/src/templates/pages/video.html.ftl new file mode 100644 index 0000000..e69de29 diff --git a/src/templates/templates/question-image.ftl b/src/templates/templates/question-image.ftl index f117256..0cf815c 100644 --- a/src/templates/templates/question-image.ftl +++ b/src/templates/templates/question-image.ftl @@ -1,9 +1,9 @@

<#list question.answers?keys as answerid> <#if selectedAnswerId?? && answerid == selectedAnswerId> -

<#else> -

diff --git a/src/templates/templates/question-quad.ftl b/src/templates/templates/question-quad.ftl new file mode 100644 index 0000000..90a7381 --- /dev/null +++ b/src/templates/templates/question-quad.ftl @@ -0,0 +1,16 @@ +

${question.top}

${question.left}

${question.right}

${question.bottom}

+ +

${question.question}

+<#if question.description??> +

+ ${question.description} +

+ diff --git a/src/templates/templates/question-slider.ftl b/src/templates/templates/question-slider.ftl new file mode 100644 index 0000000..faded36 --- /dev/null +++ b/src/templates/templates/question-slider.ftl @@ -0,0 +1,16 @@ +

${question.question}

+<#if question.description??> +

+ ${question.description} +

+ + +

+ <#list question.answers?keys as answerid> +

${question.answers[answerid].text}

+ + +

diff --git a/src/templates/templates/survey.ftl b/src/templates/templates/survey.ftl index 9ea47d5..da4e0b3 100644 --- a/src/templates/templates/survey.ftl +++ b/src/templates/templates/survey.ftl @@ -14,11 +14,14 @@

+ <#if question.previousQuestion??>