From 595d7d04e911c1f0173c549ea9be78d46b553b45 Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Thu, 5 Sep 2013 21:20:41 -0700
Subject: Moving question text to top on all question types

---
 src/templates/templates/question-circle.ftl | 14 +++++++-------
 src/templates/templates/question-image.ftl  | 13 +++++++------
 src/templates/templates/question-quad.ftl   | 13 +++++++------
 3 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/templates/templates/question-circle.ftl b/src/templates/templates/question-circle.ftl
index 157833c..cb4b9d9 100644
--- a/src/templates/templates/question-circle.ftl
+++ b/src/templates/templates/question-circle.ftl
@@ -1,3 +1,10 @@
+<h1>${question.question}</h1>
+<#if question.description??>
+<p>
+    ${question.description}
+</p>
+</#if>
+
 <div class="quadQuestion question">
     <div class="above">
         <span class="left">${question.topleft}</span>
@@ -12,10 +19,3 @@
     </div>
 </div>
 
-<h1>${question.question}</h1>
-<#if question.description??>
-<p>
-    ${question.description}
-</p>
-</#if>
-
diff --git a/src/templates/templates/question-image.ftl b/src/templates/templates/question-image.ftl
index 0cf815c..280c4aa 100644
--- a/src/templates/templates/question-image.ftl
+++ b/src/templates/templates/question-image.ftl
@@ -1,3 +1,10 @@
+<h1>${question.question}</h1>
+<#if question.description??>
+<p>
+    ${question.description}
+</p>
+</#if>
+
 <div class="imageQuestion question">
     <#list question.answers?keys as answerid>
         <#if selectedAnswerId?? && answerid == selectedAnswerId>
@@ -8,9 +15,3 @@
     </#list>
 </div>
 
-<h1>${question.question}</h1>
-<#if question.description??>
-<p>
-    ${question.description}
-</p>
-</#if>
diff --git a/src/templates/templates/question-quad.ftl b/src/templates/templates/question-quad.ftl
index 90a7381..cadaa64 100644
--- a/src/templates/templates/question-quad.ftl
+++ b/src/templates/templates/question-quad.ftl
@@ -1,3 +1,10 @@
+<h1>${question.question}</h1>
+<#if question.description??>
+<p>
+    ${question.description}
+</p>
+</#if>
+
 <div class="quadQuestion question">
     <div class="top">${question.top}</div>
     <div class="middle">
@@ -8,9 +15,3 @@
     <div class="bottom">${question.bottom}</div>
 </div>
 
-<h1>${question.question}</h1>
-<#if question.description??>
-<p>
-    ${question.description}
-</p>
-</#if>
-- 
cgit v1.2.3