From 937797070882708f6e09b86221376055f188020b Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 28 Jun 2016 18:08:08 +0200
Subject: [PATCH] Added some missing language variables (menu management)

---
 .../install/files/acp/templates/menuAdd.tpl   | 28 ++++++++++---
 .../files/acp/templates/menuItemAdd.tpl       | 42 ++++++++-----------
 .../files/acp/templates/menuItemList.tpl      |  2 +-
 .../install/files/acp/templates/menuList.tpl  |  4 +-
 wcfsetup/install/lang/de.xml                  | 15 +++++++
 wcfsetup/install/lang/en.xml                  | 15 +++++++
 6 files changed, 73 insertions(+), 33 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl
index c157dfd380..a1eee9c64f 100644
--- a/wcfsetup/install/files/acp/templates/menuAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuAdd.tpl
@@ -38,7 +38,6 @@
 						{/if}
 					</small>
 				{/if}
-				<small>{lang}wcf.acp.menu.title.description{/lang}</small>
 				{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=false}
 			</dd>
 		</dl>
@@ -49,7 +48,7 @@
 				<dd>
 					<select name="position" id="position">
 						{foreach from=$availablePositions item=availablePosition}
-							<option value="{@$availablePosition}"{if $availablePosition == $position} selected{/if}>{lang}wcf.acp.box.position.{@$availablePosition}{/lang}</option>
+							<option value="{@$availablePosition}"{if $availablePosition == $position} selected{/if}>{@$availablePosition}</option>
 						{/foreach}
 					</select>
 					
@@ -99,17 +98,34 @@
 				<dt></dt>
 				<dd>
 					<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1"{if $visibleEverywhere} checked{/if}> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
+					<script data-relocate="true">
+						elById('visibleEverywhere').addEventListener('change', function() {
+							if (this.checked) {
+								elShow(elById('visibilityExceptionHidden'));
+								elHide(elById('visibilityExceptionVisible'));
+							}
+							else {
+								elHide(elById('visibilityExceptionHidden'));
+								elShow(elById('visibilityExceptionVisible'));
+							}
+						});
+					</script>
 				</dd>
 			</dl>
 			
 			<dl>
-				<dt><label for="pageIDs">{lang}wcf.acp.box.pageIDs{/lang}</label></dt>
+				<dt>
+					<span id="visibilityExceptionVisible"{if $visibleEverywhere} style="display: none"{/if}>{lang}wcf.acp.box.visibilityException.visible{/lang}</span>
+					<span id="visibilityExceptionHidden"{if !$visibleEverywhere} style="display: none"{/if}>{lang}wcf.acp.box.visibilityException.hidden{/lang}</span>
+				</dt>
 				<dd>
-					<select name="pageIDs[]" id="pageIDs" multiple size="20">
+					<ul class="scrollableCheckboxList">
 						{foreach from=$pageNodeList item=pageNode}
-							<option value="{@$pageNode->pageID}"{if $pageNode->pageID|in_array:$pageIDs} selected{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
+							<li{if $pageNode->getDepth() > 1} style="padding-left: {$pageNode->getDepth()*20-20}px"{/if}>
+								<label><input type="checkbox" name="pageIDs[]" value="{@$pageNode->pageID}"{if $pageNode->pageID|in_array:$pageIDs} checked{/if}> {$pageNode->name}</label>
+							</li>
 						{/foreach}
-					</select>
+					</ul>
 				</dd>
 			</dl>
 		{/if}
diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index e946f90e3f..10ee12c06a 100644
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -81,6 +81,22 @@
 			</dd>
 		</dl>
 		
+		<dl>
+			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
+			<dd>
+				<input type="number" name="showOrder" id="showOrder" value="{@$showOrder}" class="tiny" min="0">
+			</dd>
+		</dl>
+		
+		{if $action == 'add' || !$menuItem->isLandingPage}
+			<dl>
+				<dt></dt>
+				<dd>
+					<label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked{/if}> <span>{lang}wcf.acp.menu.item.isDisabled{/lang}</span></label>
+				</dd>
+			</dl>
+		{/if}
+		
 		{event name='dataFields'}
 	</div>
 	
@@ -96,7 +112,7 @@
 		</dl>
 		
 		<dl id="pageIDContainer"{if $errorField == 'pageID'} class="formError"{/if}{if !$isInternalLink} style="display: none;"{/if}>
-			<dt><label for="pageID">{lang}wcf.acp.page.parentPageID{/lang}</label></dt>
+			<dt><label for="pageID">{lang}wcf.acp.page.page{/lang}</label></dt>
 			<dd>
 				<select name="pageID" id="pageID">
 					<option value="0">{lang}wcf.global.noSelection{/lang}</option>
@@ -118,7 +134,7 @@
 		</dl>
 		
 		<dl id="pageObjectIDContainer"{if $errorField == 'pageObjectID'} class="formError"{/if}{if !$pageID || !$pageHandler[$pageID]|isset} style="display: none;"{/if}>
-			<dt><label for="pageObjectID">{lang}wcf.acp.page.pageObjectID{/lang}</label></dt>
+			<dt><label for="pageObjectID">{lang}wcf.acp.page.objectID{/lang}</label></dt>
 			<dd>
 				<div class="inputAddon">
 					<input type="text" id="pageObjectID" name="pageObjectID" value="{$pageObjectID}" class="short">
@@ -157,28 +173,6 @@
 		{event name='linkFields'}
 	</section>
 	
-	<section class="section">
-		<h2 class="sectionTitle">{lang}wcf.acp.menu.item.advanced{/lang}</h2>
-		
-		<dl>
-			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
-			<dd>
-				<input type="number" name="showOrder" id="showOrder" value="{@$showOrder}" class="tiny" min="0">
-			</dd>
-		</dl>
-		
-		{if $action == 'add' || !$menuItem->isLandingPage}
-			<dl>
-				<dt></dt>
-				<dd>
-					<label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked{/if}> <span>{lang}wcf.acp.menu.item.isDisabled{/lang}</span></label>
-				</dd>
-			</dl>
-		{/if}
-		
-		{event name='advancedFields'}
-	</section>
-		
 	{event name='sections'}
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/menuItemList.tpl b/wcfsetup/install/files/acp/templates/menuItemList.tpl
index b6be3c223a..bf647b7299 100644
--- a/wcfsetup/install/files/acp/templates/menuItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemList.tpl
@@ -41,7 +41,7 @@
 								{/if}
 								<a href="{link controller='MenuItemEdit' id=$menuItemNode->itemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 fa-pencil"></span></a>
 								{if $menuItemNode->canDelete()}
-									<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menuItemNode->itemID}" data-confirm-message="{lang menuItem=$menuItemNode->getDecoratedObject()}wcf.acp.menu.item.delete.confirmMessage{/lang}"></span>
+									<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menuItemNode->itemID}" data-confirm-message-html="{lang __encode=true}wcf.acp.menu.item.delete.confirmMessage{/lang}"></span>
 								{else}
 									<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
 								{/if}
