Skip to content

Commit acc808f

Browse files
BurntimeXBurntimeX
committed
Unify layout / appearance of sidebar item lists
Closes #6160
1 parent 2761d4f commit acc808f

15 files changed

+294
-120
lines changed

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

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,40 @@
11
{if $boxPosition == 'sidebarLeft' || $boxPosition == 'sidebarRight'}
2-
<ul class="sidebarItemList">
2+
<ul class="sidebarList">
33
{foreach from=$boxArticleList item=boxArticle}
4-
<li class="box24 sidebarItem">
5-
<a href="{$boxArticle->getLink()}" aria-hidden="true" tabindex="-1">{unsafe:$boxArticle->getUserProfile()->getAvatar()->getImageTag(24)}</a>
4+
<li class="sidebarListItem">
5+
<div class="sidebarListItem__avatar">
6+
{user object=$boxArticle->getUserProfile() type='avatar24' ariaHidden='true' tabindex='-1'}
7+
</div>
68

7-
<div class="sidebarItemTitle">
8-
<h3>{anchor object=$boxArticle class='articleLink' title=$boxArticle->getTitle()}</h3>
9-
10-
<small>
11-
{if $boxSortField == 'time'}
9+
<div class="sidebarListItem__content">
10+
<h3 class="sidebarListItem__title">
11+
{anchor object=$boxArticle class='articleLink sidebarListItem__link' title=$boxArticle->getTitle()}
12+
</h3>
13+
</div>
14+
15+
<div class="sidebarListItem__meta">
16+
{if $boxSortField == 'time'}
17+
<div class="sidebarListItem__meta__author">
1218
{user object=$boxArticle->getUserProfile() tabindex='-1'}
13-
<span class="separatorLeft">{time time=$boxArticle->time}</span>
14-
{elseif $boxSortField == 'views'}
19+
</div>
20+
<div class="sidebarListItem__meta__time">
21+
{time time=$boxArticle->time}
22+
</div>
23+
{elseif $boxSortField == 'views'}
24+
<div class="sidebarListItem__meta__views">
1525
{lang article=$boxArticle}wcf.article.articleViews{/lang}
16-
{elseif $boxSortField == 'comments'}
26+
</div>
27+
{elseif $boxSortField == 'comments'}
28+
<div class="sidebarListItem__meta__comments">
1729
{$boxArticle->getDiscussionProvider()->getDiscussionCountPhrase()}
18-
{elseif $boxSortField == 'cumulativeLikes'}
30+
</div>
31+
{elseif $boxSortField == 'cumulativeLikes'}
32+
<div class="sidebarListItem__meta__reactions">
1933
{if MODULE_LIKE && $__wcf->getSession()->getPermission('user.like.canViewLike') && $boxArticle->cachedReactions}
2034
{include file='shared_topReaction' cachedReactions=$boxArticle->cachedReactions render='full'}
2135
{/if}
22-
{/if}
23-
</small>
36+
</div>
37+
{/if}
2438
</div>
2539
</li>
2640
{/foreach}

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
<ul class="sidebarItemList">
1+
<ol class="sidebarList">
22
{foreach from=$usersOnlineList item=userOnline}
3-
<li class="box32">
4-
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
5-
6-
<div class="sidebarItemTitle">
7-
<h3>{user object=$userOnline}</h3>
8-
<small>{@$userOnline->lastActivityTime|time}</small>
3+
<li class="sidebarListItem">
4+
<div class="sidebarListItem__avatar">
5+
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
6+
</div>
7+
8+
<div class="sidebarListItem__content">
9+
<h3 class="sidebarListItem__title">
10+
{user object=$userOnline class='sidebarListItem__link'}
11+
</h3>
12+
</div>
13+
14+
<div class="sidebarListItem__meta">
15+
<div class="sidebarListItem__meta__time">
16+
{time time=$userOnline->lastActivityTime}
17+
</div>
918
</div>
1019
</li>
1120
{/foreach}
12-
</ul>
21+
</ol>

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

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1-
<ul class="sidebarItemList">
1+
<ol class="sidebarList">
22
{foreach from=$subscriptions item=subscription}
3-
<li>
4-
<div class="sidebarItemTitle">
5-
<h3>{$subscription->getTitle()}</h3>
6-
<small>{lang}wcf.paidSubscription.formattedCost{/lang}</small>
3+
<li class="sidebarListItem">
4+
<div class="sidebarListItem__content">
5+
<h3 class="sidebarListItem__title">
6+
{$subscription->getTitle()}
7+
</h3>
8+
9+
<div class="sidebarListItem__description">
10+
{lang}wcf.paidSubscription.formattedCost{/lang}
11+
</div>
12+
</div>
13+
14+
<div class="sidebarListItem__meta">
15+
<div class="sidebarListItem__meta__buttons">
16+
{if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION && $__wcf->user->canPurchasePaidSubscriptions()}
17+
<ul class="buttonList">
18+
{foreach from=$subscription->getPurchaseButtons() item=button}
19+
<li>{@$button}</li>
20+
{/foreach}
21+
</ul>
22+
{/if}
23+
</div>
724
</div>
8-
9-
{if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION && $__wcf->user->canPurchasePaidSubscriptions()}
10-
<ul class="buttonList">
11-
{foreach from=$subscription->getPurchaseButtons() item=button}
12-
<li>{@$button}</li>
13-
{/foreach}
14-
</ul>
15-
{/if}
1625
</li>
1726
{/foreach}
18-
</ul>
27+
</ol>
1928

