From 2e1d5999c6d6b6c42f8cd325542d49d70a76a4a5 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Sun, 27 Apr 2014 13:25:59 +0200
Subject: [PATCH] allow more than one scrolling text on one page

---
 views/html/html.tpl                   | 2 +-
 views/html/questgroups/questgroup.tpl | 2 +-
 views/html/quests/quest.tpl           | 8 ++++----
 www/css/desktop.css                   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/views/html/html.tpl b/views/html/html.tpl
index 91382c88..6accd686 100644
--- a/views/html/html.tpl
+++ b/views/html/html.tpl
@@ -13,7 +13,7 @@
 	<script type="text/javascript">
 	$(document).ready(
 	function() {
-		$("#qtextbox").niceScroll({autohidemode:false,cursorcolor:"#c2beb9"});
+		$(".qtextbox").niceScroll({autohidemode:false,cursorcolor:"#c2beb9"});
 	}
 	);
 	</script>
diff --git a/views/html/questgroups/questgroup.tpl b/views/html/questgroups/questgroup.tpl
index fb371147..aadc169e 100644
--- a/views/html/questgroups/questgroup.tpl
+++ b/views/html/questgroups/questgroup.tpl
@@ -11,7 +11,7 @@
 <h1><?=$questgroup['title']?></h1>
 <?php endif ?>
 <?php if(count($texts) > 0): ?>
-<div id="qtextbox">
+<div class="qtextbox">
 <?php foreach($texts as &$text) : ?>
 <p class="qtext"><?=\hhu\z\Utils::t($text['text'])?></p>
 <?php endforeach ?>
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 91762197..16028ee8 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -9,7 +9,7 @@
 <?php if(array_key_exists('Prolog', $questtexts) && count($questtexts['Prolog']) > 0) : ?>
 <section>
 	<h1 id="questtext"><?=_('Prolog')?></h1>
-	<div id="qtextbox">
+	<div class="qtextbox">
 		<?php $mediaShown = false; ?>
 		<?php foreach($questtexts['Prolog'] as &$questtext) : ?>
 		<p class="qtext cf">
@@ -72,7 +72,7 @@
 <?php if(array_key_exists('Epilog', $questtexts) && count($questtexts['Epilog']) > 0) : ?>
 <section>
 	<h1 id="questtext"><?=_('Epilog')?></h1>
-	<div id="qtextbox">
+	<div class="qtextbox">
 		<?php foreach($questtexts['Epilog'] as &$questtext) : ?>
 		<p class="qtext cf">
 			<?php if(array_key_exists('media', $questtext)) : ?>
@@ -83,10 +83,10 @@
 		<?php if(count($questtext['relatedQuestsgroups']) > 0 || !empty($questtext['abort_text'])) : ?>
 		<ul>
 			<?php foreach($questtext['relatedQuestsgroups'] as &$relatedQuestgroup) : ?>
-			<li><a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$relatedQuestgroup['url']))?>"><?=$relatedQuestgroup['entry_text']?></a></li>
+			<li><p><a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$relatedQuestgroup['url']))?>"><?=$relatedQuestgroup['entry_text']?></a></p></li>
 			<?php endforeach ?>
 			<?php if(!empty($questtext['abort_text'])) : ?>
-			<li><a href="<?=$linker->link(array('quest',$seminary['url'],$relatedquesttext['quest']['questgroup_url'],$relatedquesttext['quest']['url'],$relatedquesttext['type_url']),1)?>"><?=$questtext['abort_text']?></a></li>
+			<li><p><a href="<?=$linker->link(array('quest',$seminary['url'],$relatedquesttext['quest']['questgroup_url'],$relatedquesttext['quest']['url'],$relatedquesttext['type_url']),1)?>"><?=$questtext['abort_text']?></a></p></li>
 			<?php endif ?>
 		</ul>
 		<?php endif ?>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index eb76292d..716af80b 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -112,7 +112,7 @@ aside{display:none}
 .qglist .qgtitle .bonus{background:#f5821f}
 .qglist .qgtitle .bonus:hover{background:#f68e34}
 
-#qtextbox{font-size:.875em;border-radius:5px;background:#fff;border:15px solid #fff;max-height:200px;overflow:hidden}
+.qtextbox{font-size:.875em;border-radius:5px;background:#fff;border:15px solid #fff;max-height:200px;overflow:hidden}
 .qtext{padding-right:15px}
 .qtext img,.grpqimg{float:right;margin-left:15px;max-width:30%;max-height:200px;border-radius:3px}