More templates adapted.

More HTML5, some semantical changes, old stuff removed, code-formatting
and so on. Still not all correct!

diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index a54cd9651fc99180e9718449142d652f1cf8d0f7..5552e2c27270e043827ac93f75ff527e44ac5aed 100644 (file)
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -9,7 +9,7 @@
 
 <img class="icon" src="{@RELATIVE_WCF_DIR}icon/loginXL.png" alt="" />
 
-<h1><b>{@$pageTitle}</b></h1>
+<h1>{@$pageTitle}</h1>
 
 <hr />
 
@@ -33,7 +33,6 @@
                                        </p>
                                {/if}
                        </div>
-
                        
                        <div{if $errorField == 'password'} class="errorField"{/if}>
                                <label for="password">{lang}wcf.user.password{/lang}</label>
@@ -58,4 +57,4 @@
        </div>
 </form>
 
-{include file='setupFooter'}
\ No newline at end of file
+{include file='setupFooter'}

diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index 0a5232301e8f6c9f1295752cb781c50d72d1a8bd..f3cb76b2baf6c881cf8e7574c53901f88cd42a82 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -1,12 +1,11 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/loginL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.masterPassword.enter{/lang}</h2>
-       </div>
-</div>
-
+       <hgroup>
+               <h1>{lang}wcf.acp.masterPassword.enter{/lang}</h1>
+       </hgroup>
+</header>
 
 {if $errorField != ''}
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
@@ -46,8 +45,8 @@
        </div>
 
        <div class="formSubmit">
-               <input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+               <input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
                {@SID_INPUT_TAG}
                <input type="hidden" name="url" value="{$url}" />
        </div>
@@ -61,4 +60,4 @@
        //]]>
 </script>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index 9f0b33d1f15e35d08f25f6dd47735b00626d7bb7..f3127ea22978057f0101ac3aff332635ff814d56 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -12,13 +12,12 @@
        //]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/loginL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.masterPassword.init{/lang}</h2>
-       </div>
-</div>
-
+       <hgroup>
+               <h1>{lang}wcf.acp.masterPassword.init{/lang}</h1>
+       </hgroup>
+</header>
 
 {if $errorField != ''}
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
@@ -82,8 +81,8 @@
        </div>
 
        <div class="formSubmit">
-               <input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+               <input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
                {@SID_INPUT_TAG}
                <input type="hidden" name="url" value="{$url}" />
        </div>

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index dcf3cdd9ce2bc1030f88eb5ac442cbcebab302cc..6230bb86c90115899abe15af6cf114801fb0bc83 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -8,13 +8,13 @@
        //]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/package{@$action|ucfirst}L.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{$archive->getPackageInfo('packageName')}</h2>
-               <p>{$archive->getPackageInfo('packageDescription')}</p>
-       </div>
-</div>
+       <hgroup>
+               <h1>{$archive->getPackageInfo('packageName')}</h1>
+               <h2>{$archive->getPackageInfo('packageDescription')}</h2>
+       </hgroup>
+</header>
 
 {if $missingPackages > 0}
        <p class="error">{lang}wcf.acp.package.install.error{/lang}</p>
@@ -74,7 +74,7 @@
 </fieldset>
 
 {if $updatableInstances|count > 0}
-       <p class="warning" style="margin: 20px 0 10px 0">{lang}wcf.acp.package.install.updatableInstances.warning{/lang}</p>
+       <p class="warning">{lang}wcf.acp.package.install.updatableInstances.warning{/lang}</p>
        
        <div class="border titleBarPanel">
                <div class="containerHead">
@@ -131,10 +131,9 @@
 
 <div class="formSubmit">
        <input type="button" accesskey="c" value="{lang}wcf.global.button.back{/lang}" onclick="document.location.href=fixURL('index.php?page=Package&amp;action={@$action}&amp;queueID={@$queueID}&amp;step=cancel{@SID_ARG_2ND}')" />
-       
        {if $missingPackages == 0 && $excludingPackages|count == 0 && $excludedPackages|count == 0}
                <input type="button" accesskey="s" id="submitButton" value="{lang}wcf.global.button.next{/lang}" />
        {/if}
 </div>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
