some template fixes

diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index f274a00ac9ce51fa18eeb8383fbf43b3c278ad05..fd6eb37649f858e6877f96f0b0e8163128df65a4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -8,24 +8,23 @@
        //]]>
 </script>
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@$__wcf->getPath()}icon/login1.svg" alt="" class="wcf-containerIcon" />
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{lang}wcf.acp.masterPassword.enter{/lang}</h1>
        </hgroup>
 </header>
 
 {if $errorField != ''}
-       <p class="wcf-error">{lang}wcf.global.form.error{/lang}</p>
+       <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
 <form method="post" action="{link controller='MasterPassword'}{/link}">
-       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-shadow1">
+       <div class="container containerPadding marginTop shadow">
                
                <fieldset>
                        <legend>{lang}wcf.acp.masterPassword.enter{/lang}</legend>
                
-                       <dl{if $errorField == 'masterPassword'} class="wcf-formError"{/if}>
+                       <dl{if $errorField == 'masterPassword'} class="formError"{/if}>
                                <dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
                                <dd>
                                        <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
@@ -48,10 +47,8 @@
                {event name='fieldsets'}
        </div>
 
-       <div class="wcf-formSubmit">
-               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+       <div class="formSubmit">
                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SID_INPUT_TAG}
                <input type="hidden" name="url" value="{$url}" />
        </div>
 </form>

diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index 547b811830a76d1668362744c72080361d02a46f..6d9ff35570167c61b85b2675ed53750f171656fd 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -12,24 +12,23 @@
        //]]>
 </script>
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@$__wcf->getPath()}icon/login1.svg" alt="" class="wcf-containerIcon" />
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{lang}wcf.acp.masterPassword.init{/lang}</h1>
        </hgroup>
 </header>
 
 {if $errorField != ''}
-       <p class="wcf-error">{lang}wcf.global.form.error{/lang}</p>
+       <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
 <form method="post" action="{link controller='MasterPasswordInit'}{/link}">
-       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-shadow1">
+       <div class="container containerPadding marginTop shadow">
                
                <fieldset>
                        <legend>{lang}wcf.acp.masterPassword.init{/lang}</legend>
                
-                       <dl{if $errorField == 'masterPassword'} class="wcf-formError"{/if}>
+                       <dl{if $errorField == 'masterPassword'} class="formError"{/if}>
                                <dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
                                <dd>
                                        <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
@@ -46,7 +45,7 @@
                                </dd>
                        </dl>
                        
-                       <dl{if $errorField == 'confirmMasterPassword'} class="wcf-formError"{/if}>
+                       <dl{if $errorField == 'confirmMasterPassword'} class="formError"{/if}>
                                <dt><label for="confirmMasterPassword">{lang}wcf.acp.masterPassword.confirm{/lang}</label></dt>
                                <dd>
                                        <input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="medium" />
@@ -76,10 +75,8 @@
                {event name='fieldsets'}
        </div>
 
-       <div class="wcf-formSubmit">
-               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+       <div class="formSubmit">
                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SID_INPUT_TAG}
                <input type="hidden" name="url" value="{$url}" />
        </div>
 </form>

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index 00600eb29a4df14e020b91cd72dc934cbb6b80a0..cf9de6e91e92008e9a6cb52d9b04a6b7d182bebf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -9,20 +9,19 @@
        //]]>
 </script>
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@$__wcf->getPath()}icon/working1.svg" alt="" class="wcf-containerIcon" />
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{$archive->getLocalizedPackageInfo('packageName')}</h1>
                <h2>{$archive->getLocalizedPackageInfo('packageDescription')}</h2>
        </hgroup>
 </header>
 
 {if $missingPackages > 0}
-       <p class="wcf-error">{lang}wcf.acp.package.install.error{/lang}</p>
+       <p class="error">{lang}wcf.acp.package.install.error{/lang}</p>
 {/if}
 
 {if $excludingPackages|count > 0}
