From: Sebastian Öttl <sebastian.oettl@wcfsolutions.com>
Date: Fri, 19 Jul 2013 20:06:36 +0000 (+0200)
Subject: Improved categoryAdd template
X-Git-Tag: 2.0.0_Beta_7~64^2~2^2^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5ab603a3c7cc0444a783228c160d120425562241;p=GitHub%2FWoltLab%2FWCF.git

Improved categoryAdd template
---

diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 383205d0b1..e315dfaa1d 100644
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -45,28 +45,11 @@
 
 <form method="post" action="{if $action == 'add'}{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}{else}{link controller=$editController application=$objectType->getProcessor()->getApplication() object=$category}{/link}{/if}">
 	<div class="container containerPadding marginTop">
+		{event name='beforeFieldsets'}
+		
 		<fieldset>
 			<legend>{lang}wcf.global.form.data{/lang}</legend>
 			
-			{if $categoryNodeList->hasChildren() && $objectType->getProcessor()->getMaximumNestingLevel()}
-				<dl{if $errorField == 'parentCategoryID'} class="formError"{/if}>
-					<dt><label for="parentCategoryID">{@$objectType->getProcessor()->getLanguageVariable('parentCategoryID')}</label></dt>
-					<dd>
-						<select id="parentCategoryID" name="parentCategoryID">
-							<option value="0"></option>
-							{include file='categoryOptionList' categoryID=$parentCategoryID maximumNestingLevel=$objectType->getProcessor()->getMaximumNestingLevel()}
-						</select>
-						{if $errorField == 'parentCategoryID'}
-							<small class="innerError">
-								{assign var=__languageVariable value='parentCategoryID.error.'|concat:$errorType}
-								{@$objectType->getProcessor()->getLanguageVariable($__languageVariable)}
-							</small>
-						{/if}
-						{hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('parentCategoryID.description', true)}{/content}</small>{/hascontent}
-					</dd>
-				</dl>
-			{/if}
-			
 			<dl{if $errorField == 'title'} class="formError"{/if}>
 				<dt><label for="title">{@$objectType->getProcessor()->getLanguageVariable('title')}</label></dt>
 				<dd>
@@ -113,6 +96,31 @@
 				</dd>
 			</dl>
 			
+			{event name='dataFields'}
+		</fieldset>
+		
+		<fieldset>
+			<legend>{@$objectType->getProcessor()->getLanguageVariable('position')}</legend>
+			
+			{if $categoryNodeList->hasChildren() && $objectType->getProcessor()->getMaximumNestingLevel()}
+				<dl{if $errorField == 'parentCategoryID'} class="formError"{/if}>
+					<dt><label for="parentCategoryID">{@$objectType->getProcessor()->getLanguageVariable('parentCategoryID')}</label></dt>
+					<dd>
+						<select id="parentCategoryID" name="parentCategoryID">
+							<option value="0"></option>
+							{include file='categoryOptionList' categoryID=$parentCategoryID maximumNestingLevel=$objectType->getProcessor()->getMaximumNestingLevel()}
+						</select>
+						{if $errorField == 'parentCategoryID'}
+							<small class="innerError">
+								{assign var=__languageVariable value='parentCategoryID.error.'|concat:$errorType}
+								{@$objectType->getProcessor()->getLanguageVariable($__languageVariable)}
+							</small>
+						{/if}
+						{hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('parentCategoryID.description', true)}{/content}</small>{/hascontent}
+					</dd>
+				</dl>
+			{/if}
+			
 			<dl{if $errorField == 'showOrder'} class="formError"{/if}>
 				<dt><label for="showOrder">{@$objectType->getProcessor()->getLanguageVariable('showOrder')}</label></dt>
 				<dd>
@@ -127,7 +135,7 @@
 				</dd>
 			</dl>
 			
-			{event name='dataFields'}
+			{event name='positionFields'}
 		</fieldset>
 		
 		{if $aclObjectTypeID}
@@ -143,7 +151,7 @@
 			</fieldset>
 		{/if}
 		
-		{event name='fieldsets'}
+		{event name='afterFieldsets'}
 	</div>
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 9f3d21d699..39befe51f5 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1368,6 +1368,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getAllowedExtensions()
 		<item name="wcf.category.noneAvailable"><![CDATA[Es wurde noch keine Kategorie hinzugefügt.]]></item>
 		<item name="wcf.category.parentCategoryID"><![CDATA[Übergeordnete Kategorie]]></item>
 		<item name="wcf.category.parentCategoryID.error.notValid"><![CDATA[Die ausgewählte Kategorie existiert nicht.]]></item>
+		<item name="wcf.category.position"><![CDATA[Position]]></item>
 		<item name="wcf.category.showOrder"><![CDATA[Position]]></item>
 		<item name="wcf.category.description"><![CDATA[Beschreibung]]></item>
 		<item name="wcf.category.title"><![CDATA[Titel]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 934773db4e..53167ca3a5 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1366,6 +1366,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getAllowedExtensions()}]]>
 		<item name="wcf.category.noneAvailable"><![CDATA[No category has been added yet.]]></item>
 		<item name="wcf.category.parentCategoryID"><![CDATA[Parent Category]]></item>
 		<item name="wcf.category.parentCategoryID.error.notValid"><![CDATA[Chosen category does not exist.]]></item>
+		<item name="wcf.category.position"><![CDATA[Position]]></item>
 		<item name="wcf.category.showOrder"><![CDATA[Position]]></item>
 		<item name="wcf.category.description"><![CDATA[Description]]></item>
 		<item name="wcf.category.title"><![CDATA[Title]]></item>