Fixed main menu

diff --git a/com.woltlab.wcf/template/mainMenu.tpl b/com.woltlab.wcf/template/mainMenu.tpl
index 83e3a74d5305008f1460bdc9df2cc5fb3a600161..4875655a94ca6d7027192489be02b3849a0a4c64 100644 (file)
--- 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 4a61c7a36a74b8f1c8e848ee256b1dd62ed710f0..bf3f98b2d3ed2ab3dcfd76eaed801485cbc84660 100644 (file)
--- 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()
         */