-       <div class="wcf-error">{lang}wcf.acp.package.install.error.excludingPackages{/lang}
+       <div class="error">{lang}wcf.acp.package.install.error.excludingPackages{/lang}
                <ul>
                {foreach from=$excludingPackages item=excludingPackage}
                        <li>{lang}wcf.acp.package.install.error.excludingPackages.excludingPackage{/lang}</li>
@@ -32,7 +31,7 @@
 {/if}
 
 {if $excludedPackages|count > 0}
-       <div class="wcf-error">{lang}wcf.acp.package.install.error.excludedPackages{/lang}
+       <div class="error">{lang}wcf.acp.package.install.error.excludedPackages{/lang}
                <ul>
                {foreach from=$excludedPackages item=excludedPackage}
                        <li>{lang}wcf.acp.package.install.error.excludedPackages.excludedPackage{/lang}</li>
@@ -41,7 +40,7 @@
        </div>
 {/if}
 
-<fieldset>
+<fieldset class="marginTop">
        <legend>{lang}wcf.acp.package.information.properties{/lang}</legend>
 
        <dl>
@@ -75,15 +74,15 @@
 </fieldset>
 
 {if $updatableInstances|count > 0}
-       <p class="wcf-warning">{lang}wcf.acp.package.install.updatableInstances.warning{/lang}</p>
+       <p class="warning">{lang}wcf.acp.package.install.updatableInstances.warning{/lang}</p>
        
-       <div class="wcf-box wcf-boxTitle wcf-marginTop wcf-shadow1">
+       <div class="container containerPadding marginTop shadow">
                <hgroup>
                        <h1>{lang}wcf.acp.package.install.updatableInstances{/lang}</h1>
                        <h2>{lang}wcf.acp.package.install.updatableInstances.description{/lang}</h2>
                </hgroup>
                
-               <table class="wcf-table">
+               <table class="table">
                        <thead>
                                <tr>
                                        <th class="columnTitle">{lang}wcf.acp.package.list.name{/lang}</th>
@@ -104,12 +103,12 @@
 {/if}
 
 {if $requiredPackages|count > 0}
-       <div class="wcf-box wcf-boxTitle wcf-marginTop wcf-shadow1">
+       <div class="tabularBox tabularBoxTitle marginTop shadow">
                <hgroup>
