Some changes, mostly to tables…

Table-heads without table-header sort-option do not have a hover-effect
any more, simplified table layout for that change; rebuild some forms to
be built upon definition lists; extended the CSS for large buttons;
changed some CSS for the page-background and its effects (unfinished).
Note that background-colors on page-back, box-titles and table-heads are
dark, because there should be a background-image over that. Images
aren't checked in at this time. Maybe the design will change to the
"Basic"-style at some point.

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 0bb1947b880795920124769b86af6b2b4909d02b..4061bf57c62ba7353c765b6b8b127357ba5683db 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -64,7 +64,6 @@ header.pageHeader {
        /* background-image: url("../images/header.png"); */
        background-position: left top;
        background-repeat: repeat-x;
-       
        min-width: 800px;
        width: 100%;
 }
@@ -194,7 +193,6 @@ nav.mainMenu li.activeMenuItem {
        background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#e7f2fd));
        background-image: -o-linear-gradient(#fff, #e7f2fd);
        background-image: linear-gradient(#fff, #e7f2fd);
-       
 }
 
 /* Header Navigation  */
@@ -251,7 +249,6 @@ div.main > div {
 
 section#content {
        background-color: #fff;
-       
        display: table-cell;
        padding: 25px;
        width: 100%;
@@ -287,12 +284,6 @@ nav.sidebarMenu > div {
        position: relative;
        color: #69c;
        text-shadow: 0 1px 0 #fff;
-       overflow: hidden;
-}
-
-nav.sidebarMenu > div a {
-       color: #69c;
-       text-shadow: 0 1px 0 #fff;
 }
 
 nav.sidebarMenu > div a:hover {
@@ -319,11 +310,18 @@ nav.sidebarMenu > div h1.activeMenuItem {
 
 nav.sidebarMenu > div ul li {
        font-size: 110%;
+}
+
+nav.sidebarMenu > div ul li a {
+       color: #69c;
+       text-shadow: 0 1px 0 #fff;
+       display: block;
        padding: 5px 25px 7px 35px;
 }
 
 nav.sidebarMenu > div ul li.activeMenuItem {
        background-color: #fff;
+       overflow: hidden;
        
        -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .1);
        -moz-box-shadow: 0 0 5px rgba(0, 0, 0, .1);
@@ -492,7 +490,7 @@ label {
        color: #69c;
 }
 
-/* Structure */
+/* Structure (deprecated?) */
 
 div.formElement {
        clear: both;
@@ -531,6 +529,8 @@ div.formGroupField div.formField label {
        text-align: center;
 }
 
+/* Form Elements */
+
 input[type='reset'],
 input[type='submit'],
 input[type='checkbox'],
@@ -539,8 +539,6 @@ select {
        cursor: pointer;
 }
 
-/* Form Elements */
-
 input[type='text'],
 input[type="search"],
 input[type="email"],
@@ -548,6 +546,7 @@ input[type='password'] {
        padding: 5px 3px;
 }
 
+/* inputs normal */
 input[type='text'],
 input[type="search"],
 input[type="email"],
@@ -566,6 +565,7 @@ textarea {
        box-shadow: inset 0 1px 5px rgba(0, 0, 0, .1);
 }
 
+/* inputs hover */
 input[type='text']:hover,
 input[type="search"]:hover,
 input[type="email"]:hover,
@@ -575,6 +575,7 @@ textarea:hover {
        border: 1px solid #69c;
 }
 
+/* inputs active */
 input[type='text']:active,
 input[type="search"]:active,
 input[type="email"]:active,
@@ -607,13 +608,19 @@ textarea:focus {
        display: inline;
 }
 
-.largeButtons ul li a {
-       font-size: 90%;
-}
-
+/* buttons normal */
 input[type='reset'],
 input[type='submit'],
 .largeButtons ul li a {
+       font-size: 100%;
+       border: 1px solid #ccc;
+       border-radius: 30px;
+       color: #999;
+       font-weight: bold;
+       display: inline-block;
+       padding: 5px 13px;
+       text-shadow: 0 1px 0 #fff;
+       
        background-color: #fefefe;
        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#eee));
        background-image: -moz-linear-gradient(0% 0% 270deg, #fefefe, #eee);
@@ -626,30 +633,36 @@ input[type='submit'],
        -ms-transition: all .3s linear;
        -o-transition: all .3s linear;
        transition: all .3s linear;
-       
-       border: 1px solid #ccc;
-       border-radius: 30px;
-       color: #666;
-       font-weight: bold;
-       display: inline-block;
-       padding: 5px 13px;
-       text-shadow: 0 1px 0 #fff;
 }
 
+/* buttons hover */
 input[type='reset']:hover,
 input[type='submit']:hover,
 .largeButtons ul li a:hover {
+       border: 1px solid #999;
+       color: #666;
+       text-decoration: none;
+}
+
+/* buttons active */
+input[type='reset']:focus,
+input[type='submit']:focus,
+.largeButtons ul li a:focus,
+input[type='reset']:active,
+input[type='submit']:active,
+.largeButtons ul li a:active{
+       color: #333;
+       text-decoration: none;
+       
        background-color: #fefefe;
        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#eee), to(#fefefe));
        background-image: -moz-linear-gradient(0% 0% 270deg, #eee, #fefefe);
        background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#eee), to(#fefefe));
        background-image: -o-linear-gradient(#eee, #fefefe);
        background-image: linear-gradient(#eee, #fefefe);
-       
-       color: #333;
-       text-decoration: none;
 }
 
+/* default buttons glow */
 @-webkit-keyframes glowLargeButtons {
     0% {
         -webkit-box-shadow: 0 0 13px rgba(102, 153, 204, .3);
@@ -667,8 +680,12 @@ input[type='submit']:hover,
     }
 }
 
+/* default buttons normal */
 input[type='submit'],
 .largeButtons ul li.default a {
+       border: 1px solid #bcd;
+       color: #69c;
+       
        background-color: #69c;
        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#d8e7f5));
        background-image: -moz-linear-gradient(0% 0% 270deg, #fff, #d8e7f5);
@@ -676,9 +693,6 @@ input[type='submit'],
        background-image: -o-linear-gradient(#fff, #d8e7f5);
        background-image: linear-gradient(#fff, #d8e7f5);
        
-       border: 1px solid #69c;
-       color: #369;
-       
        -webkit-box-shadow: 0 0 10px #369;
        -moz-box-shadow: 0 0 10px #369;
        -ms-box-shadow: 0 0 10px #369;
@@ -716,18 +730,30 @@ input[type='submit'],
        animation-timing-function: ease-in-out;
 }
 
+/* default buttons hover */
 input[type='submit']:hover,
 .largeButtons ul li.default a:hover {
+       border: 1px solid #69c;
+       color: #036;
+}
+
+/* default buttons active */
+input[type='submit']:focus,
+.largeButtons ul li.default a:focus,
+input[type='submit']:active,
+.largeButtons ul li.default a:active{
+       color: #369;
+       text-decoration: none;
+       
        background-color: #69c;
        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#d8e7f5), to(#fff));
        background-image: -moz-linear-gradient(0% 0% 270deg, #d8e7f5, #fff);
        background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#d8e7f5), to(#fff));
        background-image: -o-linear-gradient(#d8e7f5, #fff);
        background-image: linear-gradient(#d8e7f5, #fff);
-       
-       color: #036;
 }
 
+/* ToDo: depracated? */
 .largeButtons ul li a img {
        vertical-align: middle;
        margin: 0;
@@ -826,7 +852,7 @@ input[type='submit']:hover,
        text-decoration: none;
        text-shadow: 0 -1px 0 #000;
        border: 1px solid rgba(0, 0, 0, .3);
-       background-color: transparent;
+       background-color: rgba(0, 0, 0, .1);
        padding: 2px 10px;
        border-radius: 13px;
        
@@ -840,7 +866,7 @@ input[type='submit']:hover,
 .menu a:hover {
        color: #fff !important;
        border: 1px solid rgba(0, 0, 0, .3);
-       background-color: rgba(0, 0, 0, .1);
+       background-color: rgba(0, 0, 0, .2);
 }
 
 .menu a:active, .menu a:focus, .menu a.active {
@@ -865,6 +891,11 @@ table {
 
 /* Table Header */
 
+thead th {
+       font-size: 87%;
+       white-space: nowrap;
+}
+
 thead th:first-child {
        border-top-left-radius: 5px;    
 }
@@ -873,7 +904,12 @@ thead th:last-child {
        border-top-right-radius: 5px;   
 }
 
-thead th {
+thead th p a, thead th p.emptyHead {
+       color: #69c !important;
+       text-shadow: 0 -1px 0 #000;
+       display: block;
+       text-decoration: none !important;
+       padding: 7px;
        background-color: rgba(0, 0, 0, .4);
        /*
        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#444), to(#000));/* ToDo: Transparency missing *//*
@@ -882,21 +918,25 @@ thead th {
        background-image: -o-linear-gradient(#444, #000);
        background-image: linear-gradient(#444, #000);
        */
+}
+
+thead th p a {
        border-right: 1px solid rgba(0, 0, 0, .4);
-       font-size: 87%;
-       white-space: nowrap;
 }
 
-thead th:last-child {
+thead th:last-child p a {
        border-right-width: 0;
 }
 
-thead th:hover {
+thead th:hover p a {
+       color: #fff !important;
        background-color: rgba(0, 0, 0, .5);
 }
 
-thead th.active {
+thead th.active p a {
        background-color: rgba(0, 0, 0, .5);
+       font-weight: bold;
+       color: #fff !important;
        
        -webkit-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .5);
        -moz-box-shadow: inset 0 5px 15px rgba(0, 0, 0, .5);
@@ -905,25 +945,20 @@ thead th.active {
        box-shadow: inset 0 5px 15px rgba(0, 0, 0, .5);
 }
 
-thead th.active:hover {
+thead th.active:hover p a {
        background-color: rgba(0, 0, 0, .5);
 }
 
-thead th a, thead th .emptyHead {
-       color: #69c !important;
-       text-shadow: 0 -1px 0 #000;
+thead th.columnMark p.emptyHead {
+       background-color: transparent;
+       padding: 0 !important;
        display: block;
-       text-decoration: none !important;
-       padding: 5px 7px;
+       width: 30px;
 }
 
-thead th a:hover {
-       color: #fff !important;
-}
-
-thead th.active a {
-       font-weight: bold;
-       color: #fff !important;
+thead th p a img {
+       margin-top: -5px !important;
+       margin-bottom: -3px !important;
 }
 
 /* Table Body */
@@ -1067,18 +1102,7 @@ p.warning {
 }
 
 
-
-
-#actionProxyLoading {
-       background-color: #faebd7;
-       border: 1px solid #f80;
-       border-top-width: 0;
-       border-radius: 0 0 5px 5px;
-       left: 43%;
-       padding: 7px 21px 7px;
-       position: fixed;
-       top: 0;
-}
+/* -- -- -- -- -- ToDo: Fieldset -- -- -- -- -- */
 
 fieldset {
        background-color: rgba(230, 230, 230, .1);
@@ -1173,6 +1197,17 @@ div#ajaxExceptionStacktrace {
 
 /* ToDo */
 
+#actionProxyLoading {
+       background-color: #faebd7;
+       border: 1px solid #f80;
+       border-top-width: 0;
+       border-radius: 0 0 5px 5px;
+       left: 43%;
+       padding: 7px 21px 7px;
+       position: fixed;
+       top: 0;
+}
+
 div.wcfDimensions {
        display: inline-block;
 }
@@ -1262,22 +1297,21 @@ div.ui-widget-overlay {
 }
 
 .ui-tabs .ui-tabs-nav li a {
-       background-color: #fefefe;
-       background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#eee));
-       background-image: -moz-linear-gradient(0% 0% 270deg, #fefefe, #eee);
-       background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#eee));
-       background-image: -o-linear-gradient(#fefefe, #eee);
-       background-image: linear-gradient(#fefefe, #eee);
-       
+       float: left;
+       padding: 7px 14px;
+       text-decoration: none;
        border: 1px solid #ccc;
        border-bottom-width: 0;
        
        border-top-left-radius: 3px;
        border-top-right-radius: 3px;
        
-       float: left;
-       padding: 7px 14px;
-       text-decoration: none;
+       background-color: #fefefe;
+       background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#eee));
+       background-image: -moz-linear-gradient(0% 0% 270deg, #fefefe, #eee);
+       background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#eee));
+       background-image: -o-linear-gradient(#fefefe, #eee);
+       background-image: linear-gradient(#fefefe, #eee);
 }
 
 .ui-tabs .ui-tabs-nav li.ui-tabs-selected {
@@ -1287,11 +1321,11 @@ div.ui-widget-overlay {
 
 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
        background-color: #fefefe;      
-       background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#eee), to(#fefefe));
-       background-image: -moz-linear-gradient(0% 0% 270deg, #eee, #fefefe);
-       background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#eee), to(#fefefe));
-       background-image: -o-linear-gradient(#eee, #fefefe);
-       background-image: linear-gradient(#eee, #fefefe);
+       background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#fefefe));
+       background-image: -moz-linear-gradient(0% 0% 270deg, #fff, #fefefe);
+       background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#fefefe));
+       background-image: -o-linear-gradient(#fff, #fefefe);
+       background-image: linear-gradient(#fff, #fefefe);
        
        border-bottom: 1px solid #fefefe;
 }
@@ -1308,7 +1342,7 @@ div.ui-widget-overlay {
 }
 
 .ui-tabs .ui-tabs-panel {
-       background-color: #fefefe;
+       background-color: #fefefe);
        border: 1px solid #ccc !important;
        z-index: 89; /* Prevents border overlay during transition */
        display: block;

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 3957fd56ae227ce97197d24218f6efe1db24988e..503a8bc10501c4598743d328909c4d2bdd01806e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -14,24 +14,24 @@
 <fieldset>
        <legend>{lang}wcf.acp.cache.data{/lang}</legend>
        
-       <div class="formElement">
-               <p class="formFieldLabel">{lang}wcf.acp.cache.data.source{/lang}</p>
-               <p class="formField">{$cacheData.source}</p>
-       </div>
+       <dl>
+               <dt><label>{lang}wcf.acp.cache.data.source{/lang}</label></dt>
+               <dd>{$cacheData.source}</dd>
+       </dl>
        {if $cacheData.version}
-               <div class="formElement">
-                       <p class="formFieldLabel">{lang}wcf.acp.cache.data.version{/lang}</p>
-                       <p class="formField">{$cacheData.version}</p>
-               </div>
+               <dl>
+                       <dt><label>{lang}wcf.acp.cache.data.version{/lang}</label></dt>
+                       <dd>{$cacheData.version}</dd>
+               </dl>
        {/if}
-       <div class="formElement">
-               <p class="formFieldLabel">{lang}wcf.acp.cache.data.size{/lang}</p>
-               <p class="formField">{@$cacheData.size|filesize}</p>
-       </div>
-       <div class="formElement">
-               <p class="formFieldLabel">{lang}wcf.acp.cache.data.files{/lang}</p>
-               <p class="formField">{#$cacheData.files}</p>
-       </div>
+       <dl>
+               <dt><label>{lang}wcf.acp.cache.data.size{/lang}</label></dt>
+               <dd>{@$cacheData.size|filesize}</dd>
+       </dl>
+       <dl>
+               <dt><label>{lang}wcf.acp.cache.data.files{/lang}</label></dt>
+               <dd>{#$cacheData.files}</dd>
+       </dl>
        
        {if $additionalFields|isset}{@$additionalFields}{/if}
 </fieldset>
@@ -55,11 +55,11 @@
                        <table id="{$cache}">
                                <thead>
                                        <tr>
-                                               <th><p><span class="emptyHead">{lang}wcf.acp.cache.list.name{/lang}</span></p></th>
-                                               <th><p><span class="emptyHead">{lang}wcf.acp.cache.list.size{/lang}</span></p></th>
-                                               <th><p><span class="emptyHead">{lang}wcf.acp.cache.list.mtime{/lang}</span></p></th>
+                                               <th><p class="emptyHead">{lang}wcf.acp.cache.list.name{/lang}</p></th>
+                                               <th><p class="emptyHead">{lang}wcf.acp.cache.list.size{/lang}</p></th>
+                                               <th><p class="emptyHead">{lang}wcf.acp.cache.list.mtime{/lang}</p></th>
                                                {if $files.0.perm|isset}
-                                                       <th><p><span class="emptyHead">{lang}wcf.acp.cache.list.perm{/lang}</span></p></th>
+                                                       <th><p class="emptyHead">{lang}wcf.acp.cache.list.perm{/lang}</p></th>
                                                {/if}
                                        </tr>
                                </thead>
@@ -85,4 +85,13 @@
        {/if}
 {/foreach}
 
+<div class="contentFooter">
+       <nav class="largeButtons">
+               <ul>
+                       <li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="index.php?action=CacheClear{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/deleteM.png" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+               </ul>
+       </nav>
+</div>
+
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index 72792856760f613d387b174685a77d040cddc4c2..aeeb308859505ea8f61571e6b264ea5221b10603 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -84,8 +84,8 @@
                <table>
                        <thead>
                                <tr class="tableHead">
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
                                </tr>
                        </thead>
                        <tbody>
@@ -111,13 +111,13 @@
                <table class="tableList">
                        <thead>
                                <tr class="tableHead">
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
                                </tr>
                        </thead>
                        <tbody>
                        {foreach from=$requiredPackages item=$package}
-                               <tr class="{cycle values="container-1,container-2"}">
+                               <tr>
                                        <td class="columnText"><p>{lang}wcf.acp.package.install.packageName{/lang}</p></td>
                                        <td class="columnText"><p>{if $package.minversion|isset}{$package.minversion}{/if}</p></td>
                                </tr>

diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
index eb1aef3c224e00d2ea6302350c217c1a148accbf..f2e139ec2c0a2ec3e5c457571a0c3a8b73606710 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
@@ -76,11 +76,11 @@
                <table>
                        <thead>
                                <tr>
-                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</span></p></th>
-                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</span></p></th>
+                                       <th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</p></th>
+                                       <th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</p></th>
                                        
                                        {if $additionalColumns|isset}{@$additionalColumns}{/if}
                                </tr>

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 2a9dba5ef0bb73d3b3f6aed074bd543a956f49b8..59127ded67427cc37826cf36f8467cf6104166da 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -103,11 +103,11 @@
                <table id="requiredPackages">
                        <thead>
                                <tr class="tableHead">
-                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</span></p></th>
-                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</span></p></th>
+                                       <th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</p></th>
+                                       <th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</p></th>
                                        
                                        {if $additionalColumns|isset}{@$additionalColumns}{/if}
                                </tr>
@@ -168,11 +168,11 @@
                <table id="dependentPackages">
                        <thead>
                                <tr class="tableHead">
-                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</span></p></th>
-                                       <th colspan="2"><p><span class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</span></p></th>
-                                       <th><p><span class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</span></p></th>
+                                       <th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</p></th>
+                                       <th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
+                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</p></th>
                                        
                                        {if $additionalColumns|isset}{@$additionalColumns}{/if}
                                </tr>

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index 30c77a48763bfb4568b51074161075de51f75d31..e221953705c9448b84192f9351d46966a15c4926 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -74,7 +74,7 @@
                <table>
                        <thead>
                                <tr class="tableHead">
-                                       <th class="columnMark"><p><label class="emptyHead"><input type="checkbox" name="userMarkAll" /></label></p></th>
+                                       <th class="columnMark"><p class="emptyHead"><label><input type="checkbox" name="userMarkAll" /></label></p></th>
                                        <th class="columnUserID{if $sortField == 'userID'} active{/if}" colspan="2"><p><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=userID&amp;sortOrder={if $sortField == 'userID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
                                        <th class="columnUsername{if $sortField == 'username'} active{/if}"><p><a href="index.php?page=UserList&amp;searchID={@$searchID}&amp;action={@$encodedAction}&amp;pageNo={@$pageNo}&amp;sortField=username&amp;sortOrder={if $sortField == 'username' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.user.username{/lang}{if $sortField == 'username'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></dipv></th>
                                        

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 5d982162d2e378b96fee5eeb5cd71976ddc410a4..d324397fbda924ead33712a10b2bd4da970bf9ca 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -70,71 +70,48 @@
                                <legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
                                
                                <div>
-                                       <div id="subjectDiv" class="formElement{if $errorField == 'subject'} formError{/if}">
-                                               <div class="formFieldLabel">
-                                                       <label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label>
-                                               </div>
-                                               <div class="formField">
-                                                       <input type="text" id="subject" name="subject" value="{$subject}" class="inputText" />
-                                                       {if $errorField == 'subject'}
-                                                               <p class="innerError">
-                                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                               </p>
-                                                       {/if}
-                                               </div>
-                                               <div id="subjectHelpMessage" class="formFieldDesc hidden">
-                                                       <p>{lang}wcf.acp.user.sendMail.subject.description{/lang}</p>
-                                               </div>
-                                       </div>
+                                       <dl id="subjectDiv"{if $errorField == 'subject'} class="formError"{/if}>
+                                               <dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
+                                               <dd><input type="text" id="subject" name="subject" value="{$subject}" class="inputText" /></dd>
+                                               {if $errorField == 'subject'}
+                                                       <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+                                               {/if}
+                                               <small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
+                                       </dl>
                                        <script type="text/javascript">//<![CDATA[
                                                inlineHelp.register('subject');
                                        //]]></script>
                                        
-                                       <div id="fromDiv" class="formElement{if $errorField == 'from'} formError{/if}">
-                                               <div class="formFieldLabel">
-                                                       <label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label>
-                                               </div>
-                                               <div class="formField">
-                                                       <input type="text" id="from" name="from" value="{$from}" class="inputText" />
-                                                       {if $errorField == 'from'}
-                                                               <p class="innerError">
-                                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                               </p>
-                                                       {/if}
-                                               </div>
-                                               <div id="fromHelpMessage" class="formFieldDesc hidden">
-                                                       <p>{lang}wcf.acp.user.sendMail.from.description{/lang}</p>
-                                               </div>
-                                       </div>
+                                       <dl id="fromDiv"{if $errorField == 'from'} class="formError"{/if}>
+                                               <dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
+                                               <dd><input type="text" id="from" name="from" value="{$from}" class="inputText" /></dd>
+                                               {if $errorField == 'from'}
+                                                       <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+                                               {/if}
+                                               <small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small><!-- ToDo: Language variable contains paragraphs! -->
+                                       </dl>
                                        <script type="text/javascript">//<![CDATA[
                                                inlineHelp.register('from');
                                        //]]></script>
                                
-                                       <div id="textDiv" class="formElement{if $errorField == 'text'} formError{/if}">
-                                               <div class="formFieldLabel">
-                                                       <label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label>
-                                               </div>
-                                               <div class="formField">
-                                                       <textarea id="text" name="text" rows="15" cols="40">{$text}</textarea>
-                                                       {if $errorField == 'text'}
-                                                               <p class="innerError">
-                                                                       {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                               </p>
-                                                       {/if}
-                                               </div>
-                                               <div id="textHelpMessage" class="formFieldDesc hidden">
-                                                       <p>{lang}wcf.acp.user.sendMail.text.description{/lang}</p>
-                                               </div>
-                                       </div>
+                                       <dl id="textDiv"{if $errorField == 'text'} class="formError"{/if}>
+                                               <dt class="formFieldLabel"><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
+                                               <dd class="formField"><textarea id="text" name="text" rows="15" cols="40">{$text}</textarea></dd>
+                                               {if $errorField == 'text'}
+                                                       <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+                                               {/if}
+                                               <small id="textHelpMessage" class="formFieldDesc hidden">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
+                                       </dl>
                                        <script type="text/javascript">//<![CDATA[
                                                inlineHelp.register('text');
                                        //]]></script>
                                        
-                                       <div class="formElement">
-                                               <div class="formField">
+                                       <dl>
+                                               <dt></dt>
+                                               <dd>
                                                        <label><input type="checkbox" id="enableHTML" name="enableHTML" {if $enableHTML == 1}checked="checked" {/if}value="1" /> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
-                                               </div>
-                                       </div>
+                                               </dd>
+                                       </dl>
                                </div>
                                
                                {if $additionalFields|isset}{@$additionalFields}{/if}