From 601077518cd43bdc8230712b7bf5927764f5819e Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Mon, 21 Apr 2014 21:13:58 +0200
Subject: [PATCH] update view for Questgroup and solved Quest

---
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 8498 -> 8666 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  29 +++++++++++++-------
 views/html/questgroups/questgroup.tpl       |   2 +-
 views/html/quests/quest.tpl                 |  11 +++++---
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index b809dbd5ed60e006591b7c98acd859e08b552da3..e4ce1818495c7fdf88a21227fd34f6caa4c6c141 100644
GIT binary patch
delta 3009
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
E0Qr^>H~;_u

delta 2870
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
W#@>8W<T~@_JrakRH?Nh^Wd#7tUhRYc

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index ddf07c44..c85999cc 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2014-04-19 23:22+0100\n"
-"PO-Revision-Date: 2014-04-19 23:22+0100\n"
+"POT-Creation-Date: 2014-04-21 21:12+0100\n"
+"PO-Revision-Date: 2014-04-21 21:12+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -83,12 +83,12 @@ msgid "submitted at %s on %s h"
 msgstr "eingereicht am %s um %s Uhr"
 
 #: questtypes/submit/html/submission.tpl:6
-#: questtypes/submit/html/submission.tpl:8
+#: questtypes/submit/html/submission.tpl:8 views/html/quests/quest.tpl:43
 #: views/html/quests/submissions.tpl:33
 msgid "solved"
 msgstr "gelöst"
 
-#: questtypes/submit/html/submission.tpl:9 views/html/quests/quest.tpl:45
+#: questtypes/submit/html/submission.tpl:9 views/html/quests/quest.tpl:46
 #: views/html/quests/submissions.tpl:24
 msgid "unsolved"
 msgstr "ungelöst"
@@ -372,7 +372,7 @@ msgstr ""
 msgid "Wrong text"
 msgstr ""
 
-#: views/html/quests/create.tpl:37 views/html/quests/quest.tpl:53
+#: views/html/quests/create.tpl:37 views/html/quests/quest.tpl:55
 msgid "Task"
 msgstr "Aufgabe"
 
@@ -392,23 +392,32 @@ msgstr "Filter anwenden"
 msgid "Reset filters"
 msgstr "Filter zurücksetzen"
 
-#: views/html/quests/quest.tpl:58
+#: views/html/quests/quest.tpl:44
+#, php-format
+msgid "Quest completed. You have earned %d XPs."
+msgstr "Quest abgeschlossen. Du hast %d XPs erhalten."
+
+#: views/html/quests/quest.tpl:60
 msgid "Task already successfully solved"
 msgstr "Du hast die Aufgabe bereits erfolgreich gelöst"
 
-#: views/html/quests/quest.tpl:61
+#: views/html/quests/quest.tpl:63
 msgid "Show answer"
 msgstr "Lösung anzeigen"
 
-#: views/html/quests/quest.tpl:62
+#: views/html/quests/quest.tpl:64
 msgid "Skip task"
 msgstr "Aufgabe überspringen"
 
-#: views/html/quests/quest.tpl:67
+#: views/html/quests/quest.tpl:69
 msgid "continue"
 msgstr "fortfahren"
 
-#: views/html/quests/quest.tpl:79 views/html/quests/quest.tpl:92
+#: views/html/quests/quest.tpl:76
+msgid "Continuation"
+msgstr "Fortsetzung"
+
+#: views/html/quests/quest.tpl:82 views/html/quests/quest.tpl:95
 msgid "Quest"
 msgstr "Quest"
 
diff --git a/views/html/questgroups/questgroup.tpl b/views/html/questgroups/questgroup.tpl
index 4d3ce2b9..285aa706 100644
--- a/views/html/questgroups/questgroup.tpl
+++ b/views/html/questgroups/questgroup.tpl
@@ -39,7 +39,7 @@
 <?php endforeach ?>
 <?php endif ?>
 
-<?php if(isset($quests) && !is_null($quests)) : ?>
+<?php if(isset($quests) && !is_null($quests) && count($quests) > 0) : ?>
 <h3><?=_('Quests')?></h3>
 <ul class="qglist">
 	<?php foreach($quests as &$quest) : ?>
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index f851166a..5256b4f7 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -10,9 +10,6 @@
 <?php if(count($questtexts) > 0) : ?>
 <section>
 	<h1 id="questtext"><?=$questtexttype['type']?></h1>
-	
-	
-	
 	<div id="qtextbox">
 		<?php $mediaShown = false; ?>
 		<?php foreach($questtexts as &$questtext) : ?>
@@ -40,10 +37,15 @@
 </section>
 <?php endif ?>
 
-<?php if(!is_null($queststatus) && $queststatus == 'unsolved') : ?>
+<?php if(!is_null($queststatus)) : ?>
 <section>
+	<?php if($queststatus == 'solved') : ?>
+	<h1><?=_('solved')?></h1>
+	<p><?=sprintf(_('Quest completed. You have earned %d XPs.'), $quest['xps'])?></p>
+	<?php elseif($queststatus == 'unsolved') : ?>
 	<h1><?=_('unsolved')?></h1>
 	<p><?=\hhu\z\Utils::t($quest['wrong_text'])?></p>
+	<?php endif ?>
 </section>
 <?php endif ?>
 
@@ -71,6 +73,7 @@
 
 <?php if(!is_null($nextquests) || !is_null($nextquestgroup)) : ?>
 <section>
+	<h1><?=_('Continuation')?></h1>
 	<?php if(count($nextquests) > 0) : ?>
 	<ul>
 		<?php foreach($nextquests as &$nextquest) : ?>