update view for Questgroup and solved Quest

This commit is contained in:
coderkun 2014-04-21 21:13:58 +02:00
commit 601077518c
4 changed files with 27 additions and 15 deletions

View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: The Legend of Z\n" "Project-Id-Version: The Legend of Z\n"
"POT-Creation-Date: 2014-04-19 23:22+0100\n" "POT-Creation-Date: 2014-04-21 21:12+0100\n"
"PO-Revision-Date: 2014-04-19 23:22+0100\n" "PO-Revision-Date: 2014-04-21 21:12+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: de_DE\n" "Language: de_DE\n"
@ -83,12 +83,12 @@ msgid "submitted at %s on %sh"
msgstr "eingereicht am %s um %s Uhr" msgstr "eingereicht am %s um %s Uhr"
#: questtypes/submit/html/submission.tpl:6 #: 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 #: views/html/quests/submissions.tpl:33
msgid "solved" msgid "solved"
msgstr "gelöst" 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 #: views/html/quests/submissions.tpl:24
msgid "unsolved" msgid "unsolved"
msgstr "ungelöst" msgstr "ungelöst"
@ -372,7 +372,7 @@ msgstr ""
msgid "Wrong text" msgid "Wrong text"
msgstr "" 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" msgid "Task"
msgstr "Aufgabe" msgstr "Aufgabe"
@ -392,23 +392,32 @@ msgstr "Filter anwenden"
msgid "Reset filters" msgid "Reset filters"
msgstr "Filter zurücksetzen" 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" msgid "Task already successfully solved"
msgstr "Du hast die Aufgabe bereits erfolgreich gelöst" msgstr "Du hast die Aufgabe bereits erfolgreich gelöst"
#: views/html/quests/quest.tpl:61 #: views/html/quests/quest.tpl:63
msgid "Show answer" msgid "Show answer"
msgstr "Lösung anzeigen" msgstr "Lösung anzeigen"
#: views/html/quests/quest.tpl:62 #: views/html/quests/quest.tpl:64
msgid "Skip task" msgid "Skip task"
msgstr "Aufgabe überspringen" msgstr "Aufgabe überspringen"
#: views/html/quests/quest.tpl:67 #: views/html/quests/quest.tpl:69
msgid "continue" msgid "continue"
msgstr "fortfahren" 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" msgid "Quest"
msgstr "Quest" msgstr "Quest"

View file

@ -39,7 +39,7 @@
<?php endforeach ?> <?php endforeach ?>
<?php endif ?> <?php endif ?>
<?php if(isset($quests) && !is_null($quests)) : ?> <?php if(isset($quests) && !is_null($quests) && count($quests) > 0) : ?>
<h3><?=_('Quests')?></h3> <h3><?=_('Quests')?></h3>
<ul class="qglist"> <ul class="qglist">
<?php foreach($quests as &$quest) : ?> <?php foreach($quests as &$quest) : ?>

View file

@ -10,9 +10,6 @@
<?php if(count($questtexts) > 0) : ?> <?php if(count($questtexts) > 0) : ?>
<section> <section>
<h1 id="questtext"><?=$questtexttype['type']?></h1> <h1 id="questtext"><?=$questtexttype['type']?></h1>
<div id="qtextbox"> <div id="qtextbox">
<?php $mediaShown = false; ?> <?php $mediaShown = false; ?>
<?php foreach($questtexts as &$questtext) : ?> <?php foreach($questtexts as &$questtext) : ?>
@ -40,10 +37,15 @@
</section> </section>
<?php endif ?> <?php endif ?>
<?php if(!is_null($queststatus) && $queststatus == 'unsolved') : ?> <?php if(!is_null($queststatus)) : ?>
<section> <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> <h1><?=_('unsolved')?></h1>
<p><?=\hhu\z\Utils::t($quest['wrong_text'])?></p> <p><?=\hhu\z\Utils::t($quest['wrong_text'])?></p>
<?php endif ?>
</section> </section>
<?php endif ?> <?php endif ?>
@ -71,6 +73,7 @@
<?php if(!is_null($nextquests) || !is_null($nextquestgroup)) : ?> <?php if(!is_null($nextquests) || !is_null($nextquestgroup)) : ?>
<section> <section>
<h1><?=_('Continuation')?></h1>
<?php if(count($nextquests) > 0) : ?> <?php if(count($nextquests) > 0) : ?>
<ul> <ul>
<?php foreach($nextquests as &$nextquest) : ?> <?php foreach($nextquests as &$nextquest) : ?>