Code-Format & Input Type "email" (unfinished!)
authorLuzifr <szekely@woltlab.com>
Tue, 26 Jul 2011 23:43:17 +0000 (01:43 +0200)
committerLuzifr <szekely@woltlab.com>
Tue, 26 Jul 2011 23:43:17 +0000 (01:43 +0200)
21 files changed:
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/acp/templates/login.tpl
wcfsetup/install/files/acp/templates/masterPassword.tpl
wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
wcfsetup/install/files/acp/templates/option.tpl
wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
wcfsetup/install/files/acp/templates/packageList.tpl
wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
wcfsetup/install/files/acp/templates/packageView.tpl
wcfsetup/install/files/acp/templates/setupHeader.tpl
wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.tpl
wcfsetup/install/files/acp/templates/userGroupList.tpl
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/install/files/acp/templates/userSearch.tpl
wcfsetup/install/files/acp/templates/usersMassProcessing.tpl

index 756daa7129aed52be2ea4a49a8766df588f28d3b..0ce6b7dde71504bec9d8c73c926ecc0f022ac0a5 100644 (file)
@@ -68,8 +68,8 @@
 </head>
 
 <body id="tpl{$templateName|ucfirst}">
-       <!-- HEADER -->
        <a id="top"></a>
+       <!-- HEADER -->
        <header class="pageHeader">
                
                <!-- top menu -->
index 5552e2c27270e043827ac93f75ff527e44ac5aed..ca2f0a70c4837f2fe6556c946241cd3d7e43f151 100644 (file)
@@ -24,7 +24,7 @@
                <div class="inner">
                        <div{if $errorField == 'username'} class="errorField"{/if}>
                                <label for="username">{lang}wcf.user.username{/lang}</label>
-                               <input type="text" class="inputText" id="username" name="username" value="{$username}" />
+                               <input type="text" id="username" name="username" value="{$username}" class="inputText" />
                                {if $errorField == 'username'}
                                        <p>
                                                <img src="{@RELATIVE_WCF_DIR}icon/errorS.png" alt="" />
@@ -36,7 +36,7 @@
                        
                        <div{if $errorField == 'password'} class="errorField"{/if}>
                                <label for="password">{lang}wcf.user.password{/lang}</label>
-                               <input type="password" class="inputText" id="password" name="password" value="" />
+                               <input type="password" id="password" name="password" value="" class="inputText" />
                                {if $errorField == 'password'}
                                        <p>
                                                <img src="{@RELATIVE_WCF_DIR}icon/errorS.png" alt="" />
index f3cb76b2baf6c881cf8e7574c53901f88cd42a82..8a80e18c78f073492989b295dd381e8cf8ddf714 100644 (file)
@@ -22,7 +22,7 @@
                                                <label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label>
                                        </div>
                                        <div class="formField">
-                                               <input type="password" class="inputText" id="masterPassword" name="masterPassword" value="{$masterPassword}" />
+                                               <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="inputText" />
                                                {if $errorField == 'masterPassword'}
                                                        <p class="innerError">
                                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
index f3127ea22978057f0101ac3aff332635ff814d56..b87f1bf65f2158773f0bdb89f5d7a900fd3c7432 100644 (file)
@@ -34,7 +34,7 @@
                                                <label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label>
                                        </div>
                                        <div class="formField">
-                                               <input type="password" class="inputText" id="masterPassword" name="masterPassword" value="{$masterPassword}" />
+                                               <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="inputText" />
                                                {if $errorField == 'masterPassword'}
                                                        <p class="innerError">
                                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
@@ -42,7 +42,7 @@
                                                        </p>
                                                {/if}
                                        </div>
-                                       <div class="formFieldDesc hidden" id="masterPasswordHelpMessage">
+                                       <div id="masterPasswordHelpMessage" class="formFieldDesc hidden">
                                                <p>{lang}wcf.acp.masterPassword.init.description{/lang}</p>
                                        </div>
                                </div>
@@ -55,7 +55,7 @@
                                                <label for="confirmMasterPassword">{lang}wcf.acp.masterPassword.confirm{/lang}</label>
                                        </div>
                                        <div class="formField">
-                                               <input type="password" class="inputText" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" />
+                                               <input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="inputText" />
                                                {if $errorField == 'confirmMasterPassword'}
                                                        <p class="innerError">
                                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
index ee638a9b8b5e335a9f877fdbad3ded6eb919a48a..658ca314edcea4d128419c10d9de2abd89637598 100644 (file)
@@ -1,4 +1,5 @@
 {include file='header'}
