More definition-lists

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index db9c67dbd4c73d975e714a5cf1e7775485d9275b..1599928fbc225b4e670eebda2c0a56822b137757 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -58,66 +58,62 @@
                                <fieldset>
                                        <legend>{lang}wcf.acp.packageUpdate.search.server{/lang}</legend>
                                        
-                                       <div>
-                                               <div class="formElement">
-                                                       <div class="formField">
-                                                               <label><input type="checkbox" name="checkUncheck" value="" /> {lang}wcf.acp.packageUpdate.search.server.all{/lang}</label> 
-                                                       </div>
-                                               </div>
-                                               
-                                               <div id="updateServerList">
-                                                       {foreach from=$updateServers item=updateServer}
-                                                               <div class="formElement">
-                                                                       <div class="formField">
-                                                                               <label><input type="checkbox" name="packageUpdateServerIDs[]" value="{@$updateServer->packageUpdateServerID}" {if $updateServer->packageUpdateServerID|in_array:$packageUpdateServerIDs}checked="checked" {/if}/> {$updateServer->serverURL}</label>
-                                                                       </div>
-                                                               </div>
-                                                       {/foreach}
-                                               </div>
-                                       </div>
+                                       <dl>
+                                               <dt></dt>
+                                               <dd>
+                                                       <label><input type="checkbox" name="checkUncheck" value="" /> {lang}wcf.acp.packageUpdate.search.server.all{/lang}</label> 
+                                               </dd>
+                                       </dl>
+                                       
+                                       <dl id="updateServerList">
+                                               <dt></dt>
+                                               {foreach from=$updateServers item=updateServer}
+                                                       <dd>
+                                                               <label><input type="checkbox" name="packageUpdateServerIDs[]" value="{@$updateServer->packageUpdateServerID}" {if $updateServer->packageUpdateServerID|in_array:$packageUpdateServerIDs}checked="checked" {/if}/> {$updateServer->serverURL}</label>
+                                                       </dd>
+                                               {/foreach}
+                                       </dl>
                                </fieldset>
                                
                                <fieldset>
                                        <legend>{lang}wcf.acp.packageUpdate.search.conditions{/lang}</legend>
                                        
