More adjustments to match the design-sketch.

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 0c65d2daee9101f8a80f6be3b129ef1189277618..24bc396a82e861bab77e7c1cb03324e32154de04 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -54,6 +54,10 @@ section#content a:hover {
        top: -9000px;\r
 }\r
 \r
+hr {\r
+       display: none;\r
+}\r
+\r
 \r
 \r
 /* -- -- -- -- -- Header -- -- -- -- -- */\r
@@ -252,7 +256,7 @@ section#content {
        background-color: #fff;\r
        \r
        display: table-cell;\r
-       padding: 21px;\r
+       padding: 25px;\r
        width: 100%;\r
 }\r
 \r
@@ -299,7 +303,7 @@ nav.sidebarMenu > div h1 {
        font-size: 130%;\r
        font-weight: bold;\r
        margin-top: 5px;\r
-       padding: 7px 15px 7px 35px;\r
+       padding: 7px 25px 7px 35px;\r
        position: relative;\r
 }\r
 \r
@@ -309,7 +313,7 @@ nav.sidebarMenu > div h1.activeMenuItem {
 \r
 nav.sidebarMenu > div ul li {\r
        font-size: 110%;\r
-       padding: 5px 15px 7px 35px;\r
+       padding: 5px 25px 7px 35px;\r
 }\r
 \r
 nav.sidebarMenu > div ul li.activeMenuItem {\r
@@ -449,7 +453,6 @@ div.ui-widget-overlay {
 /* Main Heading */\r
 \r
 .mainHeading {\r
-       height: 48px;\r
        margin-bottom: 15px;\r
        position: relative;\r
 }\r
@@ -458,6 +461,7 @@ div.ui-widget-overlay {
        position: absolute;\r
        top: 0;\r
        left: 0;\r
+       width: 48px;\r
        height: 48px;\r
 }\r
 \r
@@ -470,6 +474,7 @@ div.ui-widget-overlay {
 .mainHeading > hgroup h1 {\r
        border-bottom: 1px solid #999;\r
        color: #999;\r
+       text-shadow: 0 1px 0 #fff;\r
        font-size: 140%;\r
        font-weight: bold;\r
        padding-bottom: 10px;\r
@@ -484,6 +489,7 @@ div.ui-widget-overlay {
 .subHeading {\r
        border-bottom: 1px solid #999;\r
        font-size: 120%;\r
+       text-shadow: 0 1px 0 #fff;\r
        margin: 14px 0 14px;\r
        padding: 15px;\r
 }\r
@@ -500,6 +506,7 @@ fieldset {
 }\r
 \r
 fieldset legend {\r
+       color: #999;\r
        padding: 0 7px 0;\r
 }\r
 \r
@@ -641,13 +648,19 @@ th:last-child {
        border-right-width: 0;\r
 }\r
 \r
+th {\r
+       font-size: 85%;\r
+}\r
+\r
 th a {\r
+       color: #999;\r
        display: block;\r
        text-decoration: none;\r
 }\r
 \r
 th a:hover {\r
-       color: #00c !important;\r
+       color: #333 !important;\r
+       text-shadow: 0 1px 0 #fff;\r
        text-decoration: none !important;\r
 }\r
 \r
@@ -718,17 +731,17 @@ tr.container-2 td {
 \r
 /* -- -- -- -- -- Large Buttons -- -- -- -- -- */\r
 \r
-div.largeButtons {\r
+nav.largeButtons {\r
        text-align: right;\r
 }\r
 \r
-div.largeButtons ul li {\r
+nav.largeButtons ul li {\r
        display: inline;\r
 }\r
 \r
 input[type='reset'],\r
 input[type='submit'],\r
-div.largeButtons ul li a {\r
+nav.largeButtons ul li a {\r
        background-color: #fefefe;\r
        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#eee));\r
        background-image: -moz-linear-gradient(0% 0% 270deg, #fefefe, #eee);\r
@@ -744,7 +757,7 @@ div.largeButtons ul li a {
 \r
 input[type='reset']:hover,\r
 input[type='submit']:hover,\r
-div.largeButtons ul li a:hover {\r
+nav.largeButtons ul li a:hover {\r
        background-color: #fefefe;\r
        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#eee), to(#fefefe));\r
        background-image: -moz-linear-gradient(0% 0% 270deg, #eee, #fefefe);\r
@@ -755,11 +768,11 @@ div.largeButtons ul li a:hover {
        text-decoration: none;\r
 }\r
 \r
-div.largeButtons ul li a img {\r
+nav.largeButtons ul li a img {\r
        vertical-align: middle;\r
 }\r
 \r
-div.formSubmit {\r
+.formSubmit {\r
        text-align: center;\r
 }\r
 \r
@@ -814,18 +827,42 @@ div#ajaxExceptionStacktrace {
        padding: 3px;\r
 }\r
 \r
-p.success {\r
-       background-color: #b5e61d;\r
-       border: 1px solid #22b14c;\r
-       border-radius: 5px;\r
+\r
+\r
+/* -- -- -- -- -- System Notifications -- -- -- -- -- */\r
+\r
+p.info,\r
+p.error,\r
+p.success,\r
+p.warning {\r
+       border-radius: 7px;\r
        margin-bottom: 14px;\r
-       padding: 7px;\r
+       padding: 7px 14px;\r
 }\r
 \r
-hr {\r
-       display: none;\r
+p.info {\r
+       background-color: #def;\r
+       border: 1px solid #06f;\r
+}\r
+\r
+p.success {\r
+       background-color: #efe;\r
+       border: 1px solid #090;\r
+}\r
+\r
+p.error {\r
+       background-color: #fee;\r
+       border: 1px solid #c00;\r
+}\r
+\r
+p.warning {\r
+       background-color: #ffd;\r
+       border: 1px solid #660;\r
 }\r
 \r
+\r
+\r
+\r
 #actionProxyLoading {\r
        background-color: #faebd7;\r
        border: 1px solid #f80;\r

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index f437813edb216356a78bf621aed8d4f776dce74f..78b833ffdeeea030e97dc6396de17c5602a46f4f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.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/sessionLogL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.sessionLog.access.view{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.sessionLog.access.view{/lang}</h1>
+       </hgroup>
+</header>
 
 <div class="contentHeader">
        {pages print=true assign=pagesLinks link="index.php?page=ACPSessionLog&sessionLogID=$sessionLogID&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
index 06ce0052773dafdf9b4c72fc04f8a5d2cf8f302a..1a2852361402df37af9063105c846f6dd18f2d13 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.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/sessionLogL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.sessionLog.view{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.sessionLog.view{/lang}</h1>
+       </hgroup>
+</header>
 
 <div class="contentHeader">
        {pages print=true assign=pagesLinks link="index.php?page=ACPSessionLogList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index bf0342c6f3719f45e192b36d86738a054133c5db..b251e34d7838f1fb12e3bdb05350a702190c0be3 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -1,11 +1,11 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/cacheL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.cache.list{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.cache.list{/lang}</h1>
+       </hgroup>
+</header>
 
 {if $cleared}
        <p class="success">{lang}wcf.acp.cache.clear.success{/lang}</p> 
@@ -37,12 +37,12 @@
 </fieldset>
 
 <div class="contentHeader">
-       <div class="largeButtons">
+       <nav class="largeButtons">
                <ul>
                        <li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="index.php?action=CacheClear{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/deleteM.png" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
-       </div>
+       </nav>
 </div>
 
 {foreach from=$caches key=cache item=files}

diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index b09961ba6b86c9feb0d1f2e478cd05a6d667693e..1bb07683d7b6c7d210d6eabd026019f8fd709eb0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -1,12 +1,12 @@
 {include file='header'}\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img src="{@RELATIVE_WCF_DIR}icon/cronjobs{$action|ucfirst}L.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>{lang}wcf.acp.cronjob.{$action}{/lang}</h2>\r
-               <p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>\r
-       </div>\r
-</div>\r
+       <hgroup>\r
+               <h1>{lang}wcf.acp.cronjob.{$action}{/lang}</h1>\r
+               <h2>{lang}wcf.acp.cronjob.subtitle{/lang}</h2>\r
+       </hgroup>\r
+</header>\r
 \r
 {if $errorField}\r
        <p class="error">{lang}wcf.global.form.error{/lang}</p>\r
@@ -19,13 +19,14 @@
 <p class="info">{lang}wcf.acp.cronjob.intro{/lang}</p>\r
 \r
 <div class="contentHeader">\r
-       <div class="largeButtons">\r
+       <nav class="largeButtons">\r
                <ul>\r
                        <li><a href="index.php?page=CronjobList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.cronjobs.view{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobsM.png" alt="" /> <span>{lang}wcf.acp.menu.link.cronjobs.view{/lang}</span></a></li>\r
                        {if $action == 'edit'}<li><a href="index.php?action=CronjobExecute&amp;cronjobID={@$cronjobID}{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.execute{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobExecuteM.png" alt="" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>{/if}\r
                </ul>\r
-       </div>\r
+       </nav>\r
 </div>\r
+\r
 <form method="post" action="index.php?form=Cronjob{$action|ucfirst}">\r
        <div class="border content">\r
                <div class="container-1">\r
@@ -175,9 +176,10 @@
                        {if $additionalFields|isset}{@$additionalFields}{/if}\r
                </div>\r
        </div>\r
+       \r
        <div class="formSubmit">\r
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />\r
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                {@SID_INPUT_TAG}\r
                {if $cronjobID|isset}<input type="hidden" name="cronjobID" value="{@$cronjobID}" />{/if}\r
        </div>\r

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 86004e95f88a4f786e9f032178a2b710ab18fe1a..46ab5a69a449063a13d96214a7d910f1ff01fb50 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.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/cronjobsL.png" alt="" />
-       <div class="headlineContainer">
-               <h2>{lang}wcf.acp.cronjob.list{/lang}</h2>
-               <p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>
-       </div>
+       <hgroup>
+               <h1>{lang}wcf.acp.cronjob.list{/lang}</h1>
+               <h2>{lang}wcf.acp.cronjob.subtitle{/lang}</h2>
+       </hgroup>
        
        <script type="text/javascript">
                //<![CDATA[
@@ -33,15 +33,15 @@
                });
                //]]>
        </script>
-</div>
+</header>
 
 <div class="contentHeader">
        {pages print=true assign=pagesLinks link="index.php?page=CronjobList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}
        
        {if $__wcf->session->getPermission('admin.system.cronjobs.canAddCronjob')}
-               <div class="largeButtons">
+               <nav class="largeButtons">
                        <ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobsAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
-               </div>
+               </nav>
        {/if}
 </div>
 
@@ -131,9 +131,9 @@
                {@$pagesLinks}
                
                {if $__wcf->session->getPermission('admin.system.cronjobs.canAddCronjob')}
-                       <div class="largeButtons">
+                       <nav class="largeButtons">
                                <ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobsAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
-                       </div>
+                       </nav>
                {/if}
        </div>
 {/if}

diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 2328099faa943df1050c4e3182331ab42495acf8..9c780857c39309638563b6b84eb4f551243b3081 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -1,13 +1,13 @@
 {include file='header'}\r
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img src="{@RELATIVE_WCF_DIR}icon/cronjobsLogL.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>{lang}wcf.acp.cronjob.log{/lang}</h2>\r
-               <p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>\r
-       </div>\r
-</div>\r
+       <hgroup>\r
+               <h1>{lang}wcf.acp.cronjob.log{/lang}</h1>\r
+               <h2>{lang}wcf.acp.cronjob.subtitle{/lang}</h2>\r
+       </hgroup>\r
+</header>\r
 \r
 <div class="contentHeader">\r
        {pages print=true assign=pagesLinks link="index.php?page=CronjobLogList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}\r
@@ -68,7 +68,7 @@
 {hascontentelse}\r
        <div class="border content">\r
                <div class="container-1">\r
-                       <p>{lang}wcf.acp.cronjob.log.noEntries{/lang}</p>\r
+                       <p class="info">{lang}wcf.acp.cronjob.log.noEntries{/lang}</p>\r
                </div>\r
        </div>\r
 {/hascontent}\r

diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl
index e0ecbcb242e79cb40650aca83c13f1160b8d9a5a..db7645357eea551629cb034828bd8e9e8fac94e3 100644 (file)
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -65,8 +65,8 @@
        </div>\r
        \r
        <div class="formSubmit">\r
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />\r
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                {@SID_INPUT_TAG}\r
                <input type="hidden" id="activeTabMenuItem" name="activeTabMenuItem" value="{$activeTabMenuItem}" />\r
        </div>\r

diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index 973aed272805a7a8c61adbc28ff620c84e4a8ff4..7ed40a7bdf611b45c2f9f254d65b0f61e0c91f9e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -49,8 +49,8 @@
        </div>\r
 \r
        <div class="formSubmit">\r
-               <input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />\r
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />\r
+               <input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />\r
                {@SID_INPUT_TAG}\r
        </div>\r
 </form>\r

diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
index 5cb8751ae0058c9b197b52f73fd029724cf4fec7..84ed005a9bcecf7fec5d5a2a47b342b00cafd343 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
@@ -22,30 +22,30 @@
 </script>
 
 <form method="post" action="index.php?form=PackageUpdate" id="updateForm">
-       <div class="mainHeadline">
+       <header class="mainHeading">
                <img src="{@RELATIVE_WCF_DIR}icon/packageUpdateL.png" alt="" />
-               <div class="headlineContainer">
-                       <h2>{lang}wcf.acp.packageUpdate{/lang}</h2>
-                       {if $availableUpdates|count}<p><label><input type="checkbox" onclick="checkUncheckAllPackages(document.getElementById('updateForm'))" /> {lang}wcf.acp.packageUpdate.selectAll{/lang}</label></p>{/if}
-               </div>
-       </div>
-
+               <hgroup>
+                       <h1>{lang}wcf.acp.packageUpdate{/lang}</h1>
+                       {if $availableUpdates|count}<h2><label><input type="checkbox" onclick="checkUncheckAllPackages(document.getElementById('updateForm'))" /> {lang}wcf.acp.packageUpdate.selectAll{/lang}</label></h2>{/if}
+               </hgroup>
+       </header>
+       
        {if !$availableUpdates|count}
                <div class="border content">
                        <div class="container-1">
-                               <p>{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
+                               <p class="info">{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
                        </div>
                </div>
        {else}
                {foreach from=$availableUpdates item=availableUpdate}
-                       <div class="message content"{if $availableUpdate.version.updateType == 'security'} style="border-color: #c00"{/if}>
+                       <article class="message content"{if $availableUpdate.version.updateType == 'security'} style="border-color: #c00"{/if}>
                                <div class="messageInner container-{cycle name='styles' values='1,2'}">
-                                       <h3 class="subHeadline">
+                                       <h1 class="subHeading">
                                                <label>
                                                        <input onclick="enableFormElements(document.getElementById('version-{@$availableUpdate.packageID}Div'), this.checked)" type="checkbox" name="updates[{@$availableUpdate.packageID}]" value="{$availableUpdate.version.packageVersion}" />
                                                        {$availableUpdate.packageName}{if $availableUpdate.instanceNo > 1} (#{#$availableUpdate.instanceNo}){/if}
                                                </label>
-                                       </h3>
+                                       </h1>
 
                                        <div class="messageBody">
                                                <div class="formElement">
@@ -92,12 +92,12 @@
 
                                        <hr />
                                </div>
-                       </div>                  
+                       </article>                      
                {/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}" />
                        {@SID_INPUT_TAG}
                </div>
        {/if}

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 487834913a29d57b7a91a1eed3ca7fc60e155995..24c1c2994e2fbf2f514c7b5639f65f9fa2a09efa 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -10,23 +10,23 @@
        //]]>\r
 </script>\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img src="{@RELATIVE_WCF_DIR}icon/packageL.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>{lang}wcf.acp.package.list{/lang}</h2>\r
-       </div>\r
-</div>\r
+       <hgroup>\r
+               <h1>{lang}wcf.acp.package.list{/lang}</h1>\r
+       </hgroup>\r
+</header>\r
 \r
 <div class="contentHeader">\r
        {pages print=true assign=pagesLinks link="index.php?page=PackageList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}\r
 \r
        {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset}\r
-               <div class="largeButtons">\r
+               <nav class="largeButtons">\r
                        <ul>\r
                                {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=install{@SID_ARG_2ND}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageInstallM.png" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}\r
                                {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}\r
                        </ul>\r
-               </div>\r
+               </nav>\r
        {/if}\r
 </div>\r
 \r
@@ -93,12 +93,12 @@
        {@$pagesLinks}\r
        \r
        {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset}\r
-               <div class="largeButtons">\r
+               <nav class="largeButtons">\r
                        <ul>\r
                                {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=install{@SID_ARG_2ND}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageInstallM.png" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}\r
                                {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}\r
                        </ul>\r
-               </div>\r
+               </nav>\r
        {/if}\r
 </div>\r
 \r

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 40795c96055c969463d70e857619e9ee9585efae..f077b20d76bf8ea40f78381b5cce0a7ef063975e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -1,33 +1,33 @@
 {include file='header'}\r
 \r
-{if $packageID == 0}\r
-       <div class="mainHeadline">\r
+\r
+<header class="mainHeading">\r
+       {if $packageID == 0}\r
                <img src="{@RELATIVE_WCF_DIR}icon/packageInstallL.png" alt="" />\r
-               <div class="headlineContainer">\r
-                       <h2>{lang}wcf.acp.package.startInstall{/lang}</h2>\r
-               </div>\r
-       </div>\r
-{else}\r
-       <div class="mainHeadline">\r
+               <hgroup class="headlineContainer">\r
+                       <h1>{lang}wcf.acp.package.startInstall{/lang}</h1>\r
+               </hgroup>\r
+       {else}\r
                <img src="{@RELATIVE_WCF_DIR}icon/packageUpdateL.png" alt="" />\r
-               <div class="headlineContainer">\r
-                       <h2>{lang}wcf.acp.package.startUpdate{/lang}</h2>\r
-               </div>\r
-       </div>\r
-{/if}\r
+               <hgroup class="headlineContainer">\r
+                       <h1>{lang}wcf.acp.package.startUpdate{/lang}</h1>\r
+               </hgroup>\r
+       {/if}\r
+</header>\r
 \r
 {if $errorField != ''}\r
        <p class="error">{lang}wcf.global.form.error{/lang}</p>\r
 {/if}\r
 \r
 <div class="contentHeader">\r
-       <div class="largeButtons">\r
+       <nav class="largeButtons">\r
                <ul>\r
                        <li><a href="index.php?page=PackageList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.package.view{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageM.png" alt="" /> <span>{lang}wcf.acp.menu.link.package.view{/lang}</span></a></li>\r
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}\r
                </ul>\r
-       </div>\r
+       </nav>\r
 </div>\r
+\r
 <form method="post" action="index.php?form=PackageStartInstall" enctype="multipart/form-data">\r
        <div class="border content">\r
                <div class="container-1">\r
@@ -91,8 +91,9 @@
        </div>\r
 \r
        <div class="formSubmit">\r
-               <input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />\r
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />\r
+               <input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />\r
+               \r
                {@SID_INPUT_TAG}\r
                <input type="hidden" name="action" value="{$action}" />\r
                {if $packageID != 0}<input type="hidden" name="activePackageID" value="{@$packageID}" />{/if}\r

diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index 9e0d915e9b3a7f658b19d4f8f1d3697f426999fa..8daa81deff8d935b021f22e7ec3620d81b55f522 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.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{/lang}</h2>
-       </div>
-</div>
+       <hgroup>
+               <h1>{lang}wcf.acp.packageUpdate{/lang}</h1>
+       </hgroup>
+</header>
 
 {if $errorField == 'updates'}
        {if $errorType === 'empty'}
@@ -49,8 +49,8 @@
                </div>
                
                <div class="formSubmit">
-                       {if !$errorField}<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />{/if}
                        {*<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />*}
+                       {if !$errorField}<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />{/if}
                        {@SID_INPUT_TAG}
                        <input type="hidden" name="send" value="1" />
                        
@@ -61,5 +61,4 @@
        </form>
 {/if}
 
-
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index 1a9991eb36087d2ada7bcb230c177578a54062d8..60c6ab7f42e03b16eccb6bc25c31ab90a0de65ba 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -37,12 +37,12 @@
        //]]>
 </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>
 
 {if $errorField != ''}
        <p class="error">{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
@@ -126,8 +126,8 @@
                </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}
                </div>
        </form>

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 16eafd0936dc6e5f2a6154f3f542332ff80b432c..1a56a7dce80d1922d511445733d87427b653c619 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -1,12 +1,12 @@
 {include file='header'}\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img src="{@RELATIVE_WCF_DIR}icon/packageL.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>{$package->getName()}</h2>\r
-               <p>{$package->packageDescription}</p>\r
-       </div>\r
-</div>\r
+       <hgroup>\r
+               <h1>{$package->getName()}</h1>\r
+               <h2>{$package->packageDescription}</h2>\r
+       </hgroup>\r
+</header>\r
 \r
 <fieldset>\r
        <legend>{lang}wcf.acp.package.view.properties{/lang}</legend>\r
@@ -81,7 +81,7 @@
 {/foreach}\r
 \r
 <div class="contentHeader">\r
-       <div class="largeButtons">\r
+       <nav class="largeButtons">\r
                <ul>\r
                        {if PACKAGE_ID != $package->packageID}\r
                                {if $package->standalone && $package->package != 'com.woltlab.wcf'}<li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php?packageID={@$package->packageID}{@SID_ARG_2ND}" title="{lang}wcf.acp.package.view.button.makeActive{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageMakeActiveM.png" alt="" /> <span>{lang}wcf.acp.package.view.button.makeActive{/lang}</span></a></li>{/if}\r
@@ -90,7 +90,7 @@
                        {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=update&amp;activePackageID={@$package->packageID}{@SID_ARG_2ND}" title="{lang}wcf.acp.package.view.button.update{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageUpdateM.png" alt="" /> <span>{lang}wcf.acp.package.view.button.update{/lang}</span></a></li>{/if}\r
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}\r
                </ul>\r
-       </div>\r
+       </nav>\r
 </div>\r
 \r
 {if $requiredPackages|count > 0}\r
@@ -231,4 +231,4 @@
        </script>\r
 {/if}\r
 \r
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}\r

diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
index 65e597263e6490725add8400b71a2fae336e721a..f5d6c0fe14b21b8d15bd317f44799c0f64074bed 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
@@ -1,11 +1,11 @@
 {include file='header'}\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img src="{@RELATIVE_WCF_DIR}icon/updateServer{@$action|ucfirst}L.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>{lang}wcf.acp.updateServer.{$action}{/lang}</h2>\r
-       </div>\r
-</div>\r
+       <hgroup>\r
+               <h1>{lang}wcf.acp.updateServer.{$action}{/lang}</h1>\r
+       </hgroup>\r
+</header>\r
 \r
 {if $errorField}\r
        <p class="error">{lang}wcf.global.form.error{/lang}</p>\r
@@ -20,9 +20,9 @@
 {/if}\r
 \r
 <div class="contentHeader">\r
-       <div class="largeButtons">\r
+       <nav class="largeButtons">\r
                <ul><li><a href="index.php?page=UpdateServerList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.package.server.view{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerM.png" alt="" /> <span>{lang}wcf.acp.menu.link.package.server.view{/lang}</span></a></li></ul>\r
-       </div>\r
+       </nav>\r
 </div>\r
 <form method="post" action="index.php?form=UpdateServer{@$action|ucfirst}{if $packageUpdateServerID|isset}&amp;packageUpdateServerID={@$packageUpdateServerID}{/if}">\r
        <div class="border content">\r
@@ -88,8 +88,8 @@
        </div>\r
        \r
        <div class="formSubmit">\r
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />\r
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                {@SID_INPUT_TAG}\r
        </div>\r
 </form>\r

diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index 6bfebfeddf3ee56034b60a4dad5e2b742c6951a4..fa9dec31cbf8f9365588f66a4887f8bb50831188 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -9,21 +9,21 @@
        //]]>\r
 </script>\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img src="{@RELATIVE_WCF_DIR}icon/updateServerL.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>{lang}wcf.acp.updateServer.view{/lang}</h2>\r
-       </div>\r
-</div>\r
+       <hgroup>\r
+               <h1>{lang}wcf.acp.updateServer.view{/lang}</h1>\r
+       </hgroup>\r
+</header>\r
 \r
 {if $deletedPackageUpdateServerID}\r
        <p class="success">{lang}wcf.acp.updateServer.delete.success{/lang}</p>\r
 {/if}\r
 \r
 <div class="contentHeader">\r
-       <div class="largeButtons">\r
+       <nav class="largeButtons">\r
                <ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerAddM.png" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>\r
-       </div>\r
+       </nav>\r
 </div>\r
 \r
 {if !$updateServers|count}\r
@@ -88,9 +88,9 @@
                </table>\r
        </div>\r
        <div class="contentHeader">\r
-               <div class="largeButtons">\r
+               <nav class="largeButtons">\r
                        <ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerAddM.png" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>\r
-               </div>\r
+               </nav>\r
        </div>\r
 {/if}\r
 \r

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 368b5f7d4a434136e5bb950f16cd90cc914cabc2..646f7fa8aa2f7e628367c69593d89b9db3a1c81b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -49,12 +49,12 @@
        //]]>\r
 </script>\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img {if $userID|isset}id="userEdit{@$userID}" {/if}src="{@RELATIVE_WCF_DIR}icon/user{@$action|ucfirst}L.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>{lang}wcf.acp.user.{@$action}{/lang}</h2>\r
-       </div>\r
-</div>\r
+       <hgroup>\r
+               <h1>{lang}wcf.acp.user.{@$action}{/lang}</h1>\r
+       </hgroup>\r
+</header>\r
 \r
 {if $errorField}\r
        <p class="error">{lang}wcf.global.form.error{/lang}</p>\r
@@ -69,14 +69,15 @@
 {/if}\r
 \r
 <div class="contentHeader">\r
-       <div class="largeButtons">\r
+       <nav class="largeButtons">\r
                <ul>\r
                        <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>\r
                        <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>\r
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}\r
                </ul>\r
-       </div>\r
+       </nav>\r
 </div>\r
+\r
 <form method="post" action="index.php?form=User{@$action|ucfirst}">\r
        <div class="border content">\r
                <div class="container-1">\r
@@ -184,15 +185,17 @@
                        {if $additionalFields|isset}{@$additionalFields}{/if}\r
                        \r
                        {if $optionTree|count || $additionalTabs|isset}\r
-                               <div class="tabMenu">\r
-                                       <ul>\r
-                                               {foreach from=$optionTree item=categoryLevel1}\r
-                                                       <li id="{@$categoryLevel1[object]->categoryName}"><a onclick="tabMenu.showSubTabMenu('{@$categoryLevel1[object]->categoryName}');"><span>{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</span></a></li>\r
-                                               {/foreach}\r
-                                               \r
-                                               {if $additionalTabs|isset}{@$additionalTabs}{/if}\r
-                                       </ul>\r
-                               </div>\r
+                               <nav>\r
+                                       <div class="tabMenu">\r
+                                               <ul>\r
+                                                       {foreach from=$optionTree item=categoryLevel1}\r
+                                                               <li id="{@$categoryLevel1[object]->categoryName}"><a onclick="tabMenu.showSubTabMenu('{@$categoryLevel1[object]->categoryName}');"><span>{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</span></a></li>\r
+                                                       {/foreach}\r
+                                                       \r
+                                                       {if $additionalTabs|isset}{@$additionalTabs}{/if}\r
+                                               </ul>\r
+                                       </div>\r
+                               <nav>\r
                                <div class="subTabMenu">\r
                                        <div class="containerHead"><div> </div></div>\r
                                </div>\r
@@ -200,7 +203,7 @@
                                {foreach from=$optionTree item=categoryLevel1}\r
                                        <div class="border tabMenuContent hidden" id="{@$categoryLevel1[object]->categoryName}-content">\r
                                                <div class="container-1">\r
-                                                       <h3 class="subHeadline">{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</h3>\r
+                                                       <h3 class="subHeading">{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</h3>\r
                                                        \r
                                                        {foreach from=$categoryLevel1[categories] item=categoryLevel2}\r
                                                                <fieldset>\r
@@ -250,8 +253,8 @@
        </div>\r
        \r
        <div class="formSubmit">\r
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />\r
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                {@SID_INPUT_TAG}\r
                <input type="hidden" name="action" value="{@$action}" />\r
                {if $userID|isset}<input type="hidden" name="userID" value="{@$userID}" />{/if}\r

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index c91ce1d159946a30876de838dbccb13b23cf232d..1f5d95b9026671076643665398ae45cb501a95da 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -38,20 +38,20 @@
        //]]>\r
 </script>\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img src="{@RELATIVE_WCF_DIR}icon/{if $searchID}userSearch{else}users{/if}L.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>{lang}wcf.acp.user.{if $searchID}search{else}list{/if}{/lang}</h2>\r
-               <p>{if $searchID}{lang}wcf.acp.user.search.matches{/lang}{else}{lang}wcf.acp.user.list.count{/lang}{/if}</p>\r
-       </div>\r
-</div>\r
+       <hgroup>\r
+               <h1>{lang}wcf.acp.user.{if $searchID}search{else}list{/if}{/lang}</h1>\r
+               <h2>{if $searchID}{lang}wcf.acp.user.search.matches{/lang}{else}{lang}wcf.acp.user.list.count{/lang}{/if}</h2>\r
+       </hgroup>\r
+</header>\r
 \r
 {assign var=encodedURL value=$url|rawurlencode}\r
 {assign var=encodedAction value=$action|rawurlencode}\r
 <div class="contentHeader">\r
        {pages print=true assign=pagesLinks link="index.php?page=UserList&pageNo=%d&searchID=$searchID&action=$encodedAction&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}\r
        \r
-       <div class="largeButtons">\r
+       <nav class="largeButtons">\r
                <ul>\r
                        {if $__wcf->session->getPermission('admin.user.canAddUser')}\r
                                <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>\r
@@ -59,7 +59,7 @@
                        <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>\r
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}\r
                </ul>\r
-       </div>\r
+       </nav>\r
 </div>\r
 \r
 <div class="subTabMenu">\r
@@ -126,10 +126,11 @@
                        </tbody>\r
                </table>\r
        </div>\r
+       \r
        <div class="contentFooter">\r
                {@$pagesLinks} <div id="userEditMarked" class="optionButtons"></div>\r
                \r
-               <div class="largeButtons">\r
+               <nav class="largeButtons">\r
                        <ul>\r
                                {if $__wcf->session->getPermission('admin.user.canAddUser')}\r
                                        <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>\r
@@ -137,11 +138,13 @@
                                <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>\r
                                {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}\r
                        </ul>\r
-               </div>\r
+               </nav>\r
        </div>\r
 {else}\r
        <div class="border content">\r
-               <div class="container-1">{lang}wcf.acp.user.search.error.noMatches{/lang}</div>\r
+               <div class="container-1">\r
+                       <p class="info">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>\r
+               </div>\r
        </div>\r
 {/if}\r
 \r

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 25969b4f173823305e4acc79c5e6b8b4149a34ca..ebbd9e317a54f8342a049406f36dc6fee6278cc2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -1,9 +1,9 @@
 {include file='header'}\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img src="{@RELATIVE_WCF_DIR}icon/emailL.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>\r
+       <hgroup>\r
+               <h1>\r
                        {if $action == 'all'}\r
                                {lang}wcf.acp.user.sendMail.all{/lang}\r
                        {elseif $action == 'group'}\r
@@ -11,27 +11,27 @@
                        {else}\r
                                {lang}wcf.acp.user.sendMail{/lang}\r
                        {/if}\r
-               </h2>\r
-       </div>\r
-</div>\r
+               </h1>\r
+       </hgroup>\r
+</header>\r
 \r
 {if $errorField}\r
        <p class="error">{lang}wcf.global.form.error{/lang}</p>\r
 {/if}\r
 \r
 <div class="contentHeader">\r
-       <div class="largeButtons">\r
+       <nav class="largeButtons">\r
                <ul>\r
                        <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>\r
                        <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>\r
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}\r
                </ul>\r
-       </div>\r
+       </nav>\r
 </div>\r
+\r
 <form method="post" action="index.php?form=UserMail">\r
        <div class="border content">\r
                <div class="container-1">\r
-       \r
                        {if $action == ''}\r
                                <fieldset>\r
                                        <legend>{lang}wcf.acp.user.sendMail.markedUsers{/lang}</legend>\r
@@ -143,12 +143,12 @@
        </div>\r
        \r
        <div class="formSubmit">\r
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />\r
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                <input type="hidden" name="action" value="{@$action}" />\r
                {@SID_INPUT_TAG}\r
                <input type="hidden" name="userIDs" value="{@$userIDs}" />\r
        </div>\r
 </form>\r
 \r
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}\r

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 23273f57b23941e6175f6b6131cdd77b4ec226c4..f50c11a063935995f9c4f57dc359f4fb450780d6 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -13,12 +13,12 @@
        //]]>\r
 </script>\r
 \r
-<div class="mainHeadline">\r
+<header class="mainHeading">\r
        <img src="{@RELATIVE_WCF_DIR}icon/userSearchL.png" alt="" />\r
-       <div class="headlineContainer">\r
-               <h2>{lang}wcf.acp.user.search{/lang}</h2>\r
-       </div>\r
-</div>\r
+       <hgroup>\r
+               <h1>{lang}wcf.acp.user.search{/lang}</h1>\r
+       </hgroup>\r
+</header>\r
 \r
 {if $errorField == 'search'}\r
 <p class="error">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>\r
@@ -31,7 +31,7 @@
 {/if*}\r
 \r
 <div class="contentHeader">\r
-       <div class="largeButtons">\r
+       <nav class="largeButtons">\r
                <ul>\r
                        {if $__wcf->session->getPermission('admin.user.canAddUser')}\r
                                <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>\r
@@ -39,7 +39,7 @@
                        <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>\r
                        </li>\r
                </ul>\r
-       </div>\r
+       </nav>\r
 </div>\r
 \r
 <form method="post" action="index.php?form=UserSearch">\r
@@ -121,13 +121,15 @@
                        \r
                        {if $additionalFields|isset}{@$additionalFields}{/if}\r
                        \r
-                       <div class="tabMenu">\r
-                               <ul>\r
-                                       {if $optionTree|count}<li id="profile"><a onclick="tabMenu.showSubTabMenu('profile');"><span>{lang}wcf.acp.user.search.conditions.profile{/lang}</span></a></li>{/if}\r
-                                       {if $additionalTabs|isset}{@$additionalTabs}{/if}\r
-                                       <li id="resultOptions"><a onclick="tabMenu.showSubTabMenu('resultOptions');"><span>{lang}wcf.acp.user.search.display{/lang}</span></a></li>\r
-                               </ul>\r
-                       </div>\r
+                       <nav>\r
+                               <div class="tabMenu">\r
+                                       <ul>\r
+                                               {if $optionTree|count}<li id="profile"><a onclick="tabMenu.showSubTabMenu('profile');"><span>{lang}wcf.acp.user.search.conditions.profile{/lang}</span></a></li>{/if}\r
+                                               {if $additionalTabs|isset}{@$additionalTabs}{/if}\r
+                                               <li id="resultOptions"><a onclick="tabMenu.showSubTabMenu('resultOptions');"><span>{lang}wcf.acp.user.search.display{/lang}</span></a></li>\r
+                                       </ul>\r
+                               </div>\r
+                       </nav>\r
                        <div class="subTabMenu">\r
                                <div class="containerHead"><div> </div></div>\r
                        </div>\r
@@ -135,7 +137,7 @@
                        {if $optionTree|count}\r
                                <div class="border tabMenuContent hidden" id="profile-content">\r
                                        <div class="container-1">\r
-                                               <h3 class="subHeadline">{lang}wcf.acp.user.search.conditions.profile{/lang}</h3>\r
+                                               <h3 class="subHeading">{lang}wcf.acp.user.search.conditions.profile{/lang}</h3>\r
                                                {include file='optionFieldList' langPrefix='wcf.user.option.' options=$optionTree}\r
                                        </div>\r
                                </div>\r
@@ -145,7 +147,7 @@
                        \r
                        <div class="border tabMenuContent hidden" id="resultOptions-content">\r
                                <div class="container-1">\r
-                                       <h3 class="subHeadline">{lang}wcf.acp.user.search.display{/lang}</h3>\r
+                                       <h3 class="subHeading">{lang}wcf.acp.user.search.display{/lang}</h3>\r
                                        \r
                                        <fieldset>\r
                                                <legend>{lang}wcf.acp.user.search.display.general{/lang}</legend>\r
@@ -229,8 +231,8 @@
        </div>\r
        \r
        <div class="formSubmit">\r
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />\r
+               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />\r
                {@SID_INPUT_TAG}\r
        </div>\r
 </form>\r