index a6eedf13db740b6ff7b257ccacdc8ad950dfb2d0..50ee8e33c59082820ea49de0f0299080a93c3e47 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
@@ -1,13 +1,12 @@
 <div id="packageInstallationDialogContainer">
-       <div class="mainHeadline">
+       <header class="mainHeading">
                <img src="{@RELATIVE_WCF_DIR}icon/packageInstallL.png" alt="" />
-               <div class="headlineContainer">
-                       <h2>Paket &raquo;{$queue->packageName}&laquo; wird installiert &hellip;</h2>
-                       <p>Aktueller Schritt: <span id="packageInstallationAction">{lang}wcf.package.installation.step.prepare{/lang}</span></p>
+               <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>
-               </div>
-       </div>
-       
+               </hgroup>
+       </header>
        
        <div class="border content" id="packageInstallationInnerContentContainer" style="display: none;">
                <div class="container-1" id="packageInstallationInnerContent"></div>

diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
index 5bd8d3966ed3aa9104d3efe3bfa5592c4a3f67a8..d99f95b70c6595c3ddd3bca6e2842df9695f5952 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
@@ -8,13 +8,13 @@
 //     ]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/packageUninstallL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.package.uninstall{/lang}: {$packageObj->getName()}</h2>
-               <p>{$packageObj->packageDescription}</p>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.package.uninstall{/lang}: {$packageObj->getName()}</h1>
+               <h2>{$packageObj->packageDescription}</h2>
+       </hgroup>
+</header>
 
 <fieldset>
        <legend>{lang}wcf.acp.package.view.properties{/lang}</legend>
@@ -102,7 +102,7 @@
                                                
                                                {if $package.additionalButtons|isset}{@$package.additionalButtons}{/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}" />
@@ -112,10 +112,10 @@
                                                        <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}"><a href="index.php?page=PackageView&amp;activePackageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</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.packageDate|date}</td>
+                                       <td class="columnText" title="{$package.packageDescription}"><p><a href="index.php?page=PackageView&amp;activePackageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></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.packageDate|date}</p></td>
                                        
                                        {if $package.additionalColumns|isset}{@$package.additionalColumns}{/if}
                                </tr>
@@ -134,4 +134,4 @@
        <input type="button" accesskey="s" id="uninstallPackage" value="{lang}wcf.global.button.next{/lang}" />
 </div>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
index 9ce206808347263774c583fc7e7a408d63a2bd49..485cd97c8d8243ba9db9e9f2b22a0db0473980d7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
@@ -1,13 +1,12 @@
 <div id="packageInstallationDialogContainer">
-       <div class="mainHeadline">
+       <header class="mainHeading">
                <img src="{@RELATIVE_WCF_DIR}icon/packageUninstallL.png" alt="" />
