From 3ff2849a9250953c85866e0816aeb9c7ffec88a4 Mon Sep 17 00:00:00 2001
From: oliver <oliver@localhost>
Date: Fri, 12 Feb 2016 10:28:24 +0100
Subject: [PATCH] fix formatting of MulitpleChoice tasks (fixes #137)

---
 stationtypes/multiplechoice/html/edittask.tpl       | 7 ++++---
 views/html/charactergroupsqueststations/station.tpl | 2 +-
 views/html/quests/quest.tpl                         | 2 +-
 www/css/desktop.css                                 | 9 ++++++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/stationtypes/multiplechoice/html/edittask.tpl b/stationtypes/multiplechoice/html/edittask.tpl
index 80317f00..6978110b 100644
--- a/stationtypes/multiplechoice/html/edittask.tpl
+++ b/stationtypes/multiplechoice/html/edittask.tpl
@@ -5,12 +5,13 @@
     </fieldset>
     <fieldset>
         <legend><?=_('Answers')?></legend>
-        <ul id="answers">
+        <ol id="answers">
             <?php foreach($answers as $answerIndex => &$answer) : ?>
             <li>
+                <?=_('Answer')?>:<br />
                 <label>
                     <input id="answer-<?=$answerIndex?>-tick" type="checkbox" name="answers[<?=$answerIndex?>][tick]" <?php if(array_key_exists('tick', $answer) && $answer['tick']) : ?>checked="checked"<?php endif ?> />
-                    <?=_('correct answer')?>
+                    <?=_('correct')?>
                 </label>
                 <textarea id="answer-<?=$answerIndex?>" name="answers[<?=$answerIndex?>][answer]" class="answer">
 <?=$answer['answer']?>
@@ -22,7 +23,7 @@
             <li>
                 <button class="add-answer" type="button">+</button>
             </li>
-        </ul>
+        </ol>
     </fieldset>
     <input type="submit" name="save" value="<?=_('save')?>" />
 </form>
diff --git a/views/html/charactergroupsqueststations/station.tpl b/views/html/charactergroupsqueststations/station.tpl
index 7148c02d..32360c70 100644
--- a/views/html/charactergroupsqueststations/station.tpl
+++ b/views/html/charactergroupsqueststations/station.tpl
@@ -165,7 +165,7 @@
         <a class="cta orange" href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=_('Back to overview')?></a>
     </p>
     <?php else : ?>
-    <div class="text">
+    <div>
         <?=$t->t($station['task'])?>
         <?=$task?>
     </div>
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 9b8bc579..32cd711f 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -77,7 +77,7 @@
     <?php endif ?>
     
     <?php if($queststatus != 'solved') : ?>
-    <div class="text">
+    <div>
         <?=$t->t($quest['task'])?>
         <?=$task?>
     </div>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index ab08792a..a2b57b3c 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -349,12 +349,15 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 
 .solvdmsg{margin-top:20px}
 
-.mchoice{list-style-type:lower-alpha;list-style-position:inside}
+.mchoice{list-style-type:none}
 .mchoice li{margin:0 0 10px 0}
-.mchoice input[type=checkbox]{display:inline-block;margin:-19px 10px 0 24px;vertical-align:top}
-.mchoice label{width:90%;display:inline-block;margin:-25px 0 0 0;vertical-align:top}
+.mchoice input[type=checkbox]{display:inline-block;margin:0 10px 0 24px;vertical-align:middle}
+.mchoice label{width:90%;display:inline-block;margin:0 0 0 0;vertical-align:middle}
+.mchoice p{padding:0;margin:0}
 #questions{list-style-type:numeric}
 #questions > li{margin-left:15px}
+#answers{list-style-type:numeric}
+#answers > li{margin-left:15px}
 
 .submit{padding:15px;background:#eae8e4;border-radius:3px;margin-bottom:15px}
 .submit p{margin:15px 0 0 0;font-weight:bold}