From: Marcel Werk Date: Thu, 10 Mar 2016 18:25:18 +0000 (+0100) Subject: Some small template improvements/cleanups X-Git-Tag: 3.0.0_Beta_1~2030^2~37 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a0216dd33affde68d2a42c72570d2c6d8fb4b9d5;p=GitHub%2FWoltLab%2FWCF.git Some small template improvements/cleanups --- diff --git a/com.woltlab.wcf/templates/__menu.tpl b/com.woltlab.wcf/templates/__menu.tpl index 00e028adc1..a794c46213 100644 --- a/com.woltlab.wcf/templates/__menu.tpl +++ b/com.woltlab.wcf/templates/__menu.tpl @@ -5,7 +5,7 @@ {lang}{$menuItemNode->getMenuItem()->title}{/lang} {if $menuItemNode->getMenuItem()->getOutstandingItems() > 0} - {#$menuItemNode->getMenuItem()->getOutstandingItems()} + {#$menuItemNode->getMenuItem()->getOutstandingItems()} {/if} diff --git a/com.woltlab.wcf/templates/dashboardBoxRecentActivitySidebar.tpl b/com.woltlab.wcf/templates/dashboardBoxRecentActivitySidebar.tpl index 542949ffbd..704799d996 100644 --- a/com.woltlab.wcf/templates/dashboardBoxRecentActivitySidebar.tpl +++ b/com.woltlab.wcf/templates/dashboardBoxRecentActivitySidebar.tpl @@ -4,7 +4,10 @@ {@$event->getUserProfile()->getAvatar()->getImageTag(24)}
-

{$event->getUserProfile()->username} - {@$event->time|time}

+

+ {$event->getUserProfile()->username} + {@$event->time|time} +

{@$event->getTitle()}
diff --git a/com.woltlab.wcf/templates/dashboardBoxUsersOnlineSidebar.tpl b/com.woltlab.wcf/templates/dashboardBoxUsersOnlineSidebar.tpl index b45c040d59..f4a16f0d4c 100644 --- a/com.woltlab.wcf/templates/dashboardBoxUsersOnlineSidebar.tpl +++ b/com.woltlab.wcf/templates/dashboardBoxUsersOnlineSidebar.tpl @@ -4,4 +4,4 @@ {/foreach} -

{lang}wcf.user.usersOnline.detail{/lang}{if USERS_ONLINE_RECORD} - {lang}wcf.user.usersOnline.record{/lang}{/if}

\ No newline at end of file +

{lang}wcf.user.usersOnline.detail{/lang}{if USERS_ONLINE_RECORD} {lang}wcf.user.usersOnline.record{/lang}{/if}

\ No newline at end of file diff --git a/com.woltlab.wcf/templates/editHistory.tpl b/com.woltlab.wcf/templates/editHistory.tpl index 814da194cc..0d824b8ffd 100644 --- a/com.woltlab.wcf/templates/editHistory.tpl +++ b/com.woltlab.wcf/templates/editHistory.tpl @@ -67,7 +67,7 @@
{assign var='versionCount' value=$objects|count}

- {lang}wcf.edit.versions{/lang} {#$versionCount+1} + {lang}wcf.edit.versions{/lang} {#$versionCount+1}

diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl index 55346a7c18..7ba66929d7 100644 --- a/com.woltlab.wcf/templates/moderationList.tpl +++ b/com.woltlab.wcf/templates/moderationList.tpl @@ -18,45 +18,41 @@ {capture assign='sidebarLeft'} - {* moderation type *}
+ {* moderation type *}

{lang}wcf.moderation.filterByType{/lang}

-
- - {* assigned user *} -
+ + {* assigned user *}

{lang}wcf.moderation.filterByUser{/lang}

-
- - {* status *} -
+ + {* status *}

{lang}wcf.moderation.status{/lang}

diff --git a/com.woltlab.wcf/templates/moderationQueueList.tpl b/com.woltlab.wcf/templates/moderationQueueList.tpl index 509cef6e77..ff2a389c0a 100644 --- a/com.woltlab.wcf/templates/moderationQueueList.tpl +++ b/com.woltlab.wcf/templates/moderationQueueList.tpl @@ -6,7 +6,7 @@

{$queue->getAffectedObject()->getTitle()}

- {if $queue->getUserProfile()->userID}{$queue->getAffectedObject()->getUsername()}{else}{$queue->getAffectedObject()->getUsername()}{/if} - {@$queue->lastChangeTime|time} + {if $queue->getUserProfile()->userID}{$queue->getAffectedObject()->getUsername()}{else}{$queue->getAffectedObject()->getUsername()}{/if} {@$queue->lastChangeTime|time}
diff --git a/com.woltlab.wcf/templates/pageMenuMobile.tpl b/com.woltlab.wcf/templates/pageMenuMobile.tpl index e73ed15dcf..b247eedb8c 100644 --- a/com.woltlab.wcf/templates/pageMenuMobile.tpl +++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl @@ -14,7 +14,7 @@ {lang}{$menuItemNode->getMenuItem()->title}{/lang} {if $__outstandingItems} - {#$__outstandingItems} + {#$__outstandingItems} {/if} diff --git a/com.woltlab.wcf/templates/tagged.tpl b/com.woltlab.wcf/templates/tagged.tpl index f49443372d..3599932b31 100644 --- a/com.woltlab.wcf/templates/tagged.tpl +++ b/com.woltlab.wcf/templates/tagged.tpl @@ -21,9 +21,9 @@

{lang}wcf.tagging.objectTypes{/lang}

diff --git a/com.woltlab.wcf/templates/userMenuSidebar.tpl b/com.woltlab.wcf/templates/userMenuSidebar.tpl index 001e02ae49..d06defda54 100644 --- a/com.woltlab.wcf/templates/userMenuSidebar.tpl +++ b/com.woltlab.wcf/templates/userMenuSidebar.tpl @@ -10,23 +10,21 @@ } }); //]]> - + - {foreach from=$__wcf->getUserMenu()->getMenuItems('') item=menuCategory} -
+
+ {foreach from=$__wcf->getUserMenu()->getMenuItems('') item=menuCategory}