-               <div class="headlineContainer">
-                       <h2>Paket &raquo;{$queue->packageName}&laquo; wird deinstalliert &hellip;</h2>
-                       <p>Aktueller Schritt: <span id="packageInstallationAction">{lang}wcf.package.uninstallation.step.prepare{/lang}</span></p>
+               <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>
-               </div>
-       </div>
-       
+               </hgroup>
+       </header>
        
        <div class="border content" id="packageInstallationInnerContentContainer" style="display: none;">
                <div class="container-1" id="packageInstallationInnerContent"></div>

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
index 29cc6213bfe254659e72fd67207ddbdf6e1fab7b..4e09ea50eff045c542b2b41ae9c2b1ecb620adac 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
@@ -1,11 +1,11 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/packageUpdateL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.packageUpdate.auth{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.packageUpdate.auth{/lang}</h1>
+       </hgroup>
+</header>
 
 {if $errorField != ''}
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
@@ -92,13 +92,11 @@
        <div class="formSubmit">
                <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
-               
                <input type="hidden" name="form" value="PackageUpdateAuth" />
                {@SID_INPUT_TAG}
                <input type="hidden" name="packageUpdateServerID" value="{@$packageUpdateServerID}" />
-               
                {@$postParameters}
        </div>
 </form>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index 60c6ab7f42e03b16eccb6bc25c31ab90a0de65ba..906f411190990b96916d02a96b52fc2e9817c358 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -131,7 +131,6 @@
                        {@SID_INPUT_TAG}
                </div>
        </form>
-
 {/if}
 
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
index 08ac2976937c48c5a3464612295519e625f87881..65019a9a35fe1cfdf5063ae6f3239f4000a6a8b8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
@@ -1,12 +1,12 @@
 {include file='header'}
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/packageSearchL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.packageUpdate.search{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.packageUpdate.search{/lang}</h1>
+       </hgroup>
+</header>
 
 <div class="contentHeader">
        {pages print=true assign=pagesLinks link="index.php?page=PackageUpdateSearchResult&searchID=$searchID&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}
@@ -104,8 +104,8 @@
        {/foreach}
        
        <div class="formSubmit">
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                <input type="hidden" name="packageID" value="{@PACKAGE_ID}" />
                {@SID_INPUT_TAG}
                <input type="hidden" name="searchID" value="{@$searchID}" />

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 4095598f0ef3a6b8797766958b1c15b4bacbb4f8..603f66998211fea343d2c3ba5883bbe3afd05d55 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -133,7 +133,7 @@
                                                
                                                {if $package.additionalButtons|isset}{@$package.additionalButtons}{/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}" />
@@ -143,10 +143,10 @@
                                                        <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}"><a href="index.php?page=PackageView&amp;activePackageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</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.packageDate|date}</td>
+                                       <td class="columnText" title="{$package.packageDescription}"><p><a href="index.php?page=PackageView&amp;activePackageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>
+                                       <td class="columnText">{if $package.authorURL}<p><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package.authorURL|rawurlencode}" class="externalURL">{$package.author}</a>{else}{$package.author}</p>{/if}</td>
+                                       <td class="columnText"><p>{$package.packageVersion}</p></td>
+                                       <td class="columnDate"><p>{@$package.packageDate|date}</p></td>
                                        
                                        {if $package.additionalColumns|isset}{@$package.additionalColumns}{/if}
                                </tr>
@@ -202,7 +202,7 @@
                                                
                                                {if $package.additionalButtons|isset}{@$package.additionalButtons}{/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}" />
@@ -212,10 +212,10 @@
                                                        <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}"><a href="index.php?page=PackageView&amp;activePackageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</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.packageDate|date}</td>
+                                       <td class="columnText" title="{$package.packageDescription}"><p><a href="index.php?page=PackageView&amp;activePackageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>
+                                       <td class="columnText">{if $package.authorURL}<p><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package.authorURL|rawurlencode}" class="externalURL">{$package.author}</a>{else}{$package.author}</p>{/if}</td>
+                                       <td class="columnText"><p>{$package.packageVersion}</p></td>
+                                       <td class="columnDate"><p>{@$package.packageDate|date}</p></td>
                                        
                                        {if $package.additionalColumns|isset}{@$package.additionalColumns}{/if}
                                </tr>

diff --git a/wcfsetup/install/files/acp/templates/permissionDenied.tpl b/wcfsetup/install/files/acp/templates/permissionDenied.tpl
index 868bf62d5b6a71203771e496e38b0e600d1f6fe3..206fd66077e3bee5769ecf2459b08da661282d23 100644 (file)
--- a/wcfsetup/install/files/acp/templates/permissionDenied.tpl
+++ b/wcfsetup/install/files/acp/templates/permissionDenied.tpl
@@ -8,7 +8,7 @@
 
 <img class="icon" src="{@RELATIVE_WCF_DIR}icon/loginXL.png" alt="" />
 
-<h1><b>{@$pageTitle}</b></h1>
+<h1>{@$pageTitle}</h1>
 
 <hr />
 

