From ee29535b7b778e2721f1a2d337a776649ad8c384 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 11 Mar 2016 14:07:27 +0100
Subject: [PATCH] Added proper phrases (yet missing in .xml-PIPs)

---
 .../install/files/acp/templates/menuItemAdd.tpl  | 12 ++++++++++--
 .../js/WoltLab/WCF/Acp/Ui/Menu/Item/Handler.js   |  2 +-
 .../js/WoltLab/WCF/Ui/Page/Search/Handler.js     | 12 ++++++------
 .../lib/acp/form/MenuItemEditForm.class.php      | 16 ++++++++++++++++
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index 580f500141..fb6552e8d9 100644
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -1,7 +1,15 @@
 {include file='header' pageTitle='wcf.acp.menu.item.'|concat:$action}
 
 <script data-relocate="true">
-	require(['Dictionary', 'WoltLab/WCF/Acp/Ui/Menu/Item/Handler'], function(Dictionary, AcpUiMenuItemHandler) {
+	require(['Dictionary', 'Language', 'WoltLab/WCF/Acp/Ui/Menu/Item/Handler'], function(Dictionary, Language, AcpUiMenuItemHandler) {
+		Language.addObject({
+			'wcf.page.pageObjectID.search.noResults': '{lang}wcf.page.pageObjectID.search.noResults{/lang}',
+			'wcf.page.pageObjectID.search.results': '{lang}wcf.page.pageObjectID.search.results{/lang}',
+			'wcf.page.pageObjectID.search.results.description': '{lang}wcf.page.pageObjectID.search.results.description{/lang}',
+			'wcf.page.pageObjectID.search.terms': '{lang}wcf.page.pageObjectID.search.terms{/lang}',
+			'wcf.page.pageObjectID.search.terms.description': '{lang}wcf.page.pageObjectID.search.terms.description{/lang}'
+		});
+		
 		var handlers = new Dictionary();
 		{foreach from=$pageHandlers key=handlerPageID item=requireObjectID}
 			handlers.set({@$handlerPageID}, {if $requireObjectID}true{else}false{/if});
@@ -114,7 +122,7 @@
 			<dd>
 				<div class="inputAddon">
 					<input type="text" id="pageObjectID" name="pageObjectID" value="{$pageObjectID}" class="short">
-					<a href="#" id="searchPageObjectID" class="inputSuffix button jsTooltip" title="TODO: Search"><span class="icon icon16 fa-search"></span></a>
+					<a href="#" id="searchPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.acp.page.objectID.search{/lang}"><span class="icon icon16 fa-search"></span></a>
 				</div>
 				{if $errorField == 'pageObjectID'}
 					<small class="innerError">
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Menu/Item/Handler.js b/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Menu/Item/Handler.js
index 7d1072798d..d83826fbcb 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Menu/Item/Handler.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Menu/Item/Handler.js
@@ -110,7 +110,7 @@ define(['Dictionary', 'WoltLab/Wcf/Ui/Page/Search/Handler'], function(Dictionary
 		_openSearch: function(event) {
 			event.preventDefault();
 			
-			UiPageSearchHandler.open(_activePageId, 'foo', function(objectId) {
+			UiPageSearchHandler.open(_activePageId, _pageId.options[_pageId.selectedIndex].textContent, function(objectId) {
 				_pageObjectId.value = objectId;
 				_cache.set(_activePageId, objectId);
 			});
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Search/Handler.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Search/Handler.js
index a9074288cf..78d696495c 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Search/Handler.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Search/Handler.js
@@ -7,7 +7,7 @@
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @module	WoltLab/WCF/Ui/Page/Search/Handler
  */
-define(['StringUtil', 'Dom/Util', 'Ui/Dialog', './Input'], function(StringUtil, DomUtil, UiDialog, UiPageSearchInput) {
+define(['Language', 'StringUtil', 'Dom/Util', 'Ui/Dialog', './Input'], function(Language, StringUtil, DomUtil, UiDialog, UiPageSearchInput) {
 	"use strict";
 	
 	var _callback = null;
@@ -49,7 +49,7 @@ define(['StringUtil', 'Dom/Util', 'Ui/Dialog', './Input'], function(StringUtil,
 			if (!Array.isArray(data.returnValues) || data.returnValues.length === 0) {
 				var innerError = elCreate('small');
 				innerError.className = 'innerError';
-				innerError.textContent = 'TODO: no matches';
+				innerError.textContent = Language.get('wcf.page.pageObjectID.search.noResults');
 				DomUtil.insertAfter(innerError, _searchInput);
 				
 				return;
@@ -156,17 +156,17 @@ define(['StringUtil', 'Dom/Util', 'Ui/Dialog', './Input'], function(StringUtil,
 				},
 				source: '<div class="section">'
 						+ '<dl>'
-							+ '<dt><label for="wcfUiPageSearchInput">TODO: Search terms</label></dt>'
+							+ '<dt><label for="wcfUiPageSearchInput">' + Language.get('wcf.page.pageObjectID.search.terms') + '</label></dt>'
 							+ '<dd>'
 								+ '<input type="text" id="wcfUiPageSearchInput" class="long">'
-								+ '<small>TODO: Enter at least 3 characters to search</small>'
+								+ '<small>' + Language.get('wcf.page.pageObjectID.search.terms.description') + '</small>'
 							+ '</dd>'
 						+ '</dl>'
 					+ '</div>'
 					+ '<section id="wcfUiPageSearchResultListContainer" class="section sectionContainerList">'
 						+ '<header class="sectionHeader">'
-							+ '<h2 class="sectionTitle">TODO: results</h2>'
-							+ '<small class="sectionDescription">TODO: click on a result to select it</small>'
+							+ '<h2 class="sectionTitle">' + Language.get('wcf.page.pageObjectID.search.results') + '</h2>'
+							+ '<small class="sectionDescription">' + Language.get('wcf.page.pageObjectID.search.results.description') + '</small>'
 						+ '</header>'
 						+ '<ul id="wcfUiPageSearchResultList" class="containerList wcfUiPageSearchResultList"></ul>'
 					+ '</section>'
diff --git a/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php
index b6123e3c02..9942216532 100644
--- a/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php
@@ -3,9 +3,11 @@ namespace wcf\acp\form;
 use wcf\data\menu\item\MenuItem;
 use wcf\data\menu\item\MenuItemAction;
 use wcf\data\menu\Menu;
+use wcf\data\page\PageNodeTree;
 use wcf\form\AbstractForm;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\language\I18nHandler;
+use wcf\system\page\handler\ILookupPageHandler;
 use wcf\system\WCF;
 
 /**
@@ -49,6 +51,18 @@ class MenuItemEditForm extends MenuItemAddForm {
 		
 		I18nHandler::getInstance()->register('title');
 		I18nHandler::getInstance()->register('externalURL');
+		
+		$this->pageNodeList = (new PageNodeTree())->getNodeList();
+		
+		// fetch page handlers
+		foreach ($this->pageNodeList as $pageNode) {
+			$handler = $pageNode->getPage()->getHandler();
+			if ($handler !== null) {
+				if ($handler instanceof ILookupPageHandler) {
+					$this->pageHandlers[$pageNode->getPage()->pageID] = $pageNode->getPage()->requireObjectID;
+				}
+			}
+		}
 	}
 	
 	/**
@@ -79,6 +93,7 @@ class MenuItemEditForm extends MenuItemAddForm {
 			'isDisabled' => ($this->isDisabled) ? 1 : 0,
 			'title' => $this->title,
 			'pageID' => $this->pageID,
+			'pageObjectID' => ($this->pageObjectID ?: 0),
 			'externalURL' => $this->externalURL,
 			'parentItemID' => $this->parentItemID,
 			'showOrder' => $this->showOrder
@@ -105,6 +120,7 @@ class MenuItemEditForm extends MenuItemAddForm {
 			$this->parentItemID = $this->menuItem->parentItemID;
 			$this->title = $this->menuItem->title;
 			$this->pageID = $this->menuItem->pageID;
+			$this->pageObjectID = $this->menuItem->pageObjectID;
 			$this->externalURL = $this->menuItem->externalURL;
 			$this->showOrder = $this->menuItem->showOrder;
 			$this->isDisabled = $this->menuItem->isDisabled;
-- 
2.20.1