-                                       <div>
-                                               <dl>
-                                                       <dt><label for="packageName">{lang}wcf.acp.packageUpdate.search.packageName{/lang}</label></dt>
-                                                       <dd>
-                                                               <input type="text" id="packageName" name="packageName" value="{$packageName}" class="long" />
-                                                       </dd>
-                                                       <dd>
-                                                               <label><input type="checkbox" name="searchDescription" value="1" {if $searchDescription == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.searchDescription{/lang}</label>
-                                                       </dd>
-                                               </dl>
-                                               
-                                               <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>
-                                               
-                                               <dl>
-                                                       <dt>{lang}wcf.acp.packageUpdate.search.type{/lang}</dt>
-                                                       <dd>
-                                                               <label><input type="checkbox" name="standalone" value="1" {if $standalone == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.standalone{/lang}</label> 
-                                                       </dd>
-                                                       <dd>
-                                                               <label><input type="checkbox" name="plugin" value="1" {if $plugin == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.plugin{/lang}</label> 
-                                                       </dd>
-                                                       <dd>
-                                                               <label><input type="checkbox" name="other" value="1" {if $other == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.other{/lang}</label> 
-                                                       </dd>
-                                               </dl>
-                                               
-                                               <dl>
-                                                       <dt></dt>
-                                                       <dd>
-                                                               <label><input type="checkbox" name="ignoreUniques" value="1" {if $ignoreUniques == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.ignoreUniques{/lang}</label>
-                                                       </dd>
-                                               </dl>
-                                       </div>
+                                       <dl>
+                                               <dt><label for="packageName">{lang}wcf.acp.packageUpdate.search.packageName{/lang}</label></dt>
+                                               <dd>
+                                                       <input type="text" id="packageName" name="packageName" value="{$packageName}" class="long" />
+                                               </dd>
+                                               <dd>
+                                                       <label><input type="checkbox" name="searchDescription" value="1" {if $searchDescription == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.searchDescription{/lang}</label>
+                                               </dd>
+                                       </dl>
+                                       
+                                       <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>
+                                       
+                                       <dl>
+                                               <dt>{lang}wcf.acp.packageUpdate.search.type{/lang}</dt>
+                                               <dd>
+                                                       <label><input type="checkbox" name="standalone" value="1" {if $standalone == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.standalone{/lang}</label> 
+                                               </dd>
+                                               <dd>
+                                                       <label><input type="checkbox" name="plugin" value="1" {if $plugin == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.plugin{/lang}</label> 
+                                               </dd>
+                                               <dd>
+                                                       <label><input type="checkbox" name="other" value="1" {if $other == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.other{/lang}</label> 
+                                               </dd>
+                                       </dl>
+                                       
+                                       <dl>
+                                               <dt></dt>
+                                               <dd>
+                                                       <label><input type="checkbox" name="ignoreUniques" value="1" {if $ignoreUniques == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.ignoreUniques{/lang}</label>
+                                               </dd>
+                                       </dl>
                                </fieldset>
                        </div>
                </div>

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index f5659d0c00526a45ab806e2ee5321a01d1e8623e..383a96c9a24d7ee892dc747c84b530eb27778ba7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -41,39 +41,34 @@
                <div class="container-1">
                        <fieldset>
                                <legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>
-                               <div class="formElement">
-                                       <div class="formFieldLabel">
-                                               <label for="username">{lang}wcf.user.username{/lang}</label>
-                                       </div>
-                                       <div class="formField">
-                                               <input type="text" id="username" name="username" value="{$username}" class="inputText" />
+                               
+                               <dl>
+                                       <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                                       <dd>
+                                               <input type="text" id="username" name="username" value="{$username}" class="medium" />
                                                <script type="text/javascript">
                                                        //<![CDATA[
                                                        var suggestion = new Suggestion('username');
                                                        suggestion.enableMultiple(false);
                                                        //]]>
                                                </script>
-                                       </div>
-                               </div>
+                                       </dd>
+                               </dl>
                                
-                               <div class="formElement">
-                                       <div class="formFieldLabel">
-                                               <label for="userID">{lang}wcf.user.userID{/lang}</label>
-                                       </div>
-                                       <div class="formField"> 
-                                               <input type="text" id="userID" name="userID" value="{$userID}" class="inputText" />
-                                       </div>
-                               </div>
+                               <dl>
+                                       <dt><label for="userID">{lang}wcf.user.userID{/lang}</label></dt>
+                                       <dd>    
+                                               <input type="text" id="userID" name="userID" value="{$userID}" class="short" />
+                                       </dd>
+                               </dl>
                                
                                {if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-                                       <div class="formElement">
-                                               <div class="formFieldLabel">
-                                                       <label for="email">{lang}wcf.user.email{/lang}</label>
-                                               </div>
-                                               <div class="formField"> 
-                                                       <input type="email" id="email" name="email" value="{$email}" class="inputText" />
-                                               </div>
-                                       </div>
+                                       <dl>
+                                               <dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+                                               <dd>
+                                                       <input type="email" id="email" name="email" value="{$email}" class="medium" />
+                                               </dd>
+                                       </dl>
                                {/if}
                                
                                {if $availableGroups|count}
@@ -142,11 +137,9 @@
                                                <fieldset>
                                                        <legend>{lang}wcf.acp.user.search.display.general{/lang}</legend>
                                                
-                                                       <div class="formElement">
-                                                               <div class="formFieldLabel">
-                                                                       <label for="sortField">{lang}wcf.acp.user.search.display.sort{/lang}</label>
-                                                               </div>
-                                                               <div class="formField">
+                                                       <dl>
+                                                               <dt><label for="sortField">{lang}wcf.acp.user.search.display.sort{/lang}</label></dt>
+                                                               <dd>
                                                                        <select id="sortField" name="sortField">
                                                                                <option value="userID"{if $sortField == 'userID'} selected="selected"{/if}>{lang}wcf.user.userID{/lang}</option>
                                                                                <option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.user.username{/lang}</option>
@@ -155,21 +148,21 @@
                                                                        
                                                                                {if $additionalSortFields|isset}{@$additionalSortFields}{/if}
                                                                        </select>
+                                                               </dd>
+                                                               <dd>
                                                                        <select id="sortOrder" name="sortOrder">
                                                                                <option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
                                                                                <option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
                                                                        </select>
-                                                               </div>
-                                                       </div>
+                                                               </dd>
+                                                       </dl>
                                                
-                                                       <div class="formElement">
-                                                               <div class="formFieldLabel">
-                                                                       <label for="itemsPerPage">{lang}wcf.acp.user.search.display.itemsPerPage{/lang}</label>
-                                                               </div>
-                                                               <div class="formField">
-                                                                       <input type="text" id="itemsPerPage" name="itemsPerPage" value="{@$itemsPerPage}" class="inputText" />
-                                                               </div>
-                                                       </div>
+                                                       <dl>
+                                                               <dt><label for="itemsPerPage">{lang}wcf.acp.user.search.display.itemsPerPage{/lang}</label></dt>
+                                                               <dd>
+                                                                       <input type="text" id="itemsPerPage" name="itemsPerPage" value="{@$itemsPerPage}" class="short" />
+                                                               </dd>
+                                                       </dl>
                                                </fieldset>
                                        
                                                <fieldset>