From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 26 Apr 2013 14:54:13 +0000 (+0200)
Subject: Fixed issue in page menu administration
X-Git-Tag: 2.0.0_Beta_1~295^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e01bcdebb99a484c413a3dd09596418bf3b79e01;p=GitHub%2FWoltLab%2FWCF.git

Fixed issue in page menu administration
---

diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
index 472adbba97..49afc45bff 100644
--- a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
@@ -7,6 +7,7 @@
 		var $parentMenuItemContainer = $('#parentMenuItemContainer');
 		var $isInternalLink = $('input[name=isInternalLink]').filter('[value=1]');
 		var $menuItemControllerContainer = $('#menuItemControllerContainer');
+		var $menuItemLinkContainer = $('#menuItemLinkContainer');
 		
 		function handleMenuPosition() {
 			if ($menuPosition.val() === 'header') {
@@ -20,9 +21,11 @@
 		function handleIsInternalLink() {
 			if ($isInternalLink.is(':checked')) {
 				$menuItemControllerContainer.show();
+				$menuItemLinkContainer.hide();
 			}
 			else {
 				$menuItemControllerContainer.hide();
+				$menuItemLinkContainer.show();
 			}
 		}
 		
@@ -138,7 +141,7 @@
 			<dl id="menuItemControllerContainer"{if $errorField == 'menuItemController'} class="formError"{/if}>
 				<dt><label for="menuItemController">{lang}wcf.acp.pageMenu.menuItemController{/lang}</label></dt>
 				<dd>
-					<input type="text" name="menuItemController" id="menuItemController" value="{$menuItemController}" class="medium" />
+					<input type="text" name="menuItemController" id="menuItemController" value="{$menuItemController}" class="long" />
 					{if $errorField == 'menuItemController'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -152,7 +155,7 @@
 				</dd>
 			</dl>
 			
-			<dl{if $errorField == 'menuItemLink'} class="formError"{/if}>
+			<dl id="menuItemLinkContainer"{if $errorField == 'menuItemLink'} class="formError"{/if}>
 				<dt><label for="menuItemLink">{lang}wcf.acp.pageMenu.menuItemLink{/lang}</label></dt>
 				<dd>
 					<input type="text" name="menuItemLink" id="menuItemLink" value="{$menuItemLink}" class="long" />
diff --git a/wcfsetup/install/files/acp/templates/selectOptionType.tpl b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
index 25332e39d2..e0e2ce6cdf 100644
--- a/wcfsetup/install/files/acp/templates/selectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
@@ -1,5 +1,5 @@
 <select id="{$option->optionName}" name="values[{$option->optionName}]">
-	<option value=""></option>
+	{if $option->allowEmptyValue}<option value=""></option>{/if}
 	{foreach from=$selectOptions key=key item=selectOption}
 		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
 	{/foreach}