From eb633b5dcfd984a5e7fa034b2eb45c10009e98b3 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 24 Apr 2014 12:46:48 +0200
Subject: [PATCH] milestone design update & changed section order

---
 views/html/characters/character.tpl | 65 ++++++++++++++---------------
 www/css/desktop.css                 |  1 +
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/views/html/characters/character.tpl b/views/html/characters/character.tpl
index 2fdc870f..f74fa78c 100644
--- a/views/html/characters/character.tpl
+++ b/views/html/characters/character.tpl
@@ -34,7 +34,7 @@
 				<?php if($milestone['achieved']) : ?>
 				<p class="unlocked fwb"><i class="fa fa-check-circle fa-fw"></i><?=$milestone['title']?></p>
 				<?php elseif($milestone['deadline'] < date('Y-m-d H:i:s')) : ?>
-				<i class="fa fa-times-circle fa-fw"></i><?=$milestone['title']?></p>
+				<p class="passed fwb"><i class="fa fa-times-circle fa-fw"></i><?=$milestone['title']?></p>
 				<?php else : ?>
 				<p class="fwb"><i class="fa fa-lock fa-fw"></i><?=$milestone['title']?></p>
 				<?php endif ?>
@@ -50,6 +50,30 @@
 
 <div class="cf">
 	<section class="fll48">
+		<h2><i class="fa fa-list fa-fw"></i><?=_('Ranking')?></h2>
+		<ul class="cranks">
+			<?php foreach($ranking['superior'] as $index => &$rankCharacter) : ?>
+			<li>
+				<a href="#"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$rankCharacter['charactertype_url'],$rankCharacter['xplevel'],'portrait'))?>"></a>
+				<p><?=$character['rank']-count($ranking['superior'])+$index?>. <a href="#"><?=$rankCharacter['name']?></a></p>
+				<p><small><?=_('Level')?> <?=$rankCharacter['xplevel']?> (<?=$rankCharacter['xps']?> XPs)</small></p>
+			</li>
+			<?php endforeach ?>
+			<li>
+				<a href="#"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']['level'],'portrait'))?>"></a>
+				<p class="fwb"><?=$character['rank']?>. <a href="#"><?=$character['name']?></a></p>
+				<p><small><?=_('Level')?> <?=$character['xplevel']['level']?> (<?=$character['xps']?> XPs)</small></p>
+			</li>
+			<?php foreach($ranking['inferior'] as $index => &$rankCharacter) : ?>
+			<li>
+				<a href="#"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$rankCharacter['charactertype_url'],$rankCharacter['xplevel'],'portrait'))?>"></a>
+				<p><?=$character['rank']+$index+1?>. <a href="#"><?=$rankCharacter['name']?></a></p>
+				<p><small><?=_('Level')?> <?=$rankCharacter['xplevel']?> (<?=$rankCharacter['xps']?> XPs)</small></p>
+			</li>
+			<?php endforeach ?>
+		</ul>
+	</section>
+	<section class="flr48">
 		<h2><i class="fa fa-users fa-fw"></i><?=_('Character Groups')?></h2>
 		<ul class="cgroups cf">
 			<?php foreach($groups as &$group) : ?>
@@ -60,32 +84,15 @@
 			<?php endforeach ?>
 		</ul>
 	</section>
-	<section class="flr48">
-		<h2><i class="fa fa-list fa-fw"></i><?=_('Ranking')?></h2>
-		<ul class="cranks">
-			<?php foreach($ranking['superior'] as $index => &$rankCharacter) : ?>
-			<li>
-				<a href="#" title="Achievement-Titel"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$rankCharacter['charactertype_url'],$rankCharacter['xplevel'],'portrait'))?>"></a>
-				<p><?=$character['rank']-count($ranking['superior'])+$index?>. <a href="#"><?=$rankCharacter['name']?></a></p>
-				<p><small><?=_('Level')?> <?=$rankCharacter['xplevel']?> (<?=$rankCharacter['xps']?> XPs)</small></p>
-			</li>
-			<?php endforeach ?>
-			<li>
-				<a href="#" title="Achievement-Titel"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']['level'],'portrait'))?>"></a>
-				<p class="fwb"><?=$character['rank']?>. <a href="#"><?=$character['name']?></a></p>
-				<p><small><?=_('Level')?> <?=$character['xplevel']['level']?> (<?=$character['xps']?> XPs)</small></p>
-			</li>
-			<?php foreach($ranking['inferior'] as $index => &$rankCharacter) : ?>
-			<li>
-				<a href="#" title="Achievement-Titel"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$rankCharacter['charactertype_url'],$rankCharacter['xplevel'],'portrait'))?>"></a>
-				<p><?=$character['rank']+$index+1?>. <a href="#"><?=$rankCharacter['name']?></a></p>
-				<p><small><?=_('Level')?> <?=$rankCharacter['xplevel']?> (<?=$rankCharacter['xps']?> XPs)</small></p>
-			</li>
-			<?php endforeach ?>
-		</ul>
-	</section>
 </div>
 
+<?php if(!is_null($lastQuest)) : ?>
+<section>
+	<h2><i class="fa fa-share-square fa-fw"></i><?=_('Last Quest')?></h2>
+	<p><i class="fa fa-pencil-square-o fa-fw"></i><a href="<?=$linker->link(array('quests','quest',$seminary['url'],$lastQuest['questgroup']['url'],$lastQuest['url']))?>"><?=$lastQuest['title']?></a></p>
+</section>
+<?php endif ?>
+
 <section>
 	<h2><i class="fa fa-book fa-fw"></i><?=_('Topic progress')?></h2>
 	<ul class="ctopics cf">
@@ -100,11 +107,3 @@
 	</ul>
 </section>
 
-
-<?php if(!is_null($lastQuest)) : ?>
-<section>
-	<h2><?=_('Last Quest')?></h2>
-	<p><i class="fa fa-pencil-square-o fa-fw"></i><a href="<?=$linker->link(array('quests','quest',$seminary['url'],$lastQuest['questgroup']['url'],$lastQuest['url']))?>"><?=$lastQuest['title']?></a></p>
-</section>
-<?php endif ?>
-
diff --git a/www/css/desktop.css b/www/css/desktop.css
index fb192b69..fa97244a 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -157,6 +157,7 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .crewards li:last-child{margin-bottom:0}
 .crewards li .fa{font-size:1.25em}
 .crewards p{margin-bottom:5px}
+.crewards .passed .fa{color:#850000}
 
 .cgroups img{float:left;border-radius:3px;margin-right:5px;height:35px}
 .cgroups p{float:left;0;padding:0 12px;line-height:35px;background:#fff;border-radius:0 3px 3px 0}