diff --git a/wcfsetup/install/files/acp/templates/setupHeader.tpl b/wcfsetup/install/files/acp/templates/setupHeader.tpl
index 4dcd9d7e91d3ed891dfb3b627e3f87e4820ed6eb..95838514f7b2b75089b6b227daae4cdf3a957345 100644 (file)
--- a/wcfsetup/install/files/acp/templates/setupHeader.tpl
+++ b/wcfsetup/install/files/acp/templates/setupHeader.tpl
@@ -1,45 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" dir="{@$__wcf->getLanguage()->getPageDirection()}" xml:lang="{@$__wcf->getLanguage()->getFixedLanguageCode()}">
-       <head>
-               <title>{@$pageTitle} - {lang}wcf.global.pageTitle{/lang}</title>
-               <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-               <script type="text/javascript">
-                       //<![CDATA[
-                       var SID_ARG_2ND = '{@SID_ARG_2ND_NOT_ENCODED}';
-                       var RELATIVE_WCF_DIR = '{@RELATIVE_WCF_DIR}';
-                       //]]>
-               </script>
-               <script type="text/javascript" src="{@RELATIVE_WCF_DIR}acp/js/x.js"></script>
-               <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/3rdParty/protoaculous.1.8.2.min.js"></script>
-               <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/default.js"></script>
-               <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/AjaxRequest.class.js"></script>
-               <script type="text/javascript" src="{@RELATIVE_WCF_DIR}acp/js/default.js"></script>
-               <style type="text/css">
-                       @import url("{@RELATIVE_WCF_DIR}acp/style/extra/setupStyle{if $__wcf->getLanguage()->getPageDirection() == 'rtl'}-rtl{/if}.css");
-               </style>
-               
-               <!--[if lt IE 7]>
-                       <style type="text/css">
-                               .page {
-                                       width: 800px;
-                               }
-                               .progressText {
-                                       margin-top: -16px;
-                               }
-                       </style>
-               <![endif]-->
-               <!--[if IE]>
-                       <style type="text/css">
-                               hr {
-                                       margin: 0;
-                               }
-                               fieldset p, fieldset div {
-                                       min-height: 0;
-                               }
-                       </style>
-               <![endif]-->
-       </head>
-<body>
-<div class="page">
+<head>
+       <title>{@$pageTitle} - {lang}wcf.global.pageTitle{/lang}</title>
+       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+       <script type="text/javascript">
+               //<![CDATA[
+               var SID_ARG_2ND = '{@SID_ARG_2ND_NOT_ENCODED}';
+               var RELATIVE_WCF_DIR = '{@RELATIVE_WCF_DIR}';
+               //]]>
+       </script>
+       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}acp/js/x.js"></script>
+       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/3rdParty/protoaculous.1.8.2.min.js"></script>
+       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/default.js"></script>
+       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/AjaxRequest.class.js"></script>
+       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}acp/js/default.js"></script>
+       <style type="text/css">
+               @import url("{@RELATIVE_WCF_DIR}acp/style/extra/setupStyle{if $__wcf->getLanguage()->getPageDirection() == 'rtl'}-rtl{/if}.css");
+       </style>
+</head>
 
+<body>
+       <div class="page">

