From: Marcel Werk Date: Sat, 27 Apr 2013 19:38:53 +0000 (+0200) Subject: Removed hgroup tag X-Git-Tag: 2.0.0_Beta_1~294 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=635a8feb0083290c4e096080bdcb17619a307274;p=GitHub%2FWoltLab%2FWCF.git Removed hgroup tag --- diff --git a/com.woltlab.wcf/template/styleChooser.tpl b/com.woltlab.wcf/template/styleChooser.tpl index eaaac6c7ff..a6ec52b911 100644 --- a/com.woltlab.wcf/template/styleChooser.tpl +++ b/com.woltlab.wcf/template/styleChooser.tpl @@ -7,9 +7,9 @@
-
-

{$style->styleName}

-
+
+

{$style->styleName}

+
{if $style->styleDescription}{lang}{@$style->styleDescription}{/lang}{/if}
diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index 7a6494d14f..fd247a574e 100644 --- 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(); - $('').appendTo($('.boxHeadline > hgroup > h1')); + $('').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 b78a6879ed..8fc0b423ba 100644 --- 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'}
-
-

{lang}wcf.acp.sessionLog.access.list{/lang}

-
+

{lang}wcf.acp.sessionLog.access.list{/lang}

@@ -20,9 +18,9 @@ {hascontent}
-
-

