From f52b8fa27f15a6d62283480e67f51fa0fb9d6aa3 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Wed, 9 Apr 2014 00:22:38 +0200
Subject: [PATCH] add Seminary menu as submenu of mainmenu (Issue #43)

---
 agents/bottomlevel/MenuAgent.inc | 2 ++
 agents/toplevel/HtmlAgent.inc    | 3 +--
 controllers/MenuController.inc   | 1 +
 views/html/html.tpl              | 3 ---
 views/html/menu/index.tpl        | 1 +
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/agents/bottomlevel/MenuAgent.inc b/agents/bottomlevel/MenuAgent.inc
index 77d60d8d..49512791 100644
--- a/agents/bottomlevel/MenuAgent.inc
+++ b/agents/bottomlevel/MenuAgent.inc
@@ -28,6 +28,8 @@
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{
+			// Add Seminary menu
+			$this->addSubAgent('Seminarymenu');
 		}
 		
 	}
diff --git a/agents/toplevel/HtmlAgent.inc b/agents/toplevel/HtmlAgent.inc
index 0648160e..63ed4525 100644
--- a/agents/toplevel/HtmlAgent.inc
+++ b/agents/toplevel/HtmlAgent.inc
@@ -37,9 +37,8 @@
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{
-			// Add menus
+			// Add menu
 			$this->addSubAgent('Menu');
-			$this->addSubAgent('Seminarymenu');
 		}
 		
 		
diff --git a/controllers/MenuController.inc b/controllers/MenuController.inc
index df01f2ff..2be5ea8c 100644
--- a/controllers/MenuController.inc
+++ b/controllers/MenuController.inc
@@ -35,6 +35,7 @@
 			
 			// Set userdata
 			$this->set('loggedUser', IntermediateController::$user);
+			$this->set('loggedSeminary', IntermediateController::$seminary);
 		}
 		
 		
diff --git a/views/html/html.tpl b/views/html/html.tpl
index 91bd00b8..2e8cc9e9 100644
--- a/views/html/html.tpl
+++ b/views/html/html.tpl
@@ -40,9 +40,6 @@
 			<?php endif ?>
 			<menu>
 				<?=$menu?>
-				<?php if(!is_null($loggedSeminary)) : ?>
-				<?=$seminarymenu?>
-				<?php endif ?>
 			</menu>
 		</nav>
 	</header>
diff --git a/views/html/menu/index.tpl b/views/html/menu/index.tpl
index db402226..8c61c817 100644
--- a/views/html/menu/index.tpl
+++ b/views/html/menu/index.tpl
@@ -2,6 +2,7 @@
 <?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('usersgroups')?>"><i class="fa fa-users fa-fw"></i><?=_('Usergroups')?></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($loggedSeminary)) : ?><?=$seminarymenu?><?php endif ?>
 <?php if(is_null($loggedUser)) : ?>
 <li><a href="<?=$linker->link(array('users','login'))?>"><i class="fa fa-sign-in fa-fw"></i><?=_('Login')?></a></li>
 <?php else : ?>