From 5fb3ddc7b96b442e868e44dc513d33ba90cbe7bd Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Wed, 30 Apr 2014 01:44:22 +0200
Subject: [PATCH] add buttons for choosing next Quest/Quest group (Issue #83)

---
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 12916 -> 12973 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  41 +++++++++++---------
 views/html/quests/quest.tpl                 |  30 +++++++-------
 views/html/seminaries/seminary.tpl          |   2 +-
 4 files changed, 39 insertions(+), 34 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 4d4d2a4e913993108dfda29c30d3506f0c51f233..7d47da299b7656e26b3c6162cee580fd5e0c0a2d 100644
GIT binary patch
delta 4304
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

delta 4249
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

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 cf711981..f86d7747 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-30 00:43+0100\n"
-"PO-Revision-Date: 2014-04-30 00:45+0100\n"
+"POT-Creation-Date: 2014-04-30 01:43+0100\n"
+"PO-Revision-Date: 2014-04-30 01:43+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "lost"
 msgstr "verloren"
 
-#: questtypes/bossfight/html/quest.tpl:41
+#: questtypes/bossfight/html/quest.tpl:41 views/html/quests/quest.tpl:121
 msgid "Choose"
 msgstr "Wählen"
 
@@ -401,7 +401,6 @@ msgid "Quests"
 msgstr "Quests"
 
 #: views/html/charactergroupsquests/create.tpl:12
-#: views/html/charactergroupsquests/edit.tpl:12
 #, php-format
 msgid "New %s-Quest"
 msgstr "Neue %s-Quest"
@@ -463,7 +462,7 @@ msgstr "Titel"
 #: views/html/charactergroupsquests/create.tpl:59
 #: views/html/charactergroupsquests/edit.tpl:58
 #: views/html/charactergroupsquests/edit.tpl:59
-#: views/html/characters/index.tpl:21 views/html/characters/manage.tpl:16
+#: views/html/characters/index.tpl:22 views/html/characters/manage.tpl:17
 #: views/html/quests/create.tpl:29 views/html/quests/create.tpl:30
 msgid "XPs"
 msgstr "XP"
@@ -516,6 +515,7 @@ msgstr "%s-Quest löschen"
 msgid "Should the %s-Quest “%s” really be deleted?"
 msgstr "Soll die %s-Quest „%s“ wirklich gelöscht werden?"
 
+#: views/html/charactergroupsquests/edit.tpl:12
 #: views/html/charactergroupsquests/quest.tpl:14
 #, php-format
 msgid "Edit %s-Quest"
@@ -575,39 +575,39 @@ msgstr "Thematischer Fortschritt"
 msgid "Manage"
 msgstr "Verwalten"
 
-#: views/html/characters/index.tpl:20 views/html/characters/manage.tpl:15
+#: views/html/characters/index.tpl:21 views/html/characters/manage.tpl:16
 #: views/html/characters/register.tpl:42 views/html/characters/register.tpl:43
 msgid "Character name"
 msgstr "Charaktername"
 
-#: views/html/characters/index.tpl:22 views/html/characters/manage.tpl:17
+#: views/html/characters/index.tpl:23 views/html/characters/manage.tpl:18
 msgid "Role"
 msgstr "Rolle"
 
-#: views/html/characters/index.tpl:27 views/html/characters/manage.tpl:22
+#: views/html/characters/index.tpl:28 views/html/characters/manage.tpl:23
 msgid "Sort list"
 msgstr "Liste sortieren"
 
-#: views/html/characters/index.tpl:37 views/html/characters/manage.tpl:33
-#: views/html/characters/manage.tpl:48 views/html/characters/manage.tpl:56
+#: views/html/characters/index.tpl:38 views/html/characters/manage.tpl:34
+#: views/html/characters/manage.tpl:49 views/html/characters/manage.tpl:57
 msgid "Admin"
 msgstr "Administrator"
 
-#: views/html/characters/index.tpl:38 views/html/characters/manage.tpl:34
-#: views/html/characters/manage.tpl:49 views/html/characters/manage.tpl:57
+#: views/html/characters/index.tpl:39 views/html/characters/manage.tpl:35
+#: views/html/characters/manage.tpl:50 views/html/characters/manage.tpl:58
 msgid "Moderator"
 msgstr "Moderator"
 
-#: views/html/characters/index.tpl:39 views/html/characters/manage.tpl:35
-#: views/html/characters/manage.tpl:51 views/html/characters/manage.tpl:59
+#: views/html/characters/index.tpl:40 views/html/characters/manage.tpl:36
+#: views/html/characters/manage.tpl:52 views/html/characters/manage.tpl:60
 msgid "User"
 msgstr "Benutzer"
 
-#: views/html/characters/manage.tpl:46
+#: views/html/characters/manage.tpl:47
 msgid "Add role"
 msgstr "Füge Rolle hinzu"
 
-#: views/html/characters/manage.tpl:54
+#: views/html/characters/manage.tpl:55
 msgid "Remove role"
 msgstr "Entferne Rolle"
 
@@ -806,12 +806,17 @@ msgstr "Epilog"
 
 #: views/html/quests/quest.tpl:100
 msgid "Continuation"
-msgstr "Fortsetzung"
+msgstr "Setze deine Reise fort"
 
-#: views/html/quests/quest.tpl:107 views/html/quests/quest.tpl:122
+#: views/html/quests/quest.tpl:107 views/html/quests/quest.tpl:124
 msgid "Quest"
 msgstr "Quest"
 
+#: views/html/quests/quest.tpl:126 views/html/quests/quest.tpl:137
+#: views/html/seminaries/seminary.tpl:35
+msgid "Let’s go"
+msgstr "Auf ins Abenteuer!"
+
 #: views/html/quests/submission.tpl:9
 #, php-format
 msgid "Submission of %s"
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 16028ee8..34c41ef4 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -115,27 +115,27 @@
 		<?php else : ?>
 		<li>
 			<p>
-			<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
-			<?php if(!empty($nextquest['entry_text'])) : ?>
-			<a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=$nextquest['entry_text']?></a>
-			<?php else : ?>
-			<?=_('Quest')?>:
-			<a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=$nextquest['title']?></a>
-			<?php endif ?>
-			<?php else : ?>
-			<?php if(!empty($nextquest['entry_text'])) : ?>
-			<?=$nextquest['entry_text']?>
-			<?php else : ?>
-			<?=$nextquest['title']?>
-			<?php endif ?>
-			<?php endif ?>
+				<?php if(!empty($nextquest['entry_text'])) : ?>
+				<i><?=$nextquest['entry_text']?></i>
+				<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
+				<a class="cta orange" href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=_('Choose')?></a>
+				<?php endif ?>
+				<?php else : ?>
+				<?=_('Quest')?>: <a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=$nextquest['title']?></a>
+				<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
+				<a class="cta orange" href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=_('Let’s go')?></a>
+				<?php endif ?>
+				<?php endif ?>
 			</p>
 		</li>
 		<?php endif ?>
 		<?php endforeach ?>
 	</ul>
 	<?php elseif(!is_null($nextquestgroup)) : ?>
-	<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$nextquestgroup['url']))?>"><?=$nextquestgroup['hierarchy']['title_singular']?> <?=$nextquestgroup['hierarchy']['questgroup_pos']?>: <?=$nextquestgroup['title']?></a>
+	<p>
+		<?=$nextquestgroup['hierarchy']['title_singular']?> <?=$nextquestgroup['hierarchy']['questgroup_pos']?>: <a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$nextquestgroup['url']))?>"><?=$nextquestgroup['title']?></a>
+		<a class="cta orange" href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$nextquestgroup['url']))?>"><?=_('Let’s go')?></a>
+	</p>
 	<?php endif ?>
 </section>
 <?php endif ?>
diff --git a/views/html/seminaries/seminary.tpl b/views/html/seminaries/seminary.tpl
index b32fabed..6f797954 100644
--- a/views/html/seminaries/seminary.tpl
+++ b/views/html/seminaries/seminary.tpl
@@ -32,7 +32,7 @@
 			<?php if(array_key_exists('text', $group)) : ?>
 			<p><?=$group['text']?></p>
 			<?php endif ?>
-			<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$group['url']))?>" class="cta orange">Auf ins Abenteuer!</a>
+			<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$group['url']))?>" class="cta orange"><?=_('Let’s go')?></a>
 		</section>
 	</li>
 	<?php endforeach?>