{lang}wcf.acp.sessionLog.access.list{/lang} {#$items}

-
+
+

{lang}wcf.acp.sessionLog.access.list{/lang} {#$items}

+
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index 7d09361925..921149b819 100644 --- 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'}
-
-

{lang}wcf.acp.sessionLog.list{/lang}

-
+

{lang}wcf.acp.sessionLog.list{/lang}

@@ -22,9 +20,9 @@ {if $objects|count}
-
-

{lang}wcf.acp.sessionLog.list{/lang} {#$items}

-
+
+

{lang}wcf.acp.sessionLog.list{/lang} {#$items}

+
diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl index e2624f51bb..a3eef8b7c0 100644 --- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl +++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl @@ -16,9 +16,7 @@ {/if}
-
-

{lang}wcf.acp.application.edit.title{/lang}{if $application->isPrimary} {/if}

-
+

{lang}wcf.acp.application.edit.title{/lang}{if $application->isPrimary} {/if}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/applicationManagement.tpl b/wcfsetup/install/files/acp/templates/applicationManagement.tpl index bade874355..e4a50579c3 100644 --- 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'}
-
-

{lang}wcf.acp.application.list{/lang}

-
+

{lang}wcf.acp.application.list{/lang}

@@ -19,9 +17,9 @@
-
-

{lang}wcf.acp.application.list{/lang} {#$applicationList|count}

-
+
+

{lang}wcf.acp.application.list{/lang} {#$applicationList|count}

+
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index bf102776b1..f02a6eb342 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -9,9 +9,7 @@
-
-

{lang}wcf.acp.cache.list{/lang}

-
+

{lang}wcf.acp.cache.list{/lang}

@@ -63,10 +61,10 @@ {if $files|count}
-
-

{lang}wcf.acp.cache.type.{$cacheType}{/lang} {#$files|count}

-

{$cache}

-
+
+

{lang}wcf.acp.cache.type.{$cacheType}{/lang} {#$files|count}

+ {$cache} +
diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl index 43a77974a3..2d5aa0ca9f 100644 --- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl +++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl @@ -16,9 +16,7 @@ {/if}
-
-

{@$objectType->getProcessor()->getLanguageVariable($action)}

-
+

{@$objectType->getProcessor()->getLanguageVariable($action)}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/categoryList.tpl b/wcfsetup/install/files/acp/templates/categoryList.tpl index 4484e66916..70a01d92e3 100644 --- a/wcfsetup/install/files/acp/templates/categoryList.tpl +++ b/wcfsetup/install/files/acp/templates/categoryList.tpl @@ -68,9 +68,7 @@ {/if}
-
-

{@$objectType->getProcessor()->getLanguageVariable('list')}

-
+

{@$objectType->getProcessor()->getLanguageVariable('list')}

diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl index 537f4d3c8c..9facf168d4 100644 --- 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}
-
-

{lang}wcf.acp.cronjob.{$action}{/lang}

-
+

{lang}wcf.acp.cronjob.{$action}{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl index 0054d26ab2..b286284012 100644 --- 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'}
-
-

{lang}wcf.acp.cronjob.list{/lang}

-

{lang}wcf.acp.cronjob.subtitle{/lang}

-
+

{lang}wcf.acp.cronjob.list{/lang}

+

{lang}wcf.acp.cronjob.subtitle{/lang}

-
-

{lang}wcf.acp.cronjob.log{/lang}

-
+

{lang}wcf.acp.cronjob.log{/lang}

@@ -55,9 +53,9 @@ {hascontent}
-
-

{lang}wcf.acp.cronjob.log{/lang} {#$items}

-
+
+

{lang}wcf.acp.cronjob.log{/lang} {#$items}

+
diff --git a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl index bcfbd399b6..0007bdfaed 100644 --- a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl +++ b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl @@ -22,9 +22,7 @@
-
-

{lang}wcf.acp.exceptionLog{/lang}

-
+

{lang}wcf.acp.exceptionLog{/lang}

{if !$logFiles|empty} @@ -73,10 +71,10 @@ {if $logFile} {foreach from=$exceptions item='exception' key='exceptionKey'}
-
-

{$exception[message]}

-

{$exception[date]|strtotime|plainTime}

-
+
+

{$exception[message]}

+ {$exception[date]|strtotime|plainTime} +
diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl index 41d1f3e8ec..0cf68f3417 100644 --- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl +++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl @@ -11,9 +11,7 @@
-
-

{lang}wcf.acp.language.multilingualism{/lang}

-
+

{lang}wcf.acp.language.multilingualism{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl index b6fe3f7b50..8d8c2fd996 100644 --- 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}
-
-

{lang}wcf.acp.languageServer.{$action}{/lang}

-
+

{lang}wcf.acp.languageServer.{$action}{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/languageServerList.tpl b/wcfsetup/install/files/acp/templates/languageServerList.tpl index 159a71f7b5..e3556ab547 100644 --- a/wcfsetup/install/files/acp/templates/languageServerList.tpl +++ b/wcfsetup/install/files/acp/templates/languageServerList.tpl @@ -10,9 +10,7 @@
-
-

{lang}wcf.acp.languageServer.list{/lang}

-
+

{lang}wcf.acp.languageServer.list{/lang}

@@ -31,9 +29,9 @@

{lang}wcf.acp.languageServer.view.noneAvailable{/lang}

{else}
-
-

{lang}wcf.acp.languageServer.list{/lang} {#$items}

-
+
+

{lang}wcf.acp.languageServer.list{/lang} {#$items}

+
diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl index 6ae1d012af..fce276da15 100644 --- a/wcfsetup/install/files/acp/templates/login.tpl +++ b/wcfsetup/install/files/acp/templates/login.tpl @@ -14,9 +14,7 @@
-
-

{@$pageTitle|language}

-
+

{@$pageTitle|language}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl index 6d4645ba7b..853c35120c 100644 --- a/wcfsetup/install/files/acp/templates/masterPassword.tpl +++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl @@ -9,9 +9,7 @@
-
-

{lang}wcf.acp.masterPassword.enter{/lang}

-
+

{lang}wcf.acp.masterPassword.enter{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl index a0d3c09a27..e46ea05451 100644 --- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl +++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl @@ -13,9 +13,7 @@
-
-

{lang}wcf.acp.masterPassword.init{/lang}

-
+

{lang}wcf.acp.masterPassword.init{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl index 369fba256e..29bca7a71d 100644 --- a/wcfsetup/install/files/acp/templates/option.tpl +++ b/wcfsetup/install/files/acp/templates/option.tpl @@ -21,10 +21,8 @@
-
-

{lang}wcf.acp.option.category.{$category->categoryName}{/lang}

- {hascontent}

{content}{lang __optional=true}wcf.acp.option.category.{$category->categoryName}.description{/lang}{/content}

{/hascontent} -
+

{lang}wcf.acp.option.category.{$category->categoryName}{/lang}

+ {hascontent}

{content}{lang __optional=true}wcf.acp.option.category.{$category->categoryName}.description{/lang}{/content}

{/hascontent}
{if $success|isset} diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl index 96f786e2c4..d50346251a 100644 --- 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'}
-
-

{lang}wcf.acp.option.import{/lang}

-
+

{lang}wcf.acp.option.import{/lang}

{if $errorField} @@ -60,9 +58,7 @@
-
-

{lang}wcf.acp.option.export{/lang}

-
+

{lang}wcf.acp.option.export{/lang}

diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl index d4e40ff5b5..42035c06d6 100644 --- a/wcfsetup/install/files/acp/templates/package.tpl +++ b/wcfsetup/install/files/acp/templates/package.tpl @@ -11,10 +11,8 @@
-
-

{$package->getName()}

-

{$package->packageDescription|language}

-
+

{$package->getName()}

+

{$package->packageDescription|language}

@@ -113,10 +111,10 @@ {hascontent}
@@ -162,10 +160,10 @@ {hascontent}
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl index b0367b5743..6a86d59552 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl +++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl @@ -10,10 +10,8 @@
-
-

{$archive->getLocalizedPackageInfo('packageName')}

-

{$archive->getLocalizedPackageInfo('packageDescription')}

-
+

{$archive->getLocalizedPackageInfo('packageName')}

+

{$archive->getLocalizedPackageInfo('packageDescription')}

{if $missingPackages > 0} @@ -75,9 +73,9 @@ {if $requiredPackages|count > 0}
-
-

{lang}wcf.acp.package.dependencies.required{/lang} {#$requiredPackages|count}

-
+
+

{lang}wcf.acp.package.dependencies.required{/lang} {#$requiredPackages|count}

+
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl index f3145095e2..e449cb3b66 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl +++ b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl @@ -2,11 +2,11 @@
-
+

{lang}wcf.acp.package.installation.title{/lang}

-

{lang}wcf.acp.package.installation.step.prepare{/lang}

+

{lang}wcf.acp.package.installation.step.prepare{/lang}

0% 0% -
+
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl index 8823a2672a..2364be7f6f 100644 --- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl +++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl @@ -16,9 +16,7 @@
-
-

{lang}{@$pageTitle}{/lang}

-
+

{lang}{@$pageTitle}{/lang}

{if $errorField} @@ -70,9 +68,7 @@
diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl index 49afc45bff..4a8f040419 100644 --- a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl +++ b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl @@ -39,9 +39,7 @@
-
-

{lang}wcf.acp.pageMenu.{$action}{/lang}

-
+

{lang}wcf.acp.pageMenu.{$action}{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl index 6518dde582..74970d56e6 100644 --- a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl +++ b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl @@ -17,9 +17,7 @@
-
-

{lang}wcf.acp.pageMenu.list{/lang}

-
+

{lang}wcf.acp.pageMenu.list{/lang}

{lang}wcf.acp.pageMenu.landingPage.description{/lang}

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl index 682ae57432..da68420023 100644 --- a/wcfsetup/install/files/acp/templates/styleAdd.tpl +++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl @@ -43,10 +43,8 @@ //]]>
-
-

{lang}wcf.acp.style.{$action}{/lang}

- {if $action == 'edit'}

{$styleName}

{/if} -
+

{lang}wcf.acp.style.{$action}{/lang}

+ {if $action == 'edit'}

{$styleName}

{/if}
{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl index 1da04bbfb3..10925487c1 100644 --- 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'}
-
-

{lang}wcf.acp.style.exportStyle{/lang}

-
+

{lang}wcf.acp.style.exportStyle{/lang}

diff --git a/wcfsetup/install/files/acp/templates/styleImport.tpl b/wcfsetup/install/files/acp/templates/styleImport.tpl index 000518e7e8..71ab379655 100644 --- 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'}
-
-

{lang}wcf.acp.style.importStyle{/lang}

-
+

{lang}wcf.acp.style.importStyle{/lang}

{if $success|isset} diff --git a/wcfsetup/install/files/acp/templates/styleList.tpl b/wcfsetup/install/files/acp/templates/styleList.tpl index 6fd846d7b5..9a1e73ebe5 100644 --- a/wcfsetup/install/files/acp/templates/styleList.tpl +++ b/wcfsetup/install/files/acp/templates/styleList.tpl @@ -11,9 +11,7 @@
-
-

{lang}wcf.acp.style.list{/lang}

-
+

{lang}wcf.acp.style.list{/lang}

@@ -42,10 +40,10 @@
-
-

{$style->styleName}

- {if $style->styleDescription}

{lang}{@$style->styleDescription}{/lang}

{/if} -
+
+

{$style->styleName}

+ {if $style->styleDescription}{lang}{@$style->styleDescription}{/lang}{/if} +
    • diff --git a/wcfsetup/install/files/acp/templates/templateAdd.tpl b/wcfsetup/install/files/acp/templates/templateAdd.tpl index edcbf6df2c..b5c50f1613 100644 --- a/wcfsetup/install/files/acp/templates/templateAdd.tpl +++ b/wcfsetup/install/files/acp/templates/templateAdd.tpl @@ -1,10 +1,8 @@ {include file='header'}
    -
    -

    {lang}wcf.acp.template.{$action}{/lang}

    - {if $action == 'edit'}

    {$template->getPath()}

    {/if} -
    +

    {lang}wcf.acp.template.{$action}{/lang}

    + {if $action == 'edit'}

    {$template->getPath()}

    {/if}
    {if $errorField} diff --git a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl index a4f1cea4d1..9fc09e68b6 100644 --- a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl @@ -1,9 +1,7 @@ {include file='header'}
    -
    -

    {lang}wcf.acp.template.group.{$action}{/lang}

    -
    +

    {lang}wcf.acp.template.group.{$action}{/lang}

    {if $errorField} diff --git a/wcfsetup/install/files/acp/templates/templateGroupList.tpl b/wcfsetup/install/files/acp/templates/templateGroupList.tpl index 59144f2605..7eec3304d0 100644 --- 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'}
    -
    -

    {lang}wcf.acp.template.group.list{/lang}

    -
    +

    {lang}wcf.acp.template.group.list{/lang}

    -
    -

    {lang}wcf.acp.template.list{/lang}

    -
    +

    {lang}wcf.acp.template.list{/lang}

    @@ -63,9 +61,9 @@ {if $objects|count}
    -
    -

    {lang}wcf.acp.template.list{/lang} {#$items}

    -
    +
    +

    {lang}wcf.acp.template.list{/lang} {#$items}

    +
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl index 3b146d0efb..bc3e6c37de 100644 --- a/wcfsetup/install/files/acp/templates/userAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userAdd.tpl @@ -9,9 +9,7 @@
-
-

{lang}wcf.acp.user.{@$action}{/lang}

-
+

{lang}wcf.acp.user.{@$action}{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl index 40f135371d..411d8ceb74 100644 --- 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'}
-
-

{lang}wcf.acp.user.assignToGroup{/lang}

-
+

{lang}wcf.acp.user.assignToGroup{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl index e484d31e5d..fac1b5d58b 100644 --- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl +++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl @@ -9,9 +9,7 @@
-
-

{lang}wcf.acp.user.exportEmailAddress{/lang}

-
+

{lang}wcf.acp.user.exportEmailAddress{/lang}

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index 517a6decd9..dcc842ae32 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -9,9 +9,7 @@
-
-

{lang}wcf.acp.group.{@$action}{/lang}

-
+

{lang}wcf.acp.group.{@$action}{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl index 8cfaeaa09f..985ef6e1e2 100644 --- a/wcfsetup/install/files/acp/templates/userGroupList.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl @@ -9,9 +9,7 @@
-
-

{lang}wcf.acp.group.list{/lang}

-
+

{lang}wcf.acp.group.list{/lang}

@@ -33,9 +31,9 @@
-
-

{lang}wcf.acp.group.list{/lang} {#$items}

-
+
+

{lang}wcf.acp.group.list{/lang} {#$items}

+
diff --git a/wcfsetup/install/files/acp/templates/userGroupOption.tpl b/wcfsetup/install/files/acp/templates/userGroupOption.tpl index 7f9dc563f8..19636939db 100644 --- a/wcfsetup/install/files/acp/templates/userGroupOption.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupOption.tpl @@ -9,9 +9,7 @@
-
-

{lang}wcf.acp.group.option.editingOption{/lang} {lang}wcf.acp.group.option.{$userGroupOption->optionName}{/lang}

-
+

{lang}wcf.acp.group.option.editingOption{/lang} {lang}wcf.acp.group.option.{$userGroupOption->optionName}{/lang}

{lang}wcf.acp.group.option.hint{/lang}

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index e7e2c44b6c..5d34e4c196 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -26,9 +26,7 @@
-
-

{lang}{@$pageTitle}{/lang}

-
+

{lang}{@$pageTitle}{/lang}

{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 aa301c5585..18ab259a80 100644 --- a/wcfsetup/install/files/acp/templates/userMail.tpl +++ b/wcfsetup/install/files/acp/templates/userMail.tpl @@ -21,9 +21,7 @@ {/if}
-
-

{lang}{@$pageTitle}{/lang}

-
+

{lang}{@$pageTitle}{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl index a1c19b79a8..3bf9bc2a5a 100644 --- a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl @@ -1,9 +1,7 @@ {include file='header'}
-
-

{lang}wcf.acp.user.option.{$action}{/lang}

-
+

{lang}wcf.acp.user.option.{$action}{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl index 3dd319b3b2..8860fc0e83 100644 --- a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl @@ -1,9 +1,7 @@ {include file='header'}
-
-

{lang}wcf.acp.user.option.category.{$action}{/lang}

-
+

{lang}wcf.acp.user.option.category.{$action}{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl index 149b5273d0..b68858e331 100644 --- 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'}
-
-

{lang}wcf.acp.user.option.category.list{/lang}

-
+

{lang}wcf.acp.user.option.category.list{/lang}

-
-

{lang}wcf.acp.user.search{/lang}

-
+

{lang}wcf.acp.user.search{/lang}

{if $errorField == 'search'} @@ -107,7 +105,7 @@ {foreach from=$optionTree[0][categories] item=category}
{lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang} - {hascontent}

{content}{lang __optional=true}wcf.user.option.category.{@$category[object]->categoryName}.description{/lang}{/content}

{/hascontent} + {hascontent}

{content}{lang __optional=true}wcf.user.option.category.{@$category[object]->categoryName}.description{/lang}{/content}

{/hascontent} {include file='optionFieldList' options=$category[options] langPrefix='wcf.user.option.'}
diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl index 06774de0cf..c40eab224f 100644 --- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl @@ -61,9 +61,7 @@
-
-

{lang}wcf.acp.user.massProcessing{/lang}

-
+

{lang}wcf.acp.user.massProcessing{/lang}

{if $errorField} diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl index d93e9b5eed..9d9eb801b2 100644 --- a/wcfsetup/install/files/acp/templates/worker.tpl +++ b/wcfsetup/install/files/acp/templates/worker.tpl @@ -2,9 +2,7 @@
-
-

{lang}wcf.global.worker.executing{/lang}

- 0% 0% -
+

{lang}wcf.global.worker.executing{/lang}

+ 0% 0%
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index bb51ceb9de..9ade67bd23 100755 --- 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 = $('

  • ' + $language.languageName + '

    • ').appendTo($dropdownMenu); + var $item = $('

  • ' + $language.languageName + '

    • ').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 2088a0094e..1598898092 100644 --- 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 04a02a3d97..d556d30c4b 100644 --- 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 8de98adfe9..8379c1e40b 100644 --- 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 7b2e383575..ae19e7e91f 100644 --- a/wcfsetup/setup/template/header.tpl +++ b/wcfsetup/setup/template/header.tpl @@ -47,10 +47,8 @@
    -
    -

    {lang}wcf.global.title{/lang}

    -

    {lang}wcf.global.title.subtitle{/lang}

    -

    {@$progress}%

    -
    +

    {lang}wcf.global.title{/lang}

    +

    {lang}wcf.global.title.subtitle{/lang}

    +

    {@$progress}%

    diff --git a/wcfsetup/setup/template/stepConfigureDB.tpl b/wcfsetup/setup/template/stepConfigureDB.tpl index 507c12df95..ce6a95bf70 100644 --- a/wcfsetup/setup/template/stepConfigureDB.tpl +++ b/wcfsetup/setup/template/stepConfigureDB.tpl @@ -1,10 +1,8 @@ {include file='header'}
    -
    -

    {lang}wcf.global.configureDB{/lang}

    -

    {lang}wcf.global.configureDB.description{/lang}

    -
    +

    {lang}wcf.global.configureDB{/lang}

    +

    {lang}wcf.global.configureDB.description{/lang}

    {if $exception|isset} diff --git a/wcfsetup/setup/template/stepCreateUser.tpl b/wcfsetup/setup/template/stepCreateUser.tpl index 39f85bec74..96fd3f9fc1 100644 --- a/wcfsetup/setup/template/stepCreateUser.tpl +++ b/wcfsetup/setup/template/stepCreateUser.tpl @@ -1,10 +1,8 @@ {include file='header'}
    -
    -

    {lang}wcf.global.createUser{/lang}

    -

    {lang}wcf.global.createUser.description{/lang}

    -
    +

    {lang}wcf.global.createUser{/lang}

    +

    {lang}wcf.global.createUser.description{/lang}

    {if $errorField} diff --git a/wcfsetup/setup/template/stepInstallPackages.tpl b/wcfsetup/setup/template/stepInstallPackages.tpl index 8d1a991bed..26969f18f8 100644 --- a/wcfsetup/setup/template/stepInstallPackages.tpl +++ b/wcfsetup/setup/template/stepInstallPackages.tpl @@ -2,10 +2,8 @@ {include file='header'}
    -
    -

    {lang}wcf.global.next{/lang}

    -

    {lang}wcf.global.next.description{/lang}

    -
    +

    {lang}wcf.global.next{/lang}

    +

    {lang}wcf.global.next.description{/lang}

    diff --git a/wcfsetup/setup/template/stepNext.tpl b/wcfsetup/setup/template/stepNext.tpl index 377ddcb967..8c1b098b66 100644 --- a/wcfsetup/setup/template/stepNext.tpl +++ b/wcfsetup/setup/template/stepNext.tpl @@ -1,10 +1,8 @@ {include file='header'}
    -
    -

    {lang}wcf.global.next{/lang}

    -

    {lang}wcf.global.next.description{/lang}

    -
    +

    {lang}wcf.global.next{/lang}

    +

    {lang}wcf.global.next.description{/lang}

    diff --git a/wcfsetup/setup/template/stepSearchWcfDir.tpl b/wcfsetup/setup/template/stepSearchWcfDir.tpl index 42be50e817..1d77bc1f3c 100644 --- a/wcfsetup/setup/template/stepSearchWcfDir.tpl +++ b/wcfsetup/setup/template/stepSearchWcfDir.tpl @@ -81,10 +81,8 @@
    -
    -

    {lang}wcf.global.wcfDir{/lang}

    -

    {lang}wcf.global.wcfDir.description{/lang}

    -
    +

    {lang}wcf.global.wcfDir{/lang}

    +

    {lang}wcf.global.wcfDir.description{/lang}

    {if $invalidDirectory} diff --git a/wcfsetup/setup/template/stepSelectLanguages.tpl b/wcfsetup/setup/template/stepSelectLanguages.tpl index f272ff4059..15ec080e60 100644 --- a/wcfsetup/setup/template/stepSelectLanguages.tpl +++ b/wcfsetup/setup/template/stepSelectLanguages.tpl @@ -1,10 +1,8 @@ {include file='header'}
    -
    -

    {lang}wcf.global.languages{/lang}

    -

    {lang}wcf.global.languages.description{/lang}

    -
    +

    {lang}wcf.global.languages{/lang}

    +

    {lang}wcf.global.languages.description{/lang}

    {if $errorField} diff --git a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl index 6da9e093e0..c942e55d07 100644 --- a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl +++ b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl @@ -1,10 +1,8 @@ {include file='header'}
    -
    -

    {lang}wcf.global.welcome{/lang}

    -

    {lang}wcf.global.welcome.description{/lang}

    -
    +

    {lang}wcf.global.welcome{/lang}

    +

    {lang}wcf.global.welcome.description{/lang}

    diff --git a/wcfsetup/setup/template/stepShowLicense.tpl b/wcfsetup/setup/template/stepShowLicense.tpl index f526b727fe..2e08035d7f 100644 --- a/wcfsetup/setup/template/stepShowLicense.tpl +++ b/wcfsetup/setup/template/stepShowLicense.tpl @@ -1,10 +1,8 @@ {include file='header'}
    -
    -

    {lang}wcf.global.license{/lang}

    -

    {lang}wcf.global.license.description{/lang}

    -
    +

    {lang}wcf.global.license{/lang}

    +

    {lang}wcf.global.license.description{/lang}

    {if $missingAcception|isset} diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl index 1b6d051226..3eb2efa193 100644 --- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl +++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl @@ -1,9 +1,7 @@ {include file='header'}
    -
    -

    {lang}wcf.global.systemRequirements.required{/lang}

    -
    +

    {lang}wcf.global.systemRequirements.required{/lang}

    @@ -45,9 +43,7 @@
    -
    -

    {lang}wcf.global.systemRequirements.recommended{/lang}

    -
    +

    {lang}wcf.global.systemRequirements.recommended{/lang}