From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 11 Oct 2011 12:47:11 +0000 (+0200)
Subject: Fixed main menu
X-Git-Tag: 2.0.0_Beta_1~1719
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2fe20c43a5d27992161001cb23e7fb2deb960a88;p=GitHub%2FWoltLab%2FWCF.git

Fixed main menu
---

diff --git a/com.woltlab.wcf/template/mainMenu.tpl b/com.woltlab.wcf/template/mainMenu.tpl
index 83e3a74d53..4875655a94 100644
--- a/com.woltlab.wcf/template/mainMenu.tpl
+++ b/com.woltlab.wcf/template/mainMenu.tpl
@@ -2,12 +2,12 @@
 	<nav id="mainMenu" class="mainMenu">
 		<ul>
 			{foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
-				<li><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem} ({#$menuItem->getProcessor()->getNotifications()})</a>
+				<li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="activeMenuItem"{/if}><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem}</a> <span class="badge">{#$menuItem->getProcessor()->getNotifications()}</span>
 				
 				{if $__wcf->getPageMenu()->getMenuItems($menuItem->menuItem)|count > 0}
 					<ul>
 						{foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
-							<li><a href="{$subMenuItem->menuItemLink}">{$subMenuItem->menuItem} ({#$subMenuItem->getProcessor()->getNotifications()})</a></li>
+							<li><a href="{$subMenuItem->menuItemLink}">{$subMenuItem->menuItem}</a> <span class="badge">{#$subMenuItem->getProcessor()->getNotifications()}</span></li>
 						{/foreach}
 					</ul>
 				{/if}
diff --git a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
index 4a61c7a36a..bf3f98b2d3 100644
--- a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\menu\page;
 use wcf\data\page\menu\item\PageMenuItem;
+use wcf\system\event\EventHandler;
 use wcf\system\menu\TreeMenu;
 use wcf\system\menu\ITreeMenuItem;
 use wcf\system\cache\CacheHandler;
@@ -16,6 +17,25 @@ use wcf\system\cache\CacheHandler;
  * @category 	Community Framework
  */
 class PageMenu extends TreeMenu {
+	/**
+	 * @see wcf\system\SingletonFactory::init()
+	 */
+	protected function init() {
+		// get menu items from cache
+		$this->loadCache();
+		
+		// check menu items
+		$this->checkMenuItems('header');
+		$this->checkMenuItems('footer');
+		
+		// build plain menu item list
+		$this->buildMenuItemList('header');
+		$this->buildMenuItemList('footer');
+		
+		// call init event
+		EventHandler::getInstance()->fireAction($this, 'init');
+	}
+	
 	/**
 	 * @see	wcf\system\menu\TreeMenu::loadCache()
 	 */