From: Luzifr Date: Tue, 9 Aug 2011 17:33:42 +0000 (+0200) Subject: Code format, removed one div level (container-1), system notifications styled, some... X-Git-Tag: 2.0.0_Beta_1~1896^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eee4c4ff0fdf96fa4014189a3fb9eaff4b0f735e;p=GitHub%2FWoltLab%2FWCF.git Code format, removed one div level (container-1), system notifications styled, some other improvements --- diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index 4fbb2ae718..48f725b3ec 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -141,10 +141,12 @@ header.pageHeader div#logo a { nav.mainMenu { margin: 0 30px; background-color: rgba(0, 0, 0, .4); - border-radius: 5px 5px 0 0; display: table; position: relative; bottom: -5px; + + border-top-left-radius: 5px; + border-top-right-radius: 5px; } nav.mainMenu:after { @@ -249,6 +251,11 @@ section.content { z-index: 100; } +section.content .content { + border: 1px solid #ccc; + padding: 13px 23px; +} + div.main > div section:only-child { display: block !important; width: auto; @@ -407,7 +414,7 @@ footer nav.footerNavigation ul li { } .mainHeading > hgroup { - height: 48px; + min-height: 48px; padding-left: 60px; margin-bottom: 30px; } @@ -450,11 +457,19 @@ footer nav.footerNavigation ul li { fieldset { border: 1px solid #ccc; border-radius: 7px; - background-color: rgba(230, 230, 230, .1); + background-color: rgba(0, 0, 0, .015); margin: 15px 0; padding: 15px; } +/* +fieldset:first-child { + margin-top: 0; +} +fieldset:last-child { + margin-bottom: 0; +} +*/ fieldset legend { color: #999; padding: 0 7px 0; @@ -1181,27 +1196,61 @@ p.success, p.warning { border-radius: 7px; margin-bottom: 14px; - padding: 7px 14px; + padding: 7px 14px 7px 50px; + line-height: 1.5; + text-shadow: 0 1px 0 #fff; + + -webkit-box-shadow: 0 0 7px rgba(0, 0, 0, .1); + -moz-box-shadow: 0 0 7px rgba(0, 0, 0, .1); + -ms-box-shadow: 0 0 7px rgba(0, 0, 0, .1); + -o-box-shadow: 0 0 7px rgba(0, 0, 0, .1); + box-shadow: 0 0 7px rgba(0, 0, 0, .1); + + -webkit-transition: all .1s linear; + -moz-transition: all .1s linear; + -ms-transition: all .1s linear; + -o-transition: all .1s linear; + transition: all .1s linear; } p.info { + color: #68b; + border: 1px solid #9be; background-color: #def; - border: 1px solid #06f; + background-image: url("../../icon/systemInfo.svg"); + background-size: 24px; + background-position: 13px center; + background-repeat: no-repeat; } p.success { + color: #090; + border: 1px solid #0c0; background-color: #efe; - border: 1px solid #090; -} - -p.error { - background-color: #fee; - border: 1px solid #c00; + background-image: url("../../icon/systemSuccess.svg"); + background-size: 24px; + background-position: 13px center; + background-repeat: no-repeat; } p.warning { + color: #990; + border: 1px solid #cc0; background-color: #ffd; - border: 1px solid #660; + background-image: url("../../icon/systemWarning.svg"); + background-size: 24px; + background-position: 13px center; + background-repeat: no-repeat; +} + +p.error { + color: #c00; + border: 1px solid #f99; + background-color: #fee; + background-image: url("../../icon/systemError.svg"); + background-size: 24px; + background-position: 13px center; + background-repeat: no-repeat; } @@ -1334,7 +1383,7 @@ div.ui-widget-overlay { /* -- -- -- -- -- Tab Menu -- -- -- -- -- */ -/* -- -- -- -- -- Parts taken from jQuery UI @ themes/base/jquery.ui.tabs.css -- -- -- -- -- */ +/* Parts taken from jQuery UI @ themes/base/jquery.ui.tabs.css */ /* Tab Menu */ @@ -1392,18 +1441,18 @@ div.ui-widget-overlay { .tabMenu li.ui-state-active a { color: #333 !important; font-weight: bold; - background-color: rgba(230, 230, 230, .15); + background-color: rgba(255, 255, 255, .015); } .tabMenu li.ui-tabs-selected a { background-color: #fefefe; - background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 1)), to(rgba(230, 230, 230, .15))); - background-image: -moz-linear-gradient(0% 0% 270deg, rgba(255, 255, 255, 1), rgba(230, 230, 230, .15)); - background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 1)), to(rgba(230, 230, 230, .15))); - background-image: -o-linear-gradient(rgba(255, 255, 255, 1), rgba(230, 230, 230, .15)); - background-image: linear-gradient(rgba(255, 255, 255, 1), rgba(230, 230, 230, .15)); + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 1)), to(rgba(253, 253, 253, 1))); + background-image: -moz-linear-gradient(0% 0% 270deg, rgba(255, 255, 255, 1), rgba(253, 253, 253, 1)); + background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 1)), to(rgba(253, 253, 253, 1))); + background-image: -o-linear-gradient(rgba(255, 255, 255, 1), rgba(253, 253, 253, 1)); + background-image: linear-gradient(rgba(255, 255, 255, 1), rgba(253, 253, 253, 1)); - border-bottom: 1px solid rgba(230, 230, 230, .15); + border-bottom: 1px solid rgba(253, 253, 253, 1); } .tabMenu li.ui-tabs-selected a, @@ -1420,18 +1469,14 @@ div.ui-widget-overlay { /* Tab Menu Content */ .tabMenuContent { - background-color: rgba(230, 230, 230, .15); border: 1px solid #ccc !important; + background-color: rgba(253, 253, 253, 1); z-index: 89; /* Prevents border overlay during transition */ display: block; margin: -2px 0 0; padding: 15px 23px; } -.content { - border-width: 0 !important; -} - /* ToDo: 2x hidden? */ .ui-tabs .ui-tabs-hide { diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl index 1e8803b83b..2f7af69574 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl @@ -18,6 +18,7 @@

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

