Removed hgroup tag

diff --git a/com.woltlab.wcf/template/styleChooser.tpl b/com.woltlab.wcf/template/styleChooser.tpl
index eaaac6c7ffb000b739d6798f1c6e775b05829b68..a6ec52b91192139d46087dfe8685a9e6d9dfc16a 100644 (file)
--- a/com.woltlab.wcf/template/styleChooser.tpl
+++ b/com.woltlab.wcf/template/styleChooser.tpl
@@ -7,9 +7,9 @@
                                                <img src="{@$style->getPreviewImage()}" alt="" />
                                        </span>
                                        <div class="details">
-                                               <hgroup class="containerHeadline">
-                                                       <h1>{$style->styleName}</h1>
-                                               </hgroup>
+                                               <div class="containerHeadline">
+                                                       <h3>{$style->styleName}</h3>
+                                               </div>
                                                {if $style->styleDescription}<small>{lang}{@$style->styleDescription}{/lang}</small>{/if}
                                        </div>
                                </div>

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 7a6494d14fed7ed86388cb7ca305dab611573840..fd247a574ed6e249fadd3c8b2e8084f04536e6b5 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -70,7 +70,7 @@ WCF.ACP.Application.SetAsPrimary = Class.extend({
                                
                                // insert icon
                                WCF.DOMNodeInsertedHandler.enable();
-                               $('<span class="icon icon16 icon-home jsTooltip" title="' + WCF.Language.get('wcf.acp.application.primaryApplication') + '" />').appendTo($('.boxHeadline > hgroup > h1'));
+                               $('<span class="icon icon16 icon-home jsTooltip" title="' + WCF.Language.get('wcf.acp.application.primaryApplication') + '" />').appendTo($('.boxHeadline > h1'));
                                WCF.DOMNodeInsertedHandler.disable();
                        }, this)
                });
