From 323c03d662b48218e157fffd221a78c6df8c2d60 Mon Sep 17 00:00:00 2001
From: Luzifr <szekely@woltlab.com>
Date: Fri, 5 Aug 2011 21:29:51 +0200
Subject: [PATCH] More definition lists, some other improvements

Note that only simple definition lists are being implemented right now.
Complex forms will be done later.
---
 wcfsetup/install/files/acp/style/testing.css  |  13 +-
 .../files/acp/templates/cronjobAdd.tpl        | 172 +++++++-----------
 .../install/files/acp/templates/header.tpl    |   2 +-
 .../files/acp/templates/masterPassword.tpl    |  30 ++-
 .../acp/templates/masterPasswordInit.tpl      |  44 ++---
 .../files/acp/templates/optionImport.tpl      |  39 ++--
 .../acp/templates/packageAutoUpdateList.tpl   |   8 +-
 .../acp/templates/packageStartInstall.tpl     |  50 ++---
 .../files/acp/templates/packageUpdateAuth.tpl |  61 +++----
 .../acp/templates/packageUpdateSearch.tpl     |  14 +-
 10 files changed, 168 insertions(+), 265 deletions(-)

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index a3973a060d..029972f0d9 100644
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -15,8 +15,7 @@
 
 body {
 	font-family: 'Trebuchet MS', Arial, sans-serif;
-	font-size: .8em;
-	
+	font-size: 80%;
 	background-color: #29374a;
 }
 
@@ -177,6 +176,10 @@ nav.mainMenu ul li {
 	transition: all .2s linear;
 }
 
+nav.mainMenu ul li:only-child {
+	cursor: resize !important;
+}
+
 nav.mainMenu ul li:hover {
 	color: #fff;
 }
