From ed735943079856e2ff8b0b13d35a64d78d0a19e7 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 1 May 2012 17:10:48 +0200 Subject: [PATCH] Fixed some small issues --- .../template/radioButtonOptionType.tpl | 12 ++--- com.woltlab.wcf/template/redirect.tpl | 2 +- .../acp/templates/radioButtonOptionType.tpl | 13 ++---- .../files/acp/templates/userAssignToGroup.tpl | 25 ++++------ .../acp/templates/userEmailAddressExport.tpl | 32 ++++--------- .../files/acp/templates/userGroupAdd.tpl | 4 +- .../install/files/acp/templates/userMail.tpl | 13 +----- .../files/acp/templates/userSearch.tpl | 46 ++++--------------- .../acp/templates/usersMassProcessing.tpl | 31 +++---------- wcfsetup/install/files/style/badge.less | 3 +- wcfsetup/install/files/style/comments.less | 2 +- wcfsetup/install/files/style/forms.less | 22 +-------- 12 files changed, 46 insertions(+), 159 deletions(-) diff --git a/com.woltlab.wcf/template/radioButtonOptionType.tpl b/com.woltlab.wcf/template/radioButtonOptionType.tpl index f6cd3f7197..c24b6607b7 100644 --- a/com.woltlab.wcf/template/radioButtonOptionType.tpl +++ b/com.woltlab.wcf/template/radioButtonOptionType.tpl @@ -1,9 +1,3 @@ -
-
- {foreach from=$selectOptions key=key item=selectOption} -
- -
- {/foreach} -
-
+{foreach from=$selectOptions key=key item=selectOption} + +{/foreach} diff --git a/com.woltlab.wcf/template/redirect.tpl b/com.woltlab.wcf/template/redirect.tpl index 4c047aebaa..231f3540c9 100644 --- a/com.woltlab.wcf/template/redirect.tpl +++ b/com.woltlab.wcf/template/redirect.tpl @@ -11,7 +11,7 @@

{@$message}

-

{lang}wcf.global.redirect.url{/lang}

+ {lang}wcf.global.redirect.url{/lang}
{include file='footer' sandbox=false} diff --git a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl index f6cd3f7197..bca2e4af4d 100644 --- a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl @@ -1,9 +1,4 @@ -
-
- {foreach from=$selectOptions key=key item=selectOption} -
- -
- {/foreach} -
-
+{foreach from=$selectOptions key=key item=selectOption} + +{/foreach} + \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl index 6bbd8211e4..07c0355e21 100644 --- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl +++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl @@ -1,38 +1,33 @@ {include file='header'} -
- -
+
+

{lang}wcf.acp.user.assignToGroup{/lang}

{if $errorField} -

{lang}wcf.global.form.error{/lang}

+

{lang}wcf.global.form.error{/lang}