{lang}{$menuCategory->menuItem}{/lang}

-
- -
-
- {/foreach} + + {/foreach} +
{/capture} diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl index 177bc4db71..4aca0482ba 100644 --- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl +++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl @@ -97,9 +97,9 @@ {/if} -
+
- + {hascontent}{content}{@$objectType->getProcessor()->getLanguageVariable('isDisabled.description', true)}{/content}{/hascontent}
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl index c6658b3525..2e53cfc8c1 100644 --- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl +++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl @@ -35,7 +35,7 @@ {if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
  • - {lang}wcf.acp.package.updates{/lang} {#$__wcf->getAvailableUpdates()} + {lang}wcf.acp.package.updates{/lang} {#$__wcf->getAvailableUpdates()}
    • {/if} {/if} diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js index 6cf2b492c6..43de8e52e9 100644 --- a/wcfsetup/install/files/js/WCF.User.js +++ b/wcfsetup/install/files/js/WCF.User.js @@ -384,7 +384,7 @@ WCF.User.Panel.Abstract = Class.extend({ if (count) { if (this._badge === null) { - this._badge = $('').appendTo(this._triggerElement.children('a')); + this._badge = $('').appendTo(this._triggerElement.children('a')); this._badge.before(' '); } diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index d0a657f868..8dda8b75ed 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -7502,7 +7502,7 @@ WCF.UserPanel = Class.extend({ if (count) { var $badge = this._container.find('.badge'); if (!$badge.length) { - $badge = $('').appendTo(this._container.children('.dropdownToggle')); + $badge = $('').appendTo(this._container.children('.dropdownToggle')); $badge.before(' '); } $badge.html(count); diff --git a/wcfsetup/install/files/style/ui/badge.scss b/wcfsetup/install/files/style/ui/badge.scss index ab2fd89072..f8e90595f7 100644 --- a/wcfsetup/install/files/style/ui/badge.scss +++ b/wcfsetup/install/files/style/ui/badge.scss @@ -19,12 +19,7 @@ a.badge { color: rgba(255, 255, 255, 1); font-weight: 600; } - - &.badgeInverse { - background-color: $wcfContentBackground; - color: $wcfContentText; - } - + /* default label colors */ &.green { background-color: rgba(0, 153, 0, 1); diff --git a/wcfsetup/install/files/style/ui/message.scss b/wcfsetup/install/files/style/ui/message.scss index 672020495e..0e0679eac5 100644 --- a/wcfsetup/install/files/style/ui/message.scss +++ b/wcfsetup/install/files/style/ui/message.scss @@ -177,7 +177,10 @@ display: flex; flex: 0 0 auto; justify-content: flex-end; - margin-bottom: 20px; + + + .messageBody { + margin-top: 20px; + } > .messageQuickOptions { flex: 0 0 auto; @@ -226,6 +229,10 @@ .messagePublicationTime { color: $wcfContentDimmedText; } + + + .messageStatus { + margin-left: 5px; + } } .messageStatus {
    - isNew()} title="{lang}wcf.moderation.markAsRead.doubleClick{/lang}"{/if}>{@$entry->getUserProfile()->getAvatar()->getImageTag(32)}

    + isNew()} title="{lang}wcf.moderation.markAsRead.doubleClick{/lang}"{/if}>{@$entry->getUserProfile()->getAvatar()->getImageTag(48)}

    		 @@ -119,7 +115,14 @@ {lang}wcf.moderation.type.{@$definitionNames[$entry->objectTypeID]}{/lang} {$entry->getTitle()|tableWordwrap} - {if $entry->getAffectedObject()->getUserID()}{$entry->getAffectedObject()->getUsername()}{else}{$entry->getAffectedObject()->getUsername()}{/if} - {@$entry->getAffectedObject()->getTime()|time} - {lang}wcf.moderation.type.{@$entry->getObjectTypeName()}{/lang} + +
      +
    • {if $entry->getAffectedObject()->getUserID()}{$entry->getAffectedObject()->getUsername()}{else}{$entry->getAffectedObject()->getUsername()}{/if}
      • +
    • {@$entry->getAffectedObject()->getTime()|time}
      • +
    • {lang}wcf.moderation.type.{@$entry->getObjectTypeName()}{/lang}
      • + + {event name='messageGroupInfo'} +
    		{if $entry->assignedUserID}{$entry->assignedUsername}{/if} {#$entry->comments}