-                       <h1>{lang}wcf.acp.package.dependencies.required{/lang} <span class="wcf-badge" title="{lang}wcf.acp.package.view.requiredPackages.description{/lang}">{#$requiredPackages|count}</span></h1>
+                       <h1>{lang}wcf.acp.package.dependencies.required{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.package.view.requiredPackages.description{/lang}">{#$requiredPackages|count}</span></h1>
                </hgroup>
                
-               <table class="wcf-table">
+               <table class="table">
                        <thead>
                                <tr>
                                        <th class="columnTitle">{lang}wcf.acp.package.name{/lang}</th>
@@ -129,7 +128,7 @@
        </div>
 {/if}
 
-<div class="wcf-formSubmit">
+<div class="formSubmit">
        <input type="button" onclick="document.location.href=fixURL('{link controller='Package'}action={@$action}&queueID={@$queueID}&step=cancel{/link}')" value="{lang}wcf.global.button.back{/lang}" accesskey="c" />
        {if $missingPackages == 0 && $excludingPackages|count == 0 && $excludedPackages|count == 0}
                <input type="button" id="submitButton" value="{lang}wcf.global.button.next{/lang}" class="default" accesskey="s" />

diff --git a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
index eaf0e08d666d993b10127bab83b02b41f8351c0a..46e6852dd2d33dbc12eeca372b64e0782b5fbee1 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
+++ b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
@@ -37,7 +37,7 @@
 {if $objects|count > 0}
        <div class="tabularBox tabularBoxTitle marginTop shadow">
                <hgroup>
-                       <h1><a href="{link controller='PackageList'}{/link}">{lang}wcf.acp.package.list{/lang} <span class="badge" title="{lang}wcf.acp.package.list.count{/lang}">{#$items}</span></a></h1>
+                       <h1><a href="{link controller='PackageList'}{/link}">{lang}wcf.acp.package.list{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.package.list.count{/lang}">{#$items}</span></a></h1>
                </hgroup>
                
                <table class="table">

diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index a5e2dcb119fbbb07b35be8c885725ad7190f2172..fca5284326c05f2633faa8e7d6beebaa995f289e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -1,23 +1,22 @@
 {include file='header'}
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@$__wcf->getPath()}icon/update1.svg" alt="" class="wcf-containerIcon" />
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{lang}wcf.acp.packageUpdate{/lang}</h1>
        </hgroup>
 </header>
 
 {if $errorField == 'updates'}
        {if $errorType === 'empty'}
-               <p class="wcf-error">{lang}wcf.acp.packageUpdate.noneSelected{/lang}</p>
+               <p class="error">{lang}wcf.acp.packageUpdate.noneSelected{/lang}</p>
        {else}
-               <p class="wcf-error">{lang}wcf.acp.packageUpdate.error{/lang} {$errorType->getMessage()} ({@$errorType->getCode()})</p>
+               <p class="error">{lang}wcf.acp.packageUpdate.error{/lang} {$errorType->getMessage()} ({@$errorType->getCode()})</p>
                <!-- {$errorType->getTraceAsString()} -->
        {/if}
 {/if}
 
 {if $errorField == 'excludedPackages'}
-       <div class="wcf-error">{lang}wcf.acp.packageUpdate.excludedPackages{/lang}
+       <div class="error">{lang}wcf.acp.packageUpdate.excludedPackages{/lang}
                <ul>
                {foreach from=$excludedPackages item=excludedPackage}
                        <li>{if $excludedPackage.conflict == 'existingPackageExcludesNewPackage'}{lang}wcf.acp.packageUpdate.excludedPackages.existingPackageExcludesNewPackage{/lang}{else}{lang}wcf.acp.packageUpdate.excludedPackages.newPackageExcludesExistingPackage{/lang}{/if}</li>
@@ -28,7 +27,7 @@
 
 {if $packageInstallationStack|count}
        <form method="post" action="{link controller='PackageUpdate'}{/link}">
-               <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
+               <div class="container containerPadding marginTop shadow">
                        
                        <fieldset>
                                <legend>{lang}wcf.acp.packageUpdate.updates{/lang}</legend>
@@ -48,8 +47,7 @@
                        
                </div>
                
-               <div class="wcf-formSubmit">
-                       {*<input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />*}
+               <div class="formSubmit">
                        {if !$errorField}<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />{/if}
                        {@SID_INPUT_TAG}
                        <input type="hidden" name="send" value="1" />

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
index 3057bcb2d709f139fbff44fdbea377e174bc3dfd..c9023f35c2dd29056193d5b5a47ba9c860f65404 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
@@ -1,18 +1,17 @@
 {include file='header'}
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@$__wcf->getPath()}icon/update1.svg" alt="" class="wcf-containerIcon" />
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{lang}wcf.acp.packageUpdate.auth{/lang}</h1>
        </hgroup>
 </header>
 
 {if $errorField != ''}
-       <p class="wcf-error">{lang}wcf.global.form.error{/lang}</p>
+       <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
 <form method="{$requestMethod}" action="index.php{if $getParameters}?{@$getParameters}{/if}">
-       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
+       <div class="container containerPadding marginTop shadow">
                
                <fieldset>
                        <legend>{lang}wcf.acp.packageUpdate.auth.data{/lang}</legend>
@@ -69,11 +68,9 @@
                        
        </div>
        
-       <div class="wcf-formSubmit">
-               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+       <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="form" value="PackageUpdateAuth" />
-               {@SID_INPUT_TAG}
                <input type="hidden" name="id" value="{@$packageUpdateServerID}" />
                {@$postParameters}
        </div>

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
index c8d2b16ce8858df4e4107068655c957199d0e9d9..4274983061d9d051ba30f8beb8a08fa0ed8b17f8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
@@ -1,8 +1,7 @@
 {include file='header'}
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@$__wcf->getPath()}icon/search1.svg" alt="" class="wcf-containerIcon" />
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{lang}wcf.acp.packageUpdate.search{/lang}</h1>
        </hgroup>
 </header>
@@ -100,10 +99,8 @@
                </article>                      
        {/foreach}
        
-       <div class="wcf-formSubmit">
-               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+       <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SID_INPUT_TAG}
                <input type="hidden" name="id" value="{@$searchID}" />
        </div>
 </form>

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 0f91141f50d4a4b4f990748a5641200970bf8f91..b3fe7c83a274a4eaa5e1ec576515b6664b7be416 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -10,16 +10,15 @@
        //]]>
 </script>
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@$__wcf->getPath()}icon/packageApplication1.svg" alt="" class="wcf-containerIcon" /><!-- ToDo: Add possibility to show a custom app icon if given! -->
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{$package->getName()}</h1>
                <h2>{$package->packageDescription|language}</h2>
        </hgroup>
 </header>
 