diff --git a/wcfsetup/install/files/acp/templates/menuList.tpl b/wcfsetup/install/files/acp/templates/menuList.tpl
index 8fe4c78e24..9789424325 100644
--- a/wcfsetup/install/files/acp/templates/menuList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuList.tpl
@@ -36,7 +36,7 @@
 					<th class="columnPageID{if $sortField == 'menuID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='MenuList'}pageNo={@$pageNo}&sortField=menuID&sortOrder={if $sortField == 'menuID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
 					<th class="columnTitle{if $sortField == 'title'} active {@$sortOrder}{/if}"><a href="{link controller='MenuList'}pageNo={@$pageNo}&sortField=title&sortOrder={if $sortField == 'title' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.name{/lang}</a></th>
 					<th class="columnText columnPosition{if $sortField == 'position'} active {@$sortOrder}{/if}"><a href="{link controller='MenuList'}pageNo={@$pageNo}&sortField=position&sortOrder={if $sortField == 'position' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.box.position{/lang}</a></th>
-					<th class="columnDigits columnItems{if $sortField == 'items'} active {@$sortOrder}{/if}"><a href="{link controller='MenuList'}pageNo={@$pageNo}&sortField=items&sortOrder={if $sortField == 'items' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.menu.items{/lang}</a></th>
+					<th class="columnDigits columnItems{if $sortField == 'items'} active {@$sortOrder}{/if}"><a href="{link controller='MenuList'}pageNo={@$pageNo}&sortField=items&sortOrder={if $sortField == 'items' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.menu.item.list{/lang}</a></th>
 					
 					{event name='columnHeads'}
 				</tr>
@@ -49,7 +49,7 @@
 							<a href="{link controller='MenuEdit' id=$menu->menuID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
 							<a href="{link controller='MenuItemList' id=$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.list{/lang}" class="jsTooltip"><span class="icon icon16 fa-list"></span></a>
 							{if $menu->canDelete()}
-								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menu->menuID}" data-confirm-message="{lang}wcf.acp.menu.delete.confirmMessage{/lang}"></span>
+								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menu->menuID}" data-confirm-message-html="{lang __encode=true}wcf.acp.menu.delete.confirmMessage{/lang}"></span>
 							{else}
 								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
 							{/if}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 5ad054ec10..088ca2f68e 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -157,6 +157,7 @@
 		<item name="wcf.acp.box.linkType.external"><![CDATA[Externer Link]]></item>
 		<item name="wcf.acp.box.link.externalURL"><![CDATA[Externe URL]]></item>
 		<item name="wcf.acp.box.list"><![CDATA[Boxen]]></item>
+		<item name="wcf.acp.box.name.error.notUnique"><![CDATA[Dieser Name wird bereits von einer anderen Box verwendet.]]></item>
 		<item name="wcf.acp.box.position"><![CDATA[Position]]></item>
 		<item name="wcf.acp.box.showHeader"><![CDATA[Box-Titel anzeigen]]></item>
 		<item name="wcf.acp.box.type"><![CDATA[Box-Typ]]></item>
