From c1db87a8a0de157bdb961e3d8cf535f82b44ebff Mon Sep 17 00:00:00 2001 From: Luzifr Date: Mon, 8 Aug 2011 15:30:05 +0200 Subject: [PATCH] More corrections. Preparing for newly-built Form Groups. --- wcfsetup/install/files/acp/style/testing.css | 31 ++++++++++++++++--- .../files/acp/templates/acpSessionLog.tpl | 2 +- .../install/files/acp/templates/userAdd.tpl | 13 ++++---- .../acp/templates/usersMassProcessing.tpl | 6 ++-- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index 951d8752c0..78aa03db5d 100644 --- 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 0355eb224c..1e8803b83b 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl @@ -16,7 +16,7 @@ {if $sessionAccessLogs|count}
-

{lang}wcf.acp.sessionLog.access.view.count{/lang}

+

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

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl index baacbc93dc..93fd089861 100644 --- 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')}
{lang}wcf.user.password{/lang} +
@@ -201,14 +202,12 @@ {lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang} {if $categoryLevel2[object]->categoryName == 'settings.general' && $availableLanguages|count > 1} -
-
- -
-
+
+
+
{htmlOptions options=$availableLanguages selected=$languageID name=languageID id=languageID disableEncoding=true} -
-
+
+ {if $availableContentLanguages|count > 1}
diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl index 0eec19f856..ca5eccdb29 100644 --- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl @@ -176,7 +176,7 @@
-

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

+

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

@@ -269,7 +269,7 @@
{lang}wcf.acp.user.exportEmailAddress.format{/lang} -
+
@@ -301,7 +301,7 @@ -
+
-- 2.20.1