Skip to content

Commit 8f04d16

Browse files
BurntimeXBurntimeX
authored
Merge pull request #6417 from WoltLab/6.2-sidebar-item-list
Improve appearance of sidebar item lists
2 parents 02c66df + de76bf2 commit 8f04d16

12 files changed

Lines changed: 71 additions & 51 deletions

‎com.woltlab.wcf/templates/boxArticleList.tpl‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
<ul class="sidebarList">
33
{foreach from=$boxArticleList item=boxArticle}
44
<li class="sidebarListItem">
5-
<div class="sidebarListItem__avatar">
6-
{user object=$boxArticle->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
7-
</div>
8-
95
<div class="sidebarListItem__content">
106
<h3 class="sidebarListItem__title">
117
{anchor object=$boxArticle class='articleLink sidebarListItem__link' title=$boxArticle->getTitle()}
@@ -14,22 +10,25 @@
1410

1511
<div class="sidebarListItem__meta">
1612
{if $boxSortField == 'time'}
17-
<div class="sidebarListItem__meta__author">
18-
{user object=$boxArticle->getUserProfile() tabindex='-1'}
13+
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
14+
{unsafe:$boxArticle->getUserProfile()->getAvatar()->getImageTag(16)}
15+
</div>
16+
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
17+
{unsafe:$boxArticle->getUserProfile()->getFormattedUsername()}
1918
</div>
20-
<div class="sidebarListItem__meta__time">
19+
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
2120
{time time=$boxArticle->time}
2221
</div>
2322
{elseif $boxSortField == 'views'}
24-
<div class="sidebarListItem__meta__views">
23+
<div class="sidebarListItem__meta__item sidebarListItem__meta__views">
2524
{lang article=$boxArticle}wcf.article.articleViews{/lang}
2625
</div>
2726
{elseif $boxSortField == 'comments'}
28-
<div class="sidebarListItem__meta__comments">
27+
<div class="sidebarListItem__meta__item sidebarListItem__meta__comments">
2928
{$boxArticle->getDiscussionProvider()->getDiscussionCountPhrase()}
3029
</div>
3130
{elseif $boxSortField == 'cumulativeLikes'}
32-
<div class="sidebarListItem__meta__reactions">
31+
<div class="sidebarListItem__meta__item sidebarListItem__meta__reactions">
3332
{if MODULE_LIKE && $__wcf->getSession()->getPermission('user.like.canViewLike') && $boxArticle->cachedReactions}
3433
{include file='shared_topReaction' cachedReactions=$boxArticle->cachedReactions render='full'}
3534
{/if}

‎com.woltlab.wcf/templates/boxFollowingsOnline.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ol class="sidebarList">
22
{foreach from=$usersOnlineList item=userOnline}
33
<li class="sidebarListItem">
4-
<div class="sidebarListItem__avatar">
4+
<div class="sidebarListItem__image">
55
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
66
</div>
77

@@ -12,7 +12,7 @@
1212
</div>
1313

1414
<div class="sidebarListItem__meta">
15-
<div class="sidebarListItem__meta__time">
15+
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
1616
{time time=$userOnline->lastActivityTime}
1717
</div>
1818
</div>

‎com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</div>
1313

1414
<div class="sidebarListItem__meta">
15-
<div class="sidebarListItem__meta__buttons">
15+
<div class="sidebarListItem__meta__item sidebarListItem__meta__buttons">
1616
{if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION && $__wcf->user->canPurchasePaidSubscriptions()}
1717
<ul class="buttonList">
1818
{foreach from=$subscription->getPurchaseButtons() item=button}

‎com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<ol class="sidebarList">
22
{foreach from=$eventList item=event}
33
<li class="sidebarListItem{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID, 2)} ignoredUserContent{/if}">
4-
<div class="sidebarListItem__avatar">
5-
{user object=$event->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
6-
</div>
7-
84
<div class="sidebarListItem__content">
95
<h3 class="sidebarListItem__title">
106
{if $event->getLink()}
@@ -16,7 +12,13 @@
1612
</div>
1713

1814
<div class="sidebarListItem__meta">
19-
<div class="sidebarListItem__meta__time">
15+
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
16+
{unsafe:$event->getUserProfile()->getAvatar()->getImageTag(16)}
17+
</div>
18+
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
19+
{unsafe:$event->getUserProfile()->getFormattedUsername()}
20+
</div>
21+
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
2022
{time time=$event->time}
2123
</div>
2224
</div>

‎com.woltlab.wcf/templates/boxSidebarCommentList.tpl‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<ol class="sidebarList">
22
{foreach from=$boxCommentList item=boxComment}
33
<li class="sidebarListItem">
4-
<div class="sidebarListItem__avatar">
5-
{user object=$boxComment->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
6-
</div>
7-
84
<div class="sidebarListItem__content">
95
<h3 class="sidebarListItem__title">
106
<a href="{$boxComment->getLink()}" class="sidebarListItem__link">{$boxComment->title}</a>
@@ -16,11 +12,13 @@
1612
</div>
1713

1814
<div class="sidebarListItem__meta">
19-
<div class="sidebarListItem__meta__author">
20-
{user object=$boxComment->getUserProfile() tabindex='-1'}
15+
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
16+
{unsafe:$boxComment->getUserProfile()->getAvatar()->getImageTag(16)}
2117
</div>
22-
23-
<div class="sidebarListItem__meta__time">
18+
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
19+
{unsafe:$boxComment->getUserProfile()->getFormattedUsername()}
20+
</div>
21+
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
2422
{time time=$boxComment->time}
2523
</div>
2624
</div>

‎com.woltlab.wcf/templates/boxStaffOnline.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ol class="sidebarList">
22
{foreach from=$usersOnlineList item=userOnline}
33
<li class="sidebarListItem">
4-
<div class="sidebarListItem__avatar">
4+
<div class="sidebarListItem__image">
55
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
66
</div>
77

@@ -14,7 +14,7 @@
1414

1515
{if MODULE_USER_RANK}
1616
<div class="sidebarListItem__meta">
17-
<div class="sidebarListItem__meta__userRank">
17+
<div class="sidebarListItem__meta__item sidebarListItem__meta__userRank">
1818
{if $userOnline->getUserTitle()}
1919
<p><span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span></p>
2020
{/if}

‎com.woltlab.wcf/templates/boxTodaysBirthdays.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ol class="sidebarList">
22
{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
33
<li class="sidebarListItem">
4-
<div class="sidebarListItem__avatar">
4+
<div class="sidebarListItem__image">
55
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
66
</div>
77

@@ -12,7 +12,7 @@
1212
</div>
1313

1414
<div class="sidebarListItem__meta">
15-
<div class="sidebarListItem__meta__birthday">
15+
<div class="sidebarListItem__meta__item sidebarListItem__meta__birthday">
1616
{$birthdayUserProfile->getBirthday()}
1717
</div>
1818
</div>

‎com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ol class="sidebarList">
22
{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
33
<li class="sidebarListItem">
4-
<div class="sidebarListItem__avatar">
4+
<div class="sidebarListItem__image">
55
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
66
</div>
77

@@ -12,7 +12,7 @@
1212
</div>
1313

1414
<div class="sidebarListItem__meta">
15-
<div class="sidebarListItem__meta__birthday">
15+
<div class="sidebarListItem__meta__item sidebarListItem__meta__birthday">
1616
{$birthdayUserProfile->getBirthday()}
1717
</div>
1818
</div>

‎com.woltlab.wcf/templates/boxUserListSidebar.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ol class="sidebarList">
22
{foreach from=$boxUsers item=boxUser}
33
<li class="sidebarListItem">
4-
<div class="sidebarListItem__avatar">
4+
<div class="sidebarListItem__image">
55
{user object=$boxUser type='avatar32' ariaHidden='true' tabindex='-1'}
66
</div>
77

@@ -13,15 +13,15 @@
1313

1414
<div class="sidebarListItem__meta">
1515
{if $boxSortField == 'activityPoints'}
16-
<div class="sidebarListItem__meta__points">
16+
<div class="sidebarListItem__meta__item sidebarListItem__meta__points">
1717
{lang}wcf.user.boxList.description.activityPoints{/lang}
1818
</div>
1919
{elseif $boxSortField == 'likesReceived'}
20-
<div class="sidebarListItem__meta__likes">
20+
<div class="sidebarListItem__meta__item sidebarListItem__meta__likes">
2121
{lang}wcf.user.boxList.description.likesReceived{/lang}
2222
</div>
2323
{elseif $boxSortField == 'registrationDate'}
24-
<div class="sidebarListItem__meta__time">
24+
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
2525
{time time=$boxUser->registrationDate}
2626
</div>
2727
{/if}

‎com.woltlab.wcf/templates/boxUserTrophyListSidebar.tpl‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ol class="sidebarList">
22
{foreach from=$boxUserTrophyList item=boxUserTrophy}
33
<li class="sidebarListItem">
4-
<div class="sidebarListItem__avatar">
4+
<div class="sidebarListItem__image">
55
{unsafe:$boxUserTrophy->getTrophy()->renderTrophy(32)}
66
</div>
77

@@ -14,10 +14,13 @@
1414
</div>
1515

1616
<div class="sidebarListItem__meta">
17-
<div class="sidebarListItem__meta__author">
17+
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
18+
{unsafe:$boxUserTrophy->getUserProfile()->getAvatar()->getImageTag(16)}
19+
</div>
20+
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
1821
{user object=$boxUserTrophy->getUserProfile() tabindex='-1'}
1922
</div>
20-
<div class="sidebarListItem__meta__time">
23+
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
2124
{time time=$boxUserTrophy->time}
2225
</div>
2326
</div>

0 commit comments

Comments
 (0)