{/if}
- -
- +
{lang}wcf.acp.user.assignToGroup.markedUsers{/lang}
    - {implode from=$users item=$user}
  • {$user}
    • {/implode} + {implode from=$users item=$user}
  • {$user}
    • {/implode}
{lang}wcf.acp.user.groups{/lang} - -
-
+
{htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs} {if $errorField == 'groupIDs'} - + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} {/if} @@ -43,11 +38,9 @@
-
- +
- {@SID_INPUT_TAG} -
+
{include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl index fd9fc79ef3..8362822543 100644 --- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl +++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl @@ -8,21 +8,19 @@ //]]> -
- -
+
+

{lang}wcf.acp.user.exportEmailAddress{/lang}

-
- +
{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}
    - {implode from=$users item=$user}
  • {$user}
    • {/implode} + {implode from=$users item=$user}
  • {$user}
    • {/implode}
@@ -30,27 +28,17 @@ {lang}wcf.acp.user.exportEmailAddress.format{/lang}
-
- -
+
-
- {lang}wcf.acp.user.exportEmailAddress.fileType{/lang} - -
-
-
    • -
    • -
    -
    -
    + +
    - +
    @@ -64,10 +52,8 @@
    -
    - +
    - {@SID_INPUT_TAG}
    diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index 788b524db0..1a359e7913 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -103,9 +103,7 @@ {lang}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}{/lang} {hascontent}{content}{lang __optional=true}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}.description{/lang}{/content}{/hascontent} -
    - {include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.acp.group.option.'} -
    + {include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.acp.group.option.'} {/foreach} {/if} diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl index 66363dcdbe..b4c10ccacc 100644 --- a/wcfsetup/install/files/acp/templates/userMail.tpl +++ b/wcfsetup/install/files/acp/templates/userMail.tpl @@ -58,19 +58,8 @@ {lang}wcf.acp.user.sendMail.groups{/lang} -
    - -
    -
    - {lang}wcf.acp.user.groups{/lang} - -
    -
    - {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs} -
    -
    -
    + {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs} {if $errorField == 'groupIDs'} {if $errorType == 'empty'} diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl index 0e555d75ac..b1be9ed649 100644 --- a/wcfsetup/install/files/acp/templates/userSearch.tpl +++ b/wcfsetup/install/files/acp/templates/userSearch.tpl @@ -77,15 +77,9 @@
    -
    - {lang}wcf.acp.user.groups{/lang} - -
    -
    {htmlCheckboxes options=$availableGroups name='groupIDs' selected=$groupIDs}
    -
    + {htmlCheckboxes options=$availableGroups name='groupIDs' selected=$groupIDs} - -
    +
    {/if} @@ -96,13 +90,7 @@
    -
    - {lang}wcf.acp.user.language{/lang} - -
    -
    {htmlCheckboxes options=$availableLanguages name='languageIDs' selected=$languageIDs disableEncoding=true}
    -
    -
    + {htmlCheckboxes options=$availableLanguages name='languageIDs' selected=$languageIDs disableEncoding=true}
    {/if} @@ -182,17 +170,9 @@
    -
    - {lang}wcf.acp.user.search.display.columns.profile{/lang} - -
    -
    - {foreach from=$optionTree item=option} - - {/foreach} -
    -
    -
    + {foreach from=$optionTree item=option} + + {/foreach}
    {/if*} @@ -200,18 +180,8 @@
    -
    - {lang}wcf.acp.user.search.display.columns.other{/lang} - -
    -
    -
    - -
    - - {if $additionalColumns|isset}{@$additionalColumns}{/if} -
    - + + diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl index 337a2eb0d6..3d1c6ba312 100644 --- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl @@ -101,16 +101,9 @@
    -
    - {lang}wcf.acp.user.groups{/lang} -
    -
    - {htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray} + {htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray} - -
    -
    -
    +
    {/if} @@ -119,13 +112,7 @@
    -
    - {lang}wcf.acp.user.language{/lang} - -
    -
    {htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}
    -
    -
    + {htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}
    {/if} @@ -244,21 +231,15 @@
    -
    - {lang}wcf.acp.user.exportEmailAddress.fileType{/lang} - -
    -
    -
    -
    -
    + +
    - +
    diff --git a/wcfsetup/install/files/style/badge.less b/wcfsetup/install/files/style/badge.less index fd4752d6f0..39cb95c7e0 100644 --- a/wcfsetup/install/files/style/badge.less +++ b/wcfsetup/install/files/style/badge.less @@ -15,9 +15,10 @@ color: @wcfContentBackgroundColor; display: inline-block; font-size: @wcfSmallFontSize; + font-weight: normal !important; padding: 1px 8px 2px; position: relative; - text-shadow: none; + text-shadow: none !important; white-space: nowrap; .badgeShadow(@wcfContentBackgroundColor); diff --git a/wcfsetup/install/files/style/comments.less b/wcfsetup/install/files/style/comments.less index ac0463e2e8..9f1bdbf4b8 100644 --- a/wcfsetup/install/files/style/comments.less +++ b/wcfsetup/install/files/style/comments.less @@ -88,7 +88,7 @@ } /* like display */ -.commentList .likesDisplay { +.commentList .likesBadge { display: inline-block; margin: -2px 0 -2px @wcfGapTiny; } diff --git a/wcfsetup/install/files/style/forms.less b/wcfsetup/install/files/style/forms.less index be52c477bc..577b779e27 100644 --- a/wcfsetup/install/files/style/forms.less +++ b/wcfsetup/install/files/style/forms.less @@ -69,32 +69,12 @@ fieldset { margin-top: 2px; } - /* nested fieldsets */ - > fieldset { - padding-top: 0; - - > legend { - display: none; - } - - > dl { - > dt { - margin-right: 20px; - width: 150px; - } - - > dd { - margin-left: 0; - } - } - } - > label { color: @wcfLabelColor; display: block; > input[type='checkbox'], > input[type='radio'] { - margin: 2px; + margin: 2px 2px 2px 0; } ~ small { -- 2.20.1