-<div class="wcf-tabMenuContainer">
-       <nav class="wcf-tabMenu">
+<div class="tabMenuContainer">
+       <nav class="tabMenu">
                <ul>
                        <li><a href="#information">{lang}wcf.acp.package.information.title{/lang}</a></li>
                        {if $package->getRequiredPackages()|count || $package->getDependentPackages()|count}
@@ -28,11 +27,7 @@
                </ul>
        </nav>
 
-       <div id="information" class="wcf-box wcf-boxPadding wcf-tabMenuContent hidden">
-               <hgroup class="wcf-subHeading">
-                       <h1>{lang}wcf.acp.package.information.title{/lang}</h1>
-               </hgroup>
-
+       <div id="information" class="container containerPadding shadow hidden tabMenuContent">
                <fieldset>
                        <legend>{lang}wcf.acp.package.information.properties{/lang}</legend>
        
@@ -88,17 +83,17 @@
                </fieldset>
 
                {if $package->packageDescription|language}
-                       <hgroup class="wcf-subHeading">
-                               <h1>{lang}wcf.acp.package.description{/lang}</h1>
-                       </hgroup>
-
-                       <p>{$package->packageDescription|language}</p>
+                       <fieldset>
+                               <legend>{lang}wcf.acp.package.description{/lang}</legend>
+                               
+                               <p>{$package->packageDescription|language}</p>
+                       </fieldset>
                {/if}
        </div>
 
        {if $package->getRequiredPackages()|count || $package->getDependentPackages()|count}
-               <div id="dependencies" class="wcf-box wcf-boxPadding wcf-tabMenuContainer wcf-tabMenuContent">
-                       <nav class="wcf-menu">
+               <div id="dependencies" class="container containerPadding tabMenuContainer tabMenuContent">
+                       <nav class="menu">
                                <ul>
                                        {if $package->getRequiredPackages()|count}
                                                <li><a href="#dependencies-required">{lang}wcf.acp.package.dependencies.required{/lang}</a></li>
@@ -110,13 +105,13 @@
                        </nav>
 
                        {hascontent}
-                               <div id="dependencies-required" class="wcf-hidden">
-                                       <hgroup class="wcf-subHeading">
+                               <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>
                
-                                       <table class="wcf-table wcf-box wcf-boxTitle wcf-marginTop wcf-shadow1">
+                                       <table class="table">
                                                <thead>
                                                        <tr>
                                                                <th colspan="2" class="columnID">{lang}wcf.global.objectID{/lang}</th>
@@ -170,13 +165,13 @@
                        {/hascontent}
 
                        {hascontent}
