From a4a777cea6df9160bde1dd8f22aa83cf895a7f1e Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 17 Apr 2014 15:36:20 +0200
Subject: [PATCH 1/5] form design update

---
 views/html/seminaries/create.tpl | 2 +-
 views/html/users/create.tpl      | 2 +-
 www/css/desktop.css              | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/views/html/seminaries/create.tpl b/views/html/seminaries/create.tpl
index 30938357..22a9acaa 100644
--- a/views/html/seminaries/create.tpl
+++ b/views/html/seminaries/create.tpl
@@ -6,7 +6,7 @@
 <h1><?=_('Seminaries')?></h1>
 <h2><?=_('New seminary')?></h2>
 
-<form method="post" action="<?=$linker->link('create', 1)?>">
+<form method="post" action="<?=$linker->link('create', 1)?>" class="logreg">
 	<fieldset>
 		<label for="title"><?=_('Title')?>:</label>
 		<input type="text" name="title" placeholder="<?=_('Title')?>" /><br />
diff --git a/views/html/users/create.tpl b/views/html/users/create.tpl
index d4f38bb7..2d5484dc 100644
--- a/views/html/users/create.tpl
+++ b/views/html/users/create.tpl
@@ -1,7 +1,7 @@
 <h1><?=_('Users')?></h1>
 <h2><?=_('New user')?></h2>
 
-<form method="post" action="<?=$linker->link('create', 1)?>">
+<form method="post" action="<?=$linker->link('create', 1)?>" class="logreg">
 	<fieldset>
 		<label for="username"><?=_('Username')?>:</label>
 		<input type="text" name="username" placeholder="<?=_('Username')?>" /><br />
