From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 5 Apr 2016 10:45:43 +0000 (+0200)
Subject: Properly provide frontend main menu items in ACP
X-Git-Tag: 3.0.0_Beta_1~1979
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9d5c75dffa205dee7ce4d22e4d832cb9a9fce78d;p=GitHub%2FWoltLab%2FWCF.git

Properly provide frontend main menu items in ACP
---

diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
index 60324aaae8..9ba2ce34da 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
@@ -27,10 +27,11 @@
 				<li id="jumpToPage" class="dropdown">
 					<a href="{link forceFrontend=true}{/link}" class="dropdownToggle" data-toggle="jumpToPage"><span class="icon icon32 fa-home"></span> <span>{lang}wcf.global.jumpToPage{/lang}</span></a>
 					<ul class="dropdownMenu">
-						{* TODO *}
-						{*foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=_menuItem}
-							<li><a href="{$_menuItem->getProcessor()->getLink()}">{lang}{$_menuItem->menuItem}{/lang}</a></li>
-						{/foreach*}
+						{foreach from=$__wcf->getFrontendMenu()->getMenuItemNodeList() item=_menuItem}
+							{if !$_menuItem->getMenuItem()->parentItemID && $_menuItem->getMenuItem()->getPage()}
+								<li><a href="{$_menuItem->getMenuItem()->getPage()->getLink()}">{$_menuItem->getMenuItem()->getPage()}</a></li>
+							{/if}
+						{/foreach}
 					</ul>
 				</li>
 				
diff --git a/wcfsetup/install/files/acp/templates/pageMenuMobile.tpl b/wcfsetup/install/files/acp/templates/pageMenuMobile.tpl
index 29cdc459a1..b65583287a 100644
--- a/wcfsetup/install/files/acp/templates/pageMenuMobile.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuMobile.tpl
@@ -1,7 +1,7 @@
 {* main menu *}
 <div id="pageMainMenuMobile" class="pageMainMenuMobile menuOverlayMobile" data-page-logo="{$__wcf->getPath()}images/default-logo.png">
-	<ol class="menuOverlayItemList" data-title="TODO: menu">
-		<li class="menuOverlayTitle">TODO: menu</li>
+	<ol class="menuOverlayItemList" data-title="{lang}wcf.menu.page{/lang}">
+		<li class="menuOverlayTitle">{lang}wcf.menu.page{/lang}</li>
 		{foreach from=$__wcf->getACPMenu()->getMenuItems('') item=_sectionMenuItem}
 			<li class="menuOverlayItem">
 				<a href="#" class="menuOverlayItemLink box24{if $_sectionMenuItem->menuItem|in_array:$_activeMenuItems} active{/if}">
@@ -42,18 +42,19 @@
 
 {* user menu *}
 <div id="pageUserMenuMobile" class="pageUserMenuMobile menuOverlayMobile" data-page-logo="{$__wcf->getPath()}images/default-logo.png">
-	<ol class="menuOverlayItemList" data-title="TODO: user menu">
-		<li class="menuOverlayTitle">TODO: user menu</li>
+	<ol class="menuOverlayItemList" data-title="{lang}wcf.menu.user{/lang}">
+		<li class="menuOverlayTitle">{lang}wcf.menu.user{/lang}</li>
 		<li class="menuOverlayItem">
 			<a href="#" class="menuOverlayItemLink box24">
 				<span class="icon icon24 fa-home"></span>
 				<span class="menuOverlayItemTitle">{lang}wcf.global.jumpToPage{/lang}</span>
 			</a>
 			<ol class="menuOverlayItemList">
-				{* TODO *}
-				{*foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=_menuItem}
-					<li class="menuOverlayItem"><a href="{$_menuItem->getProcessor()->getLink()}" class="menuOverlayItemLink">{lang}{$_menuItem->menuItem}{/lang}</a></li>
-				{/foreach*}
+				{foreach from=$__wcf->getFrontendMenu()->getMenuItemNodeList() item=_menuItem}
+					{if !$_menuItem->getMenuItem()->parentItemID && $_menuItem->getMenuItem()->getPage()}
+						<li class="menuOverlayItem"><a href="{$_menuItem->getMenuItem()->getPage()->getLink()}" class="menuOverlayItemLink">{$_menuItem->getMenuItem()->getPage()}</a></li>
+					{/if}
+				{/foreach}
 			</ol>
 		</li>
 		<li class="menuOverlayItem">
diff --git a/wcfsetup/install/files/lib/data/menu/MenuCache.class.php b/wcfsetup/install/files/lib/data/menu/MenuCache.class.php
index 38fc6996cc..41e673641a 100644
--- a/wcfsetup/install/files/lib/data/menu/MenuCache.class.php
+++ b/wcfsetup/install/files/lib/data/menu/MenuCache.class.php
@@ -61,4 +61,13 @@ class MenuCache extends SingletonFactory {
 		
 		return null;
 	}
+	
+	/**
+	 * Returns the main menu or null.
+	 * 
+	 * @return      Menu|null       menu object
+	 */
+	public function getMainMenu() {
+		return $this->getMenuByID(MenuCacheBuilder::getInstance()->getData([], 'mainMenuID'));
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index 6e0a71e7c7..cd0a87fba3 100644
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -2,6 +2,8 @@
 namespace wcf\system;
 use wcf\acp\form\MasterPasswordForm;
 use wcf\acp\form\MasterPasswordInitForm;
+use wcf\data\menu\Menu;
+use wcf\data\menu\MenuCache;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\AJAXException;
@@ -18,7 +20,7 @@ use wcf\util\HeaderUtil;
  * Extends WCF class with functions for the ACP.
  * 
  * @author	Marcel Werk
- * @copyright	2001-2015 WoltLab GmbH
+ * @copyright	2001-2016 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	com.woltlab.wcf
  * @subpackage	system
@@ -68,6 +70,16 @@ class WCFACP extends WCF {
 		EventHandler::getInstance()->fireAction($this, 'initialized');
 	}
 	
+	/**
+	 * Returns the main menu object.
+	 * 
+	 * @return      Menu|null       menu object
+	 * @since       2.2
+	 */
+	public function getFrontendMenu() {
+		return MenuCache::getInstance()->getMainMenu();
+	}
+	
 	/**
 	 * Returns true if ACP is currently in rescue mode.
 	 * 
diff --git a/wcfsetup/install/files/lib/system/cache/builder/MenuCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/MenuCacheBuilder.class.php
index 0a8b1468b2..47de5c5d25 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/MenuCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/MenuCacheBuilder.class.php
@@ -20,6 +20,7 @@ class MenuCacheBuilder extends AbstractCacheBuilder {
 	 */
 	protected function rebuild(array $parameters) {
 		$data = [
+			'mainMenuID' => null,
 			'menus' => [],
 			'menuItems' => []
 		];
@@ -47,6 +48,10 @@ class MenuCacheBuilder extends AbstractCacheBuilder {
 			
 			$data['menus'][$menu->menuID] = $menu;
 			$data['menuItems'][$menu->menuID] = $menuItemList;
+			
+			if ($menu->identifier === 'com.woltlab.wcf.MainMenu') {
+				$data['mainMenuID'] = $menu->menuID;
+			}
 		}
 		
 		return $data;