From 5da92f1bc7d059ec6c8c8dc6ab2eec3a8ca67518 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 26 Apr 2013 02:12:50 +0200
Subject: [PATCH] Small style optimization

---
 .../install/files/acp/templates/userAdd.tpl   | 294 +++++++++---------
 1 file changed, 146 insertions(+), 148 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index c8314f7f50..3b146d0efb 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -38,174 +38,172 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='UserAdd'}{/link}{else}{link controller='UserEdit' id=$userID}{/link}{/if}">
-	<div class="container containerPadding marginTop">
-		<fieldset>
-			<legend>{lang}wcf.acp.user.general{/lang}</legend>
-			
-			<dl{if $errorType.username|isset} class="formError"{/if}>
-				<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
-				<dd>
-					<input type="text" id="username" name="username" value="{$username}" pattern="^[^,\n]+$" autofocus="autofocus" class="medium" />
-					{if $errorType.username|isset}
-						<small class="innerError">
-							{if $errorType.username == 'empty'}
-								{lang}wcf.global.form.error.empty{/lang}
-							{else}
-								{lang}wcf.user.username.error.{@$errorType.username}{/lang}
-							{/if}
-						</small>
-					{/if}
-				</dd>
-			</dl>
-			
-			{if $availableGroups|count}
-				<dl>
-					<dt>
-						<label>{lang}wcf.acp.user.groups{/lang}</label>
-					</dt>
-					<dd>
-						{htmlCheckboxes options=$availableGroups name=groupIDs selected=$groupIDs}
-					</dd>
-				</dl>
-			{/if}
-			
-			{event name='generalFields'}
-		</fieldset>
+	<div class="tabMenuContainer">
+		<nav class="tabMenu">
+			<ul>
+				<li><a href="{@$__wcf->getAnchor('__essentials')}">{lang}wcf.global.form.data{/lang}</a></li>
+				
+				{foreach from=$optionTree item=categoryLevel1}
+					<li><a href="{@$__wcf->getAnchor($categoryLevel1[object]->categoryName)}">{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</a></li>
+				{/foreach}
+			</ul>
+		</nav>
 		
-		{if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditMailAddress')}
+		<div id="__essentials" class="container containerPadding tabMenuContent hidden">
 			<fieldset>
-				<legend>{lang}wcf.user.email{/lang}</legend>
+				<legend>{lang}wcf.acp.user.general{/lang}</legend>
 				
-				<dl{if $errorType.email|isset} class="formError"{/if}>
-					<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+				<dl{if $errorType.username|isset} class="formError"{/if}>
+					<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 					<dd>
-						<input type="email" id="email" name="email" value="{$email}" required="required" class="medium" />
-						{if $errorType.email|isset}
+						<input type="text" id="username" name="username" value="{$username}" pattern="^[^,\n]+$" autofocus="autofocus" class="medium" />
+						{if $errorType.username|isset}
 							<small class="innerError">
-								{if $errorType.email == 'empty'}
+								{if $errorType.username == 'empty'}
 									{lang}wcf.global.form.error.empty{/lang}
 								{else}
-									{lang}wcf.user.email.error.{@$errorType.email}{/lang}
+									{lang}wcf.user.username.error.{@$errorType.username}{/lang}
 								{/if}
 							</small>
 						{/if}
 					</dd>
 				</dl>
 				
-				<dl{if $errorType.confirmEmail|isset} class="formError"{/if}>
-					<dt><label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label></dt>
-					<dd>
-						<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" required="required" class="medium" />
-						{if $errorType.confirmEmail|isset}
-							<small class="innerError">
-								{lang}wcf.user.confirmEmail.error.{@$errorType.confirmEmail}{/lang}
-							</small>
-						{/if}
-					</dd>
-				</dl>
+				{if $availableGroups|count}
+					<dl>
+						<dt>
+							<label>{lang}wcf.acp.user.groups{/lang}</label>
+						</dt>
+						<dd>
+							{htmlCheckboxes options=$availableGroups name=groupIDs selected=$groupIDs}
+						</dd>
+					</dl>
+				{/if}
 				
-				{event name='emailFields'}
+				{event name='generalFields'}
 			</fieldset>
-		{/if}
+			
+			{if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditMailAddress')}
+				<fieldset>
+					<legend>{lang}wcf.user.email{/lang}</legend>
+					
+					<dl{if $errorType.email|isset} class="formError"{/if}>
+						<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+						<dd>
+							<input type="email" id="email" name="email" value="{$email}" required="required" class="medium" />
+							{if $errorType.email|isset}
+								<small class="innerError">
+									{if $errorType.email == 'empty'}
+										{lang}wcf.global.form.error.empty{/lang}
+									{else}
+										{lang}wcf.user.email.error.{@$errorType.email}{/lang}
+									{/if}
+								</small>
+							{/if}
+						</dd>
+					</dl>
+					
+					<dl{if $errorType.confirmEmail|isset} class="formError"{/if}>
+						<dt><label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label></dt>
+						<dd>
+							<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" required="required" class="medium" />
+							{if $errorType.confirmEmail|isset}
+								<small class="innerError">
+									{lang}wcf.user.confirmEmail.error.{@$errorType.confirmEmail}{/lang}
+								</small>
+							{/if}
+						</dd>
+					</dl>
+					
+					{event name='emailFields'}
+				</fieldset>
+			{/if}
+			
+			{if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditPassword')}
+				<fieldset>
+					<legend>{lang}wcf.user.password{/lang}</legend>
+					
+					<dl{if $errorType.password|isset} class="formError"{/if}>
+						<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+						<dd>
+							<input type="password" id="password" name="password" value="{$password}"{if $action == 'add'} required="required"{/if} class="medium" />
+							{if $errorType.password|isset}
+								<small class="innerError">
+									{if $errorType.password == 'empty'}
+										{lang}wcf.global.form.error.empty{/lang}
+									{else}
+										{lang}wcf.user.password.error.{@$errorType.password}{/lang}
+									{/if}
+								</small>
+							{/if}
+						</dd>
+					</dl>
+					
+					<dl{if $errorType.confirmPassword|isset} class="formError"{/if}>
+						<dt><label for="confirmPassword">{lang}wcf.user.confirmPassword{/lang}</label></dt>
+						<dd>
+							<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}"{if $action == 'add'} required="required"{/if} class="medium" />
+							{if $errorType.confirmPassword|isset}
+								<small class="innerError">
+									{lang}wcf.user.confirmPassword.error.{@$errorType.confirmPassword}{/lang}
+								</small>
+							{/if}
+						</dd>
+					</dl>
+					
+					{event name='passwordFields'}
+				</fieldset>
+			{/if}
+		</div>
 		
-		{if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditPassword')}
-			<fieldset>
-				<legend>{lang}wcf.user.password{/lang}</legend>
-				
-				<dl{if $errorType.password|isset} class="formError"{/if}>
-					<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
-					<dd>
-						<input type="password" id="password" name="password" value="{$password}"{if $action == 'add'} required="required"{/if} class="medium" />
-						{if $errorType.password|isset}
-							<small class="innerError">
-								{if $errorType.password == 'empty'}
-									{lang}wcf.global.form.error.empty{/lang}
-								{else}
-									{lang}wcf.user.password.error.{@$errorType.password}{/lang}
-								{/if}
-							</small>
+		{foreach from=$optionTree item=categoryLevel1}
+			<div id="{@$categoryLevel1[object]->categoryName}" class="container containerPadding tabMenuContent hidden">
+				{foreach from=$categoryLevel1[categories] item=categoryLevel2}
+					<fieldset>
+						<legend>{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
+						
+						{if $categoryLevel2[object]->categoryName == 'settings.general' && $availableLanguages|count > 1}
+							<dl>
+								<dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
+								<dd>
+									{htmlOptions options=$availableLanguages selected=$languageID name=languageID id=languageID disableEncoding=true}
+								</dd>
+							</dl>
+							
+							{if $availableContentLanguages|count > 1}
+								<dl>
+									<dt>
+										{lang}wcf.user.visibleLanguages{/lang}
+									</dt>
+									<dd>
+										<fieldset>
+											<legend>{lang}wcf.user.visibleLanguages{/lang}</legend>
+											<dl>
+												<dd>
+													{foreach from=$availableContentLanguages key=availableLanguageID item=availableLanguage}
+														<label><input type="checkbox" name="visibleLanguages[]" value="{@$availableLanguageID}"{if $availableLanguageID|in_array:$visibleLanguages} checked="checked"{/if} /> {@$availableLanguage}</label>
+													{/foreach}
+												</dd>
+											</dl>
+										</fieldset>
+									</dd>
+								</dl>
+							{/if}
 						{/if}
-					</dd>
-				</dl>
-				
-				<dl{if $errorType.confirmPassword|isset} class="formError"{/if}>
-					<dt><label for="confirmPassword">{lang}wcf.user.confirmPassword{/lang}</label></dt>
-					<dd>
-						<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}"{if $action == 'add'} required="required"{/if} class="medium" />
-						{if $errorType.confirmPassword|isset}
-							<small class="innerError">
-								{lang}wcf.user.confirmPassword.error.{@$errorType.confirmPassword}{/lang}
-							</small>
+						
+						{event name='categoryFields'}
+						
+						{include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.user.option.'}
+						
+						{if $categoryLevel2[categories]|count}
+							{foreach from=$categoryLevel2[categories] item=categoryLevel3}
+								{include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.user.option.'}
+							{/foreach}
 						{/if}
-					</dd>
-				</dl>
-				
-				{event name='passwordFields'}
-			</fieldset>
-		{/if}
-		
-		{event name='fieldsets'}
-		
-		{if $optionTree|count || $additionalTabs|isset}
-			<div class="tabMenuContainer">
-				<nav class="tabMenu">
-					<ul>
-						{foreach from=$optionTree item=categoryLevel1}
-							<li><a href="{@$__wcf->getAnchor($categoryLevel1[object]->categoryName)}">{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</a></li>
-						{/foreach}
-					</ul>
-				</nav>
-				
-				{foreach from=$optionTree item=categoryLevel1}
-					<div id="{@$categoryLevel1[object]->categoryName}" class="container containerPadding tabMenuContent hidden">
-						{foreach from=$categoryLevel1[categories] item=categoryLevel2}
-							<fieldset>
-								<legend>{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
-								
-								{if $categoryLevel2[object]->categoryName == 'settings.general' && $availableLanguages|count > 1}
-									<dl>
-										<dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
-										<dd>
-											{htmlOptions options=$availableLanguages selected=$languageID name=languageID id=languageID disableEncoding=true}
-										</dd>
-									</dl>
-									
-									{if $availableContentLanguages|count > 1}
-										<dl>
-											<dt>
-												{lang}wcf.user.visibleLanguages{/lang}
-											</dt>
-											<dd>
-												<fieldset>
-													<legend>{lang}wcf.user.visibleLanguages{/lang}</legend>
-													<dl>
-														<dd>
-															{foreach from=$availableContentLanguages key=availableLanguageID item=availableLanguage}
-																<label><input type="checkbox" name="visibleLanguages[]" value="{@$availableLanguageID}"{if $availableLanguageID|in_array:$visibleLanguages} checked="checked"{/if} /> {@$availableLanguage}</label>
-															{/foreach}
-														</dd>
-													</dl>
-												</fieldset>
-											</dd>
-										</dl>
-									{/if}
-								{/if}
-								
-								{event name='categoryFields'}
-								
-								{include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.user.option.'}
-								
-								{if $categoryLevel2[categories]|count}
-									{foreach from=$categoryLevel2[categories] item=categoryLevel3}
-										{include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.user.option.'}
-									{/foreach}
-								{/if}
-							</fieldset>
-						{/foreach}
-					</div>
+					</fieldset>
 				{/foreach}
 			</div>
-		{/if}
+		{/foreach}
 	</div>
 	
 	<div class="formSubmit">
-- 
2.20.1