diff --git a/www/css/desktop.css b/www/css/desktop.css
index 9226aa06..cfff8097 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -102,6 +102,7 @@ aside{display:none}
 .qgicon{margin:17px 0 0 -39px;background:#f7f5f2;font-size:1.25em;float:left}
 .qgicon.locked{margin-top:-2px}
 .qgtitle a{background:#5cb6bd;border-radius:3px 3px 0 0;display:block;padding:20px;color:#fff;font-weight:700}
+.qgtitle a:hover{background:#5bbac2}
 .qgprogress,.qghidden{margin-bottom:4px;padding:20px 20px 4px 20px;background:#fff;border-radius:0 0 3px 3px}
 
 .qglist li{margin: 0 0 5px 0}
@@ -269,7 +270,7 @@ menu a{padding:10px 0}
 #toggle,.toggle{display:none}
 .wrap{margin:0 0 0 300px}
 article{padding:20px 40px 80px 40px}
-.moodpic{margin:-20px -40px}
+.moodpic{margin:-20px -40px 0 -40px}
 .breadcrumbs li{display:inline;padding-right:10px}
 
 .gchars li{width:19%}
@@ -280,7 +281,7 @@ html{overflow-y:scroll;height:100%}
 body{background:#eae8e4;height:100%}
 .wrap{width:800px;max-width:800px;height:auto !important;min-height:100%;height:100%;position:relative;overflow:hidden}
 article{background:#f7f5f2;float:left}
-.moodpic{margin:-20px 0 0 -40px;width:880px;height:230px}
+.moodpic{width:880px;height:230px}
 .moodpic img{width:100%}
 }
 

From bde658d7a499e9c690bb81a0bb16792e2b17ccc5 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 17 Apr 2014 17:39:54 +0200
Subject: [PATCH 2/5] charactergroups design update

---
 views/html/charactergroups/group.tpl       | 32 ++++++++---------
 views/html/charactergroups/groupsgroup.tpl | 23 ++++++------
 views/html/charactergroups/index.tpl       |  9 ++---
 views/html/charactergroupsquests/quest.tpl | 42 +++++++++++-----------
 www/css/desktop.css                        | 35 +++++++++++-------
 5 files changed, 78 insertions(+), 63 deletions(-)

diff --git a/views/html/charactergroups/group.tpl b/views/html/charactergroups/group.tpl
index ba53c97b..0f6f88d3 100644
--- a/views/html/charactergroups/group.tpl
+++ b/views/html/charactergroups/group.tpl
@@ -3,23 +3,21 @@
 	<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
 </div>
 <?php endif ?>
-<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
-<h2><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Character Groups')?></a></h2>
-<h3><a href="<?=$linker->link(array('groupsgroup',$seminary['url'],$groupsgroup['url']),1)?>"><?=$groupsgroup['name']?></a></h3>
-<section class="gdata cf">
-	<div class="gbanner">
-		<img src="http://s1.directupload.net/images/140325/3eqybn4i.png">
-	</div>
-	<div class="gdesc">
-		<h3><?=$group['name']?></h3>
-		<span><?=$group['motto']?></span>
-	</div>
-	<ul>
-		<li><i class="fa fa-th-list fa-fw"></i><?=$group['rank']?>. <?=_('Rank')?></li>
-		<li><i class="fa fa-lightbulb-o fa-fw"></i><?=$group['xps']?> XPs</li>
-		<li><i class="fa fa-users fa-fw"></i><?=count($group['characters'])?> <?=(count($group['characters']) > 1) ? _('Members') : _('Member')?></li>
-	</ul>
-</section>
+<ul class="breadcrumbs">
+	<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
+	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Character Groups')?></a></li>
+	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('groupsgroup',$seminary['url'],$groupsgroup['url']),1)?>"><?=$groupsgroup['name']?></a></li>
+</ul>
+<div class="gbanner cf">
+	<img src="http://s1.directupload.net/images/140325/3eqybn4i.png" class="gbanner">
+	<h1><?=$group['name']?></h1>
+	<p>"<?=$group['motto']?>"</p>
+</div>
+<ul class="gdata cf">
+	<li><?=$group['rank']?>. <?=_('Rank')?></li>
+	<li><?=$group['xps']?> XP</li>
+	<li><?=count($group['characters'])?> <?=(count($group['characters']) > 1) ? _('Members') : _('Member')?></li>
+</ul>
 
 <section>
 	<h1><i class="fa fa-users fa-fw"></i><?=_('Characters')?></h1>
diff --git a/views/html/charactergroups/groupsgroup.tpl b/views/html/charactergroups/groupsgroup.tpl
index 93aeaba7..3d337cf3 100644
--- a/views/html/charactergroups/groupsgroup.tpl
+++ b/views/html/charactergroups/groupsgroup.tpl
@@ -3,19 +3,22 @@
 	<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
 </div>
 <?php endif ?>
-<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
-<h2><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Character Groups')?></a></h2>
-<h3><?=$groupsgroup['name']?></h3>
-
-<ul>
-	<?php foreach($groups as &$group) : ?>
-	<li><a href="<?=$linker->link(array('group',$seminary['url'],$groupsgroup['url'],$group['url']),1)?>"><?=$group['name']?> (<?=$group['xps']?> XPs)</a></li>
-	<?php endforeach ?>
+<ul class="breadcrumbs">
+	<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
+	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Character Groups')?></a></li>
 </ul>
 
+<h1><?=$groupsgroup['name']?></h1>
 
-<h3><?=_('Character Groups Quests')?></h3>
-<ul>
+<ol class="cglist">
+	<?php foreach($groups as &$group) : ?>
+	<li><a href="<?=$linker->link(array('group',$seminary['url'],$groupsgroup['url'],$group['url']),1)?>"><?=$group['name']?></a><span class="xp"><?=$group['xps']?> XP</span></li>
+	<?php endforeach ?>
+</ol>
+
+
+<h2><?=_('Character Groups Quests')?></h2>
+<ul class="cgqlist">
 	<?php foreach($quests as &$quest) : ?>
 	<li><a href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=$quest['title']?></a></li>
 	<?php endforeach ?>
diff --git a/views/html/charactergroups/index.tpl b/views/html/charactergroups/index.tpl
index e0f54b94..d88d25eb 100644
--- a/views/html/charactergroups/index.tpl
+++ b/views/html/charactergroups/index.tpl
@@ -3,10 +3,11 @@
 	<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
 </div>
 <?php endif ?>
-<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
-<h2><?=_('Character Groups')?></h2>
-
-<ul>
+<ul class="breadcrumbs">
+	<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
+</ul>
+<h1><?=_('Character Groups')?></h1>
+<ul class="cgqlist">
 	<?php foreach($groupsgroups as &$group) : ?>
 	<li><a href="<?=$linker->link(array('groupsgroup',$seminary['url'],$group['url']),1)?>"><?=$group['name']?></a></li>
 	<?php endforeach ?>
diff --git a/views/html/charactergroupsquests/quest.tpl b/views/html/charactergroupsquests/quest.tpl
index 8112a913..060cf3ab 100644
--- a/views/html/charactergroupsquests/quest.tpl
+++ b/views/html/charactergroupsquests/quest.tpl
@@ -3,19 +3,23 @@
 	<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
 </div>
 <?php endif ?>
-<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
-<h2><?=_('Character Groups Quests')?></h2>
-<h3><a href="<?=$linker->link(array('charactergroups','groupsgroup',$seminary['url'],$groupsgroup['url']))?>"><?=$groupsgroup['name']?></a></h3>
-<h4><?=$quest['title']?></h4>
+<ul class="breadcrumbs">
+	<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
+	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('charactergroups','groupsgroup',$seminary['url'],$groupsgroup['url']))?>"><?=$groupsgroup['name']?></a></li>
+	<li><i class="fa fa-chevron-right fa-fw"></i><?=_('Character Groups Quests')?></li>
+</ul>
 
-<?php if(!is_null($media)) : ?>
-<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>" />
-<?php endif ?>
+<h1><?=$quest['title']?></h1>
+<small>Maximale Belohnung: <span class="fwb"><?=$quest['xps']?> XP</span></small>
 
 <section>
-	<p>XPs: <?=$quest['xps']?></p>
 	<h1><?=_('Description')?></h1>
-	<p><?=\hhu\z\Utils::t($quest['description'])?></p>
+	<p>
+	<?php if(!is_null($media)) : ?>
+	<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>" class="grpqimg" />
+	<?php endif ?>
+	<?=\hhu\z\Utils::t($quest['description'])?>
+	</p>
 	<?php if(!empty($quest['rules'])) : ?>
 	<h1><?=_('Rules')?></h1>
 	<p><?=\hhu\z\Utils::t($quest['rules'])?></p>
@@ -37,15 +41,13 @@
 
 <section>
 	<h1><?=$groupsgroup['name']?></h1>
-	<table>
-		<tbody>
-			<?php foreach($groups as &$group) : ?>
-			<tr>
-				<td><?=$dateFormatter->format(new \DateTime($group['created']))?></td>
-				<td><a href="<?=$linker->link(array('charactergroups','group',$seminary['url'],$groupsgroup['url'],$group['url']))?>"><?=$group['name']?></a></td>
-				<td><?=$group['xps']?>/<?=$quest['xps']?> XPs</td>
-			</tr>
-			<?php endforeach ?>
-		</tbody>
-	</table>
+	<ul class="grpqlist">
+		<?php foreach($groups as &$group) : ?>
+		<li>
+			<span class="date"><?=$dateFormatter->format(new \DateTime($group['created']))?></span>
+			<span class="group"><a href="<?=$linker->link(array('charactergroups','group',$seminary['url'],$groupsgroup['url'],$group['url']))?>"><?=$group['name']?></a></span>
+			<span class="xp"><?=$group['xps']?> XP</span>
+		</li>
+		<?php endforeach ?>
+	</ul>
 </section>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index cfff8097..fa06d795 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -113,7 +113,7 @@ aside{display:none}
 
 #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}
+.qtext img,.grpqimg{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}
@@ -163,12 +163,19 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .ctopics .xpbar span{background:#50a4ab}
 
 
+/** Charactergroup List **/
+
+.cglist li{list-style-type:decimal;background:#fff;margin:0 0 6px 25px;padding:5px 15px;border-radius:3px}
+.cglist .xp{float:right}
+.cgqlist li{list-style-type:square;margin-left:25px;padding:2px 15px}
+
 /** Charactergroup Profile **/
 
-.gdata{margin-top:20px}
-.gdata img{border-radius:3px;margin-bottom:15px}
-.gdata h1{margin:0;padding:0}
-.gdata .fa{color:#aca8a1}
+.gbanner img{margin-top:10px;border-radius:3px}
+.gbanner h1{margin:10px 0 5px 0}
+
+.gdata{margin:20px 0 40px 0}
+.gdata li{float:left;background:#fff;padding:5px 15px;margin:0 5px 5px 0;border-radius:3px}
 
 .gchars li{background:#fff;padding:15px 0;border-radius:3px;float:left;margin-bottom:5px;width:49%}
 .gchars li:nth-child(even){float:right}
@@ -182,6 +189,14 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .gquests .xp{display:block}
 
 
+/** Charactergroup Quest **/
+
+.grpqlist li{background:#fff;margin-bottom:6px;padding:5px 15px 5px 0;font-size:.875em;border-radius:3px}
+.grpqlist .date{padding:0 15px;border-right:1px solid #dad8d5}
+.grpqlist .group{padding:0 15px}
+.grpqlist .xp{float:right}
+
+
 /** Achievements **/
 
 .rare ol{margin-bottom:40px}
@@ -228,9 +243,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .cinfo{float:left;width:70%}
 .cportrait{float:right;width:25%}
 
-.gdata .gbanner{float:left;min-width:100px}
-.gdata .gdesc{float:left;width:75%}
-.gdata ul{clear:both}
+.gbanner img{float:left;margin:20px 20px 0 0}
+.gbanner h1{margin:25px 0 2px}
+
 .gchars li{width:32%;margin-right:5px}
 .gchars li:nth-child(even){float:left}
 
@@ -242,10 +257,6 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 @media only screen and (min-width:768px){
 .xpbar{width:70%}
 
-.gdata{margin-top:40px}
-.gdata .gdesc{width:60%}
-.gdata li{font-size:.875em;padding-bottom:5px}
-.gdata ul{clear:none;float:right;width:20%;margin:0;padding:0}
 .gchars li{width:19%}
 
 .gquests .date{display:inline;margin-right:15px}

From 4580ccc5640dbbe0ddd829ed0d3eaaa01107efb9 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 17 Apr 2014 20:17:32 +0200
Subject: [PATCH 3/5] admin navigation style + character group quest icons

---
 views/html/charactergroupsquests/quest.tpl | 10 +++++-----
 views/html/seminaries/edit.tpl             |  2 +-
 views/html/seminaries/index.tpl            |  2 +-
 views/html/seminaries/seminary.tpl         |  4 +---
 views/html/users/edit.tpl                  |  2 +-
 views/html/users/index.tpl                 |  2 +-
 views/html/users/user.tpl                  |  2 +-
 www/css/desktop.css                        |  7 +++++--
 8 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/views/html/charactergroupsquests/quest.tpl b/views/html/charactergroupsquests/quest.tpl
index 060cf3ab..6c696737 100644
--- a/views/html/charactergroupsquests/quest.tpl
+++ b/views/html/charactergroupsquests/quest.tpl
@@ -13,7 +13,7 @@
 <small>Maximale Belohnung: <span class="fwb"><?=$quest['xps']?> XP</span></small>
 
 <section>
-	<h1><?=_('Description')?></h1>
+	<h1><i class="fa fa-envelope fa-fw"></i><?=_('Description')?></h1>
 	<p>
 	<?php if(!is_null($media)) : ?>
 	<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>" class="grpqimg" />
@@ -21,26 +21,26 @@
 	<?=\hhu\z\Utils::t($quest['description'])?>
 	</p>
 	<?php if(!empty($quest['rules'])) : ?>
-	<h1><?=_('Rules')?></h1>
+	<h1><i class="fa fa-exclamation-triangle fa-fw"></i><?=_('Rules')?></h1>
 	<p><?=\hhu\z\Utils::t($quest['rules'])?></p>
 	<?php endif ?>
 </section>
 
 <?php if(!empty($quest['von_text'])) : ?>
 <section>	
-	<h1><?=_('Won Quest')?></h1>
+	<h1><i class="fa fa-thumbs-up fa-fw"></i><?=_('Won Quest')?></h1>
 	<p><?=\hhu\z\Utils::t($quest['won_text'])?></p>
 </section>
 <?php endif ?>
 <?php if(!empty($quest['lost_text'])) : ?>
 <section>
-	<h1><?=_('Lost Quest')?></h1>
+	<h1><i class="fa fa-thumbs-down fa-fw"></i><?=_('Lost Quest')?></h1>
 	<p><?=\hhu\z\Utils::t($quest['lost_text'])?></p>
 </section>
 <?php endif ?>
 
 <section>
-	<h1><?=$groupsgroup['name']?></h1>
+	<h1><i class="fa fa-users fa-fw"></i><?=$groupsgroup['name']?></h1>
 	<ul class="grpqlist">
 		<?php foreach($groups as &$group) : ?>
 		<li>
diff --git a/views/html/seminaries/edit.tpl b/views/html/seminaries/edit.tpl
index 66d7efcd..27974c1b 100644
--- a/views/html/seminaries/edit.tpl
+++ b/views/html/seminaries/edit.tpl
@@ -6,7 +6,7 @@
 <h1><?=_('Seminaries')?></h1>
 <h2><?=_('Edit seminary')?></h2>
 
-<form method="post">
+<form method="post" class="logreg">
 	<fieldset>
 		<label for="title"><?=_('Title')?>:</label>
 		<input type="text" name="title" placeholder="<?=_('Title')?>" value="<?=$seminary['title']?>" /><br />
diff --git a/views/html/seminaries/index.tpl b/views/html/seminaries/index.tpl
index 0f2e8cac..40cdcd7c 100644
--- a/views/html/seminaries/index.tpl
+++ b/views/html/seminaries/index.tpl
@@ -1,6 +1,6 @@
 <h1><?=_('Seminaries')?></h1>
 <?php if(count(array_intersect(array('admin','moderator'),\hhu\z\controllers\IntermediateController::$user['roles'])) > 0) : ?>
-<nav>
+<nav class="admin">
 	<li><a href="<?=$linker->link('create', 1)?>"><?=_('Create new seminary')?></a></li>
 </nav>
 <?php endif ?>
diff --git a/views/html/seminaries/seminary.tpl b/views/html/seminaries/seminary.tpl
index 28488018..b28b5a14 100644
--- a/views/html/seminaries/seminary.tpl
+++ b/views/html/seminaries/seminary.tpl
@@ -3,17 +3,15 @@
 	<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
 </div>
 <?php endif ?>
-
 <h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
 <?php if(count(array_intersect(array('admin', 'moderator'), \hhu\z\controllers\IntermediateController::$user['seminaryroles'])) > 0) : ?>
-<nav>
+<nav class="admin">
 	<?php if(in_array('admin', \hhu\z\controllers\IntermediateController::$user['seminaryroles'])) : ?><li><a href="<?=$linker->link('edit', 3)?>"><?=_('Edit seminary')?></a></li><?php endif ?>
 	<?php if(in_array('admin', \hhu\z\controllers\IntermediateController::$user['seminaryroles'])) : ?><li><a href="<?=$linker->link('delete', 3)?>"><?=_('Delete seminary')?></a></li><?php endif ?>
 	<?php if(count(array_intersect(array('admin','moderator'), \hhu\z\controllers\IntermediateController::$user['seminaryroles'])) > 0) : ?><li><a href="<?=$linker->link(array('quests','index',$seminary['url']))?>"><?=_('Show Quests')?></a></li><?php endif ?>
 </nav>
 <?php endif ?>
 <p><?=\hhu\z\Utils::t($seminary['description'])?></p>
-
 <?php foreach($questgroupshierarchy as &$hierarchy) : ?>
 <h2><?=$hierarchy['title_plural']?></h2>
 <ul class="questgroups cf">
diff --git a/views/html/users/edit.tpl b/views/html/users/edit.tpl
index 56ba5d7b..510aaed3 100644
--- a/views/html/users/edit.tpl
+++ b/views/html/users/edit.tpl
@@ -1,7 +1,7 @@
 <h1><?=_('Users')?></h1>
 <h2><?=_('Edit user')?></h2>
 
-<form method="post">
+<form method="post" class="logreg">
 	<fieldset>
 		<label for="username"><?=_('Username')?>:</label>
 		<input type="text" name="username" placeholder="<?=_('Username')?>" value="<?=$user['username']?>" /><br />
diff --git a/views/html/users/index.tpl b/views/html/users/index.tpl
index 5d2883af..abc310a8 100644
--- a/views/html/users/index.tpl
+++ b/views/html/users/index.tpl
@@ -1,5 +1,5 @@
 <h1><?=_('Users')?></h1>
-<nav>
+<nav class="admin">
 	<li><a href="<?=$linker->link('create', 1)?>"><?=_('Create new user')?></a></li>
 </nav>
 <ul>
diff --git a/views/html/users/user.tpl b/views/html/users/user.tpl
index 745097b0..f48afbc3 100644
--- a/views/html/users/user.tpl
+++ b/views/html/users/user.tpl
@@ -1,7 +1,7 @@
 <h1><?=_('Users')?></h1>
 <h2><?=$user['username']?></h2>
 <?php if(count(array_intersect(array('admin','moderator'),\hhu\z\controllers\IntermediateController::$user['roles'])) > 0) : ?>
-<nav>
+<nav class="admin">
 	<li><a href="<?=$linker->link('edit', 3)?>"><?=_('Edit user')?></a></li>
 	<li><a href="<?=$linker->link('delete', 3)?>"><?=_('Delete user')?></a></li>
 </nav>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index fa06d795..485e3713 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -56,7 +56,7 @@ table{border-collapse:collapse;border-spacing:0}
 .wrap{margin:0 5%;max-height:999999px;min-height:1px}
 
 a{color:#50a4ab;text-decoration:none}
-a:hover{color:#5bbac2}
+a:hover{color:#62c5cd}
 .fa{padding:0 10px 0 0}
 .fwb{font-weight:700}
 
@@ -102,7 +102,7 @@ aside{display:none}
 .qgicon{margin:17px 0 0 -39px;background:#f7f5f2;font-size:1.25em;float:left}
 .qgicon.locked{margin-top:-2px}
 .qgtitle a{background:#5cb6bd;border-radius:3px 3px 0 0;display:block;padding:20px;color:#fff;font-weight:700}
-.qgtitle a:hover{background:#5bbac2}
+.qgtitle a:hover{background:#62c5cd}
 .qgprogress,.qghidden{margin-bottom:4px;padding:20px 20px 4px 20px;background:#fff;border-radius:0 0 3px 3px}
 
 .qglist li{margin: 0 0 5px 0}
@@ -126,6 +126,9 @@ aside{display:none}
 
 input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;border-color:#d48c4e}
 
+.admin li{margin:0 0 15px 0;display:inline-block}
+.admin li a{padding:4px 15px;background:#5cb6bd;border-bottom:2px solid #50a0a6;color:#fff;border-radius:3px}
+.admin li a:hover{background:#62c5cd}
 
 /** Login & Registration **/
 

From 74aaabb27789fd5afb19763d991ee9739beaddde Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 17 Apr 2014 20:28:21 +0200
Subject: [PATCH 4/5] user list & profile design

---
 views/html/users/index.tpl | 11 +++--------
 views/html/users/user.tpl  |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/views/html/users/index.tpl b/views/html/users/index.tpl
index abc310a8..b86a0348 100644
--- a/views/html/users/index.tpl
+++ b/views/html/users/index.tpl
@@ -2,13 +2,8 @@
 <nav class="admin">
 	<li><a href="<?=$linker->link('create', 1)?>"><?=_('Create new user')?></a></li>
 </nav>
-<ul>
+<ol class="cglist">
 	<?php foreach($users as &$user) : ?>
-	<li>
-		<h2><a href="<?=$linker->link(array('user', $user['username']), 1)?>"><?=$user['username']?></a></h2>
-		<details>
-			<summary><?=sprintf(_('registered on %s'),  $dateFormatter->format(new \DateTime($user['created'])))?></summary>
-		</details>
-	</li>
+	<li><a href="<?=$linker->link(array('user', $user['username']), 1)?>"><?=$user['username']?></a><span class="xp"><?=sprintf(_('registered on %s'),  $dateFormatter->format(new \DateTime($user['created'])))?></span></li>
 	<?php endforeach ?>
-</ul>
+</ol>
diff --git a/views/html/users/user.tpl b/views/html/users/user.tpl
index f48afbc3..b5e23aa7 100644
--- a/views/html/users/user.tpl
+++ b/views/html/users/user.tpl
@@ -1,11 +1,11 @@
 <h1><?=_('Users')?></h1>
-<h2><?=$user['username']?></h2>
 <?php if(count(array_intersect(array('admin','moderator'),\hhu\z\controllers\IntermediateController::$user['roles'])) > 0) : ?>
 <nav class="admin">
 	<li><a href="<?=$linker->link('edit', 3)?>"><?=_('Edit user')?></a></li>
 	<li><a href="<?=$linker->link('delete', 3)?>"><?=_('Delete user')?></a></li>
 </nav>
 <?php endif ?>
+<h2><?=$user['username']?></h2>
 <p>
 	<?=sprintf(_('registered on %s'), $dateFormatter->format(new \DateTime($user['created'])))?><br />
 	<?=_('Name')?>: <?=$user['prename']?> <?=$user['surname']?><br />

From 4c71f21637a5759687fa902e688f2630d3124097 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 17 Apr 2014 20:32:24 +0200
Subject: [PATCH 5/5] admin nav design for skip quest, solutions & epilog links
 under quests

---
 views/html/quests/quest.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index f914471b..9e9b146a 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -62,7 +62,7 @@
 	<?php if($solved && !is_null($task)) : ?>
 	<p><?=_('Task already successfully solved')?>:</p>
 	<?php endif ?>
-	<ul>
+	<ul class="admin">
 		<?php if(!is_null($task)) : ?>
 			<li><a href="<?=$linker->link(null,0,false,array('show-answer'=>'true'),true,'task')?>"><?=_('Show answer')?></a></li>
 			<li><a href="<?=$linker->link('Epilog',5)?>"><?=_('Skip Quest')?></a></l>