diff --git a/com.woltlab.wcf/templates/boxArticleList.tpl b/com.woltlab.wcf/templates/boxArticleList.tpl index 1ab091b5b72..db2f149e259 100644 --- a/com.woltlab.wcf/templates/boxArticleList.tpl +++ b/com.woltlab.wcf/templates/boxArticleList.tpl @@ -2,10 +2,6 @@
{foreach from=$usersOnlineList item=userOnline}-
-
+
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
@@ -12,7 +12,7 @@
-
+
{time time=$userOnline->lastActivityTime}
diff --git a/com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl b/com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
index 60fabc41948..801cc2f221e 100644
--- a/com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
+++ b/com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
@@ -12,7 +12,7 @@
-
+
{if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION && $__wcf->user->canPurchasePaidSubscriptions()}
{foreach from=$subscription->getPurchaseButtons() item=button} diff --git a/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl b/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl index abeeea90049..a08637dae9a 100644 --- a/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl +++ b/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl @@ -1,10 +1,6 @@
{foreach from=$eventList item=event}-
-
- {user object=$event->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
-
-
-
+
+ {unsafe:$event->getUserProfile()->getAvatar()->getImageTag(16)}
+
+
+ {unsafe:$event->getUserProfile()->getFormattedUsername()}
+
+
{time time=$event->time}
diff --git a/com.woltlab.wcf/templates/boxSidebarCommentList.tpl b/com.woltlab.wcf/templates/boxSidebarCommentList.tpl
index 71b7b740da6..2ce48b84b84 100644
--- a/com.woltlab.wcf/templates/boxSidebarCommentList.tpl
+++ b/com.woltlab.wcf/templates/boxSidebarCommentList.tpl
@@ -1,10 +1,6 @@
{if $event->getLink()} @@ -16,7 +12,13 @@
{foreach from=$boxCommentList item=boxComment}-
-
- {user object=$boxComment->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
-
-
-
- {user object=$boxComment->getUserProfile() tabindex='-1'}
+
+ {unsafe:$boxComment->getUserProfile()->getAvatar()->getImageTag(16)}
-
-
+
+ {unsafe:$boxComment->getUserProfile()->getFormattedUsername()}
+
+
{time time=$boxComment->time}
diff --git a/com.woltlab.wcf/templates/boxStaffOnline.tpl b/com.woltlab.wcf/templates/boxStaffOnline.tpl
index 7d48333a663..e002802061b 100644
--- a/com.woltlab.wcf/templates/boxStaffOnline.tpl
+++ b/com.woltlab.wcf/templates/boxStaffOnline.tpl
@@ -1,7 +1,7 @@
{$boxComment->title} @@ -16,11 +12,13 @@
{foreach from=$usersOnlineList item=userOnline}-
-
+
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
@@ -14,7 +14,7 @@
{if MODULE_USER_RANK}
-
+
{if $userOnline->getUserTitle()}
{$userOnline->getUserTitle()}
{/if} diff --git a/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl b/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl index 6bb4ed42969..25f0bcb4be9 100644 --- a/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl +++ b/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl @@ -1,7 +1,7 @@{foreach from=$birthdayUserProfiles item=birthdayUserProfile}-
-
+
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
@@ -12,7 +12,7 @@
-
+
{$birthdayUserProfile->getBirthday()}
diff --git a/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl b/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
index 39b48451f4b..ba934d4b356 100644
--- a/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
+++ b/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
@@ -1,7 +1,7 @@
{foreach from=$birthdayUserProfiles item=birthdayUserProfile}-
-
+
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
@@ -12,7 +12,7 @@
-
+
{$birthdayUserProfile->getBirthday()}
diff --git a/com.woltlab.wcf/templates/boxUserListSidebar.tpl b/com.woltlab.wcf/templates/boxUserListSidebar.tpl
index e0c9270bba7..6d48063b0e0 100644
--- a/com.woltlab.wcf/templates/boxUserListSidebar.tpl
+++ b/com.woltlab.wcf/templates/boxUserListSidebar.tpl
@@ -1,7 +1,7 @@
{foreach from=$boxUsers item=boxUser}-
-
+
{user object=$boxUser type='avatar32' ariaHidden='true' tabindex='-1'}
@@ -13,15 +13,15 @@
{if $boxSortField == 'activityPoints'}
-
+
{lang}wcf.user.boxList.description.activityPoints{/lang}
{elseif $boxSortField == 'likesReceived'}
-
+
{lang}wcf.user.boxList.description.likesReceived{/lang}
{elseif $boxSortField == 'registrationDate'}
-
+
{time time=$boxUser->registrationDate}
{/if}
diff --git a/com.woltlab.wcf/templates/boxUserTrophyListSidebar.tpl b/com.woltlab.wcf/templates/boxUserTrophyListSidebar.tpl
index 272fb5bef21..f2abb59c50f 100644
--- a/com.woltlab.wcf/templates/boxUserTrophyListSidebar.tpl
+++ b/com.woltlab.wcf/templates/boxUserTrophyListSidebar.tpl
@@ -1,7 +1,7 @@
{foreach from=$boxUserTrophyList item=boxUserTrophy}-
-
+
{unsafe:$boxUserTrophy->getTrophy()->renderTrophy(32)}
@@ -14,10 +14,13 @@
-
+
+ {unsafe:$boxUserTrophy->getUserProfile()->getAvatar()->getImageTag(16)}
+
+
{user object=$boxUserTrophy->getUserProfile() tabindex='-1'}
-
+
{time time=$boxUserTrophy->time}
diff --git a/com.woltlab.wcf/templates/userSidebar.tpl b/com.woltlab.wcf/templates/userSidebar.tpl
index b43632c8692..ca42810a2f5 100644
--- a/com.woltlab.wcf/templates/userSidebar.tpl
+++ b/com.woltlab.wcf/templates/userSidebar.tpl
@@ -7,7 +7,7 @@
{foreach from=$user->getSpecialTrophies() item=trophy}-
-
+
{unsafe:$trophy->renderTrophy(32)}
diff --git a/wcfsetup/install/files/style/ui/sidebarList.scss b/wcfsetup/install/files/style/ui/sidebarList.scss
index d0de6644116..1bdc4bd65ec 100644
--- a/wcfsetup/install/files/style/ui/sidebarList.scss
+++ b/wcfsetup/install/files/style/ui/sidebarList.scss
@@ -7,17 +7,21 @@
.sidebarListItem {
display: grid;
grid-template-areas:
- "avatar content"
- "avatar meta";
+ "image content"
+ "image meta";
grid-template-columns: min-content 1fr;
grid-template-rows: 1fr min-content;
- column-gap: 10px;
- row-gap: 5px;
position: relative;
+ row-gap: 2px;
}
-.sidebarListItem__avatar {
- grid-area: avatar;
+.sidebarListItem__image {
+ grid-area: image;
+ margin-right: 10px;
+}
+
+.sidebarListItem__image img {
+ max-width: 64px;
}
.sidebarListItem__content {
@@ -29,15 +33,15 @@
.sidebarListItem__meta {
grid-area: meta;
+ color: var(--wcfContentDimmedText);
+ display: flex;
+ flex-wrap: wrap;
@include wcfFontSmall;
}
-.sidebarListItem__meta__time {
- color: var(--wcfContentDimmedText);
-}
-
-a.sidebarListItem__link {
+/* Selector required to override legacy styling of the sidebar. */
+.sidebarListItem .sidebarListItem__link {
color: inherit;
&::before {
@@ -66,3 +70,17 @@ a.sidebarListItem__link {
.sidebarListItem__description {
@include wcfFontSmall;
}
+
+.sidebarListItem__meta__item {
+ align-items: center;
+ display: flex;
+}
+
+.sidebarListItem__meta__avatar + .sidebarListItem__meta__item {
+ margin-left: 5px;
+}
+
+.sidebarListItem__meta__item:not(.sidebarListItem__meta__avatar) + .sidebarListItem__meta__item::before {
+ content: "•";
+ margin: 0 3px;
+}