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 1/5] 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}

From 2dec2e672f046546055b268142158201b52916cc Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 24 Apr 2014 13:07:36 +0200
Subject: [PATCH 2/5] show all possible avatars at character creation

---
 views/html/characters/register.tpl | 24 ++++++++++++++----------
 www/css/desktop.css                |  2 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/views/html/characters/register.tpl b/views/html/characters/register.tpl
index cc3bc005..1526fd23 100644
--- a/views/html/characters/register.tpl
+++ b/views/html/characters/register.tpl
@@ -3,9 +3,10 @@
 	<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
 </div>
 <?php endif ?>
-<h1><?=$seminary['title']?></h1>
-<h2><?=_('Create Character')?></h2>
-
+<ul class="breadcrumbs">
+	<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
+</ul>
+<h1><?=_('Create Character')?></h1>
 <form method="post" action="" class="logreg">
 	<?php if($validation !== true) : ?>
 	<ul>
@@ -37,15 +38,18 @@
 	</ul>
 	<?php endif ?>
 	<fieldset>
-		<legend><?=_('Character properties')?></legend>
+		<legend class="fwb"><?=_('Character properties')?></legend>
 		<label for="charactername"><?=_('Character name')?>:</label>
 		<input type="text" name="charactername" placeholder="<?=_('Character name')?>" required="required" value="<?=$charactername?>" /><br />
-		<ul>
+		<ul class="avatar">
 			<?php foreach($types as &$type) : ?>
-			<input id="type-<?=$type['id']?>" name="type" type="radio" value="<?=$type['url']?>" <?php if(array_key_exists('selected', $type) && $type['selected']) : ?>checked="checked"<?php endif ?> />
-			<label for="type-<?=$type['id']?>">
-				<img id="avatar" src="<?=$linker->link(array('media','avatar',$seminary['url'],$type['url'],$xplevels[0]['level']))?>" />
-			</label>
+			<li>
+				<label for="type-<?=$type['id']?>">
+					<p>Mensch</p>
+					<img id="avatar" src="<?=$linker->link(array('media','avatar',$seminary['url'],$type['url'],$xplevels[0]['level']))?>" />
+				</label>
+				<input id="type-<?=$type['id']?>" name="type" type="radio" value="<?=$type['url']?>" <?php if(array_key_exists('selected', $type) && $type['selected']) : ?>checked="checked"<?php endif ?> />
+			</li>
 			<?php endforeach ?>
 		</ul>
 	</fieldset>
@@ -58,7 +62,7 @@
 	</ul>
 	<?php endif ?>
 	<fieldset>
-		<legend><?=_('Seminary fields')?></legend>
+		<legend class="fwb"><?=_('Seminary fields')?></legend>
 		<?php foreach($fields as &$field) : ?>
 		<label for="fields[<?=$field['url']?>]"><?=$field['title']?>:</label>
 		<?php switch($field['type_title']) {
diff --git a/www/css/desktop.css b/www/css/desktop.css
index fa97244a..f4905c16 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -142,6 +142,8 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .logreg input{margin:5px 0 15px}
 .logreg .cta{display:block}
 
+.avatar li{display:inline-block;margin-right:5px;text-align:center}
+.avatar img{border-radius:3px}
 
 /** Character Profile **/
 

From f72890e0c7c79f52464a2b60e922e88fa1a35032 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 24 Apr 2014 13:45:23 +0200
Subject: [PATCH 3/5] manage users design

---
 views/html/characters/manage.tpl | 24 +++++++++---------------
 www/css/desktop.css              | 13 ++++---------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/views/html/characters/manage.tpl b/views/html/characters/manage.tpl
index 17a2c82b..b9dd9978 100644
--- a/views/html/characters/manage.tpl
+++ b/views/html/characters/manage.tpl
@@ -3,13 +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>
-<h2><?=_('Characters')?></h2>
-<h3><?=_('Manage')?></h3>
+<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><?=_('Characters')?></li>
+</ul>
+<h1><?=_('Manage')?></h1>
 
 <form method="post">
 	<fieldset>
-		<legend><?=_('Selection')?></legend>
+		<legend><?=_('Selection')?>:</legend>
 		<ul class="gchars cf">
 			<?php foreach($characters as &$character) : ?>
 			<li>
@@ -18,17 +20,9 @@
 					<p><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']['level'],'portrait'))?>"></p>
 					<p><a href="<?=$linker->link(array('characters','character',$seminary['url'],$character['url']))?>"><?=$character['name']?></a></p>
 					<p><small><?=$character['xps']?> XP</small></p>
-					<ul>
-						<?php if(in_array('admin', $character['characterroles'])) : ?>
-						<li><?=_('Admin')?></li>
-						<?php endif ?>
-						<?php if(in_array('moderator', $character['characterroles'])) : ?>
-						<li><?=_('Moderator')?></li>
-						<?php endif ?>
-						<?php if(in_array('user', $character['characterroles'])) : ?>
-						<li><?=_('User')?></li>
-						<?php endif ?>
-					</ul>
+					<?php if(in_array('admin', $character['characterroles'])) : ?><p><small><?=_('Admin')?></small></p><?php endif ?>
+					<?php if(in_array('moderator', $character['characterroles'])) : ?><p><small><?=_('Moderator')?></small></p><?php endif ?>
+					<?php if(in_array('user', $character['characterroles'])) : ?><p><small><?=_('User')?></small></p><?php endif ?>
 				</label>
 			</li>
 			<?php endforeach ?>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index f4905c16..c6d2371d 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -29,8 +29,7 @@ sup{top:-.5em}
 sub{bottom:-.25em}
 svg:not(:root){overflow:hidden}
 figure{margin:0}
-fieldset{border:0;margin:0;padding:0}
-legend{border:0;padding:0;margin-bottom:15px}
+fieldset,legend{border:0;margin:0 0 10px;padding:0}
 button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
 button,input{line-height:normal}
 button,select{text-transform:none}
@@ -189,10 +188,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .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}
+.gchars li{background:#fff;padding:15px 0;border-radius:3px;display:inline-block;margin-bottom:5px;width:49%;text-align:center;vertical-align:top}
 .gchars img{width:50px;height:50px;border-radius:25px}
-.gchars p{margin:0;padding:0;text-align:center}
+.gchars p{margin:0;padding:0}
 .gchars .fa{position:absolute;margin:-10px 0 0}
 
 .gquests li{padding:12px 15px 0 15px;border-radius:3px}
@@ -296,8 +294,7 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .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}
+.gchars li{width:32%}
 
 .achmnts .xpbar{width:89%}
 
