From 055943ed96f5378e320f5074bb1f9675b13877b8 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Tue, 10 Mar 2015 10:00:58 +0100
Subject: [PATCH] fix styling for ordering questgroups (fixes issue #32)

---
 views/html/questgroups/questgroup.tpl |  8 ++++----
 views/html/seminaries/seminary.tpl    | 14 ++++++++------
 www/css/desktop.css                   |  2 ++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/views/html/questgroups/questgroup.tpl b/views/html/questgroups/questgroup.tpl
index f345ddeb..69a5d1e6 100644
--- a/views/html/questgroups/questgroup.tpl
+++ b/views/html/questgroups/questgroup.tpl
@@ -53,6 +53,10 @@
 			<i class="fa fa-square-o"></i>
 			<?php endif ?>
 		</span>
+		<div class="qgorder">
+			<?php if($questgroupIndex > 0) : ?><a href="<?=$linker->link(array('questgroups','moveup',$seminary['url'],$group['url']),0,true,array('referer'=>$questgroup['id']))?>">↑</a><?php endif ?>
+			<?php if($questgroupIndex < count($hierarchy['questgroups'])-1) : ?><a href="<?=$linker->link(array('questgroups','movedown',$seminary['url'],$group['url']),0,true,array('referer'=>$questgroup['id']))?>">↓</a><?php endif ?>
+		</div>
 		<div class="qgtitle"><a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$group['url']))?>"><?=$group['title']?></a></div>
 		<div class="qgprogress cf">
 			<p class="xpinfo">Fortschritt:</p>
@@ -68,10 +72,6 @@
 		</div>
 		<?php endforeach ?>
 		<?php if(in_array('admin', \hhu\z\controllers\SeminaryController::$character['characterroles'])) : ?>
-		<div>
-			<?php if($questgroupIndex > 0) : ?><a href="<?=$linker->link(array('questgroups','moveup',$seminary['url'],$group['url']),0,true,array('referer'=>$questgroup['id']))?>">↑</a><?php endif ?>
-			<?php if($questgroupIndex < count($hierarchy['questgroups'])-1) : ?><a href="<?=$linker->link(array('questgroups','movedown',$seminary['url'],$group['url']),0,true,array('referer'=>$questgroup['id']))?>">↓</a><?php endif ?>
-		</div>
 		<?php endif ?>
 	</li>
 	<?php endforeach?>
diff --git a/views/html/seminaries/seminary.tpl b/views/html/seminaries/seminary.tpl
index 0f872923..3ebecbce 100644
--- a/views/html/seminaries/seminary.tpl
+++ b/views/html/seminaries/seminary.tpl
@@ -34,8 +34,14 @@
 		<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$group['picture']['url']))?>">
 		<?php endif ?>
 		<section>
-			<p class="fwb"><?=$hierarchy['title_singular']?> <?=$group['pos']?>:
-			<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$group['url']))?>"><?=$group['title']?></a></p>
+			<div class="qgorder">
+				<?php if($questgroupIndex > 0) : ?><a href="<?=$linker->link(array('questgroups','moveup',$seminary['url'],$group['url']))?>">↑</a><?php endif ?>
+				<?php if($questgroupIndex < count($hierarchy['questgroups'])-1) : ?><a href="<?=$linker->link(array('questgroups','movedown',$seminary['url'],$group['url']))?>">↓</a><?php endif ?>
+			</div>
+            <div>
+                <p class="fwb"><?=$hierarchy['title_singular']?> <?=$group['pos']?>:
+                <a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$group['url']))?>"><?=$group['title']?></a></p>
+            </div>
 			<div class="cf">
 				<div class="xpbar">
 					<span style="width:<?=($group['achievable_xps'] > 0) ? round($group['character_xps']*100/$group['achievable_xps']) : 0?>%"></span>
@@ -47,10 +53,6 @@
 			<?php endif ?>
 			<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$group['url']))?>" class="cta orange"><?=_('Let’s go')?></a>
 			<?php if(in_array('admin', \hhu\z\controllers\SeminaryController::$character['characterroles'])) : ?>
-			<div>
-				<?php if($questgroupIndex > 0) : ?><a href="<?=$linker->link(array('questgroups','moveup',$seminary['url'],$group['url']))?>">↑</a><?php endif ?>
-				<?php if($questgroupIndex < count($hierarchy['questgroups'])-1) : ?><a href="<?=$linker->link(array('questgroups','movedown',$seminary['url'],$group['url']))?>">↓</a><?php endif ?>
-			</div>
 			<?php endif ?>
 		</section>
 	</li>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index dd05a1af..9d31814c 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -52,6 +52,7 @@ table{border-collapse:collapse;border-spacing:0}
 .cf:after{clear:both}
 .cf{zoom:1}
 .cb{clear:both}
+li.cf .qgorder{padding:20px}
 
 .wrap{margin:0 5%;max-height:999999px;min-height:1px}
 
@@ -115,6 +116,7 @@ aside{display:none}
 .qglist .qgtitle .solved .fa{color:#bcd75e}
 .qglist .qgtitle .bonus{background:#f5821f}
 .qglist .qgtitle .bonus:hover{background:#f68e34}
+.qgorder{float:right}
 
 .qtextbox{font-size:.875em;border-radius:5px;background:#fff;border:15px solid #fff;max-height:200px;overflow:hidden}
 .qtext{padding-right:15px}