From 5ee9c929c9ab6cfc6d3b4647cea189e81a094a76 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] 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 **/