From b57e0175b3b71658e25144b3ddf4a93e33c6cfde Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.uni-duesseldorf.de>
Date: Mon, 17 Mar 2014 21:09:59 +0100
Subject: [PATCH] menu changes according to css

---
 views/html/html.tpl       | 13 +++++++++----
 views/html/menu/index.tpl |  8 ++++----
 2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/views/html/html.tpl b/views/html/html.tpl
index 54499a6f..98dc7390 100644
--- a/views/html/html.tpl
+++ b/views/html/html.tpl
@@ -18,10 +18,17 @@
 
 <body>
 	<header>
-		<h1><a href="<?=$linker->link(array(), 0, true, array(), true)?>">The Legend of Z</a></h1>
-		<nav>
+		<nav class="wrap">
+			<input type="checkbox" id="toggle">
+			<label for="toggle" class="toggle" onclick><a id="navicon"><i class="fa fa-bars"></i>Menü</a></label>
+			<?php if(!is_null($loggedUser)) : ?>
+			<a href="<?=$linker->link(array('users',$loggedUser['url']))?>" id="profile"><i class="fa fa-user fa-fw"></i><?=$loggedUser['username']?></a>
+			<?php endif ?>
 			<?=$menu?>
 		</nav>
+	</header>
+	<article class="wrap">
+		<h1><a href="<?=$linker->link(array(), 0, true, array(), true)?>">The Legend of Z</a></h1>
 		<?php if(!is_null($loggedUser)) : ?>
 		<div id="user">
 			<a href="<?=$linker->link(array('users',$loggedUser['url']))?>"><?=$loggedUser['username']?></a>
@@ -30,8 +37,6 @@
 			<?php endif ?>
 		</div>
 		<?php endif ?>
-	</header>
-	<article>
 		<?=$intermediate?>
 	</article>
 </body>
diff --git a/views/html/menu/index.tpl b/views/html/menu/index.tpl
index f9f8246c..62af9696 100644
--- a/views/html/menu/index.tpl
+++ b/views/html/menu/index.tpl
@@ -1,9 +1,9 @@
 <menu>
-	<li><a href="<?=$linker->link("users")?>"><?=_('Users')?></a></li>
-	<li><a href="<?=$linker->link("seminaries")?>"><?=_('Seminaries')?></a></li>
+	<li><a href="<?=$linker->link("users")?>"><i class="fa fa-users fa-fw"></i><?=_('Users')?></a></li>
+	<li><a href="<?=$linker->link("seminaries")?>"><i class="fa fa-users fa-fw"></i><?=_('Seminaries')?></a></li>
 	<?php if(is_null($loggedUser)) : ?>
-	<li><a href="<?=$linker->link(array('users','login'))?>"><?=_('Login')?></a></li>
+	<li><a href="<?=$linker->link(array('users','login'))?>"><i class="fa fa-sign-in fa-fw"></i><?=_('Login')?></a></li>
 	<?php else : ?>
-	<li><a href="<?=$linker->link(array('users','logout'))?>"><?=_('Logout')?></a></li>
+	<li><a href="<?=$linker->link(array('users','logout'))?>"><i class="fa fa-sign-out fa-fw"></i><?=_('Logout')?></a></li>
 	<?php endif ?>
 </menu>