+
 <script type="text/javascript">
        //<![CDATA[
        $(function() {
index 6230bb86c90115899abe15af6cf114801fb0bc83..dc2999c9f27397f25c815d7e9d22d82e6fcfb468 100644 (file)
                <table class="tableList">
                        <thead>
                                <tr class="tableHead">
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></div></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
                                </tr>
                        </thead>
                        <tbody>
                        {foreach from=$updatableInstances item=$package}
-                               <tr class="{cycle values="container-1,container-2"}">
-                                       <td class="columnText"><a href="index.php?page=Package&amp;action=install&amp;queueID={@$queueID}&amp;step=changeToUpdate&amp;updatePackageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></td>
-                                       <td class="columnText">{$package.packageVersion}</td>
+                               <tr>
+                                       <td class="columnText"><p><a href="index.php?page=Package&amp;action=install&amp;queueID={@$queueID}&amp;step=changeToUpdate&amp;updatePackageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>
+                                       <td class="columnText"><p>{$package.packageVersion}</p></td>
                                </tr>
                        {/foreach}
                        </tbody>
                <table class="tableList">
                        <thead>
                                <tr class="tableHead">
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></div></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
                                </tr>
                        </thead>
                        <tbody>
                        {foreach from=$requiredPackages item=$package}
                                <tr class="{cycle values="container-1,container-2"}">
-                                       <td class="columnText">{lang}wcf.acp.package.install.packageName{/lang}</td>
-                                       <td class="columnText">{if $package.minversion|isset}{$package.minversion}{/if}</td>
+                                       <td class="columnText"><p>{lang}wcf.acp.package.install.packageName{/lang}</p></td>
+                                       <td class="columnText"><p>{if $package.minversion|isset}{$package.minversion}{/if}</p></td>
                                </tr>
                        {/foreach}
                        </tbody>
index 50ee8e33c59082820ea49de0f0299080a93c3e47..94c073b92133f445fad4b31f9e57027452e50607 100644 (file)
@@ -4,11 +4,11 @@
                <hgroup>
                        <h1>Paket &raquo;{$queue->packageName}&laquo; wird installiert &hellip;</h1>
                        <h2>Aktueller Schritt: <span id="packageInstallationAction">{lang}wcf.package.installation.step.prepare{/lang}</span></h2>
-                       <p><progress value="0" max="100" style="width: 200px;" id="packageInstallationProgress">0%</progress></p>
+                       <p><progress id="packageInstallationProgress" value="0" max="100" style="width: 200px;">0%</progress></p>
                </hgroup>
        </header>
        
-       <div class="border content" id="packageInstallationInnerContentContainer" style="display: none;">
-               <div class="container-1" id="packageInstallationInnerContent"></div>
+       <div id="packageInstallationInnerContentContainer" class="border content" style="display: none;">
+               <div id="packageInstallationInnerContent" class="container-1"></div>
        </div>
 </div>
\ No newline at end of file
index 688281c6f6439b40aaa1aa541bf2955bf7ce244c..dcb08a3ce9793b6a6ec99b78e3d38a4ef8b699dc 100644 (file)
@@ -1,4 +1,5 @@
 {include file='header'}
+
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
 <script type="text/javascript">
        //<![CDATA[
                <table class="tableList">
                        <thead>
                                <tr class="tableHead">
-                                       <th colspan="2"{if $sortField == 'packageID'} class="active"{/if}><div><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageID&amp;sortOrder={if $sortField == 'packageID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.id{/lang}{if $sortField == 'packageID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
-                                       <th colspan="2"{if $sortField == 'packageName'} class="active"{/if}><div><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.name{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
-                                       <th{if $sortField == 'author'} class="active"{/if}><div><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=author&amp;sortOrder={if $sortField == 'author' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.author{/lang}{if $sortField == 'author'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
-                                       <th{if $sortField == 'packageVersion'} class="active"{/if}><div><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageVersion&amp;sortOrder={if $sortField == 'packageVersion' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.version{/lang}{if $sortField == 'packageVersion'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
-                                       <th{if $sortField == 'updateDate'} class="active"{/if}><div><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=updateDate&amp;sortOrder={if $sortField == 'updateDate' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
+                                       <th colspan="2"{if $sortField == 'packageID'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageID&amp;sortOrder={if $sortField == 'packageID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.id{/lang}{if $sortField == 'packageID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
+                                       <th colspan="2"{if $sortField == 'packageName'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.name{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
+                                       <th{if $sortField == 'author'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=author&amp;sortOrder={if $sortField == 'author' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.author{/lang}{if $sortField == 'author'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
+                                       <th{if $sortField == 'packageVersion'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=packageVersion&amp;sortOrder={if $sortField == 'packageVersion' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.list.version{/lang}{if $sortField == 'packageVersion'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
+                                       <th{if $sortField == 'updateDate'} class="active"{/if}><p><a href="index.php?page=PackageList&amp;pageNo={@$pageNo}&amp;sortField=updateDate&amp;sortOrder={if $sortField == 'updateDate' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
                                        
                                        {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
                                </tr>
                        </thead>
                        <tbody>
                                {foreach from=$packages item=$package}
-                                       <tr class="packageRow {cycle values="container-1,container-2"}">
+                                       <tr class="packageRow">
                                                <td class="columnIcon">
                                                        {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
                                                                <a href="index.php?form=PackageStartInstall&amp;action=update&amp;activePackageID={@$package->packageID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/packageUpdateS.png" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" /></a>
@@ -64,7 +65,7 @@
                                                        
                                                        {if $additionalButtons[$package->packageID]|isset}{@$additionalButtons[$package->packageID]}{/if}
                                                </td>
-                                               <td class="columnID">{@$package->packageID}</td>
+                                               <td class="columnID"><p>{@$package->packageID}</p></td>
                                                <td class="columnIcon">
                                                        {if $package->standalone}
                                                                <img src="{@RELATIVE_WCF_DIR}icon/packageTypeStandaloneS.png" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" />
                                                                <img src="{@RELATIVE_WCF_DIR}icon/packageS.png" alt="" title="{lang}wcf.acp.package.list.other{/lang}" />
                                                        {/if}
                                                </td>
-                                               <td class="columnText" title="{$package->packageDescription}" id="packageName{@$package->packageID}">
+                                               <td id="packageName{@$package->packageID}" class="columnText" title="{$package->packageDescription}">
                                                        <a href="index.php?page=PackageView&amp;activePackageID={@$package->packageID}{@SID_ARG_2ND}"><span>{$package->getName()}{if $package->instanceNo > 1 && $package->instanceName == ''} (#{#$package->instanceNo}){/if}</span></a>
                                                </td>
-                                               <td class="columnText">{if $package->authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="externalURL">{$package->author}</a>{else}{$package->author}{/if}</td>
-                                               <td class="columnText">{$package->packageVersion}</td>
-                                               <td class="columnDate">{@$package->updateDate|time}</td>
+                                               <td class="columnText"><p>{if $package->authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="externalURL">{$package->author}</a>{else}{$package->author}{/if}</p></td>
+                                               <td class="columnText"><p>{$package->packageVersion}</p></td>
+                                               <td class="columnDate"><p>{@$package->updateDate|time}</p></td>
                                                
                                                {if $additionalColumns[$package->packageID]|isset}{@$additionalColumns[$package->packageID]}{/if}
                                        </tr>
index d99f95b70c6595c3ddd3bca6e2842df9695f5952..52fd22c44c5b7d19667edaebb2bf69cd0243cae0 100644 (file)
                <table class="tableList">
                        <thead>
                                <tr class="tableHead">
-                                       <th colspan="2"><div><span class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</span></div></th>
-                                       <th colspan="2"><div><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</span></div></th>
+                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</span></p></th>
+                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</span></p></th>
                                        
                                        {if $additionalColumns|isset}{@$additionalColumns}{/if}
                                </tr>
                        </thead>
                        <tbody>
                        {foreach from=$dependentPackages item=package}
-                               <tr class="{cycle values="container-1,container-2"}">
+                               <tr>
                                        <td class="columnIcon">
                                                {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
                                                        <a href="index.php?form=PackageStartInstall&amp;action=update&amp;activePackageID={@$package.packageID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/packageUpdateS.png" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" /></a>
index 485cd97c8d8243ba9db9e9f2b22a0db0473980d7..1dc0026f397a1a4d37e984869d74c87325f3076c 100644 (file)
@@ -4,11 +4,11 @@
                <hgroup>
                        <h1>Paket &raquo;{$queue->packageName}&laquo; wird deinstalliert &hellip;</h1>
                        <h2>Aktueller Schritt: <span id="packageInstallationAction">{lang}wcf.package.uninstallation.step.prepare{/lang}</span></h2>
-                       <p><progress value="0" max="100" style="width: 200px;" id="packageInstallationProgress">0%</progress></p>
+                       <p><progress id="packageInstallationProgress" value="0" max="100" style="width: 200px;">0%</progress></p>
                </hgroup>
        </header>
        
-       <div class="border content" id="packageInstallationInnerContentContainer" style="display: none;">
-               <div class="container-1" id="packageInstallationInnerContent"></div>
+       <div id="packageInstallationInnerContentContainer" class="border content" style="display: none;">
+               <div id="packageInstallationInnerContent" class="container-1"></div>
        </div>
 </div>
\ No newline at end of file
index 23568502ef1ff1e4f28f34f3b8da0e5d21315cef..a99cfc8e4dec22fed6a10ae196048b85b144c86a 100644 (file)
                        <fieldset>
                                <legend>{lang}wcf.acp.packageUpdate.auth.input{/lang}</legend>
                                
-                               <div class="formElement{if $errorField == 'loginPassword'} formError{/if}" id="loginUsernameDiv">
+                               <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" class="inputText" id="loginUsername" name="loginUsername" value="{$loginUsername}" />
+                                               <input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="inputText" />
                                        </div>
-                                       <div class="formFieldDesc hidden" id="loginUsernameHelpMessage">
+                                       <div id="loginUsernameHelpMessage" class="formFieldDesc hidden">
                                                <p>{lang}wcf.acp.packageUpdate.auth.loginUsername.description{/lang}</p>
                                        </div>
                                </div>
                                        inlineHelp.register('loginUsername');
                                //]]></script>
                                
-                               <div class="formElement{if $errorField == 'loginPassword'} formError{/if}" id="loginPasswordDiv">
+                               <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" class="inputText" id="loginPassword" name="loginPassword" value="{$loginPassword}" />
+                                               <input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="inputText" />
                                                {if $errorField == 'loginPassword'}
                                                        <p class="innerError">
                                                                {if $errorType == 'invalid'}{lang}wcf.acp.packageUpdate.auth.error{/lang}{/if}
                                                        </p>
                                                {/if}
                                        </div>
-                                       <div class="formFieldDesc hidden" id="loginPasswordHelpMessage">
+                                       <div id="loginPasswordHelpMessage" class="formFieldDesc hidden">
                                                <p>{lang}wcf.acp.packageUpdate.auth.loginPassword.description{/lang}</p>
                                        </div>
                                </div>
                                        inlineHelp.register('loginPassword');
                                //]]></script>
                                
-                               <div class="formElement" id="saveAuthDataDiv">
+                               <div id="saveAuthDataDiv" class="formElement">
                                        <div class="formField">
                                                <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 class="formFieldDesc hidden" id="saveAuthDataHelpMessage">
+                                       <div id="saveAuthDataHelpMessage" class="formFieldDesc hidden">
                                                <p>{lang}wcf.acp.packageUpdate.auth.save.description{/lang}</p>
                                        </div>
                                </div>
index 906f411190990b96916d02a96b52fc2e9817c358..843743a8f7ead40204ef33dde05c43af03b32ead 100644 (file)
@@ -86,7 +86,7 @@
                                                                <label for="packageName">{lang}wcf.acp.packageUpdate.search.packageName{/lang}</label>
                                                        </div>
                                                        <div class="formField">
-                                                               <input type="text" class="inputText" id="packageName" name="packageName" value="{$packageName}" />
+                                                               <input type="text" id="packageName" name="packageName" value="{$packageName}" class="inputText" />
                                                                <label><input type="checkbox" name="searchDescription" value="1" {if $searchDescription == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.searchDescription{/lang}</label>
                                                        </div>
                                                </div>
@@ -96,7 +96,7 @@
                                                                <label for="author">{lang}wcf.acp.packageUpdate.search.author{/lang}</label>
                                                        </div>
                                                        <div class="formField">
-                                                               <input type="text" class="inputText" id="author" name="author" value="{$author}" />
+                                                               <input type="text" id="author" name="author" value="{$author}" class="inputText" />
                                                        </div>
                                                </div>
                                                
index 65019a9a35fe1cfdf5063ae6f3239f4000a6a8b8..7488da6f625eb98c36ec638662b47cd4c7ae8205 100644 (file)
@@ -1,4 +1,5 @@
 {include file='header'}
+
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
 
 <header class="mainHeading">
index 603f66998211fea343d2c3ba5883bbe3afd05d55..dff08dfe71c50cb43541644766ba312aad3a3155 100644 (file)
                        </div>
                </div>
        </div>
-       <div class="border borderMarginRemove" id="requiredPackages">
+       <div id="requiredPackages" class="border borderMarginRemove">
                <table class="tableList">
                        <thead>
                                <tr class="tableHead">
-                                       <th colspan="2"><div><span class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</span></div></th>
-                                       <th colspan="2"><div><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</span></div></th>
+                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</span></p></th>
+                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</span></p></th>
                                        
                                        {if $additionalColumns|isset}{@$additionalColumns}{/if}
                                </tr>
                        </thead>
                        <tbody>
                        {foreach from=$requiredPackages item=$package}
-                               <tr class="{cycle values="container-1,container-2"}">
+                               <tr>
                                        <td class="columnIcon">
                                                {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
                                                        <a href="index.php?form=PackageStartInstall&amp;action=update&amp;activePackageID={@$package.packageID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/packageUpdateS.png" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" /></a>
                <table class="tableList">
                        <thead>
                                <tr class="tableHead">
-                                       <th colspan="2"><div><span class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</span></div></th>
-                                       <th colspan="2"><div><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></div></th>
-                                       <th><div><span class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</span></div></th>
+                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</span></p></th>
+                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
+                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</span></p></th>
                                        
                                        {if $additionalColumns|isset}{@$additionalColumns}{/if}
                                </tr>
                        </thead>
                        <tbody>
                        {foreach from=$dependentPackages item=$package}
-                               <tr class="{cycle values="container-1,container-2"}">
+                               <tr>
                                        <td class="columnIcon">
                                                {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
                                                        <a href="index.php?form=PackageStartInstall&amp;action=update&amp;activePackageID={@$package.packageID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/packageUpdateS.png" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" /></a>
index 95838514f7b2b75089b6b227daae4cdf3a957345..a9f4576620fbf70cdc1e093ea8f1771796b587f7 100644 (file)
@@ -21,3 +21,4 @@
 
 <body>
        <div class="page">
+               
\ No newline at end of file
index cae8fe617f519a2dad4ed4b56db93d4f77a2f3f8..4b04f32ba50eb05b7ac2e36bb5a72bf400454b9e 100644 (file)
                                                                
                                                                <div class="formField">
                                                                        <ul class="formOptionsLong">
-                                                                               <li><label><input onclick="if (IS_SAFARI) setFileType('csv')" onfocus="setFileType('csv')" type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></li>
-                                                                               <li><label><input onclick="if (IS_SAFARI) setFileType('xml')" onfocus="setFileType('xml')" type="radio" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></li>
+                                                                               <li><label><inpu type="radio"t onclick="if (IS_SAFARI) setFileType('csv')" onfocus="setFileType('csv')" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></li>
+                                                                               <li><label><input type="radio" onclick="if (IS_SAFARI) setFileType('xml')" onfocus="setFileType('xml')" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></li>
                                                                        </ul>
                                                                </div>
                                                        </fieldset>
                                                </div>
                                        </div>
                                
-                                       <div class="formElement" id="separatorDiv">
+                                       <div id="separatorDiv" class="formElement">
                                                <div class="formFieldLabel">
                                                        <label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label>
                                                </div>
                                                </div>
                                        </div>
                                        
-                                       <div class="formElement" id="textSeparatorDiv">
+                                       <div id="textSeparatorDiv" class="formElement">
                                                <div class="formFieldLabel">
                                                        <label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label>
                                                </div>
                                                <div class="formField">
-                                                       <input type="text" class="inputText" id="textSeparator" name="textSeparator" value="{$textSeparator}" />
+                                                       <input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="inputText" />
                                                </div>
                                        </div>
                                </div>
index caa94463af64150c72d11931d927a59322dcc568..e3497c757475a161d4e8a0e025848cab64b7081b 100644 (file)
                        <fieldset>
                                <legend>{lang}wcf.acp.group.data{/lang}</legend>
                                
-                               <div class="formElement{if $errorType.groupName|isset} formError{/if}" id="groupNameDiv">
+                               <div id="groupNameDiv" class="formElement{if $errorType.groupName|isset} formError{/if}">
                                        <div class="formFieldLabel">
                                                <label for="groupName">{lang}wcf.acp.group.groupName{/lang}</label>
                                        </div>
                                        <div class="formField">
-                                               <input type="text" class="inputText" id="groupName" name="groupName" value="{$groupName}" />
+                                               <input type="text" id="groupName" name="groupName" value="{$groupName}" class="inputText" />
                                                {if $errorType.groupName|isset}
                                                        <p class="innerError">
                                                                {if $errorType.groupName == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
                                                        </p>
                                                {/if}
                                        </div>
-                                       <div class="formFieldDesc hidden" id="groupNameHelpMessage">
+                                       <div id="groupNameHelpMessage" class="formFieldDesc hidden">
                                                <p>{lang}wcf.acp.group.groupName.description{/lang}</p>
                                        </div>
                                </div>
@@ -77,7 +77,7 @@
                        <div class="subTabMenu">
                                <div class="containerHead">
                                        {foreach from=$optionTree item=categoryLevel1}
-                                               <ul class="hidden" id="{@$categoryLevel1[object]->categoryName}-categories">
+                                               <ul id="{@$categoryLevel1[object]->categoryName}-categories" class="hidden">
                                                        {foreach from=$categoryLevel1[categories] item=categoryLevel2}
                                                                <li id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}"><a onclick="tabMenu.showTabMenuContent('{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}');"><span>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</span></a></li>
                                                        {/foreach}
@@ -88,7 +88,7 @@
                        
                        {foreach from=$optionTree item=categoryLevel1}
                                {foreach from=$categoryLevel1[categories] item=categoryLevel2}
-                                       <div class="border tabMenuContent hidden" id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}-content">
+                                       <div id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}-content" class="border tabMenuContent hidden">
                                                <div class="container-1">
                                                        <h3 class="subHeading">{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h3>
                                                        <p class="description">{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}.description{/lang}</p>
index fcf7553ddf78e262c8addeceafca8a6c51166f79..52214b7940105e6134967c417f6f68676e39c40f 100644 (file)
                <table class="tableList">
                        <thead>
                                <tr class="tableHead">
-                                       <th class="columnGroupID{if $sortField == 'groupID'} active{/if}" colspan="2"><div><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupID&amp;sortOrder={if $sortField == 'groupID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupID{/lang}{if $sortField == 'groupID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
-                                       <th class="columnGroupName{if $sortField == 'groupName'} active{/if}"><div><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupName&amp;sortOrder={if $sortField == 'groupName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
-                                       <th class="columnMembers{if $sortField == 'members'} active{/if}"><div><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=members&amp;sortOrder={if $sortField == 'members' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
+                                       <th class="columnGroupID{if $sortField == 'groupID'} active{/if}" colspan="2"><p><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupID&amp;sortOrder={if $sortField == 'groupID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupID{/lang}{if $sortField == 'groupID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
+                                       <th class="columnGroupName{if $sortField == 'groupName'} active{/if}"><p><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupName&amp;sortOrder={if $sortField == 'groupName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
+                                       <th class="columnMembers{if $sortField == 'members'} active{/if}"><p><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=members&amp;sortOrder={if $sortField == 'members' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
                                        
                                        {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
                                </tr>
                        </thead>
                        <tbody>
                                {foreach from=$groups item=group}
-                                       <tr class="{cycle values="container-1,container-2"}" id="groupContainer{@$group->groupID}">
+                                       <tr id="groupContainer{@$group->groupID}">
                                                <td class="columnIcon">
                                                        {if $group->isEditable()}
                                                                <a href="index.php?form=UserGroupEdit&amp;groupID={@$group->groupID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/editS.png" alt="" title="{lang}wcf.acp.group.edit{/lang}" /></a>
index ad982a1149b1033eb204881e0b6be6e5eca2b66a..80c2ca7ec94bf2dd77075ede66d0458a5f304d1a 100644 (file)
@@ -1,4 +1,5 @@
 {include file='header'}
+
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/AjaxRequest.class.js"></script>
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/InlineListEdit.class.js"></script>
                <table class="tableList">
                        <thead>
                                <tr class="tableHead">
-                                       <th class="columnMark"><div><label class="emptyHead"><input name="userMarkAll" type="checkbox" /></label></div></th>
-                                       <th class="columnUserID{if $sortField == 'userID'} active{/if}" colspan="2"><div><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=userID&amp;sortOrder={if $sortField == 'userID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
-                                       <th class="columnUsername{if $sortField == 'username'} active{/if}"><div><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=username&amp;sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.username{/lang}{if $sortField == 'username'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
+                                       <th class="columnMark"><p><label class="emptyHead"><input type="checkbox" name="userMarkAll" /></label></p></th>
+                                       <th class="columnUserID{if $sortField == 'userID'} active{/if}" colspan="2"><p><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=userID&amp;sortOrder={if $sortField == 'userID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
+                                       <th class="columnUsername{if $sortField == 'username'} active{/if}"><p><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=username&amp;sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.username{/lang}{if $sortField == 'username'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></dipv></th>
                                        
                                        {foreach from=$columnHeads key=column item=columnLanguageVariable}
-                                               <th class="column{$column|ucfirst}{if $sortField == $column} active{/if}"><div><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField={$column}&amp;sortOrder={if $sortField == $column && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
+                                               <th class="column{$column|ucfirst}{if $sortField == $column} active{/if}"><p><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField={$column}&amp;sortOrder={if $sortField == $column && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
                                        {/foreach}
                                        
                                        {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
@@ -89,7 +90,7 @@
                        <tbody>
                        {foreach from=$users item=user}
                                <tr id="userRow{@$user->userID}">
-                                       <td class="columnMark"><input name="userMark" id="userMark{@$user->userID}" type="checkbox" value="{@$user->userID}" /></td>
+                                       <td class="columnMark"><input type="checkbox" id="userMark{@$user->userID}" name="userMark" value="{@$user->userID}" /></td>
                                        <td class="columnIcon">
                                                <script type="text/javascript">
                                                        //<![CDATA[
                                                
                                                {if $additionalButtons[$user->userID]|isset}{@$additionalButtons[$user->userID]}{/if}
                                        </td>
-                                       <td class="columnUserID columnID">{@$user->userID}</td>
-                                       <td class="columnUsername columnText">{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user->username}</a>{else}{$user->username}{/if}</td>
+                                       <td class="columnUserID columnID"><p>{@$user->userID}</p></td>
+                                       <td class="columnUsername columnText"><p>{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user->username}</a>{else}{$user->username}{/if}</p></td>
                                        
                                        {foreach from=$columnHeads key=column item=columnLanguageVariable}
-                                               <td class="column{$column|ucfirst}">{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}</td>
+                                               <td class="column{$column|ucfirst}"><p>{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}</p></td>
                                        {/foreach}
                                        
                                        {if $additionalColumns[$user->userID]|isset}{@$additionalColumns[$user->userID]}{/if}
index 1675c47c736aae22bb55f63f3e1bc50837f4c48a..8d2f1bdc8b5060e34dbecea073963568e063acd3 100644 (file)
@@ -31,8 +31,7 @@
                        {if $__wcf->session->getPermission('admin.user.canAddUser')}
                                <li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userAddM.png" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                        {/if}
-                       <li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/usersM.png" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a>
-                       </li>
+                       <li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/usersM.png" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
                </ul>
        </nav>
 </div>
@@ -47,7 +46,7 @@
                                                <label for="username">{lang}wcf.user.username{/lang}</label>
                                        </div>
                                        <div class="formField">
-                                               <input type="text" class="inputText" id="username" name="username" value="{$username}" />
+                                               <input type="text" id="username" name="username" value="{$username}" class="inputText" />
                                                <script type="text/javascript">
                                                        //<![CDATA[
                                                        var suggestion = new Suggestion('username');
@@ -62,7 +61,7 @@
                                                <label for="userID">{lang}wcf.user.userID{/lang}</label>
                                        </div>
                                        <div class="formField"> 
-                                               <input type="text" class="inputText" id="userID" name="userID" value="{$userID}" />
+                                               <input type="text" id="userID" name="userID" value="{$userID}" class="inputText" />
                                        </div>
                                </div>
                                
@@ -72,7 +71,7 @@
                                                        <label for="email">{lang}wcf.user.email{/lang}</label>
                                                </div>
                                                <div class="formField"> 
-                                                       <input type="text" class="inputText" id="email" name="email" value="{$email}" />
+                                                       <input type="email" id="email" name="email" value="{$email}" class="inputText" />
                                                </div>
                                        </div>
                                {/if}
                                                <li><a href="#resultOptions">{*<span>*}{lang}wcf.acp.user.search.display{/lang}{*</span>*}</a></li>
                                        </ul>
                                </nav>
-                       
-                       
+                               
                                {if $optionTree|count}
-                                       <div class="border tabMenuContent hidden" id="profile">
+                                       <div id="profile" class="border tabMenuContent hidden">
                                                <div class="container-1">
                                                        <h3 class="subHeading">{lang}wcf.acp.user.search.conditions.profile{/lang}</h3>
                                                        {include file='optionFieldList' langPrefix='wcf.user.option.' options=$optionTree}
                        
                                {if $additionalTabContents|isset}{@$additionalTabContents}{/if}
                        
-                               <div class="border tabMenuContent hidden" id="resultOptions">
+                               <div id="resultOptions" class="border tabMenuContent hidden">
                                        <div class="container-1">
                                                <h3 class="subHeading">{lang}wcf.acp.user.search.display{/lang}</h3>
                                        
                                                                        <label for="sortField">{lang}wcf.acp.user.search.display.sort{/lang}</label>
                                                                </div>
                                                                <div class="formField">
-                                                                       <select name="sortField" id="sortField">
+                                                                       <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>
                                                                                <option value="email"{if $sortField == 'email'} selected="selected"{/if}>{lang}wcf.user.email{/lang}</option>
                                                                        
                                                                                {if $additionalSortFields|isset}{@$additionalSortFields}{/if}
                                                                        </select>
-                                                                       <select name="sortOrder" id="sortOrder">
+                                                                       <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>
                                                                        <label for="itemsPerPage">{lang}wcf.acp.user.search.display.itemsPerPage{/lang}</label>
                                                                </div>
                                                                <div class="formField">
-                                                                       <input type="text" class="inputText" id="itemsPerPage" name="itemsPerPage" value="{@$itemsPerPage}" />
+                                                                       <input type="text" id="itemsPerPage" name="itemsPerPage" value="{@$itemsPerPage}" class="inputText" />
                                                                </div>
                                                        </div>
                                                </fieldset>
index c1609ac6d73511de44ce24d8df65f3753befd556..b71f45fd0609fe1e419bf4bddab6bcff4941f589 100644 (file)
@@ -95,7 +95,7 @@
                                                <label for="username">{lang}wcf.user.username{/lang}</label>
                                        </div>
                                        <div class="formField">
-                                               <input type="text" class="inputText" id="username" name="username" value="{$username}" />
+                                               <input type="text" id="username" name="username" value="{$username}" class="inputText" />
                                                <script type="text/javascript">
                                                        //<![CDATA[
                                                        suggestion.enableMultiple(false);
                                                        <label for="email">{lang}wcf.user.email{/lang}</label>
                                                </div>
                                                <div class="formField"> 
-                                                       <input type="text" class="inputText" id="email" name="email" value="{$email}" />
+                                                       <input type="email" id="email" name="email" value="{$email}" class="inputText" />
                                                </div>
                                        </div>
                                {/if}
                        </div>
                        
                        {if $options|count}
-                               <div class="border tabMenuContent hidden" id="profile-content">
+                               <div id="profile-content" class="border tabMenuContent hidden">
                                        <div class="container-1">
                                                <h3 class="subHeadline">{lang}wcf.acp.user.search.conditions.profile{/lang}</h3>
                                                {include file='optionFieldList' langPrefix='wcf.user.option.'}
                                                <div class="formField">
                                                        <ul class="formOptionsLong">
                                                                {if $__wcf->session->getPermission('admin.user.canMailUser')}
-                                                                       <li><label><input onclick="if (IS_SAFARI) enableSendMail()" onfocus="enableSendMail()" type="radio" name="action" value="sendMail" {if $action == 'sendMail'}checked="checked" {/if}/> {lang}wcf.acp.user.sendMail{/lang}</label></li>
-                                                                       <li><label><input onclick="if (IS_SAFARI) enableExportMailAddress()" onfocus="enableExportMailAddress()" type="radio" name="action" value="exportMailAddress" {if $action == 'exportMailAddress'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress{/lang}</label></li>
+                                                                       <li><label><input type="radio" onclick="if (IS_SAFARI) enableSendMail()" onfocus="enableSendMail()" name="action" value="sendMail" {if $action == 'sendMail'}checked="checked" {/if}/> {lang}wcf.acp.user.sendMail{/lang}</label></li>
+                                                                       <li><label><input type="radio" onclick="if (IS_SAFARI) enableExportMailAddress()" onfocus="enableExportMailAddress()" name="action" value="exportMailAddress" {if $action == 'exportMailAddress'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress{/lang}</label></li>
                                                                {/if}
                                                                {if $__wcf->session->getPermission('admin.user.canEditUser')}
-                                                                       <li><label><input onclick="if (IS_SAFARI) enableAssignToGroup()" onfocus="enableAssignToGroup()" type="radio" name="action" value="assignToGroup" {if $action == 'assignToGroup'}checked="checked" {/if}/> {lang}wcf.acp.user.assignToGroup{/lang}</label></li>
+                                                                       <li><label><input type="radio" onclick="if (IS_SAFARI) enableAssignToGroup()" onfocus="enableAssignToGroup()" name="action" value="assignToGroup" {if $action == 'assignToGroup'}checked="checked" {/if}/> {lang}wcf.acp.user.assignToGroup{/lang}</label></li>
                                                                {/if}
                                                                {if $__wcf->session->getPermission('admin.user.canDeleteUser')}
-                                                                       <li><label><input onclick="if (IS_SAFARI) enableDelete()" onfocus="enableDelete()" type="radio" name="action" value="delete" {if $action == 'delete'}checked="checked" {/if}/> {lang}wcf.acp.user.delete{/lang}</label></li>
+                                                                       <li><label><input type="radio" onclick="if (IS_SAFARI) enableDelete()" onfocus="enableDelete()" name="action" value="delete" {if $action == 'delete'}checked="checked" {/if}/> {lang}wcf.acp.user.delete{/lang}</label></li>
                                                                {/if}
                                                                {if $additionalActions|isset}{@$additionalActions}{/if}
                                                        </ul>
                                        <legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
                                        
                                        <div>
-                                               <div class="formElement{if $errorField == 'subject'} formError{/if}" id="subjectDiv">
+                                               <div id="subjectDiv" class="formElement{if $errorField == 'subject'} formError{/if}">
                                                        <div class="formFieldLabel">
                                                                <label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label>
                                                        </div>
                                                        <div class="formField">
-                                                               <input type="text" class="inputText" id="subject" name="subject" value="{$subject}" />
+                                                               <input type="text" id="subject" name="subject" value="{$subject}" class="inputText" />
                                                                {if $errorField == 'subject'}
                                                                        <p class="innerError">
                                                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
                                                                        </p>
                                                                {/if}
                                                        </div>
-                                                       <div class="formFieldDesc hidden" id="subjectHelpMessage">
+                                                       <div id="subjectHelpMessage" class="formFieldDesc hidden">
                                                                <p>{lang}wcf.acp.user.sendMail.subject.description{/lang}</p>
                                                        </div>
                                                </div>
                                                        inlineHelp.register('subject');
                                                //]]></script>
                                                
-                                               <div class="formElement{if $errorField == 'from'} formError{/if}" id="fromDiv">
+                                               <div id="fromDiv" class="formElement{if $errorField == 'from'} formError{/if}">
                                                        <div class="formFieldLabel">
                                                                <label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label>
                                                        </div>
                                                        <div class="formField">
-                                                               <input type="text" class="inputText" id="from" name="from" value="{$from}" />
+                                                               <input type="email" id="from" name="from" value="{$from}" class="inputText" />
                                                                {if $errorField == 'from'}
                                                                        <p class="innerError">
                                                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
                                                                        </p>
                                                                {/if}
                                                        </div>
-                                                       <div class="formFieldDesc hidden" id="fromHelpMessage">
+                                                       <div id="fromHelpMessage" class="formFieldDesc hidden">
                                                                {lang}wcf.acp.user.sendMail.from.description{/lang}
                                                        </div>
                                                </div>
                                                        inlineHelp.register('from');
                                                //]]></script>
                                        
-                                               <div class="formElement{if $errorField == 'text'} formError{/if}" id="textDiv">
+                                               <div id="textDiv" class="formElement{if $errorField == 'text'} formError{/if}">
                                                        <div class="formFieldLabel">
                                                                <label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label>
                                                        </div>
                                                                        </p>
                                                                {/if}
                                                        </div>
-                                                       <div class="formFieldDesc hidden" id="textHelpMessage">
+                                                       <div id="textHelpMessage" class="formFieldDesc hidden">
                                                                <p>{lang}wcf.acp.user.sendMail.text.description{/lang}</p>
                                                        </div>
                                                </div>
                                                
                                                <div class="formElement">
                                                        <div class="formField">
-                                                               <label><input type="checkbox" name="enableHTML" id="enableHTML" value="1" {if $enableHTML == 1}checked="checked" {/if}/> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
+                                                               <label><input type="checkbox" id="enableHTML" name="enableHTML" value="1" {if $enableHTML == 1}checked="checked" {/if}/> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
                                                        </div>
                                                </div>
                                        </div>
                                                                        
                                                                        <div class="formField">
                                                                                <ul class="formOptionsLong">
-                                                                                       <li><label><input onclick="if (IS_SAFARI) setFileType('csv')" onfocus="setFileType('csv')" type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></li>
-                                                                                       <li><label><input onclick="if (IS_SAFARI) setFileType('xml')" onfocus="setFileType('xml')" type="radio" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></li>
+                                                                                       <li><label><input type="radio" onclick="if (IS_SAFARI) setFileType('csv')" onfocus="setFileType('csv')" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></li>
+                                                                                       <li><label><input type="radio" onclick="if (IS_SAFARI) setFileType('xml')" onfocus="setFileType('xml')" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></li>
                                                                                </ul>
                                                                        </div>
                                                                </fieldset>
                                                        </div>
                                                </div>
                                        
-                                               <div class="formElement" id="separatorDiv">
+                                               <div id="separatorDiv" class="formElement">
                                                        <div class="formFieldLabel">
                                                                <label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label>
                                                        </div>
                                                        </div>
                                                </div>
                                                
-                                               <div class="formElement" id="textSeparatorDiv">
+                                               <div id="textSeparatorDiv" class="formElement">
                                                        <div class="formFieldLabel">
                                                                <label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label>
                                                        </div>
                                                        <div class="formField">
-                                                               <input type="text" class="inputText" id="textSeparator" name="textSeparator" value="{$textSeparator}" />
+                                                               <input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="inputText" />
                                                        </div>
                                                </div>
                                        </div>
        </div>
 </form>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}