diff --git a/wcfsetup/install/files/acp/templates/setupWindowHeader.tpl b/wcfsetup/install/files/acp/templates/setupWindowHeader.tpl
index f1f75753b23bbd909946e79e67ded7e08e2bbf87..5751867c7d5835a4c326d74ba9a74e25c36f3a04 100644 (file)
--- a/wcfsetup/install/files/acp/templates/setupWindowHeader.tpl
+++ b/wcfsetup/install/files/acp/templates/setupWindowHeader.tpl
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" dir="{@$__wcf->getLanguage()->getPageDirection()}" xml:lang="{@$__wcf->getLanguage()->getFixedLanguageCode()}">
-       <head>
-               <title></title>
-               <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-               <link href="{@RELATIVE_WCF_DIR}acp/style/extra/setupWindowStyle{if $__wcf->getLanguage()->getPageDirection() == 'rtl'}-rtl{/if}.css" rel="stylesheet" type="text/css" />
-               <script type="text/javascript">
-                       //<![CDATA[
-                       function changeHeight() {
-                               if (parent.document.getElementById('iframe').style.visibility != 'hidden') {
-                                       parent.document.getElementById('iframe').style.height = document.getElementById('content').offsetHeight + 4 + 'px';
-                               }
+<head>
+       <title></title>
+       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+       <link href="{@RELATIVE_WCF_DIR}acp/style/extra/setupWindowStyle{if $__wcf->getLanguage()->getPageDirection() == 'rtl'}-rtl{/if}.css" rel="stylesheet" type="text/css" />
+       <script type="text/javascript">
+               //<![CDATA[
+               function changeHeight() {
+                       if (parent.document.getElementById('iframe').style.visibility != 'hidden') {
+                               parent.document.getElementById('iframe').style.height = document.getElementById('content').offsetHeight + 4 + 'px';
                        }
-                       //]]>
-               </script>
-       </head>
+               }
+               //]]>
+       </script>
+</head>
+
 <body>
-<div id="content" class="page" style="padding: 2px 4px">
+       <div id="content" class="page">

diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index cd262bd655e26f8de814bd4f7df5e081c4171bf5..7c135934b464117572a686abbe7c6ee5f9f77bea 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -1,11 +1,11 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/usersL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.user.assignToGroup{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.user.assignToGroup{/lang}</h1>
+       </hgroup>
+</header>
 
 {if $errorField}
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
@@ -30,9 +30,7 @@
                                        <div class="formField{if $errorField == 'groupIDs'} formError{/if}">
                                                {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
                                                {if $errorField == 'groupIDs'}
-                                                       <p class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                       </p>
+                                                       <p class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</p>
                                                {/if}
                                        </div>
                                </div>
@@ -41,11 +39,11 @@
        </div>
        
        <div class="formSubmit">
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                {@SID_INPUT_TAG}
                <input type="hidden" name="userIDs" value="{@$userIDs}" />
        </div>
 </form>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index e34b5385b1f6cfe4f47742b51b52c3048cade586..cae8fe617f519a2dad4ed4b56db93d4f77a2f3f8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -1,4 +1,5 @@
 {include file='header'}
+
 <script type="text/javascript">
        //<![CDATA[
        function setFileType(newType) {
@@ -15,12 +16,12 @@
        //]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/usersL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.user.exportEmailAddress{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.user.exportEmailAddress{/lang}</h1>
+       </hgroup>
+</header>
 
 <form method="post" action="index.php?form=UserEmailAddressExport">
 
@@ -80,11 +81,11 @@
        </div>
        
        <div class="formSubmit">
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                {@SID_INPUT_TAG}
                <input type="hidden" name="userIDs" value="{@$userIDs}" />
        </div>
 </form>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 80fa26939ff2735bad0590359415fecb22085027..97b19635e0512338034a44552a8ffc49e34ebe64 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -1,4 +1,5 @@
 {include file='header'}
+
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/TabMenu.class.js"></script>
 <script type="text/javascript">
        //<![CDATA[
@@ -7,12 +8,12 @@
        //]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/userGroup{@$action|ucfirst}L.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.group.{@$action}{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.group.{@$action}{/lang}</h1>
+       </hgroup>
+</header>
 
 {if $errorField}
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
@@ -27,13 +28,14 @@
 {/if}
 
 <div class="contentHeader">
-       <div class="largeButtons">
+       <nav class="largeButtons">
                <ul>
                        <li><a href="index.php?page=UserGroupList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.group.view{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userGroupM.png" alt="" /> <span>{lang}wcf.acp.menu.link.group.view{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
-       </div>
+       </nav>
 </div>
+
 <form method="post" action="index.php?form=UserGroup{@$action|ucfirst}">
        <div class="border content">
                <div class="container-1">
@@ -47,9 +49,7 @@
                                        <div class="formField">
                                                <input type="text" class="inputText" id="groupName" name="groupName" value="{$groupName}" />
                                                {if $errorType.groupName|isset}
-                                                       <p class="innerError">
-                                                               {if $errorType.groupName == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                       </p>
+                                                       <p class="innerError">{if $errorType.groupName == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</p>
                                                {/if}
                                        </div>
                                        <div class="formFieldDesc hidden" id="groupNameHelpMessage">
@@ -88,7 +88,7 @@
                                {foreach from=$categoryLevel1[categories] item=categoryLevel2}
                                        <div class="border tabMenuContent hidden" id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}-content">
                                                <div class="container-1">
-                                                       <h3 class="subHeadline">{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h3>
+                                                       <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>
                                                        
                                                        {if $categoryLevel2[options]|count}
@@ -115,12 +115,11 @@
        </div>
        
        <div class="formSubmit">
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                {@SID_INPUT_TAG}
                <input type="hidden" name="action" value="{@$action}" />
                {if $groupID|isset}<input type="hidden" name="groupID" value="{@$groupID}" />{/if}
-               
                <input type="hidden" id="activeTabMenuItem" name="activeTabMenuItem" value="{$activeTabMenuItem}" />
                <input type="hidden" id="activeSubTabMenuItem" name="activeSubTabMenuItem" value="{$activeSubTabMenuItem}" />
        </div>

diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 4b5e0f6397d01e346c3da688ef47f18632493f8f..fcf7553ddf78e262c8addeceafca8a6c51166f79 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -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/RemoveObjectAction.class.js"></script>
 
@@ -15,12 +16,12 @@
        //]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/userGroupL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.group.list{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.group.list{/lang}</h1>
+       </hgroup>
+</header>
 
 {if $deletedGroups}
        <p class="success">{lang}wcf.acp.group.delete.success{/lang}</p>
@@ -28,12 +29,12 @@
 
 <div class="contentHeader">
        {pages print=true assign=pagesLinks link="index.php?page=UserGroupList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}
-       <div class="largeButtons">
+       <nav class="largeButtons">
                <ul>
                        <li><a href="index.php?form=UserGroupAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userGroupAddM.png" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}                       
                </ul>
-       </div>
+       </nav>
 </div>
 
 {if $groups|count}
@@ -75,9 +76,9 @@
                                                        
                                                        {if $additionalButtons[$group->groupID]|isset}{@$additionalButtons[$group->groupID]}{/if}
                                                </td>
-                                               <td class="columnGroupID columnID">{@$group->groupID}</td>
-                                               <td class="columnGroupName columnText">{if $group->isEditable()}<a title="{lang}wcf.acp.group.edit{/lang}" href="index.php?form=UserGroupEdit&amp;groupID={@$group->groupID}{@SID_ARG_2ND}">{$group->groupName}</a>{else}{$group->groupName}{/if}</td>
-                                               <td class="columnMembers columnNumbers"><a title="{lang}wcf.acp.group.showMembers{/lang}" href="index.php?form=UserSearch&amp;groupID={@$group->groupID}{@SID_ARG_2ND}">{#$group->members}</a></td>
+                                               <td class="columnGroupID columnID"><p>{@$group->groupID}</p></td>
+                                               <td class="columnGroupName columnText">{if $group->isEditable()}<p><a title="{lang}wcf.acp.group.edit{/lang}" href="index.php?form=UserGroupEdit&amp;groupID={@$group->groupID}{@SID_ARG_2ND}">{$group->groupName}</a>{else}{$group->groupName}</p>{/if}</td>
+                                               <td class="columnMembers columnNumbers"><p><a title="{lang}wcf.acp.group.showMembers{/lang}" href="index.php?form=UserSearch&amp;groupID={@$group->groupID}{@SID_ARG_2ND}">{#$group->members}</p></a></td>
                                                
                                                {if $additionalColumns[$group->groupID]|isset}{@$additionalColumns[$group->groupID]}{/if}
                                        </tr>
@@ -89,12 +90,12 @@
 
 <div class="contentFooter">
        {@$pagesLinks}
-       <div class="largeButtons">
+       <nav class="largeButtons">
                <ul>
                        <li><a href="index.php?form=UserGroupAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userGroupAddM.png" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
-       </div>
+       </nav>
 </div>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 2f6d30708d26583ae17f4d9e4240d3e745c6e84a..83cd6f704ef9c5b8181d67884aae411c40902668 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -222,7 +222,6 @@
                                                        </div>
                                                </div>
                                                
-                                               
                                        </fieldset>
                                </div>
                        </div>