@@ -241,7 +244,7 @@ div.main > div {
 
 /* -- -- -- -- -- Content -- -- -- -- -- */
 
-section#content {
+section.content {
 	background-color: #fff;
 	display: table-cell;
 	padding: 25px;
@@ -250,7 +253,9 @@ section#content {
 	z-index: 100;
 }
 
-
+div.main > div section:only-child {
+	display: block !important;
+}
 
 /* -- -- -- -- -- Sidebar -- -- -- -- -- */
 
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index 176eda62e9..c2c1f48faf 100644
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -33,144 +33,96 @@
 			<fieldset>
 				<legend>{lang}wcf.acp.cronjob.edit.data{/lang}</legend>
 				
-				<div id="classNameDiv" class="formElement{if $errorField == 'className'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="className">{lang}wcf.acp.cronjob.className{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="text" id="className" name="className" value="{$className}" class="inputText" />
+				<dl id="classNameDiv"{if $errorField == 'className'} class="formError"{/if}>
+					<dt><label for="className">{lang}wcf.acp.cronjob.className{/lang}</label></dt>
+					<dd class="formField">
+						<input type="text" id="className" name="className" value="{$className}" class="long" />
 						{if $errorField == 'className'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'empty'}{lang}wcf.acp.cronjob.error.empty{/lang}{/if}
 								{if $errorType == 'doesNotExist'}{lang}wcf.acp.cronjob.error.doesNotExist{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="classNameHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.cronjob.className.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('className');
-				//]]></script>
+						<small id="classNameHelpMessage">{lang}wcf.acp.cronjob.className.description{/lang}</small>
+					</dd>
+				</dl>
 				
-				<div id="descriptionDiv" class="formElement">
-					<div class="formFieldLabel">
-						<label for="description">{lang}wcf.acp.cronjob.description{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="text" id="description" name="description" value="{$description}" class="inputText" />
-					</div>
-					<div id="descriptionHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.cronjob.description.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('description');
-				//]]></script>
+				<dl id="descriptionDiv">
+					<dt><label for="description">{lang}wcf.acp.cronjob.description{/lang}</label></dt>
+					<dd>
+						<input type="text" id="description" name="description" value="{$description}" class="long" />
+						<small id="descriptionHelpMessage">{lang}wcf.acp.cronjob.description.description{/lang}</small>
+					</dd>
+				</dl>
 			</fieldset>
 			
 			<fieldset>
 				<legend>{lang}wcf.acp.cronjob.edit.timing{/lang}</legend>
-				<div id="startMinuteDiv" class="formElement{if $errorField == 'startMinute'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="startMinute">{lang}wcf.acp.cronjob.startMinute{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="text" id="startMinute" name="startMinute" value="{$startMinute}" class="inputText" />
+				
+				<dl id="startMinuteDiv"{if $errorField == 'startMinute'} class="formError"{/if}>
+					<dt><label for="startMinute">{lang}wcf.acp.cronjob.startMinute{/lang}</label></dt>
+					<dd>
+						<input type="text" id="startMinute" name="startMinute" value="{$startMinute}" class="short" />
 						{if $errorField == 'startMinute'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="startMinuteHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.cronjob.startMinute.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('startMinute');
-				//]]></script>
+						<small id="startMinuteHelpMessage"><p>{lang}wcf.acp.cronjob.startMinute.description{/lang}</small></small>
+					</dd>
+				</dl>
 				
-				<div id="startHourDiv" class="formElement{if $errorField == 'startHour'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="startHour">{lang}wcf.acp.cronjob.startHour{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="text" id="startHour" name="startHour" value="{$startHour}" class="inputText" />
+				<dl id="startHourDiv"{if $errorField == 'startHour'} class="formError"{/if}>
+					<dt><label for="startHour">{lang}wcf.acp.cronjob.startHour{/lang}</label></dt>
+					<dd>
+						<input type="text" id="startHour" name="startHour" value="{$startHour}" class="short" />
 						{if $errorField == 'startHour'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="startHourHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.cronjob.startHour.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('startHour');
-				//]]></script>
+						<small id="startHourHelpMessage"><p>{lang}wcf.acp.cronjob.startHour.description{/lang}</small></small>
+					</dd>
+				</dl>
 				
-				<div id="startDomDiv" class="formElement{if $errorField == 'startDom'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="startDom">{lang}wcf.acp.cronjob.startDom{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="text" id="startDom" name="startDom" value="{$startDom}" class="inputText" />
+				<dl id="startDomDiv"{if $errorField == 'startDom'} class="formError"{/if}>
+					<dt><label for="startDom">{lang}wcf.acp.cronjob.startDom{/lang}</label></dt>
+					<dd>
+						<input type="text" id="startDom" name="startDom" value="{$startDom}" class="short" />
 						{if $errorField == 'startDom'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="startDomHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.cronjob.startDom.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('startDom');
-				//]]></script>
+						<small id="startDomHelpMessage">{lang}wcf.acp.cronjob.startDom.description{/lang}</small>
+					</dd>
+				</dl>
 				
-				<div id="startMonthDiv" class="formElement{if $errorField == 'startMonth'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="startMonth">{lang}wcf.acp.cronjob.startMonth{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="text" id="startMonth" name="startMonth" value="{$startMonth}" class="inputText" />
+				<dl id="startMonthDiv"{if $errorField == 'startMonth'} class="formError"{/if}>
+					<dt><label for="startMonth">{lang}wcf.acp.cronjob.startMonth{/lang}</label></dt>
+					<dd>
+						<input type="text" id="startMonth" name="startMonth" value="{$startMonth}" class="short" />
 						{if $errorField == 'startMonth'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="startMonthHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.cronjob.startMonth.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('startMonth');
-				//]]></script>
+						<small id="startMonthHelpMessage">{lang}wcf.acp.cronjob.startMonth.description{/lang}</small>
+					</dd>
+				</dl>
 				
-				<div id="startDowDiv" class="formElement{if $errorField == 'startDow'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="startDow">{lang}wcf.acp.cronjob.startDow{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="text" id="startDow" name="startDow" value="{$startDow}" class="inputText" />
+				<dl id="startDowDiv"{if $errorField == 'startDow'} class="formError"{/if}>
+					<dt><label for="startDow">{lang}wcf.acp.cronjob.startDow{/lang}</label></dt>
+					<dd>
+						<input type="text" id="startDow" name="startDow" value="{$startDow}" class="short" />
 						{if $errorField == 'startDow'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="startDowHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.cronjob.startDow.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('startDow');
-				//]]></script>
+						<small id="startDowHelpMessage">{lang}wcf.acp.cronjob.startDow.description{/lang}</small>
+					</dd>
+				</dl>
 			</fieldset>
 			
 			{if $additionalFields|isset}{@$additionalFields}{/if}
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 7a90fd362a..5c4cd9b669 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -160,4 +160,4 @@
 				<!-- /sidebar menu -->
 			</aside>
 			
-			<section id="content">
+			<section id="content" class="content">
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index 8a80e18c78..5486696bf1 100644
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -17,27 +17,19 @@
 			<fieldset>
 				<legend>{lang}wcf.acp.masterPassword.enter{/lang}</legend>
 			
-				<div class="formElement{if $errorField == 'masterPassword'} formError{/if}" id="masterPasswordDiv">
-					<div class="formFieldLabel">
-						<label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="inputText" />
+				<dl id="masterPasswordDiv"{if $errorField == 'masterPassword'} class="formError"{/if}>
+					<dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
+					<dd class="formField">
+						<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
 						{if $errorField == 'masterPassword'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
 								{if $errorType == 'invalid'}{lang}wcf.acp.masterPassword.error.invalid{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div class="formFieldDesc hidden" id="masterPasswordHelpMessage">
-						<p>{lang}wcf.acp.masterPassword.enter.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('masterPassword');
-				//]]></script>
-				
+						<small id="masterPasswordHelpMessage">{lang}wcf.acp.masterPassword.enter.description{/lang}</small>
+					</dd>
+				</dl>
 			</fieldset>
 			
 			{if $additionalFields|isset}{@$additionalFields}{/if}
@@ -45,8 +37,8 @@
 	</div>
 
 	<div class="formSubmit">
-		<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
-		<input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
+		<input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+		<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
 		{@SID_INPUT_TAG}
  		<input type="hidden" name="url" value="{$url}" />
  	</div>
diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index b87f1bf65f..8857381758 100644
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -29,41 +29,33 @@
 			<fieldset>
 				<legend>{lang}wcf.acp.masterPassword.init{/lang}</legend>
 			
-				<div class="formElement{if $errorField == 'masterPassword'} formError{/if}" id="masterPasswordDiv">
-					<div class="formFieldLabel">
-						<label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="inputText" />
+				<dl id="masterPasswordDiv"{if $errorField == 'masterPassword'} class="formError{/if}">
+					<dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
+					<dd>
+						<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
 						{if $errorField == 'masterPassword'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
 								{if $errorType == 'notSecure'}{lang}wcf.acp.masterPassword.error.notSecure{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="masterPasswordHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.masterPassword.init.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('masterPassword');
-				//]]></script>
+						<small id="masterPasswordHelpMessage">{lang}wcf.acp.masterPassword.init.description{/lang}</small>
+					</dd>
+					
+				</dl>
 				
-				<div class="formElement{if $errorField == 'confirmMasterPassword'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="confirmMasterPassword">{lang}wcf.acp.masterPassword.confirm{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="inputText" />
+				<dl{if $errorField == 'confirmMasterPassword'} class="formError"{/if}>
+					<dt><label for="confirmMasterPassword">{lang}wcf.acp.masterPassword.confirm{/lang}</label></dt>
+					<dd>
+						<input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="medium" />
 						{if $errorField == 'confirmMasterPassword'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
 								{if $errorType == 'notEqual'}{lang}wcf.acp.masterPassword.error.notEqual{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-				</div>
+					</dd>
+				</dl>
 				
 				<div class="formElement">
 					<div class="formFieldLabel">
diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index 6e3c767716..c595de1d41 100644
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -21,21 +21,20 @@
 			<fieldset>
 				<legend>{lang}wcf.acp.option.import{/lang}</legend>
 			
-				<dl id="optionImportDiv"{if $errorField == 'optionImport'}  class="formError"{/if}>
+				<dl id="optionImportDiv"{if $errorField == 'optionImport'} class="formError"{/if}>
 					<dt><label for="optionImport">{lang}wcf.acp.option.import.upload{/lang}</label></dt>
-					<dd><input type="file" id="optionImport" name="optionImport" value="" /></dd>
-					{if $errorField == 'optionImport'}
-						<small class="innerError">
-							{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-							{if $errorType == 'importFailed'}{lang}wcf.acp.option.import.error.importFailed{/lang}{/if}
-							{if $errorType == 'uploadFailed'}{lang}wcf.acp.option.import.error.uploadFailed{/lang}{/if}
-						</small>
-					{/if}
+					<dd>
+						<input type="file" id="optionImport" name="optionImport" value="" />
+						{if $errorField == 'optionImport'}
+							<small class="innerError">
+								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+								{if $errorType == 'importFailed'}{lang}wcf.acp.option.import.error.importFailed{/lang}{/if}
+								{if $errorType == 'uploadFailed'}{lang}wcf.acp.option.import.error.uploadFailed{/lang}{/if}
+							</small>
+						{/if}
+					</dd>
 					<small id="optionImportHelpMessage">{lang}wcf.acp.option.import.upload.description{/lang}</small>
 				</dl>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('optionImport');
-				//]]></script>
 			</fieldset>
 			
 			{if $additionalFields|isset}{@$additionalFields}{/if}
@@ -54,14 +53,14 @@
 		<fieldset>
 			<legend>{lang}wcf.acp.option.export{/lang}</legend>
 		
-			<dl id="optionExportDiv">
-				<dt><label><!-- ToDo: Download label --></label></dt>
-				<dd><p><a href="index.php?action=OptionExport{@SID_ARG_2ND}" id="optionExport" class="largeButton">{lang}wcf.acp.option.export.download{/lang}</a></p></dd>
-				<small>{lang}wcf.acp.option.export.download.description{/lang}</small>
-			</dl>
-			<script type="text/javascript">//<![CDATA[
-				inlineHelp.register('optionExport');
-			//]]></script>
+			<div id="optionExportDiv" class="formElement">
+				<div class="formField">
+					<a href="index.php?action=OptionExport{@SID_ARG_2ND}" id="optionExport">{lang}wcf.acp.option.export.download{/lang}</a>
+				</div>
+				<div id="optionExportHelpMessage">
+					<p>{lang}wcf.acp.option.export.download.description{/lang}</p>
+				</div>
+			</div>
 		</fieldset>
 		
 		{if $additionalFields|isset}{@$additionalFields}{/if}
diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
index d7b2b24d06..3654f1fa2f 100644
--- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
@@ -73,10 +73,10 @@
 						{/if}
 						
 						{if $availableUpdate.packageDescription}
-							<dl>
-								<dt>{lang}wcf.acp.package.description{/lang}</dt>
-								<dd>{$availableUpdate.packageDescription}</dd>
-							</dl>
+							<div class="formElement">
+								<p class="formFieldLabel">{lang}wcf.acp.package.description{/lang}</p>
+								<p class="formField">{$availableUpdate.packageDescription}</p>
+							</div>
 						{/if}
 					</div>
 					<hr />
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index f867847300..27b4a4ac9f 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -33,14 +33,12 @@
 			<fieldset>
 				<legend>{lang}wcf.acp.package.startInstall.source{/lang}</legend>
 			
-				<div id="uploadPackageDiv" class="formElement{if $errorField == 'uploadPackage'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="uploadPackage">{lang}wcf.acp.package.startInstall.source.upload{/lang}</label>
-					</div>
-					<div class="formField">
+				<dl id="uploadPackageDiv"{if $errorField == 'uploadPackage'} class="formError"{/if}>
+					<dt><label for="uploadPackage">{lang}wcf.acp.package.startInstall.source.upload{/lang}</label></dt>
+					<dd>
 						<input type="file" id="uploadPackage" name="uploadPackage" value="" />
 						{if $errorField == 'uploadPackage'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
 								{if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if}
 								{if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if}
@@ -48,41 +46,28 @@
 								{if $errorType == 'uploadFailed'}{lang}wcf.acp.package.startInstall.error.uploadFailed{/lang}{/if}
 								{if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if}
 								{if $errorType == 'phpRequirements'}<pre>{$phpRequirements|print_r}</pre>{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="uploadPackageHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.package.startInstall.source.upload.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('uploadPackage');
-				//]]></script>
+						<small id="uploadPackageHelpMessage">{lang}wcf.acp.package.startInstall.source.upload.description{/lang}</small>
+					</dd>
+				</dl>
 				
-				<div id="downloadPackageDiv" class="formElement{if $errorField == 'downloadPackage'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="downloadPackage">{lang}wcf.acp.package.startInstall.source.download{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="text" id="downloadPackage" name="downloadPackage" value="" class="inputText" />
+				<dl id="downloadPackageDiv"{if $errorField == 'downloadPackage'} class="formError"{/if}>
+					<dt><label for="downloadPackage">{lang}wcf.acp.package.startInstall.source.download{/lang}</label></dt>
+					<dd>
+						<input type="text" id="downloadPackage" name="downloadPackage" value="" class="long" />
 						{if $errorField == 'downloadPackage'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'notFound'}{lang}wcf.acp.package.startInstall.error.notFound{/lang}{/if}
 								{if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if}
 								{if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if}
 								{if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if}
 								{if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="downloadPackageHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.package.startInstall.source.download.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('downloadPackage');
-				//]]></script>
-				
+						<small id="downloadPackageHelpMessage">{lang}wcf.acp.package.startInstall.source.download.description{/lang}</small>
+					</dd>
+				</dl>
 			</fieldset>
 			
 			{if $additionalFields|isset}{@$additionalFields}{/if}
@@ -92,7 +77,6 @@
 	<div class="formSubmit">
 		<input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
 		<input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		
 		{@SID_INPUT_TAG}
  		<input type="hidden" name="action" value="{$action}" />
  		{if $packageID != 0}<input type="hidden" name="packageID" value="{@$packageID}" />{/if}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
index a99cfc8e4d..5b647f6619 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
@@ -38,52 +38,33 @@
 			<fieldset>
 				<legend>{lang}wcf.acp.packageUpdate.auth.input{/lang}</legend>
 				
-				<div id="loginUsernameDiv" class="formElement{if $errorField == 'loginPassword'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="loginUsername">{lang}wcf.acp.packageUpdate.auth.loginUsername{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="inputText" />
-					</div>
-					<div id="loginUsernameHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.packageUpdate.auth.loginUsername.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('loginUsername');
-				//]]></script>
+				<dl id="loginUsernameDiv" class="formElement{if $errorField == 'loginPassword'} formError{/if}">
+					<dt><label for="loginUsername">{lang}wcf.acp.packageUpdate.auth.loginUsername{/lang}</label></dt>
+					<dd>
+						<input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="long" />
+						<small id="loginUsernameHelpMessage"><p>{lang}wcf.acp.packageUpdate.auth.loginUsername.description{/lang}</p></small>
+					</dd>
+				</dl>
 				
-				<div id="loginPasswordDiv" class="formElement{if $errorField == 'loginPassword'} formError{/if}">
-					<div class="formFieldLabel">
-						<label for="loginPassword">{lang}wcf.acp.packageUpdate.auth.loginPassword{/lang}</label>
-					</div>
-					<div class="formField">
-						<input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="inputText" />
+				<dl id="loginPasswordDiv"{if $errorField == 'loginPassword'} class="formError"{/if}>
+					<dt><label for="loginPassword">{lang}wcf.acp.packageUpdate.auth.loginPassword{/lang}</label></dt>
+					<dd>
+						<input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="medium" />
 						{if $errorField == 'loginPassword'}
-							<p class="innerError">
+							<small class="innerError">
 								{if $errorType == 'invalid'}{lang}wcf.acp.packageUpdate.auth.error{/lang}{/if}
-							</p>
+							</small>
 						{/if}
-					</div>
-					<div id="loginPasswordHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.packageUpdate.auth.loginPassword.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('loginPassword');
-				//]]></script>
+						<small id="loginPasswordHelpMessage">{lang}wcf.acp.packageUpdate.auth.loginPassword.description{/lang}</small>
+					</dd>
+				</dl>
 				
-				<div id="saveAuthDataDiv" class="formElement">
-					<div class="formField">
+				<dl id="saveAuthDataDiv">
+					<dt>
 						<label><input type="checkbox" id="saveAuthData" name="saveAuthData" value="1" {if $saveAuthData == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.auth.save{/lang}</label>
-					</div>
-					<div id="saveAuthDataHelpMessage" class="formFieldDesc hidden">
-						<p>{lang}wcf.acp.packageUpdate.auth.save.description{/lang}</p>
-					</div>
-				</div>
-				<script type="text/javascript">//<![CDATA[
-					inlineHelp.register('saveAuthData');
-				//]]></script>
+					</dt>
+					<dd id="saveAuthDataHelpMessage"><small>{lang}wcf.acp.packageUpdate.auth.save.description{/lang}</small></dd>
+				</dl>
 			</fieldset>
 			
 		</div>
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index 5a7b905461..5c156ddb3d 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -91,14 +91,12 @@
 							</div>
 						</div>
 						
-						<div class="formElement">
-							<div class="formFieldLabel">
-								<label for="author">{lang}wcf.acp.packageUpdate.search.author{/lang}</label>
-							</div>
-							<div class="formField">
-								<input type="text" id="author" name="author" value="{$author}" class="inputText" />
-							</div>
-						</div>
+						<dl>
+							<dt><label for="author">{lang}wcf.acp.packageUpdate.search.author{/lang}</label></dt>
+							<dd>
+								<input type="text" id="author" name="author" value="{$author}" class="medium" />
+							</dd>
+						</dl>
 						
 						<div class="formElement">
 							<div class="formFieldLabel">
-- 
2.20.1