@@ -706,6 +707,20 @@
 		<item name="wcf.acp.menu.link.article.add"><![CDATA[Artikel hinzufügen]]></item>
 		<item name="wcf.acp.menu.link.article.category.list"><![CDATA[Kategorien]]></item>
 		<item name="wcf.acp.menu.link.article.category.add"><![CDATA[Kategorie hinzufügen]]></item>
+		<item name="wcf.acp.menu.add"><![CDATA[Menü hinzufügen]]></item>
+		<item name="wcf.acp.menu.delete.confirmMessage"><![CDATA[Wollen Sie das Menü <span class="confirmationObject">{lang}{$menu->title}{/lang}</span> wirklich löschen?]]></item>
+		<item name="wcf.acp.menu.edit"><![CDATA[Menü bearbeiten]]></item>
+		<item name="wcf.acp.menu.list"><![CDATA[Menüs]]></item>
+		<item name="wcf.acp.menu.item.add"><![CDATA[Menüpunkt hinzufügen]]></item>
+		<item name="wcf.acp.menu.item.delete.confirmMessage"><![CDATA[Wollen Sie den Menüpunkt <span class="confirmationObject">{lang}{$menuItemNode->title}{/lang}</span> wirklich löschen?]]></item>
+		<item name="wcf.acp.menu.item.edit"><![CDATA[Menüpunkt bearbeiten]]></item>
+		<item name="wcf.acp.menu.item.externalURL"><![CDATA[Externe URL]]></item>
+		<item name="wcf.acp.menu.item.isDisabled"><![CDATA[Menüpunkt deaktivieren]]></item>
+		<item name="wcf.acp.menu.item.link"><![CDATA[Verlinkung]]></item>
+		<item name="wcf.acp.menu.item.link.external"><![CDATA[Externer Link]]></item>
+		<item name="wcf.acp.menu.item.link.internal"><![CDATA[Interner Link]]></item>
+		<item name="wcf.acp.menu.item.list"><![CDATA[Menüpunkte]]></item>
+		<item name="wcf.acp.menu.item.parentItem"><![CDATA[Übergeordneter Menüpunkt]]></item>
 	</category>
 	
 	<category name="wcf.acp.notice">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 71d4daa3da..979d3f49ed 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -156,6 +156,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.box.linkType.external"><![CDATA[External link]]></item>
 		<item name="wcf.acp.box.link.externalURL"><![CDATA[External URL]]></item>
 		<item name="wcf.acp.box.list"><![CDATA[Boxes]]></item>
+		<item name="wcf.acp.box.name.error.notUnique"><![CDATA[Name is already in use.]]></item>
 		<item name="wcf.acp.box.position"><![CDATA[Position]]></item>
 		<item name="wcf.acp.box.showHeader"><![CDATA[Show box title]]></item>
 		<item name="wcf.acp.box.type"><![CDATA[Page Type]]></item>
@@ -704,6 +705,20 @@ Examples for medium ID detection:
 		<item name="wcf.acp.menu.link.article.add"><![CDATA[Add Article]]></item>
 		<item name="wcf.acp.menu.link.article.category.list"><![CDATA[Categories]]></item>
 		<item name="wcf.acp.menu.link.article.category.add"><![CDATA[Add Category]]></item>
+		<item name="wcf.acp.menu.add"><![CDATA[Add Menu]]></item>
+		<item name="wcf.acp.menu.delete.confirmMessage"><![CDATA[Do you really want to delete the menu <span class="confirmationObject">{lang}{$menu->title}{/lang}</span>?]]></item>
+		<item name="wcf.acp.menu.edit"><![CDATA[Edit Menu]]></item>
+		<item name="wcf.acp.menu.list"><![CDATA[Menus]]></item>
+		<item name="wcf.acp.menu.item.add"><![CDATA[Add Menu Item]]></item>
+		<item name="wcf.acp.menu.item.delete.confirmMessage"><![CDATA[Do you really want to delete the menu item <span class="confirmationObject">{lang}{$menuItemNode->title}{/lang}</span>?]]></item>
+		<item name="wcf.acp.menu.item.edit"><![CDATA[Edit Menu Item]]></item>
+		<item name="wcf.acp.menu.item.externalURL"><![CDATA[External URL]]></item>
+		<item name="wcf.acp.menu.item.isDisabled"><![CDATA[Disable menu item]]></item>
+		<item name="wcf.acp.menu.item.link"><![CDATA[Link]]></item>
+		<item name="wcf.acp.menu.item.link.external"><![CDATA[External link]]></item>
+		<item name="wcf.acp.menu.item.link.internal"><![CDATA[Internal link]]></item>
+		<item name="wcf.acp.menu.item.list"><![CDATA[Menu Items]]></item>
+		<item name="wcf.acp.menu.item.parentItem"><![CDATA[Parent Menu Item]]></item>
 	</category>
 	
 	<category name="wcf.acp.notice">
-- 
2.20.1