2029
{if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION && $__wcf->user->canPurchasePaidSubscriptions()}
2130
<a class="button small more" href="{link controller='PaidSubscriptionList'}{/link}">{lang}wcf.paidSubscription.button.moreInformation{/lang}</a>

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

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
1-
<ul class="sidebarItemList">
1+
<ol class="sidebarList">
22
{foreach from=$eventList item=event}
3-
<li class="box24{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID, 2)} ignoredUserContent{/if}">
4-
{user object=$event->getUserProfile() type='avatar24' ariaHidden='true' tabindex='-1'}
5-
6-
<div class="sidebarItemTitle">
7-
<h3>
8-
{user object=$event->getUserProfile()}
9-
<small class="separatorLeft">{@$event->time|time}</small>
3+
<li class="sidebarListItem{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID, 2)} ignoredUserContent{/if}">
4+
<div class="sidebarListItem__avatar">
5+
{user object=$event->getUserProfile() type='avatar24' ariaHidden='true' tabindex='-1'}
6+
</div>
7+
8+
<div class="sidebarListItem__content">
9+
<h3 class="sidebarListItem__title">
10+
{if $event->getLink()}
11+
<a href="{$event->getLink()}" class="sidebarListItem__link">{unsafe:$event->getTitle()}</a>
12+
{else}
13+
{unsafe:$event->getTitle()}
14+
{/if}
1015
</h3>
11-
<small>{@$event->getTitle()}</small>
16+
</div>
17+
18+
<div class="sidebarListItem__meta">
19+
<div class="sidebarListItem__meta__time">
20+
{time time=$event->time}
21+
</div>
1222
</div>
1323
</li>
1424
{/foreach}
15-
</ul>
25+
</ol>

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

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,29 @@
1-
<ul class="sidebarItemList">
1+
<ol class="sidebarList">
22
{foreach from=$boxCommentList item=boxComment}
3-
<li>
4-
<div class="sidebarItemTitle">
5-
<h3><a href="{$boxComment->getLink()}">{$boxComment->title}</a></h3>
3+
<li class="sidebarListItem">
4+
<div class="sidebarListItem__avatar">
5+
{user object=$boxComment->getUserProfile() type='avatar24' ariaHidden='true' tabindex='-1'}
66
</div>
7-
8-
<div class="sidebarCommentContent">
9-
<small>{@$boxComment->getExcerpt(50)}</small>
7+
8+
<div class="sidebarListItem__content">
9+
<h3 class="sidebarListItem__title">
10+
<a href="{$boxComment->getLink()}" class="sidebarListItem__link">{$boxComment->title}</a>
11+
</h3>
12+
13+
<div class="sidebarListItem__description">
14+
{unsafe:$boxComment->getExcerpt(150)}
15+
</div>
1016
</div>
11-
<div>
12-
<small>{user object=$boxComment->getUserProfile()} <span class="separatorLeft">{@$boxComment->time|time}</span></small>
17+
18+
<div class="sidebarListItem__meta">
19+
<div class="sidebarListItem__meta__author">
20+
{user object=$boxComment->getUserProfile() tabindex='-1'}
21+
</div>
22+
23+
<div class="sidebarListItem__meta__time">
24+
{time time=$boxComment->time}
25+
</div>
1326
</div>
1427
</li>
1528
{/foreach}
16-
</ul>
29+
</ol>

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

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
1-
<ul class="sidebarItemList">
1+
<ol class="sidebarList">
22
{foreach from=$usersOnlineList item=userOnline}
3-
<li class="box32">
4-
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
5-
6-
<div class="sidebarItemTitle">
7-
<h3>
3+
<li class="sidebarListItem">
4+
<div class="sidebarListItem__avatar">
5+
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
6+
</div>
7+
8+
<div class="sidebarListItem__content">
9+
<h3 class="sidebarListItem__title">
810
{event name='beforeUsername'}
9-
{user object=$userOnline}
11+
{user object=$userOnline class='sidebarListItem__link'}
1012
</h3>
11-
{if MODULE_USER_RANK}
12-
{if $userOnline->getUserTitle()}
13-
<p><span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {@$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span></p>
14-
{/if}
15-
{if $userOnline->getRank() && $userOnline->getRank()->rankImage}
16-
<p><span class="userRankImage">{@$userOnline->getRank()->getImage()}</span></p>
17-
{/if}
18-
{/if}
1913
</div>
14+
15+
{if MODULE_USER_RANK}
16+
<div class="sidebarListItem__meta">
17+
<div class="sidebarListItem__meta__userRank">
18+
{if $userOnline->getUserTitle()}
19+
<p><span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {@$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span></p>
20+
{/if}
21+
{if $userOnline->getRank() && $userOnline->getRank()->rankImage}
22+
<p><span class="userRankImage">{@$userOnline->getRank()->getImage()}</span></p>
23+
{/if}
24+
</div>
25+
</div>
26+
{/if}
2027
</li>
2128
{/foreach}
22-
</ul>
29+
</ol>

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1-
<ul class="sidebarItemList">
1+
<ol class="sidebarList">
22
{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
3-
<li class="box32">
4-
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
5-
6-
<div class="sidebarItemTitle">
7-
<h3>{user object=$birthdayUserProfile}</h3>
8-
<small>{$birthdayUserProfile->getBirthday()}</small>
3+
<li class="sidebarListItem">
4+
<div class="sidebarListItem__avatar">
5+
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
6+
</div>
7+
8+
<div class="sidebarListItem__content">
9+
<h3 class="sidebarListItem__title">
10+
{user object=$birthdayUserProfile class='sidebarListItem__link'}
11+
</h3>
12+
</div>
13+
14+
<div class="sidebarListItem__meta">
15+
<div class="sidebarListItem__meta__birthday">
16+
{$birthdayUserProfile->getBirthday()}
17+
</div>
918
</div>
1019
</li>
1120
{/foreach}
12-
</ul>
21+
</ol>
1322

1423
{if $birthdayUserProfiles|count >= 10}
1524
<button type="button" class="jsTodaysBirthdays button small more jsOnly">{lang}wcf.global.button.showAll{/lang}</button>

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
<ul class="sidebarItemList">
1+
<ol class="sidebarList">
22
{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
3-
<li class="box32">
4-
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
5-
6-
<div class="sidebarItemTitle">
7-
<h3>{user object=$birthdayUserProfile}</h3>
8-
<small>{$birthdayUserProfile->getBirthday()}</small>
3+
<li class="sidebarListItem">
4+
<div class="sidebarListItem__avatar">
5+
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
6+
</div>
7+
8+
<div class="sidebarListItem__content">
9+
<h3 class="sidebarListItem__title">
10+
{user object=$birthdayUserProfile class='sidebarListItem__link'}
11+
</h3>
12+
</div>
13+
14+
<div class="sidebarListItem__meta">
15+
<div class="sidebarListItem__meta__birthday">
16+
{$birthdayUserProfile->getBirthday()}
17+
</div>
918
</div>
1019
</li>
1120
{/foreach}
12-
</ul>
21+
</ol>

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

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,31 @@
1-
<ul class="sidebarItemList">
1+
<ol class="sidebarList">
22
{foreach from=$boxUsers item=boxUser}
3-
<li class="box24">
4-
{user object=$boxUser type='avatar24' ariaHidden='true' tabindex='-1'}
5-
6-
<div class="sidebarItemTitle">
7-
<h3>{user object=$boxUser}</h3>
8-
{capture assign='__boxUserLanguageItem'}{lang __optional=true}wcf.user.boxList.description.{$boxSortField}{/lang}{/capture}
9-
{if $__boxUserLanguageItem}
10-
<small>{@$__boxUserLanguageItem}</small>
3+
<li class="sidebarListItem">
4+
<div class="sidebarListItem__avatar">
5+
{user object=$boxUser type='avatar32' ariaHidden='true' tabindex='-1'}
6+
</div>
7+
8+
<div class="sidebarListItem__content">
9+
<h3 class="sidebarListItem__title">
10+
{user object=$boxUser class='sidebarListItem__link'}
11+
</h3>
12+
</div>
13+
14+
<div class="sidebarListItem__meta">
15+
{if $boxSortField == 'activityPoints'}
16+
<div class="sidebarListItem__meta__points">
17+
{lang}wcf.user.boxList.description.activityPoints{/lang}
18+
</div>
19+
{elseif $boxSortField == 'likesReceived'}
20+
<div class="sidebarListItem__meta__likes">
21+
{lang}wcf.user.boxList.description.likesReceived{/lang}
22+
</div>
23+
{elseif $boxSortField == 'registrationDate'}
24+
<div class="sidebarListItem__meta__time">
25+
{time time=$boxUser->registrationDate}
26+
</div>
1127
{/if}
1228
</div>
1329
</li>
1430
{/foreach}
15-
</ul>
31+
</ol>

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

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
{if $boxPosition == 'sidebarLeft' || $boxPosition == 'sidebarRight'}
2-
<ul class="sidebarItemList">
2+
<ol class="sidebarList">
33
{foreach from=$boxUserTrophyList item=boxUserTrophy}
4-
<li class="box32">
5-
<div>{@$boxUserTrophy->getTrophy()->renderTrophy(32)}</div>
4+
<li class="sidebarListItem">
5+
<div class="sidebarListItem__avatar">
6+
{unsafe:$boxUserTrophy->getTrophy()->renderTrophy(32)}
7+
</div>
68

7-
<div class="sidebarItemTitle">
8-
<h3>
9-
<a href="{$boxUserTrophy->getTrophy()->getLink()}">{$boxUserTrophy->getTrophy()->getTitle()}</a>
9+
<div class="sidebarListItem__content">
10+
<h3 class="sidebarListItem__title">
11+
<a href="{$boxUserTrophy->getTrophy()->getLink()}" class="sidebarListItem__link">
12+
{$boxUserTrophy->getTrophy()->getTitle()}
13+
</a>
1014
</h3>
11-
<small>
12-
{user object=$boxUserTrophy->getUserProfile()}
13-
<span class="separatorLeft">{@$boxUserTrophy->time|time}</span>
14-
</small>
15+
</div>
16+
17+
<div class="sidebarListItem__meta">
18+
<div class="sidebarListItem__meta__author">
19+
{user object=$boxUserTrophy->getUserProfile() tabindex='-1'}
20+
</div>
21+
<div class="sidebarListItem__meta__time">
22+
{time time=$boxUserTrophy->time}
23+
</div>
1524
</div>
1625
</li>
1726
{/foreach}
18-
</ul>
27+
</ol>
1928
{else}
2029
<ol class="containerBoxList trophyCategoryList tripleColumned">
2130
{foreach from=$boxUserTrophyList item=boxUserTrophy}

0 commit comments

Comments
 (0)