@@ -341,8 +338,6 @@ menu a{padding:10px 0}
 article{padding:20px 40px 80px 40px}
 .moodpic{margin:-20px -40px 0 -40px}
 .breadcrumbs li{display:inline;padding-right:5px}
-
-.gchars li{width:19%}
 }
 
 @media only screen and (min-width:1366px){

From cdaec40aac47019b6e53cb035fc600245b205a1e Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 24 Apr 2014 13:47:30 +0200
Subject: [PATCH 4/5] user list bugfix

---
 views/html/characters/index.tpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/views/html/characters/index.tpl b/views/html/characters/index.tpl
index a0c10339..171d09d7 100644
--- a/views/html/characters/index.tpl
+++ b/views/html/characters/index.tpl
@@ -3,12 +3,14 @@
 	<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><?=_('Characters')?></h2>
+<ul class="breadcrumbs">
+	<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
+</ul>
+<h1><?=_('Characters')?></h1>
 
 <?php if(count(array_intersect(array('admin', 'moderator'), \hhu\z\controllers\SeminaryController::$character['characterroles'])) > 0) : ?>
 <nav class="admin">
-	<li><a href="<?=$linker->link(array('manage',$seminary['url']),1)?>"><?=_('Manage')?></li>
+	<li><a href="<?=$linker->link(array('manage',$seminary['url']),1)?>"><?=_('Manage')?></a></li>
 </nav>
 <?php endif ?>
 

From 0ea6010918df54285a8779f79d8d776b27ab1893 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Thu, 24 Apr 2014 13:50:07 +0200
Subject: [PATCH 5/5] menu update with new meta system name

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

diff --git a/views/html/menu/index.tpl b/views/html/menu/index.tpl
index 0e9d4aea..a0e6cbf7 100644
--- a/views/html/menu/index.tpl
+++ b/views/html/menu/index.tpl
@@ -1,4 +1,4 @@
-<li><a href="<?=$linker->link(array(), 0, true, array(), true)?>"><i class="fa fa-home fa-fw"></i>The Legend of Z</a></li>
+<li><a href="<?=$linker->link(array(), 0, true, array(), true)?>"><i class="fa fa-home fa-fw"></i>Questlab</a></li>
 <?php if(!is_null($loggedUser) && count(array_intersect(array('admin','moderator'),$loggedUser['roles'])) > 0) : ?><li><a href="<?=$linker->link('users')?>"><i class="fa fa-users fa-fw"></i><?=_('Users')?></a></li><?php endif ?>
 <?php if(!is_null($loggedUser)) : ?><li><a href="<?=$linker->link('seminaries')?>"><i class="fa fa-pencil-square-o fa-fw"></i><?=_('Seminaries')?></a></li><?php endif ?>
 <?php if(!is_null($loggedCharacter) && count($loggedCharacter['characterroles']) > 0) : ?><?=$seminarymenu?><?php endif ?>