-                               <div id="dependencies-dependent" class="hidden">
+                               <div id="dependencies-dependent" class="tabularBox tabularBoxTitle hidden">
                                        <hgroup class="wcf-subHeading">
                                                <h1>{lang}wcf.acp.package.dependencies.dependent{/lang}</h1>
                                                <h2>{lang}wcf.acp.package.dependencies.dependent.description{/lang}</h2>
                                        </hgroup>
                
-                                       <table class="wcf-table wcf-box wcf-boxTitle wcf-marginTop wcf-shadow1">
+                                       <table class="table">
                                                <thead>
                                                        <tr>
                                                                <th colspan="2" class="columnID">{lang}wcf.global.objectID{/lang}</th>
@@ -240,9 +235,9 @@
        {/if}
 {/foreach}
 
-<div class="wcf-contentFooter">
+<div class="contentNavigation">
        <nav>
-               <ul class="wcf-largeButtons">
+               <ul>
                        {if PACKAGE_ID != $package->packageID}
                                {if $package->isApplication && $package->package != 'com.woltlab.wcf'}
                                        <li><a href="{@$__wcf->getPath()}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.button.switch{/lang}" class="wcf-button"><img src="{@$__wcf->getPath()}icon/packageACP1.svg" alt="" /> <span>{lang}wcf.acp.package.button.switch{/lang}</span></a></li>

diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index f46c70448038ea242e6dd4bd467e65641691ab3c..f44abe0fadb36bcdbd001b9810d4cc4780c3616a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -34,7 +34,7 @@
 {hascontent}
        <div class="tabularBox tabularBoxTitle marginTop shadow">
                <hgroup>
-                       <h1>{lang}wcf.acp.updateServer.list{/lang} <span class="badge" title="{lang}wcf.acp.updateServer.list.count{/lang}">{#$items}</span></h1>
+                       <h1>{lang}wcf.acp.updateServer.list{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.updateServer.list.count{/lang}">{#$items}</span></h1>
                </hgroup>
                
                <table class="table">

diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index 07c0355e21e7091ca112a9525e987b72292c9e80..97bca46a377bc7e094ce533122834963dbbad28b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -15,10 +15,10 @@
                <fieldset>
                        <legend>{lang}wcf.acp.user.assignToGroup.markedUsers{/lang}</legend>
                        
-                       <ul>
-                               {implode from=$users item=$user}<li><a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a></li>{/implode}
-                       </ul>
-               </fieldset>     
+                       <div>
+                               {implode from=$users item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
+                       </div>
+               </fieldset>
                
                <fieldset>
                        <legend>{lang}wcf.acp.user.groups{/lang}</legend>

diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index 83628225435a81649c2af11b9d0d202e588f21dd..2fd61a0e5b00e676e834071efb478b938ed2cbc8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -19,10 +19,10 @@
                <fieldset>
                        <legend>{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}</legend>
                        
-                       <ul>
-                               {implode from=$users item=$user}<li><a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a></li>{/implode}
-                       </ul>
-               </fieldset>     
+                       <div>
+                               {implode from=$users item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
+                       </div>
+               </fieldset>
                
                <fieldset>
                        <legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>

diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl
index d138aeb215057d0b2e84d00e5b3018ce76a4cafb..641bcaa170373ed0652cf1f34cfdfa9b9d4395c1 100644 (file)
--- a/wcfsetup/install/files/acp/templates/worker.tpl
+++ b/wcfsetup/install/files/acp/templates/worker.tpl
@@ -1,5 +1,5 @@
 <div id="workerContainer">
-       <header class="wcf-container wcf-mainHeading">
+       <header>
                <img src="{@$__wcf->getPath()}icon/working2.svg" alt="" class="wcf-containerIcon" />
                <hgroup class="wcf-containerIcon">
                        <h1>Aufgaben werden ausgeführt &hellip;</h1><!--ToDo: Language variables -->