Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions com.woltlab.wcf/templates/boxArticleList.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
<ul class="sidebarList">
{foreach from=$boxArticleList item=boxArticle}
<li class="sidebarListItem">
<div class="sidebarListItem__avatar">
{user object=$boxArticle->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
</div>

<div class="sidebarListItem__content">
<h3 class="sidebarListItem__title">
{anchor object=$boxArticle class='articleLink sidebarListItem__link' title=$boxArticle->getTitle()}
Expand All @@ -14,22 +10,25 @@

<div class="sidebarListItem__meta">
{if $boxSortField == 'time'}
<div class="sidebarListItem__meta__author">
{user object=$boxArticle->getUserProfile() tabindex='-1'}
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
{unsafe:$boxArticle->getUserProfile()->getAvatar()->getImageTag(16)}
</div>
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
{unsafe:$boxArticle->getUserProfile()->getFormattedUsername()}
</div>
<div class="sidebarListItem__meta__time">
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
{time time=$boxArticle->time}
</div>
{elseif $boxSortField == 'views'}
<div class="sidebarListItem__meta__views">
<div class="sidebarListItem__meta__item sidebarListItem__meta__views">
{lang article=$boxArticle}wcf.article.articleViews{/lang}
</div>
{elseif $boxSortField == 'comments'}
<div class="sidebarListItem__meta__comments">
<div class="sidebarListItem__meta__item sidebarListItem__meta__comments">
{$boxArticle->getDiscussionProvider()->getDiscussionCountPhrase()}
</div>
{elseif $boxSortField == 'cumulativeLikes'}
<div class="sidebarListItem__meta__reactions">
<div class="sidebarListItem__meta__item sidebarListItem__meta__reactions">
{if MODULE_LIKE && $__wcf->getSession()->getPermission('user.like.canViewLike') && $boxArticle->cachedReactions}
{include file='shared_topReaction' cachedReactions=$boxArticle->cachedReactions render='full'}
{/if}
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/boxFollowingsOnline.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ol class="sidebarList">
{foreach from=$usersOnlineList item=userOnline}
<li class="sidebarListItem">
<div class="sidebarListItem__avatar">
<div class="sidebarListItem__image">
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
</div>

Expand All @@ -12,7 +12,7 @@
</div>

<div class="sidebarListItem__meta">
<div class="sidebarListItem__meta__time">
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
{time time=$userOnline->lastActivityTime}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</div>

<div class="sidebarListItem__meta">
<div class="sidebarListItem__meta__buttons">
<div class="sidebarListItem__meta__item sidebarListItem__meta__buttons">
{if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION && $__wcf->user->canPurchasePaidSubscriptions()}
<ul class="buttonList">
{foreach from=$subscription->getPurchaseButtons() item=button}
Expand Down
12 changes: 7 additions & 5 deletions com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<ol class="sidebarList">
{foreach from=$eventList item=event}
<li class="sidebarListItem{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID, 2)} ignoredUserContent{/if}">
<div class="sidebarListItem__avatar">
{user object=$event->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
</div>

<div class="sidebarListItem__content">
<h3 class="sidebarListItem__title">
{if $event->getLink()}
Expand All @@ -16,7 +12,13 @@
</div>

<div class="sidebarListItem__meta">
<div class="sidebarListItem__meta__time">
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
{unsafe:$event->getUserProfile()->getAvatar()->getImageTag(16)}
</div>
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
{unsafe:$event->getUserProfile()->getFormattedUsername()}
</div>
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
{time time=$event->time}
</div>
</div>
Expand Down
14 changes: 6 additions & 8 deletions com.woltlab.wcf/templates/boxSidebarCommentList.tpl
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<ol class="sidebarList">
{foreach from=$boxCommentList item=boxComment}
<li class="sidebarListItem">
<div class="sidebarListItem__avatar">
{user object=$boxComment->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
</div>

<div class="sidebarListItem__content">
<h3 class="sidebarListItem__title">
<a href="{$boxComment->getLink()}" class="sidebarListItem__link">{$boxComment->title}</a>
Expand All @@ -16,11 +12,13 @@
</div>

<div class="sidebarListItem__meta">
<div class="sidebarListItem__meta__author">
{user object=$boxComment->getUserProfile() tabindex='-1'}
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
{unsafe:$boxComment->getUserProfile()->getAvatar()->getImageTag(16)}
</div>

<div class="sidebarListItem__meta__time">
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
{unsafe:$boxComment->getUserProfile()->getFormattedUsername()}
</div>
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
{time time=$boxComment->time}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/boxStaffOnline.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ol class="sidebarList">
{foreach from=$usersOnlineList item=userOnline}
<li class="sidebarListItem">
<div class="sidebarListItem__avatar">
<div class="sidebarListItem__image">
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
</div>

Expand All @@ -14,7 +14,7 @@

{if MODULE_USER_RANK}
<div class="sidebarListItem__meta">
<div class="sidebarListItem__meta__userRank">
<div class="sidebarListItem__meta__item sidebarListItem__meta__userRank">
{if $userOnline->getUserTitle()}
<p><span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span></p>
{/if}
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ol class="sidebarList">
{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
<li class="sidebarListItem">
<div class="sidebarListItem__avatar">
<div class="sidebarListItem__image">
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
</div>

Expand All @@ -12,7 +12,7 @@
</div>

<div class="sidebarListItem__meta">
<div class="sidebarListItem__meta__birthday">
<div class="sidebarListItem__meta__item sidebarListItem__meta__birthday">
{$birthdayUserProfile->getBirthday()}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ol class="sidebarList">
{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
<li class="sidebarListItem">
<div class="sidebarListItem__avatar">
<div class="sidebarListItem__image">
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
</div>

Expand All @@ -12,7 +12,7 @@
</div>

<div class="sidebarListItem__meta">
<div class="sidebarListItem__meta__birthday">
<div class="sidebarListItem__meta__item sidebarListItem__meta__birthday">
{$birthdayUserProfile->getBirthday()}
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions com.woltlab.wcf/templates/boxUserListSidebar.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ol class="sidebarList">
{foreach from=$boxUsers item=boxUser}
<li class="sidebarListItem">
<div class="sidebarListItem__avatar">
<div class="sidebarListItem__image">
{user object=$boxUser type='avatar32' ariaHidden='true' tabindex='-1'}
</div>

Expand All @@ -13,15 +13,15 @@

<div class="sidebarListItem__meta">
{if $boxSortField == 'activityPoints'}
<div class="sidebarListItem__meta__points">
<div class="sidebarListItem__meta__item sidebarListItem__meta__points">
{lang}wcf.user.boxList.description.activityPoints{/lang}
</div>
{elseif $boxSortField == 'likesReceived'}
<div class="sidebarListItem__meta__likes">
<div class="sidebarListItem__meta__item sidebarListItem__meta__likes">
{lang}wcf.user.boxList.description.likesReceived{/lang}
</div>
{elseif $boxSortField == 'registrationDate'}
<div class="sidebarListItem__meta__time">
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
{time time=$boxUser->registrationDate}
</div>
{/if}
Expand Down
9 changes: 6 additions & 3 deletions com.woltlab.wcf/templates/boxUserTrophyListSidebar.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ol class="sidebarList">
{foreach from=$boxUserTrophyList item=boxUserTrophy}
<li class="sidebarListItem">
<div class="sidebarListItem__avatar">
<div class="sidebarListItem__image">
{unsafe:$boxUserTrophy->getTrophy()->renderTrophy(32)}
</div>

Expand All @@ -14,10 +14,13 @@
</div>

<div class="sidebarListItem__meta">
<div class="sidebarListItem__meta__author">
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
{unsafe:$boxUserTrophy->getUserProfile()->getAvatar()->getImageTag(16)}
</div>
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
{user object=$boxUserTrophy->getUserProfile() tabindex='-1'}
</div>
<div class="sidebarListItem__meta__time">
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
{time time=$boxUserTrophy->time}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/userSidebar.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ol class="sidebarList">
{foreach from=$user->getSpecialTrophies() item=trophy}
<li class="sidebarListItem">
<div class="sidebarListItem__avatar">
<div class="sidebarListItem__image">
{unsafe:$trophy->renderTrophy(32)}
</div>

Expand Down
40 changes: 29 additions & 11 deletions wcfsetup/install/files/style/ui/sidebarList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
}