@@ -803,7 +803,7 @@ WCF.ACP.Package.Search = Class.extend({
                // update badge count
                if (count !== undefined) {
                        this._content = { 1: template };
-                       this._packageSearchResultContainer.find('> header > hgroup > h1 > .badge').html(count);
+                       this._packageSearchResultContainer.find('> header > h1 > .badge').html(count);
                }
        },
        

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index b78a6879ed4b9ff9ff50f50d757f28bd0dfd8b37..8fc0b423baccaa0a4887396dc24ce046d0142367 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.sessionLog.access.list'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.sessionLog.access.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.sessionLog.access.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -20,9 +18,9 @@
 
 {hascontent}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.sessionLog.access.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.sessionLog.access.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
index 7d093619259db413cee32ff3285d4d7fc35bc02e..921149b819945ce9cb7e43f15067b2b4561aee77 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.sessionLog.list'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.sessionLog.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.sessionLog.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -22,9 +20,9 @@
 
 {if $objects|count}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.sessionLog.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.sessionLog.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
index e2624f51bb5f67db0254b2597a0b57671724ef0c..a3eef8b7c083005fa13398561d41b889c5363cad 100644 (file)
--- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
@@ -16,9 +16,7 @@
 {/if}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.application.edit.title{/lang}{if $application->isPrimary} <span class="icon icon16 icon-home jsTooltip" title="{lang}wcf.acp.application.primaryApplication{/lang}"></span>{/if}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.application.edit.title{/lang}{if $application->isPrimary} <span class="icon icon16 icon-home jsTooltip" title="{lang}wcf.acp.application.primaryApplication{/lang}"></span>{/if}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/applicationManagement.tpl b/wcfsetup/install/files/acp/templates/applicationManagement.tpl
index bade874355858d2e6aeba37c530b33127909593e..e4a50579c32db571f2a0f17e411f8790f9a4672e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/applicationManagement.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationManagement.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.application.list'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.application.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.application.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -19,9 +17,9 @@
 </div>
 
 <div class="tabularBox tabularBoxTitle marginTop">
-       <hgroup>
-               <h1>{lang}wcf.acp.application.list{/lang} <span class="badge badgeInverse">{#$applicationList|count}</span></h1>
-       </hgroup>
+       <header>
+               <h2>{lang}wcf.acp.application.list{/lang} <span class="badge badgeInverse">{#$applicationList|count}</span></h2>
+       </header>
        
        <table class="table">
                <thead>

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index bf102776b164d263edbc686fd255478d4cf8fdf8..f02a6eb34229bfb62e87005b1d0aa5237cbad187 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -9,9 +9,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.cache.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.cache.list{/lang}</h1>
 </header>
 
 <div class="container containerPadding marginTop">
@@ -63,10 +61,10 @@
                
                {if $files|count}
                        <div class="tabularBox tabularBoxTitle marginTop">
-                               <hgroup>
-                                       <h1><a class="jsCollapsible jsTooltip" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip"><span class="icon icon16 icon-chevron-right"></span></a> {lang}wcf.acp.cache.type.{$cacheType}{/lang} <span class="badge badgeInverse">{#$files|count}</span></h1>
-                                       <h2>{$cache}</h2>
-                               </hgroup>
+                               <header>
+                                       <h2><a class="jsCollapsible jsTooltip" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip"><span class="icon icon16 icon-chevron-right"></span></a> {lang}wcf.acp.cache.type.{$cacheType}{/lang} <span class="badge badgeInverse">{#$files|count}</span></h2>
+                                       <small>{$cache}</small>
+                               </header>
                                
                                <table id="cache{@$cacheIndex}" style="display: none;" class="table">
                                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 43a77974a33c5de7bc63e2c23bd84e36ffff513d..2d5aa0ca9f75bd39304077fad988a683bb73ac3f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -16,9 +16,7 @@
 {/if}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{@$objectType->getProcessor()->getLanguageVariable($action)}</h1>
-       </hgroup>
+       <h1>{@$objectType->getProcessor()->getLanguageVariable($action)}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/categoryList.tpl b/wcfsetup/install/files/acp/templates/categoryList.tpl
index 4484e66916ad7b33cbe947554f77a1fc7de42b19..70a01d92e3f02a05f2a6c136b521e2bbb43e668e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/categoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryList.tpl
@@ -68,9 +68,7 @@
 {/if}
 
 <header class="box48 boxHeadline">
-       <hgroup>
-               <h1>{@$objectType->getProcessor()->getLanguageVariable('list')}</h1>
-       </hgroup>
+       <h1>{@$objectType->getProcessor()->getLanguageVariable('list')}</h1>
 </header>
 
 <div class="contentNavigation">

diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index 537f4d3c8cb9715d226526657f779ecd83eed7ba..9facf168d479910f45236d2d6d4d2a835ef229cf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.cronjob.'|concat:$action}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.cronjob.{$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.cronjob.{$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 0054d26ab234c0fe55119dd406d80b2bc8348545..b28628401235da8ad5eff2ba970bb2607648b7a0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -1,10 +1,8 @@
 {include file='header' pageTitle='wcf.acp.cronjob.list'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.cronjob.list{/lang}</h1>
-               <h2>{lang}wcf.acp.cronjob.subtitle{/lang}</h2>
-       </hgroup>
+       <h1>{lang}wcf.acp.cronjob.list{/lang}</h1>
+       <p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>
 </header>
 
 <script type="text/javascript">
@@ -47,9 +45,9 @@
 
 {hascontent}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.cronjob.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.cronjob.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 25482ddc50fbe7fc6e0f9da606b7a6feb5313650..7e36aae7367fefc4c26d413e54c5b73ce6116650 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -30,9 +30,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.cronjob.log{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.cronjob.log{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -55,9 +53,9 @@
 
 {hascontent}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.cronjob.log{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.cronjob.log{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
index bcfbd399b6779448e5d88ba30ccc2c64e1903393..0007bdfaed7e1664d5aba6d35b2108e84d407423 100644 (file)
--- a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
+++ b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
@@ -22,9 +22,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.exceptionLog{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.exceptionLog{/lang}</h1>
 </header>
 
 {if !$logFiles|empty}
@@ -73,10 +71,10 @@
        {if $logFile}
                {foreach from=$exceptions item='exception' key='exceptionKey'}
                        <div class="tabularBox tabularBoxTitle marginTop" id="{$exceptionKey}">
-                               <hgroup>
-                                       <h1><a class="jsCollapsible jsTooltip" data-is-open="{if $exceptionKey == $exceptionID}1{else}0{/if}" data-collapsible-container="exception_{$exceptionKey}" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip"><span class="icon icon16 icon-chevron-{if $exceptionKey == $exceptionID}down{else}right{/if}"></span></a> {$exception[message]}</h1>
-                                       <h2>{$exception[date]|strtotime|plainTime}</h2>
-                               </hgroup>
+                               <header>
+                                       <h2><a class="jsCollapsible jsTooltip" data-is-open="{if $exceptionKey == $exceptionID}1{else}0{/if}" data-collapsible-container="exception_{$exceptionKey}" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip"><span class="icon icon16 icon-chevron-{if $exceptionKey == $exceptionID}down{else}right{/if}"></span></a> {$exception[message]}</h2>
+                                       <small>{$exception[date]|strtotime|plainTime}</small>
+                               </header>
                                
                                <div id="exception_{$exceptionKey}" class="container containerPadding" {if $exceptionKey != $exceptionID} style="display: none;"{/if}>
                                        <dl>

diff --git a/wcfsetup/install/files/acp/templates/languageAdd.tpl b/wcfsetup/install/files/acp/templates/languageAdd.tpl
index 8e2c0a279f87b6d3cd9437375d9049328ae74915..65c5483f0ba2588717f03f5402693b9d686660ca 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageAdd.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle="wcf.acp.language.$action"}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.language.{@$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.language.{@$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/languageExport.tpl b/wcfsetup/install/files/acp/templates/languageExport.tpl
index 405063cd31e27ee7487aed175f2dbbe80988a743..fc0524e18c27394fd1208f79c684c38a9ddf6591 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageExport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageExport.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.language.export'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.language.export{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.language.export{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/languageImport.tpl b/wcfsetup/install/files/acp/templates/languageImport.tpl
index 8ba6bd42e5488e3b489b089a77c20c5ec34e23c3..0f26c3be8165493a0297ed6ebbe9e75c4a16ca17 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageImport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageImport.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.language.import'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.language.import{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.language.import{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/languageItemList.tpl b/wcfsetup/install/files/acp/templates/languageItemList.tpl
index 03975cc644651aa09ed371749ce2b61bfdf1b51e..9d87e86161fdf8ecad832edc54af8dae0b8fc786 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemList.tpl
@@ -10,9 +10,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.language.item.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.language.item.list{/lang}</h1>
 </header>
 
 <form method="post" action="{link controller='LanguageItemList'}{/link}">
@@ -89,9 +87,9 @@
                                <li>
                                        <div>
                                                <div class="details">
-                                                       <hgroup class="containerHeadline">
-                                                               <h1><a class="jsLanguageItem" data-language-item-id="{@$item->languageItemID}">{$item->languageItem}</a>{if $item->languageCustomItemValue} <span class="icon icon16 icon-bookmark jsTooltip" title="{lang}wcf.acp.language.item.hasCustomValue{/lang}"></span>{/if}</h1>
-                                                       </hgroup>
+                                                       <div class="containerHeadline">
+                                                               <h3><a class="jsLanguageItem" data-language-item-id="{@$item->languageItemID}">{$item->languageItem}</a>{if $item->languageCustomItemValue} <span class="icon icon16 icon-bookmark jsTooltip" title="{lang}wcf.acp.language.item.hasCustomValue{/lang}"></span>{/if}</h3>
+                                                       </div>
                                                        
                                                        <p>{if $item->languageUseCustomValue}{$item->languageCustomItemValue|truncate:255}{else}{$item->languageItemValue|truncate:255}{/if}</p>
                                                </div>

diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl
index 39d7d1f0205558adf54d8dd32bc3a4702d906966..ef9e940e59f77503a0a2ce7390915c251f9a3723 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageList.tpl
@@ -18,9 +18,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.language.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.language.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -38,9 +36,9 @@
 
 {if $objects|count}
        <div id="userTableContainer" class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.language.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.language.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
index 41d1f3e8ece4edf009962b0685de237127669264..0cf68f34177c460b3e17ea8ff809b705c16cae4b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
+++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
@@ -11,9 +11,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.language.multilingualism{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.language.multilingualism{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
index b6fe3f7b50c7ef6feb23bec83db6b661dfbe1a25..8d8c2fd996b187fc7fd40b2fc92e51407e979c75 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.languageServer.'|concat:$action}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.languageServer.{$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.languageServer.{$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/languageServerList.tpl b/wcfsetup/install/files/acp/templates/languageServerList.tpl
index 159a71f7b5296b4c3e38726114e7aa2b8efc67a4..e3556ab547fe2d00e8ae62148dbab7d7099b3667 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageServerList.tpl
@@ -10,9 +10,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.languageServer.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.languageServer.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -31,9 +29,9 @@
        <p class="warning">{lang}wcf.acp.languageServer.view.noneAvailable{/lang}</p>
 {else}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.languageServer.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.languageServer.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index 6ae1d012af47ed6613b73fa56310cb505dc39da5..fce276da15a1083b340824235dc04d98fd9f5609 100644 (file)
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -14,9 +14,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{@$pageTitle|language}</h1>
-       </hgroup>
+       <h1>{@$pageTitle|language}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index 6d4645ba7b149212c193cad6eeb426f2021c03d6..853c35120c9716fdcc2ad653af5cc43c4f4cbd7a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -9,9 +9,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.masterPassword.enter{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.masterPassword.enter{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index a0d3c09a2780ad0283243eeac7a3c75bc8aca6bf..e46ea0545152834bda38bb4fea068d26af5d09ef 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -13,9 +13,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.masterPassword.init{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.masterPassword.init{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl
index 369fba256ed160619a96bd7bbdd9d6f3a30c0f8f..29bca7a71da908774c1208776ce5ad2526c8ed8b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -21,10 +21,8 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.option.category.{$category->categoryName}{/lang}</h1>
-               {hascontent}<h2>{content}{lang __optional=true}wcf.acp.option.category.{$category->categoryName}.description{/lang}{/content}</h2>{/hascontent}
-       </hgroup>
+       <h1>{lang}wcf.acp.option.category.{$category->categoryName}{/lang}</h1>
+       {hascontent}<p>{content}{lang __optional=true}wcf.acp.option.category.{$category->categoryName}.description{/lang}{/content}</p>{/hascontent}
 </header>
 
 {if $success|isset}

diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index 96f786e2c43f7fa2c5e1ba468edbeca87b732755..d50346251aa4cb5d43633681e5a5420d94c3b19b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.option.import'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.option.import{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.option.import{/lang}</h1>
 </header>
 
 {if $errorField}
@@ -60,9 +58,7 @@
 </form>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.option.export{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.option.export{/lang}</h1>
 </header>
 
 <div class="container containerPadding marginTop">

diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index d4e40ff5b5c15dad1edb9585c92c06748e319618..42035c06d6d969bf5e331f5425b0bc0385a7411d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/package.tpl
+++ b/wcfsetup/install/files/acp/templates/package.tpl
@@ -11,10 +11,8 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{$package->getName()}</h1>
-               <h2>{$package->packageDescription|language}</h2>
-       </hgroup>
+       <h1>{$package->getName()}</h1>
+       <p>{$package->packageDescription|language}</p>
 </header>
 
 <div class="contentNavigation">
@@ -113,10 +111,10 @@
                        
                        {hascontent}
                                <div id="dependencies-required" class="tabularBox tabularBoxTitle hidden">
-                                       <hgroup>
-                                               <h1>{lang}wcf.acp.package.dependencies.required{/lang}</h1>
-                                               <h2>{lang}wcf.acp.package.dependencies.required.description{/lang}</h2>
-                                       </hgroup>
+                                       <header>
+                                               <h2>{lang}wcf.acp.package.dependencies.required{/lang}</h2>
+                                               <small>{lang}wcf.acp.package.dependencies.required.description{/lang}</small>
+                                       </header>
                                        
                                        <table class="table">
                                                <thead>
@@ -162,10 +160,10 @@
                        
                        {hascontent}
                                <div id="dependencies-dependent" class="tabularBox tabularBoxTitle hidden">
-                                       <hgroup>
-                                               <h1>{lang}wcf.acp.package.dependencies.dependent{/lang}</h1>
-                                               <h2>{lang}wcf.acp.package.dependencies.dependent.description{/lang}</h2>
-                                       </hgroup>
+                                       <header>
+                                               <h2>{lang}wcf.acp.package.dependencies.dependent{/lang}</h2>
+                                               <small>{lang}wcf.acp.package.dependencies.dependent.description{/lang}</small>
+                                       </header>
                                        
                                        <table class="table">
                                                <thead>

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index b0367b5743511bb7a914642a7ebee467c990ea3f..6a86d5955272a8ef819d12ce4dac302bfad90e2b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -10,10 +10,8 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{$archive->getLocalizedPackageInfo('packageName')}</h1>
-               <h2>{$archive->getLocalizedPackageInfo('packageDescription')}</h2>
-       </hgroup>
+       <h1>{$archive->getLocalizedPackageInfo('packageName')}</h1>
+       <p>{$archive->getLocalizedPackageInfo('packageDescription')}</p>
 </header>
 
 {if $missingPackages > 0}
@@ -75,9 +73,9 @@
 
 {if $requiredPackages|count > 0}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.package.dependencies.required{/lang} <span class="badge badgeInverse">{#$requiredPackages|count}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.package.dependencies.required{/lang} <span class="badge badgeInverse">{#$requiredPackages|count}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
index f3145095e20e879d29660e0a15e4dde1db5f3dc6..e449cb3b66423011c7967e8d54d9bc9e7cbd919a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
@@ -2,11 +2,11 @@
        <header class="box48 boxHeadline">
                <span class="icon icon48 icon-spinner"></span>
                
-               <hgroup>
+               <div>
                        <h1>{lang}wcf.acp.package.installation.title{/lang}</h1>
-                       <h2 id="packageInstallationAction">{lang}wcf.acp.package.installation.step.prepare{/lang}</span></h2>
+                       <p id="packageInstallationAction">{lang}wcf.acp.package.installation.step.prepare{/lang}</span></p>
                        <small><progress id="packageInstallationProgress" value="0" max="100">0%</progress> <span id="packageInstallationProgressLabel">0%</span></small>
-               </hgroup>
+               </div>
        </header>
        
        <div id="packageInstallationInnerContentContainer" style="display: none;">

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 3cb8c9ddb4d1e4e77ec91d42888a20aa56c138b0..ec0adda07c31ac62f8073cc151ab9a1d7c6fe0ed 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -21,9 +21,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.package.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.package.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -46,9 +44,9 @@
 
 {if $objects|count}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.package.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.package.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 8823a2672a564648946d0c411f3dda9ae238a2d0..2364be7f6f052eb5561551f86b58845453f0081f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -16,9 +16,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}{@$pageTitle}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}{@$pageTitle}{/lang}</h1>
 </header>
 
 {if $errorField}
@@ -70,9 +68,7 @@
                
                <div id="packageSearchResultContainer" style="display: none;">
                        <header class="boxHeadline boxSubHeadline">
-                               <hgroup>
-                                       <h1>{lang}wcf.acp.package.search.resultList{/lang} <span class="badge">0</span></h1>
-                               </hgroup>
+                               <h2>{lang}wcf.acp.package.search.resultList{/lang} <span class="badge">0</span></h2>
                        </header>
                        
                        <div id="packageSearchResultList"></div>

diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
index 3cba3d57405eb4bf441acb115a52eb784b3f8a10..a244c559593269f613ec3d44e76024492e199d99 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
@@ -2,11 +2,11 @@
        <header class="box48 boxHeadline">
                <span class="icon icon48 icon-spinner"></span>
                
-               <hgroup>
+               <div>
                        <h1>Paket &raquo;{$queue->packageName}&laquo; wird deinstalliert &hellip;</h1><!-- ToDo: Language variables -->
-                       <h2>Aktueller Schritt: <span id="packageInstallationAction">{lang}wcf.package.uninstallation.step.prepare{/lang}</span></h2>
+                       <p>Aktueller Schritt: <span id="packageInstallationAction">{lang}wcf.package.uninstallation.step.prepare{/lang}</span></p>
                        <p><progress id="packageInstallationProgress" value="0" max="100">0%</progress></p>
-               </hgroup>
+               </div>
        </header>
        
        <div id="packageInstallationInnerContentContainer" style="display: none;">

diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index 71b6e793378340154eb46b5532ff3fb6a50188eb..01374232b74d629942d1c5d912aba56daf0db513 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -13,9 +13,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.packageUpdate{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.packageUpdate{/lang}</h1>
 </header>
 
 <div class="container containerPadding marginTop">

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
index be4f3e41916f9d92dbb51befe6ea5768e3da3e03..4eda7166f5b878571de95c82573b5a3a3147abd0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.packageUpdate.auth'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.packageUpdate.auth{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.packageUpdate.auth{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
index eb21917a70658ffed133520c522449e0f13f7889..4b860c30939fc6b607d15615c6b20fac73785609 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.updateServer.'|concat:$action}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.updateServer.{$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.updateServer.{$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
index c0fea056d7252949179d23bb07dc158df4872c49..3872107536ba378a54e26bed2e0864d09d21701d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
@@ -10,9 +10,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.updateServer.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.updateServer.list{/lang}</h1>
 </header>
 
 {if $deletedPackageUpdateServerID}
@@ -33,9 +31,9 @@
 
 {hascontent}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.updateServer.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.updateServer.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
index 49afc45bffb37a2a4f37fef694aa905fe3021b6a..4a8f040419b0071609214a1f9365201efefa7a63 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
@@ -39,9 +39,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.pageMenu.{$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.pageMenu.{$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
index 6518dde5822b7622524c607092fcab26bc2f0520..74970d56e68bba67e27857598b3e0e6df6521e86 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
@@ -17,9 +17,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.pageMenu.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.pageMenu.list{/lang}</h1>
 </header>
 
 <p class="info">{lang}wcf.acp.pageMenu.landingPage.description{/lang}</p>

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 682ae574322f5d27e328ea7585491d9577da92f1..da684200238f7e725d245e44d3e0bd2506103591 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -43,10 +43,8 @@
        //]]>
 </script>
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.style.{$action}{/lang}</h1>
-               {if $action == 'edit'}<h2>{$styleName}</h2>{/if}
-       </hgroup>
+       <h1>{lang}wcf.acp.style.{$action}{/lang}</h1>
+       {if $action == 'edit'}<p>{$styleName}</p>{/if}
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl
index 1da04bbfb3614c198172c6457e81b7625bb8453a..10925487c19e2fba30060d6eb29025dfd4646705 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleExport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleExport.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.style.exportStyle'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.style.exportStyle{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.style.exportStyle{/lang}</h1>
 </header>
 
 <div class="contentNavigation">

diff --git a/wcfsetup/install/files/acp/templates/styleImport.tpl b/wcfsetup/install/files/acp/templates/styleImport.tpl
index 000518e7e8a8418e70913f1a3d5c66d2050187c1..71ab379655f64c1ededf4ed73468899f88f58080 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleImport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleImport.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.style.importStyle'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.style.importStyle{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.style.importStyle{/lang}</h1>
 </header>
 
 {if $success|isset}

diff --git a/wcfsetup/install/files/acp/templates/styleList.tpl b/wcfsetup/install/files/acp/templates/styleList.tpl
index 6fd846d7b5b8cd4f4477d7e6fc4417cf869089b1..9a1e73ebe5c13f5dbe377efb3901f3e614ec1a12 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleList.tpl
+++ b/wcfsetup/install/files/acp/templates/styleList.tpl
@@ -11,9 +11,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.style.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.style.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -42,10 +40,10 @@
                                <div class="box64">
                                        <span class="framed"><img src="{@$style->getPreviewImage()}" alt="" /></span>
                                        <div class="details">
-                                               <hgroup class="containerHeadline">
-                                                       <h1><a href="{link controller='StyleEdit' id=$style->styleID}{/link}">{$style->styleName}</a></h1>
-                                                       {if $style->styleDescription}<h2>{lang}{@$style->styleDescription}{/lang}</h2>{/if}
-                                               </hgroup>
+                                               <div class="containerHeadline">
+                                                       <h3><a href="{link controller='StyleEdit' id=$style->styleID}{/link}">{$style->styleName}</a></h3>
+                                                       {if $style->styleDescription}<small>{lang}{@$style->styleDescription}{/lang}</small>{/if}
+                                               </div>
                                                <ul class="buttonList" data-style-id="{@$style->styleID}">
                                                        <li><a href="{link controller='StyleEdit' id=$style->styleID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 icon-pencil"></span></a></li>
                                                        <li><a href="{link controller='StyleExport' id=$style->styleID}{/link}" title="{lang}wcf.acp.style.exportStyle{/lang}" class="jsTooltip"><span class="icon icon16 icon-download-alt"></span></a></li>

diff --git a/wcfsetup/install/files/acp/templates/templateAdd.tpl b/wcfsetup/install/files/acp/templates/templateAdd.tpl
index edcbf6df2c5455e8a1a599951d51d3beb3af13ae..b5c50f161398595a5cbe21d326d12d53d6a3628f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateAdd.tpl
@@ -1,10 +1,8 @@
 {include file='header'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.template.{$action}{/lang}</h1>
-               {if $action == 'edit'}<h2>{$template->getPath()}</h2>{/if}
-       </hgroup>
+       <h1>{lang}wcf.acp.template.{$action}{/lang}</h1>
+       {if $action == 'edit'}<p>{$template->getPath()}</p>{/if}
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
index a4f1cea4d13a44c2a584372ed639ba990bf0969f..9fc09e68b679c476ba426b35e555d5128d8165d7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
@@ -1,9 +1,7 @@
 {include file='header'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.template.group.{$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.template.group.{$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/templateGroupList.tpl b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
index 59144f260542dc24c4d3adc8a0b443a2393b2f6c..7eec3304d0514fc26eca3c021e982e6b9a8b4782 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.template.group.list'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.template.group.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.template.group.list{/lang}</h1>
        
        <script type="text/javascript">
                //<![CDATA[
@@ -28,9 +26,9 @@
 
 {if $objects|count}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.template.group.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.template.group.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index 4700b117f72146da59805aa72ee31f74c807b854..e0327e97e376fc282130cd0df13d6cb8e6abc1d3 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -9,9 +9,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.template.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.template.list{/lang}</h1>
 </header>
 
 <form method="post" action="{link controller='TemplateList'}{/link}">
@@ -63,9 +61,9 @@
 
 {if $objects|count}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.template.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.template.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 3b146d0efb5122765ba7020a8495c8a073d05491..bc3e6c37deb4bc5a712798143fe5047e31f4a3d8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -9,9 +9,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.{@$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.{@$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index 40f135371dc006c7a1da394a860bb0e47b50c1bc..411d8ceb741722d3d50292ef675d777c560d6e12 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.assignToGroup'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.assignToGroup{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.assignToGroup{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index e484d31e5dc501c63b2c6de58f43194519dfc300..fac1b5d58b6c3ce6e1d3587800b3f797e49f54d1 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -9,9 +9,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.exportEmailAddress{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.exportEmailAddress{/lang}</h1>
 </header>
 
 <div class="contentNavigation">

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 517a6decd99eddb53141c093ea6f3ce1f905aa9b..dcc842ae32f106c216e9fde8dd76132e4fda0093 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -9,9 +9,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.group.{@$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.group.{@$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 8cfaeaa09ff82c9ec86c8ecf6feb182704e792ff..985ef6e1e2ad108e5e5d465fc61bcd62e69111c9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -9,9 +9,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.group.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.group.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -33,9 +31,9 @@
 </div>
 
 <div class="tabularBox tabularBoxTitle marginTop">
-       <hgroup>
-               <h1>{lang}wcf.acp.group.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-       </hgroup>
+       <header>
+               <h2>{lang}wcf.acp.group.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+       </header>
        
        <table class="table">
                <thead>

diff --git a/wcfsetup/install/files/acp/templates/userGroupOption.tpl b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
index 7f9dc563f8a43fbe4364b318f1944ae0b1bdca4a..19636939db775a74e3dce24f9781e1b58542f94d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
@@ -9,9 +9,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.group.option.editingOption{/lang} {lang}wcf.acp.group.option.{$userGroupOption->optionName}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.group.option.editingOption{/lang} {lang}wcf.acp.group.option.{$userGroupOption->optionName}{/lang}</h1>
 </header>
 
 <p class="info marginTop">{lang}wcf.acp.group.option.hint{/lang}</p>

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index e7e2c44b6c8abe0251ab4195a8f63e91543c921d..5d34e4c196157ca1e437ba6c32d5e2d551a58d0c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -26,9 +26,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}{@$pageTitle}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}{@$pageTitle}{/lang}</h1>
 </header>
 
 {assign var=encodedURL value=$url|rawurlencode}

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index aa301c5585530101147949a46343be5deb141661..18ab259a80bcfefbd0dd1a82f3fd6256105e2598 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -21,9 +21,7 @@
 {/if}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}{@$pageTitle}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}{@$pageTitle}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
index a1c19b79a86f2c2123f67717ebed49801d9cc9c3..3bf9bc2a5a30325d778a922d2cfb115a47dca48c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
@@ -1,9 +1,7 @@
 {include file='header'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.option.{$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.option.{$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
index 3dd319b3b234631683a3fccef9098e5b2f0a111c..8860fc0e83f0ecbb3602ac27c443a7ed15ca58b0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
@@ -1,9 +1,7 @@
 {include file='header'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.option.category.{$action}{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.option.category.{$action}{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
index 149b5273d05cd5c2176df2e6652ad6df934da793..b68858e331c233167f17c73c34951dc38dc8ee0d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.option.category.list'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.option.category.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.option.category.list{/lang}</h1>
        
        <script type="text/javascript">
                //<![CDATA[
@@ -28,9 +26,9 @@
 
 {if $objects|count}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.user.option.category.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.user.option.category.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/userOptionList.tpl b/wcfsetup/install/files/acp/templates/userOptionList.tpl
index 5cf08b62642b4911fd3ffc2b58286cdeaf192c9e..0d1e87139084300a8fcf048075b23a876e376866 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionList.tpl
@@ -1,9 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.option.list'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.option.list{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.option.list{/lang}</h1>
        
        <script type="text/javascript">
                //<![CDATA[
@@ -29,9 +27,9 @@
 
 {if $objects|count}
        <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.user.option.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
-               </hgroup>
+               <header>
+                       <h2>{lang}wcf.acp.user.option.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
+               </header>
                
                <table class="table">
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
index c38179e5f3e47dae32e38024433d5166ade4a8c1..8233776fafd4b3adaaeaaa6185697ed8fa83642c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
@@ -1,9 +1,7 @@
 {include file='header'}
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.option.setDefaults{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.option.setDefaults{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 478ef4a0bf29a3c788b45969cbd340f3a6616327..55c4909e463ea6ebd1d8e0bfb417bf0ff777bca5 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -10,9 +10,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.search{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.search{/lang}</h1>
 </header>
 
 {if $errorField == 'search'}
@@ -107,7 +105,7 @@
                                        {foreach from=$optionTree[0][categories] item=category}
                                                <fieldset>
                                                        <legend>{lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang}</legend>
-                                                       {hascontent}<h2>{content}{lang __optional=true}wcf.user.option.category.{@$category[object]->categoryName}.description{/lang}{/content}</h2>{/hascontent}
+                                                       {hascontent}<p>{content}{lang __optional=true}wcf.user.option.category.{@$category[object]->categoryName}.description{/lang}{/content}</p>{/hascontent}
                                                        
                                                        {include file='optionFieldList' options=$category[options] langPrefix='wcf.user.option.'}
                                                </fieldset>

diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
index 06774de0cf8b01818ffc2e4e06412346fb3103be..c40eab224fef99482face81c1dea36bdc79bef93 100644 (file)
--- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
@@ -61,9 +61,7 @@
 </script>
 
 <header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.user.massProcessing{/lang}</h1>
-       </hgroup>
+       <h1>{lang}wcf.acp.user.massProcessing{/lang}</h1>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl
index d93e9b5eed3e9687f4e8011657bb0ea633d322af..9d9eb801b26bc8771d7ce9eb43a82f63e8acc668 100644 (file)
--- a/wcfsetup/install/files/acp/templates/worker.tpl
+++ b/wcfsetup/install/files/acp/templates/worker.tpl
@@ -2,9 +2,7 @@
        <header class="box48 boxHeadline">
                <span class="icon icon48 icon-spinner"></span>
                
-               <hgroup>
-                       <h1>{lang}wcf.global.worker.executing{/lang}</h1>
-                       <small><progress value="0" max="100">0%</progress> <span>0%</span></small>
-               </hgroup>
+               <h1>{lang}wcf.global.worker.executing{/lang}</h1>
+               <small><progress value="0" max="100">0%</progress> <span>0%</span></small>
        </header>
 </div>

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index bb51ceb9de98341a361094a6fe3507859807445d..9ade67bd2343d1d8d355394024d553d3132e1777 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -7453,7 +7453,7 @@ WCF.Language.Chooser = Class.extend({
                
                for (var $languageID in languages) {
                        var $language = languages[$languageID];
-                       var $item = $('<li class="boxFlag"><a class="box24"><div class="framed"><img src="' + $language.iconPath + '" alt="" class="iconFlag" /></div> <hgroup><h1>' + $language.languageName + '</h1></hgroup></a></li>').appendTo($dropdownMenu);
+                       var $item = $('<li class="boxFlag"><a class="box24"><div class="framed"><img src="' + $language.iconPath + '" alt="" class="iconFlag" /></div> <div><h3>' + $language.languageName + '</h3></div></a></li>').appendTo($dropdownMenu);
                        $item.data('languageID', $languageID).click($.proxy(this._click, this));
                        
                        // update dropdown label

diff --git a/wcfsetup/install/files/style/bootstrap/reset.less b/wcfsetup/install/files/style/bootstrap/reset.less
index 2088a0094e9256b70136c4712a92148d07e38ca8..15988980927b5ad4f1b4c9f59eb7adbf64d697a7 100644 (file)
--- a/wcfsetup/install/files/style/bootstrap/reset.less
+++ b/wcfsetup/install/files/style/bootstrap/reset.less
@@ -16,7 +16,7 @@ dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+figure, figcaption, footer, header,  
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
        margin: 0;
@@ -31,7 +31,7 @@ h1, h2, h3, h4, h5, h6 {
 
 /* HTML5 display-role reset for older browsers */
 article, aside, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section {
+footer, header, menu, nav, section {
        display: block;
 }
 

diff --git a/wcfsetup/install/files/style/dropdown.less b/wcfsetup/install/files/style/dropdown.less
index 04a02a3d97289bdc3f1b489ebd8597b9c468a017..d556d30c4badd6fe7c3c2e066cd892973f94442e 100644 (file)
--- a/wcfsetup/install/files/style/dropdown.less
+++ b/wcfsetup/install/files/style/dropdown.less
@@ -182,7 +182,7 @@
                        .containerHeadline {
                                margin-bottom: 0;
                                
-                               h2 {
+                               > p {
                                        font-size: @wcfSmallFontSize;
                                }
                        }

diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less
index 8de98adfe966a24588be6cff36350f86ffe397ca..8379c1e40b4d10b6ea113b89cc0850a81e71ec95 100644 (file)
--- a/wcfsetup/install/files/style/layout.less
+++ b/wcfsetup/install/files/style/layout.less
@@ -186,7 +186,7 @@
                                        
                                        /* hide user panel labels */
                                        > a > span:not(.icon):not(.badge),
-                                       &#pageLanguageContainer > div > div > hgroup {
+                                       &#pageLanguageContainer > div > div > h3 {
                                                display: none;
                                        }
                                        
@@ -264,13 +264,13 @@
        margin: 0 -@wcfGapSmall;
        
        li {
-               a,
-               h1 {
+               > a,
+               > h3 {
                        overflow: hidden;
                        padding: @wcfGapTiny @wcfGapMedium;
                }
                
-               a {
+               > a {
                        display: block;
                        
                        .borderRadius(6px);
@@ -732,34 +732,14 @@
        margin-top: @wcfGapMedium;
        overflow: hidden;
        
-       > hgroup {
-               > h1 {
-                       color: @wcfHeadlineColor;
-                       font-family: @wcfHeadlineFontFamily;
-                       font-size: @wcfHeadlineFontSize;
-                       font-weight: bold;
-                       
-                       .textShadow(@wcfContentBackgroundColor);
-                       
-                       a {
-                               color: @wcfHeadlineColor;
-                               text-decoration: none;
-                       }
-               }
-               
-               > h2,
-               > h3 {
-                       color: @wcfDimmedColor;
-                       font-size: @wcfSmallFontSize;
-               }
+       > h1 {
+               font-size: @wcfHeadlineFontSize;
        }
        
-       &.boxSubHeadline {
-               > hgroup {
-                       > h1 {
-                               font-size: @wcfSubHeadlineFontSize;
-                       }
-               }
+       > p {
+               color: @wcfDimmedColor;
+               display: inline-block;
+               font-size: @wcfSmallFontSize;
        }
        
        > .dataList,
@@ -769,6 +749,26 @@
        }
 }
 
+.boxHeadline > h1,
+.boxSubHeadline > h2 {
+       color: @wcfHeadlineColor;
+       font-family: @wcfHeadlineFontFamily;
+       font-weight: bold;
+       
+       .textShadow(@wcfContentBackgroundColor);
+       
+       a {
+               color: @wcfHeadlineColor;
+               text-decoration: none;
+       }
+}
+
+.boxSubHeadline {
+       > h2 {
+               font-size: @wcfSubHeadlineFontSize;
+       }
+}
+
 @media only screen and (max-width: 800px) {
        .boxHeadline {
                margin-top: @wcfGapSmall;
@@ -854,7 +854,7 @@
 }
 
 .containerHeadline {
-       > h1 {
+       > h3 {
                font-size: @wcfTitleFontSize;
                font-weight: bold;
                
@@ -870,7 +870,7 @@
                }
        }
        
-       > h1, > h1 > a {
+       > h3, > h3 > a {
                .textShadow(@wcfContainerBackgroundColor);
        }
        
@@ -897,7 +897,7 @@
                                        opacity: 1;
                                }
                                
-                               > hgroup > .containerContentType {
+                               > .containerHeadline > .containerContentType {
                                        color: @wcfDimmedColor;
                                }
                        }
@@ -915,7 +915,7 @@
                                .transition(opacity, .1s);
                        }
                        
-                       > hgroup > .containerContentType {
+                       > .containerHeadline > .containerContentType {
                                color: lighten(@wcfDimmedColor, 20%);
                                position: absolute;
                                right: 0;
@@ -1032,11 +1032,6 @@
                > div {
                        padding: 0 14px;
                        
-                       > hgroup > h1 {
-                               font-size: @wcfTitleFontSize;
-                               font-weight: bold;
-                       }
-                       
                        > ol {
                                > li {
                                        display: inline-block;
@@ -1382,11 +1377,11 @@
        }
 }
 
-.tabularBoxTitle > hgroup {
+.tabularBoxTitle > header {
        color: @wcfTabularBoxColor;
        padding: 5px 7px;
 
-       > h1 {
+       > h2 {
                font-size: @wcfTitleFontSize;
                font-weight: bold;
                
@@ -1420,7 +1415,7 @@
 }
 
 @media only screen and (min-width: 641px) and (max-width: 800px) {
-       .tabularBoxTitle > hgroup {
+       .tabularBoxTitle > header {
                padding-left: @wcfGapMedium;
                padding-right: @wcfGapMedium;
        }
@@ -1932,7 +1927,7 @@ ul.inlineDataList {
        }
        
        .sidebarBoxHeadline {
-               > h1 {
+               > h3 {
                        margin-bottom: 1px;
                        overflow: hidden;
                        text-overflow: ellipsis;

diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl
index 7b2e38357506b13690238e9ee79f99e30f05ca0e..ae19e7e91fef071019c48d8d9edc720ff9dd504e 100644 (file)
--- a/wcfsetup/setup/template/header.tpl
+++ b/wcfsetup/setup/template/header.tpl
@@ -47,10 +47,8 @@
                <div>
                        <section id="content" class="content clearfix">
                                <header class="boxHeadline">
-                                       <hgroup>
-                                               <h1>{lang}wcf.global.title{/lang}</h1>
-                                               <h2>{lang}wcf.global.title.subtitle{/lang}</h2>
-                                               <p><progress id="packageInstallationProgress" value="{@$progress}" max="100" style="width: 300px;" title="{@$progress}%">{@$progress}%</progress></p>
-                                       </hgroup>
+                                       <h1>{lang}wcf.global.title{/lang}</h1>
+                                       <p>{lang}wcf.global.title.subtitle{/lang}</p>
+                                       <p><progress id="packageInstallationProgress" value="{@$progress}" max="100" style="width: 300px;" title="{@$progress}%">{@$progress}%</progress></p>
                                </header>
                                

diff --git a/wcfsetup/setup/template/stepConfigureDB.tpl b/wcfsetup/setup/template/stepConfigureDB.tpl
index 507c12df953f4864dc358d310ddd9c7bd67fd326..ce6a95bf700849b7fb282f76fe31364fc5405be4 100644 (file)
--- a/wcfsetup/setup/template/stepConfigureDB.tpl
+++ b/wcfsetup/setup/template/stepConfigureDB.tpl
@@ -1,10 +1,8 @@
 {include file='header'}
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.configureDB{/lang}</h1>
-               <h2>{lang}wcf.global.configureDB.description{/lang}</h2>
-       </hgroup>
+       <h2>{lang}wcf.global.configureDB{/lang}</h2>
+       <p>{lang}wcf.global.configureDB.description{/lang}</p>
 </header>
 
 {if $exception|isset}

diff --git a/wcfsetup/setup/template/stepCreateUser.tpl b/wcfsetup/setup/template/stepCreateUser.tpl
index 39f85bec7491c70eb644ab3f302bcbec121b5410..96fd3f9fc121aa8ccc78deee51502dd9193c65f9 100644 (file)
--- a/wcfsetup/setup/template/stepCreateUser.tpl
+++ b/wcfsetup/setup/template/stepCreateUser.tpl
@@ -1,10 +1,8 @@
 {include file='header'}
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.createUser{/lang}</h1>
-               <h2>{lang}wcf.global.createUser.description{/lang}</h2>
-       </hgroup>
+       <h2>{lang}wcf.global.createUser{/lang}</h2>
+       <p>{lang}wcf.global.createUser.description{/lang}</p>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/setup/template/stepInstallPackages.tpl b/wcfsetup/setup/template/stepInstallPackages.tpl
index 8d1a991bedd2deb899378b03fe9b69883d61a70b..26969f18f8f9fded4d534af99b781903990e3b59 100644 (file)
--- a/wcfsetup/setup/template/stepInstallPackages.tpl
+++ b/wcfsetup/setup/template/stepInstallPackages.tpl
@@ -2,10 +2,8 @@
 {include file='header'}
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.next{/lang}</h1>
-               <h2>{lang}wcf.global.next.description{/lang}</h2>
-       </hgroup>
+       <h2>{lang}wcf.global.next{/lang}</h2>
+       <p>{lang}wcf.global.next.description{/lang}</p>
 </header>
 
 <form method="get" action="{@RELATIVE_WCF_DIR}acp/index.php">

diff --git a/wcfsetup/setup/template/stepNext.tpl b/wcfsetup/setup/template/stepNext.tpl
index 377ddcb96755bae293507d1ccf592511931d8bb6..8c1b098b665819f985f0d258c40413479f9f40a2 100644 (file)
--- a/wcfsetup/setup/template/stepNext.tpl
+++ b/wcfsetup/setup/template/stepNext.tpl
@@ -1,10 +1,8 @@
 {include file='header'}
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.next{/lang}</h1>
-               <h2>{lang}wcf.global.next.description{/lang}</h2>
-       </hgroup>
+       <h2>{lang}wcf.global.next{/lang}</h2>
+       <p>{lang}wcf.global.next.description{/lang}</p>
 </header>
 
 <form method="post" action="install.php?step={@$nextStep}">

diff --git a/wcfsetup/setup/template/stepSearchWcfDir.tpl b/wcfsetup/setup/template/stepSearchWcfDir.tpl
index 42be50e817e9d731cb362cde865fbbcdd4bf37dc..1d77bc1f3ca58302bcba1ff861983429dcc2d3f5 100644 (file)
--- a/wcfsetup/setup/template/stepSearchWcfDir.tpl
+++ b/wcfsetup/setup/template/stepSearchWcfDir.tpl
@@ -81,10 +81,8 @@
 </script>
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.wcfDir{/lang}</h1>
-               <h2>{lang}wcf.global.wcfDir.description{/lang}</h2>
-       </hgroup>
+       <h2>{lang}wcf.global.wcfDir{/lang}</h2>
+       <p>{lang}wcf.global.wcfDir.description{/lang}</p>
 </header>
 
 {if $invalidDirectory}

diff --git a/wcfsetup/setup/template/stepSelectLanguages.tpl b/wcfsetup/setup/template/stepSelectLanguages.tpl
index f272ff405912980d129ae40b1ed246aa33f06e32..15ec080e60d048b7253c26c8cad7c9685e6829ac 100644 (file)
--- a/wcfsetup/setup/template/stepSelectLanguages.tpl
+++ b/wcfsetup/setup/template/stepSelectLanguages.tpl
@@ -1,10 +1,8 @@
 {include file='header'}
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.languages{/lang}</h1>
-               <h2>{lang}wcf.global.languages.description{/lang}</h2>
-       </hgroup>
+       <h2>{lang}wcf.global.languages{/lang}</h2>
+       <p>{lang}wcf.global.languages.description{/lang}</p>
 </header>
 
 {if $errorField}

diff --git a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
index 6da9e093e046022bed666c1860b3e7ddcc1e3895..c942e55d074b2b7fe21d4f4e46843cf92e2e7650 100644 (file)
--- a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
+++ b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
@@ -1,10 +1,8 @@
 {include file='header'}
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.welcome{/lang}</h1>
-               <h2>{lang}wcf.global.welcome.description{/lang}</h2>
-       </hgroup>
+       <h2>{lang}wcf.global.welcome{/lang}</h2>
+       <p>{lang}wcf.global.welcome.description{/lang}</p>
 </header>
 
 <form method="post" action="install.php">

diff --git a/wcfsetup/setup/template/stepShowLicense.tpl b/wcfsetup/setup/template/stepShowLicense.tpl
index f526b727fe5a2c5f3783597d7f93d610e34bb730..2e08035d7ff36f6612cf1545426cb3b704ebc717 100644 (file)
--- a/wcfsetup/setup/template/stepShowLicense.tpl
+++ b/wcfsetup/setup/template/stepShowLicense.tpl
@@ -1,10 +1,8 @@
 {include file='header'}
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.license{/lang}</h1>
-               <h2>{lang}wcf.global.license.description{/lang}</h2>
-       </hgroup>
+       <h2>{lang}wcf.global.license{/lang}</h2>
+       <p>{lang}wcf.global.license.description{/lang}</p>
 </header>
 
 {if $missingAcception|isset}

diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index 1b6d0512260718f0b2e5f1fec9d0796778a0ae72..3eb2efa1935faf4cac8cbbfa708942f5414f37d2 100644 (file)
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -1,9 +1,7 @@
 {include file='header'}
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.systemRequirements.required{/lang}</h1>
-       </hgroup>
+       <h2>{lang}wcf.global.systemRequirements.required{/lang}</h2>
 </header>
 
 <div class="container containerPadding marginTop">
@@ -45,9 +43,7 @@
 </div>
 
 <header class="boxHeadline boxSubHeadline">
-       <hgroup>
-               <h1>{lang}wcf.global.systemRequirements.recommended{/lang}</h1>
-       </hgroup>
+       <h2>{lang}wcf.global.systemRequirements.recommended{/lang}</h2>
 </header>
 
 <div class="container containerPadding marginTop">