From 2661c21b33babd1b6595254d5347d8426fb5d4c9 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Mon, 24 Mar 2014 20:17:27 +0100
Subject: [PATCH] quest image positioning inside quest text

---
 views/html/quests/quest.tpl | 6 +-----
 www/css/desktop.css         | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 28c91fbd..595194f5 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -10,10 +10,6 @@
 <h4><?=$quest['title']?></h4>
 <?php endif ?>
 
-<?php if(!is_null($media)) : ?>
-<img src="<?=$linker->link(array('media','index',$seminary['url'],$media['url']))?>" />
-<?php endif ?>
-
 <?php if(!is_null($queststatustext)) : ?>
 <section>
 	<?php if($queststatus == 'solved') : ?>
@@ -29,7 +25,7 @@
 <section>
 	<h1 id="questtext"><?=$questtext['type']?></h1>
 	<div id="qtextbox">
-		<p class="qtext"><?=\hhu\z\Utils::t($questtext['text'])?></p>
+		<p class="qtext cf"><?php if(!is_null($media)) : ?><img src="<?=$linker->link(array('media','index',$seminary['url'],$media['url']))?>" /><?php endif ?><?=\hhu\z\Utils::t($questtext['text'])?></p>
 	</div>
 	
 	<ul>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index e997d4d1..65173207 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -109,6 +109,7 @@ article{padding:70px 0 30px}
 
 #qtextbox{font-size:.875em;border-radius:5px;background:#fff;border:15px solid #fff;height:200px;overflow:hidden}
 .qtext{padding-right:15px}
+.qtext img{float:right;margin-left:15px;max-width:30%;border-radius:3px}
 
 .xpinfo{display:none}
 .xpbar{width:60%;float:left;height:10px;position:relative;background:#eee;border-radius:25px;margin:8px 0 16px}