More corrections. Preparing for newly-built Form Groups.

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 951d8752c0889c6ad71e66099792931ecae2e3f6..78aa03db5d7774cada5a7deac3f58e62664fe03e 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -515,21 +515,42 @@ label {
        color: #69c;
 }
 
-/* Structure (deprecated?) */
+/* Structure */
 
-div.formElement {
+/* Form Element (deprecated) */
+
+.formElement {
        clear: both;
        margin-bottom: 14px;
 }
 
-div.formGroupLabel label {
-       display: none;
+/* Form Group (deprecated) */
+
+.formGroup {
+       margin-top: 10px;
+}
+
+.formGroup .formGroupLabel {
+       text-align: right;
+       float: left;
+       width: 233px;
 }
 
-div.formGroupField div.formField label {
+.formGroup .formGroupField {
        display: block;
+       margin-left: 250px;
 }
 
+.formGroup .formGroupField div.formField label {
+       display: block;
+}
+
+.formGroup .formGroupField fieldset legend {
+       display: none;
+}
+
+/* Form Group (deprecated) */
+
 .formSubmit {
        text-align: center;
        margin-top: 15px;

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index 0355eb224c80d05aa6da990d8d394ef9431b4c45..1e8803b83b36bf933b8315ff5ae0a19c80c1ce89 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -16,7 +16,7 @@
 {if $sessionAccessLogs|count}
        <div class="border boxTitle">
                <hgroup>
-                       <h1>{lang}wcf.acp.sessionLog.access.view.count{/lang}</h1>
+                       <h1>{lang}wcf.acp.sessionLog.access.view.count{/lang} <span class="badge" title="{lang}wcf.acp.sessionLog.access.view.count{/lang}">{#$items}</span></h1>
                </hgroup>
                <table>
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index baacbc93dca2e539bad9904fb404081669c1890e..93fd0898611092aadf35d5fd70415edb35f4c65f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -147,6 +147,7 @@
                        {if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditPassword')}
                                <fieldset>
                                        <legend>{lang}wcf.user.password{/lang}</legend>
+                                       
                                        <dl{if $errorType.password|isset} class="formError"{/if}>
                                                <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
                                                <dd>
@@ -201,14 +202,12 @@
                                                                        <legend>{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
                                                                        
                                                                        {if $categoryLevel2[object]->categoryName == 'settings.general' && $availableLanguages|count > 1}
-                                                                               <div class="formElement">
-                                                                                       <div class="formFieldLabel">
-                                                                                               <label for="languageID">{lang}wcf.user.language{/lang}</label>
-                                                                                       </div>
-                                                                                       <div class="formField">
+                                                                               <dl>
+                                                                                       <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
+                                                                                       <dd>
                                                                                                {htmlOptions options=$availableLanguages selected=$languageID name=languageID id=languageID disableEncoding=true}
-                                                                                       </div>
-                                                                               </div>
+                                                                                       </dd>
+                                                                               </dl>
                                                                                        
                                                                                {if $availableContentLanguages|count > 1}
                                                                                        <div class="formGroup">

diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
index 0eec19f856cd2edc33608edbd9826f97425c13a0..ca5eccdb290fad0adb13e4f4ff7e2c5c02b10321 100644 (file)
--- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
@@ -176,7 +176,7 @@
        
        <div class="border content">
                <div class="container-1">
-                       <h3 class="subHeading">{lang}wcf.acp.user.massProcessing.action{/lang}</h3>
+                       <h1 class="subHeading">{lang}wcf.acp.user.massProcessing.action{/lang}</h1>
                                
                        <div class="formGroup{if $errorField == 'action'} formError{/if}">
                                <div class="formGroupLabel">
@@ -269,7 +269,7 @@
                                <fieldset>
                                        <legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>
                                        
-                                       <div>
+                                       
                                                <div class="formGroup">
                                                        <div class="formGroupLabel">
                                                                <label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label>
@@ -301,7 +301,7 @@
                                                                <input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
                                                        </dd>
                                                </dl>
-                                       </div>
+                                       
                                </fieldset>
                        </div>