Skip to content

Commit f95dbae

Browse files
dtdesigndtdesign
committed
Unify the sidebar layout with a leading image column
1 parent ef7ba7d commit f95dbae

11 files changed

Lines changed: 30 additions & 31 deletions

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1-
{if $boxPosition == 'sidebarLeft' || $boxPosition == 'sidebarRight'}
1+
{if $boxPosition === 'sidebarLeft' || $boxPosition === 'sidebarRight'}
22
<ul class="sidebarList">
33
{foreach from=$boxArticleList item=boxArticle}
44
<li class="sidebarListItem">
5+
<div class="sidebarListItem__image">
6+
{unsafe:$boxArticle->getUserProfile()->getAvatar()->getImageTag(24)}
7+
</div>
8+
59
<div class="sidebarListItem__content">
610
<h3 class="sidebarListItem__title">
711
{anchor object=$boxArticle class='articleLink sidebarListItem__link' title=$boxArticle->getTitle()}
812
</h3>
913
</div>
1014

1115
<div class="sidebarListItem__meta">
12-
{if $boxSortField == 'time'}
13-
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
14-
{unsafe:$boxArticle->getUserProfile()->getAvatar()->getImageTag(16)}
15-
</div>
16+
{if $boxSortField === 'time'}
1617
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
1718
{unsafe:$boxArticle->getUserProfile()->getFormattedUsername()}
1819
</div>
1920
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
2021
{time time=$boxArticle->time}
2122
</div>
22-
{elseif $boxSortField == 'views'}
23+
{elseif $boxSortField === 'views'}
2324
<div class="sidebarListItem__meta__item sidebarListItem__meta__views">
2425
{lang article=$boxArticle}wcf.article.articleViews{/lang}
2526
</div>
26-
{elseif $boxSortField == 'comments'}
27+
{elseif $boxSortField === 'comments'}
2728
<div class="sidebarListItem__meta__item sidebarListItem__meta__comments">
2829
{$boxArticle->getDiscussionProvider()->getDiscussionCountPhrase()}
2930
</div>
30-
{elseif $boxSortField == 'cumulativeLikes'}
31+
{elseif $boxSortField === 'cumulativeLikes'}
3132
<div class="sidebarListItem__meta__item sidebarListItem__meta__reactions">
3233
{if MODULE_LIKE && $__wcf->getSession()->getPermission('user.like.canViewLike') && $boxArticle->cachedReactions}
3334
{include file='shared_topReaction' cachedReactions=$boxArticle->cachedReactions render='full'}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{foreach from=$usersOnlineList item=userOnline}
33
<li class="sidebarListItem">
44
<div class="sidebarListItem__image">
5-
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
5+
{user object=$userOnline type='avatar24' ariaHidden='true' tabindex='-1'}
66
</div>
77

88
<div class="sidebarListItem__content">

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
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__image">
5+
{unsafe:$event->getUserProfile()->getAvatar()->getImageTag(24)}
6+
</div>
7+
48
<div class="sidebarListItem__content">
59
<h3 class="sidebarListItem__title">
610
{if $event->getLink()}
@@ -12,9 +16,6 @@
1216
</div>
1317

1418
<div class="sidebarListItem__meta">
15-
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
16-
{unsafe:$event->getUserProfile()->getAvatar()->getImageTag(16)}
17-
</div>
1819
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
1920
{unsafe:$event->getUserProfile()->getFormattedUsername()}
2021
</div>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<ol class="sidebarList">
22
{foreach from=$boxCommentList item=boxComment}
33
<li class="sidebarListItem">
4+
<div class="sidebarListItem__image">
5+
{unsafe:$boxComment->getUserProfile()->getAvatar()->getImageTag(24)}
6+
</div>
7+
48
<div class="sidebarListItem__content">
59
<h3 class="sidebarListItem__title">
610
<a href="{$boxComment->getLink()}" class="sidebarListItem__link">{$boxComment->title}</a>
@@ -12,9 +16,6 @@
1216
</div>
1317

1418
<div class="sidebarListItem__meta">
15-
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
16-
{unsafe:$boxComment->getUserProfile()->getAvatar()->getImageTag(16)}
17-
</div>
1819
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
1920
{unsafe:$boxComment->getUserProfile()->getFormattedUsername()}
2021
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{foreach from=$usersOnlineList item=userOnline}
33
<li class="sidebarListItem">
44
<div class="sidebarListItem__image">
5-
{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
5+
{user object=$userOnline type='avatar24' ariaHidden='true' tabindex='-1'}
66
</div>
77

88
<div class="sidebarListItem__content">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
33
<li class="sidebarListItem">
44
<div class="sidebarListItem__image">
5-
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
5+
{user object=$birthdayUserProfile type='avatar24' ariaHidden='true' tabindex='-1'}
66
</div>
77

88
<div class="sidebarListItem__content">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
33
<li class="sidebarListItem">
44
<div class="sidebarListItem__image">
5-
{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
5+
{user object=$birthdayUserProfile type='avatar24' ariaHidden='true' tabindex='-1'}
66
</div>
77

88
<div class="sidebarListItem__content">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{foreach from=$boxUsers item=boxUser}
33
<li class="sidebarListItem">
44
<div class="sidebarListItem__image">
5-
{user object=$boxUser type='avatar32' ariaHidden='true' tabindex='-1'}
5+
{user object=$boxUser type='avatar24' ariaHidden='true' tabindex='-1'}
66
</div>
77

88
<div class="sidebarListItem__content">

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{foreach from=$boxUserTrophyList item=boxUserTrophy}
33
<li class="sidebarListItem">
44
<div class="sidebarListItem__image">
5-
{unsafe:$boxUserTrophy->getTrophy()->renderTrophy(32)}
5+
{unsafe:$boxUserTrophy->getTrophy()->renderTrophy(24)}
66
</div>
77

88
<div class="sidebarListItem__content">
@@ -14,9 +14,6 @@
1414
</div>
1515

1616
<div class="sidebarListItem__meta">
17-
<div class="sidebarListItem__meta__item sidebarListItem__meta__avatar">
18-
{unsafe:$boxUserTrophy->getUserProfile()->getAvatar()->getImageTag(16)}
19-
</div>
2017
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
2118
{user object=$boxUserTrophy->getUserProfile() tabindex='-1'}
2219
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{foreach from=$user->getSpecialTrophies() item=trophy}
99
<li class="sidebarListItem">
1010
<div class="sidebarListItem__image">
11-
{unsafe:$trophy->renderTrophy(32)}
11+
{unsafe:$trophy->renderTrophy(24)}
1212
</div>
1313

1414
<div class="sidebarListItem__content">

0 commit comments

Comments
 (0)