From 2ef250ff5d47f4c13f1e0fb95062a90465047cee Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 13 Jan 2012 18:57:11 +0100
Subject: [PATCH] Moved the sub menu to a new position

---
 com.woltlab.wcf/template/header.tpl          |  4 ++++
 com.woltlab.wcf/template/mainMenu.tpl        | 12 +-----------
 com.woltlab.wcf/template/mainMenuSubMenu.tpl |  9 +++++++++
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 com.woltlab.wcf/template/mainMenuSubMenu.tpl

diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index d19d2ef2d3..d9e958ad93 100644
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -35,6 +35,10 @@
 		<!-- header navigation -->
 		<nav class="headerNavigation">
 			<div>
+				<!-- main menu sub menu -->
+				{include file='mainMenuSubMenu'}
+				<!-- /main menu sub menu -->
+				
 				<ul>
 					<li id="toBottomLink" class="toBottomLink"><a href="#bottom" title="{lang}wcf.global.scrollDown{/lang}" class="balloonTooltip"><img src="{icon size='S'}toBottom{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
 					{event name='headerNavigation'}
diff --git a/com.woltlab.wcf/template/mainMenu.tpl b/com.woltlab.wcf/template/mainMenu.tpl
index ed9b084a87..921803ea80 100644
--- a/com.woltlab.wcf/template/mainMenu.tpl
+++ b/com.woltlab.wcf/template/mainMenu.tpl
@@ -2,17 +2,7 @@
 	<nav id="mainMenu" class="mainMenu">
 		<ul>
 			{foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
-				<li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="activeMenuItem"{/if}><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="badge">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a> 
-				
-				{if $__wcf->getPageMenu()->getMenuItems($menuItem->menuItem)|count > 0}
-					<ul>
-						{foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
-							<li><a href="{$subMenuItem->getProcessor()->getLink()}">{lang}{$subMenuItem->menuItem}{/lang}</a>{if $subMenuItem->getProcessor()->getNotifications()} <span class="badge">{#$subMenuItem->getProcessor()->getNotifications()}</span>{/if}</li>
-						{/foreach}
-					</ul>
-				{/if}
-				
-				</li>
+				<li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="activeMenuItem"{/if}><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="badge">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a></li>
 			{/foreach}
 		</ul>
 	</nav>
diff --git a/com.woltlab.wcf/template/mainMenuSubMenu.tpl b/com.woltlab.wcf/template/mainMenuSubMenu.tpl
new file mode 100644
index 0000000000..8adcff343a
--- /dev/null
+++ b/com.woltlab.wcf/template/mainMenuSubMenu.tpl
@@ -0,0 +1,9 @@
+{foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
+	{if $__wcf->getPageMenu()->getMenuItems($menuItem->menuItem)|count > 0}
+		<ul>
+			{foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
+				<li><a href="{$subMenuItem->getProcessor()->getLink()}">{lang}{$subMenuItem->menuItem}{/lang}</a>{if $subMenuItem->getProcessor()->getNotifications()} <span class="badge">{#$subMenuItem->getProcessor()->getNotifications()}</span>{/if}</li>
+			{/foreach}
+		</ul>
+	{/if}
+{/foreach}
\ No newline at end of file
-- 
2.20.1