From 0f2a6d9c5159640100e099b84c32de8a6fa66e25 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Thu, 18 Aug 2011 22:25:14 +0200 Subject: [PATCH] Removed links to PNG icons, fixed tabbed view without form elements, indented view for checkbox and radio descriptions, removed deprecated form CSS. Also restored my changes in UserGroupAdd.tpl, which were lost after Alex's last commit. ;-) --- wcfsetup/install/files/acp/style/testing.css | 60 +++++++------------ .../install/files/acp/templates/cacheList.tpl | 8 +-- .../files/acp/templates/packageView.tpl | 34 +++++------ .../files/acp/templates/userGroupAdd.tpl | 5 +- 4 files changed, 44 insertions(+), 63 deletions(-) diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index 6cbbc002ec..808cd7cbfc 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -533,10 +533,6 @@ dl { position: relative; } -dl.disabled > dt { - color: #777; -} - dl > dt { color: #69c; float: left; @@ -545,8 +541,18 @@ dl > dt { margin-top: 5px; /* not so nice */ } +dl > dt > label { + margin-top: 5px; + display: block; +} + +dl.disabled > dt { + color: #777; +} + dl > dd { margin-left: 250px; + padding-top: 5px; } dl > dd > small { @@ -559,7 +565,8 @@ dl > dd > small { /* Nested */ dl > dd > fieldset { - + margin-top: 0; + margin-bottom: 0; } dl > dd > fieldset > legend { @@ -613,46 +620,17 @@ label { /* Structure */ -/* Form Element (deprecated) */ - -.formElement { - clear: both; - margin-bottom: 14px; -} - -/* Form Group (deprecated) */ - -.formGroup { - margin-top: 10px; -} - -.formGroup .formGroupLabel { - text-align: right; - margin-top: 7px; - float: left; - width: 233px; -} - -.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; } +input[type='checkbox'] ~ small, +input[type='radio'] ~ small { + margin-top: 0; + margin-left: 21px; +} + /* Form Elements */ input[type='reset'], @@ -1615,6 +1593,8 @@ div.ui-widget-overlay { color: #666; border: 1px solid #999; background-color: #fff; + margin-right: 0; + margin-left: 0; padding: 3px 10px 5px; background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)); diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 827cb98de5..a2fa5a0dfc 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -15,21 +15,21 @@ {lang}wcf.acp.cache.data{/lang}
-
+
{lang}wcf.acp.cache.data.source{/lang}
{$cacheData.source}
{if $cacheData.version}
-
+
{lang}wcf.acp.cache.data.version{/lang}
{$cacheData.version}
{/if}
-
+
{lang}wcf.acp.cache.data.size{/lang}
{@$cacheData.size|filesize}
-
+
{lang}wcf.acp.cache.data.files{/lang}
{#$cacheData.files}
diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index e4d3869ac2..5762e18284 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -67,7 +67,7 @@ {/if}
{lang}wcf.acp.package.view.author{/lang}
-
{if $package->authorURL}{$package->author}{else}{$package->author}{/if}
+
{if $package->authorURL}{$package->author}{else}{$package->author}{/if}
{if $additionalFields|isset}{@$additionalFields}{/if} @@ -96,7 +96,7 @@ {if $requiredPackages|count > 0}
- +

{lang}wcf.acp.package.view.requiredPackages{/lang}

{lang}wcf.acp.package.view.requiredPackages.description{/lang}

@@ -120,14 +120,14 @@ {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} - + {/if} {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $package.package != 'com.woltlab.wcf' && $package.packageID != PACKAGE_ID} - + {else} - + {/if} {if $package.additionalButtons|isset}{@$package.additionalButtons}{/if} @@ -135,11 +135,11 @@

{@$package.packageID}

{if $package.standalone} - + {elseif $package.parentPackageID} - + {else} - + {/if}

{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}

@@ -163,7 +163,7 @@ {if $dependentPackages|count > 0}
- +

{lang}wcf.acp.package.view.dependentPackages{/lang}

{lang}wcf.acp.package.view.dependentPackages.description{/lang}

@@ -187,14 +187,14 @@ {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} - + {/if} {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $package.package != 'com.woltlab.wcf' && $package.packageID != PACKAGE_ID} - + {else} - + {/if} {if $package.additionalButtons|isset}{@$package.additionalButtons}{/if} @@ -202,11 +202,11 @@

{@$package.packageID}

{if $package.standalone} - + {elseif $package.parentPackageID} - + {else} - + {/if}

{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index 28dae03181..eae70f5cf0 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -9,7 +9,7 @@
- +

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

@@ -30,7 +30,7 @@
@@ -38,6 +38,7 @@
+
{lang}wcf.acp.group.data{/lang} -- 2.20.1