+ @@ -32,6 +33,7 @@ {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if} + {foreach from=$sessionAccessLogs item=sessionAccessLog} @@ -48,6 +50,7 @@ {/foreach}
+
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index 600c04a0dc..f55951151f 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -18,6 +18,7 @@

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

+ @@ -32,6 +33,7 @@ {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if} + {foreach from=$sessionLogs item=sessionLog} @@ -48,6 +50,7 @@ {/foreach}
+
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 503a8bc105..0cc40fa1ff 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -52,6 +52,7 @@

{$cache} {#$files|count}

+ @@ -63,6 +64,7 @@ {/if} + {foreach from=$files item=file} @@ -76,6 +78,7 @@ {/foreach}
+
- - - {if $additionalFields|isset}{@$additionalFields}{/if} - + +
+ {lang}wcf.acp.option.export{/lang} + +
+
+

{lang}wcf.acp.option.export.download{/lang}

+ {lang}wcf.acp.option.export.download.description{/lang} +
+
+ + {if $additionalFields|isset}{@$additionalFields}{/if} {include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/optionTypeText.tpl b/wcfsetup/install/files/acp/templates/optionTypeText.tpl index 7052b00487..f1e93baec2 100644 --- a/wcfsetup/install/files/acp/templates/optionTypeText.tpl +++ b/wcfsetup/install/files/acp/templates/optionTypeText.tpl @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl index 663b71539c..9c7ab1c33f 100644 --- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl +++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl @@ -34,20 +34,20 @@ {if !$availableUpdates|count}
-
-

{lang}wcf.acp.packageUpdate.noneAvailable{/lang}

-
+

{lang}wcf.acp.packageUpdate.noneAvailable{/lang}

{else} {foreach from=$availableUpdates item=availableUpdate}
-

- -

+
+

+ +

+
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl index 9a8f5f9c33..a556182012 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl +++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl @@ -81,6 +81,7 @@

{lang}wcf.acp.package.install.updatableInstances{/lang}

{lang}wcf.acp.package.install.updatableInstances.description{/lang}

+ @@ -88,6 +89,7 @@ + {foreach from=$updatableInstances item=$package} @@ -101,34 +103,34 @@ {/if} {if $requiredPackages|count > 0} -
-
-

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

-

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

-
-
-
-

{lang}wcf.acp.package.list.version{/lang}
- - - - - - - - {foreach from=$requiredPackages item=$package} - - - - - {/foreach} - -

{lang}wcf.acp.package.list.name{/lang}

{lang}wcf.acp.package.list.version{/lang}

{lang}wcf.acp.package.install.packageName{/lang}

{if $package.minversion|isset}{$package.minversion}{/if}

+
+
+

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

+

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

+
+ + + + + + + + + + + {foreach from=$requiredPackages item=$package} + + + + + {/foreach} + +

{lang}wcf.acp.package.list.name{/lang}

{lang}wcf.acp.package.list.version{/lang}

{lang}wcf.acp.package.install.packageName{/lang}

{if $package.minversion|isset}{$package.minversion}{/if}

{/if}
- + {if $missingPackages == 0 && $excludingPackages|count == 0 && $excludedPackages|count == 0} {/if} diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index e97e2474d3..475e7e515e 100644 --- a/wcfsetup/install/files/acp/templates/packageList.tpl +++ b/wcfsetup/install/files/acp/templates/packageList.tpl @@ -36,6 +36,7 @@

{lang}wcf.acp.package.list{/lang} {#$items}

+ @@ -48,6 +49,7 @@ {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if} + {foreach from=$packages item=$package} @@ -87,6 +89,7 @@ {/foreach}
+
{/if} diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl index 27b4a4ac9f..13f23d49d7 100644 --- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl +++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl @@ -29,49 +29,48 @@
-
-
- {lang}wcf.acp.package.startInstall.source{/lang} + +
+ {lang}wcf.acp.package.startInstall.source{/lang} + +
+
+
+ + {if $errorField == 'uploadPackage'} + + {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} + {if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if} + {if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if} + {if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if} + {if $errorType == 'uploadFailed'}{lang}wcf.acp.package.startInstall.error.uploadFailed{/lang}{/if} + {if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if} + {if $errorType == 'phpRequirements'}
{$phpRequirements|print_r}
{/if} + + {/if} + {lang}wcf.acp.package.startInstall.source.upload.description{/lang} +
+
-
-
-
- - {if $errorField == 'uploadPackage'} - - {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} - {if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if} - {if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if} - {if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if} - {if $errorType == 'uploadFailed'}{lang}wcf.acp.package.startInstall.error.uploadFailed{/lang}{/if} - {if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if} - {if $errorType == 'phpRequirements'}
{$phpRequirements|print_r}
{/if} - - {/if} - {lang}wcf.acp.package.startInstall.source.upload.description{/lang} -
-
- -
-
-
- - {if $errorField == 'downloadPackage'} - - {if $errorType == 'notFound'}{lang}wcf.acp.package.startInstall.error.notFound{/lang}{/if} - {if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if} - {if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if} - {if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if} - {if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if} - - {/if} - {lang}wcf.acp.package.startInstall.source.download.description{/lang} -
-
-
- - {if $additionalFields|isset}{@$additionalFields}{/if} -
+
+
+
+ + {if $errorField == 'downloadPackage'} + + {if $errorType == 'notFound'}{lang}wcf.acp.package.startInstall.error.notFound{/lang}{/if} + {if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if} + {if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if} + {if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if} + {if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if} + + {/if} + {lang}wcf.acp.package.startInstall.source.download.description{/lang} +
+
+ + + {if $additionalFields|isset}{@$additionalFields}{/if}
diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl index b96f756509..953c7d9a22 100644 --- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl +++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl @@ -73,6 +73,7 @@

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

+ @@ -85,6 +86,7 @@ {if $additionalColumns|isset}{@$additionalColumns}{/if} + {foreach from=$dependentPackages item=package} @@ -122,6 +124,7 @@ {/foreach}
+
{/if} diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl index 6e08a94712..56282b41b1 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl @@ -29,23 +29,23 @@ {if $packageInstallationStack|count}
-
-
- {lang}wcf.acp.packageUpdate.updates{/lang} - -
    - {foreach from=$packageInstallationStack item=package} -
  • - {if $package.action == 'install'} - {lang}wcf.acp.packageUpdate.install{/lang} - {else} - {lang}wcf.acp.packageUpdate.update{/lang} - {/if} -
    • - {/foreach} -
-
-
+ +
+ {lang}wcf.acp.packageUpdate.updates{/lang} + +
    + {foreach from=$packageInstallationStack item=package} +
  • + {if $package.action == 'install'} + {lang}wcf.acp.packageUpdate.install{/lang} + {else} + {lang}wcf.acp.packageUpdate.update{/lang} + {/if} +
    • + {/foreach} +
+
+
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl index 905f672fdc..6486042e30 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl @@ -13,61 +13,60 @@
-
-
- {lang}wcf.acp.packageUpdate.auth.data{/lang} - -
-
{lang}wcf.acp.packageUpdate.auth.url{/lang}
-
{$url}
-
- {if $realm} -
-
{lang}wcf.acp.packageUpdate.auth.realm{/lang}
-
{$realm}
-
- {/if} - {if $message} -
-
{lang}wcf.acp.packageUpdate.auth.message{/lang}
-
{@$message}
-
- {/if} -
+ +
+ {lang}wcf.acp.packageUpdate.auth.data{/lang} -
- {lang}wcf.acp.packageUpdate.auth.input{/lang} - -
-
-
- -

{lang}wcf.acp.packageUpdate.auth.loginUsername.description{/lang}

 -
-
- -
-
-
- - {if $errorField == 'loginPassword'} - - {if $errorType == 'invalid'}{lang}wcf.acp.packageUpdate.auth.error{/lang}{/if} - - {/if} - {lang}wcf.acp.packageUpdate.auth.loginPassword.description{/lang} -
+
+
{lang}wcf.acp.packageUpdate.auth.url{/lang}
+
{$url}
+
+ {if $realm} +
+
{lang}wcf.acp.packageUpdate.auth.realm{/lang}
+
{$realm}
- -
-
- -
-
{lang}wcf.acp.packageUpdate.auth.save.description{/lang}
+ {/if} + {if $message} +
+
{lang}wcf.acp.packageUpdate.auth.message{/lang}
+
{@$message}
-
+ {/if} +
+ +
+ {lang}wcf.acp.packageUpdate.auth.input{/lang} + +
+
+
+ +

{lang}wcf.acp.packageUpdate.auth.loginUsername.description{/lang}

 +
+
+ +
+
+
+ + {if $errorField == 'loginPassword'} + + {if $errorType == 'invalid'}{lang}wcf.acp.packageUpdate.auth.error{/lang}{/if} + + {/if} + {lang}wcf.acp.packageUpdate.auth.loginPassword.description{/lang} +
+
+ +
+
+ +
+
{lang}wcf.acp.packageUpdate.auth.save.description{/lang}
+
+
-
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl index 1599928fbc..f0399b011b 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl @@ -53,69 +53,68 @@ {else}
-
-
- {lang}wcf.acp.packageUpdate.search.server{/lang} - -
-
-
- -
-
- -
-
- {foreach from=$updateServers item=updateServer} -
- -
- {/foreach} -
-
+
+ {lang}wcf.acp.packageUpdate.search.server{/lang} -
- {lang}wcf.acp.packageUpdate.search.conditions{/lang} - -
-
-
- -
-
- -
-
- -
-
-
- -
-
- -
-
{lang}wcf.acp.packageUpdate.search.type{/lang}
-
- -
-
- -
-
- -
-
- -
-
+
+
+
+ +
+
+ +
+
+ {foreach from=$updateServers item=updateServer}
- +
-
-
-
+ {/foreach} + + + +
+ {lang}wcf.acp.packageUpdate.search.conditions{/lang} + +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
{lang}wcf.acp.packageUpdate.search.type{/lang}
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+
+
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl index d90cc2aac2..bb65b63a6e 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl @@ -17,21 +17,22 @@ {foreach from=$packages item=package}
-

- {if $package.standalone == 1} - - {elseif $package.plugin != ''} - - {else} - - {/if} - {$package.packageName} -

+
+

+ {if $package.standalone == 1} + + {elseif $package.plugin != ''} + + {else} + + {/if} + {$package.packageName} +

+
-
-
+
+
+
+ + {if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-
+
- - +
- + {/if} + + {if $availableGroups|count} +
+
+ +
+
+
+ {lang}wcf.acp.user.groups{/lang} + +
+
{htmlCheckboxes options=$availableGroups name='groupIDs' selected=$groupIDs}
+
+ + +
+
+
+ {/if} + + {if $availableLanguages|count > 1}
-
-
- +
+ +
+
+
+ {lang}wcf.acp.user.language{/lang} + +
+
{htmlCheckboxes options=$availableLanguages name='languageIDs' selected=$languageIDs disableEncoding=true}
+
+
+ {/if} + + + {if $additionalFields|isset}{@$additionalFields}{/if} + +
+ + + {if $optionTree|count} + + {/if} + + {if $additionalTabContents|isset}{@$additionalTabContents}{/if} + +
diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl index a85e99d0e1..95be3bb83d 100644 --- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl @@ -84,226 +84,123 @@
-
-

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

+ +
+

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

+
+ +
+ {lang}wcf.acp.user.search.conditions.general{/lang} -
- {lang}wcf.acp.user.search.conditions.general{/lang} - +
+
+
+ + +
+
+ + {if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-
-
- - +
+
+
- - {if $__wcf->session->getPermission('admin.user.canEditMailAddress')} -
-
-
- -
-
- {/if} - - {if $availableGroups|count} -
-
-
-
- {lang}wcf.acp.user.groups{/lang} -
-
- {htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray} - - -
-
-
-
-
- {/if} - - {if $availableLanguages|count > 1} -
-
-
-
- {lang}wcf.acp.user.language{/lang} - -
-
{htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}
-
-
-
-
- {/if} -
- - {if $additionalFields|isset}{@$additionalFields}{/if} - -
- -
-
-
-
+ {/if} - {if $options|count} - + {if $availableGroups|count} +
+
+
+
+ {lang}wcf.acp.user.groups{/lang} +
+
+ {htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray} + + +
+
+
+
+
{/if} - {if $additionalTabContents|isset}{@$additionalTabContents}{/if} -
+ {if $availableLanguages|count > 1} +
+
+
+
+ {lang}wcf.acp.user.language{/lang} + +
+
{htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}
+
+
+
+
+ {/if} + + + {if $additionalFields|isset}{@$additionalFields}{/if} + + + + + + {if $options|count} + + {/if} + + {if $additionalTabContents|isset}{@$additionalTabContents}{/if}
-
-

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

- - -
-
-
- {lang}wcf.acp.user.massProcessing.action{/lang} - -
-
- {if $__wcf->session->getPermission('admin.user.canMailUser')} - - - {/if} - {if $__wcf->session->getPermission('admin.user.canEditUser')} - - {/if} - {if $__wcf->session->getPermission('admin.user.canDeleteUser')} - - {/if} - - {if $additionalActions|isset}{@$additionalActions}{/if} - - {if $errorField == 'action'} - - {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} - - {/if} -
-
-
-
- +
+

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

+
-
+ +
+
- {lang}wcf.acp.user.sendMail.mail{/lang} + {lang}wcf.acp.user.massProcessing.action{/lang} -
-
+
- - {if $errorField == 'from'} - - {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} - + {if $__wcf->session->getPermission('admin.user.canMailUser')} + + {/if} - {lang}wcf.acp.user.sendMail.from.description{/lang} -
-
- -
-
- -
-
- - {if $errorField == 'subject'} - - {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} - + {if $__wcf->session->getPermission('admin.user.canEditUser')} + {/if} - {lang}wcf.acp.user.sendMail.subject.description{/lang} -
-
- -
-
-
- - {if $errorField == 'text'} - - {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} - + {if $__wcf->session->getPermission('admin.user.canDeleteUser')} + {/if} - {lang}wcf.acp.user.sendMail.text.description{/lang} -
-
- -
-
-
- -
-
-
- - -
-
- {lang}wcf.acp.user.exportEmailAddress.format{/lang} - -
-
-
-
- {lang}wcf.acp.user.exportEmailAddress.fileType{/lang} - -
-
-
-
-
-
-
- -
-
-
- -
-
- -
-
-
- -
-
-
-
- -
-
- {lang}wcf.acp.user.groups{/lang} - -
- - {htmlCheckboxes options=$availableGroups name=assignToGroupIDArray selected=$assignToGroupIDArray} - {if $errorField == 'assignToGroupIDArray'} + + {if $additionalActions|isset}{@$additionalActions}{/if} + + {if $errorField == 'action'} {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} @@ -311,10 +208,115 @@
+ + + +
+
+ {lang}wcf.acp.user.sendMail.mail{/lang} + +
+
+
+ + {if $errorField == 'from'} + + {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} + + {/if} + {lang}wcf.acp.user.sendMail.from.description{/lang} +
+
+ +
+
+ +
+
+ + {if $errorField == 'subject'} + + {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} + + {/if} + {lang}wcf.acp.user.sendMail.subject.description{/lang} +
+
+ +
+
+
+ + {if $errorField == 'text'} + + {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} + + {/if} + {lang}wcf.acp.user.sendMail.text.description{/lang} +
+
+ +
+
+
+ +
+
+ + +
+
+ {lang}wcf.acp.user.exportEmailAddress.format{/lang} + +
+
+
+
+ {lang}wcf.acp.user.exportEmailAddress.fileType{/lang} + +
+
+
+
+
+
+
- {if $additionalActionSettings|isset}{@$additionalActionSettings}{/if} +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ {lang}wcf.acp.user.groups{/lang} + +
+ + {htmlCheckboxes options=$availableGroups name=assignToGroupIDArray selected=$assignToGroupIDArray} + {if $errorField == 'assignToGroupIDArray'} + + {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} + + {/if} + +
+
+
+ + {if $additionalActionSettings|isset}{@$additionalActionSettings}{/if}