-
Notifications
You must be signed in to change notification settings - Fork 144
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Unify layout / appearance of sidebar item lists
Closes #6160
- Loading branch information
Showing
15 changed files
with
294 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,21 @@ | ||
| <ul class="sidebarItemList"> | ||
| <ol class="sidebarList"> | ||
| {foreach from=$usersOnlineList item=userOnline} | ||
| <li class="box32"> | ||
| {user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'} | ||
|
|
||
| <div class="sidebarItemTitle"> | ||
| <h3>{user object=$userOnline}</h3> | ||
| <small>{@$userOnline->lastActivityTime|time}</small> | ||
| <li class="sidebarListItem"> | ||
| <div class="sidebarListItem__avatar"> | ||
| {user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'} | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__content"> | ||
| <h3 class="sidebarListItem__title"> | ||
| {user object=$userOnline class='sidebarListItem__link'} | ||
| </h3> | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__meta"> | ||
| <div class="sidebarListItem__meta__time"> | ||
| {time time=$userOnline->lastActivityTime} | ||
| </div> | ||
| </div> | ||
| </li> | ||
| {/foreach} | ||
| </ul> | ||
| </ol> |
37 changes: 23 additions & 14 deletions
37
com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,25 @@ | ||
| <ul class="sidebarItemList"> | ||
| <ol class="sidebarList"> | ||
| {foreach from=$eventList item=event} | ||
| <li class="box24{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID, 2)} ignoredUserContent{/if}"> | ||
| {user object=$event->getUserProfile() type='avatar24' ariaHidden='true' tabindex='-1'} | ||
|
|
||
| <div class="sidebarItemTitle"> | ||
| <h3> | ||
| {user object=$event->getUserProfile()} | ||
| <small class="separatorLeft">{@$event->time|time}</small> | ||
| <li class="sidebarListItem{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID, 2)} ignoredUserContent{/if}"> | ||
| <div class="sidebarListItem__avatar"> | ||
| {user object=$event->getUserProfile() type='avatar24' ariaHidden='true' tabindex='-1'} | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__content"> | ||
| <h3 class="sidebarListItem__title"> | ||
| {if $event->getLink()} | ||
| <a href="{$event->getLink()}" class="sidebarListItem__link">{unsafe:$event->getTitle()}</a> | ||
| {else} | ||
| {unsafe:$event->getTitle()} | ||
| {/if} | ||
| </h3> | ||
| <small>{@$event->getTitle()}</small> | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__meta"> | ||
| <div class="sidebarListItem__meta__time"> | ||
| {time time=$event->time} | ||
| </div> | ||
| </div> | ||
| </li> | ||
| {/foreach} | ||
| </ul> | ||
| </ol> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,29 @@ | ||
| <ul class="sidebarItemList"> | ||
| <ol class="sidebarList"> | ||
| {foreach from=$boxCommentList item=boxComment} | ||
| <li> | ||
| <div class="sidebarItemTitle"> | ||
| <h3><a href="{$boxComment->getLink()}">{$boxComment->title}</a></h3> | ||
| <li class="sidebarListItem"> | ||
| <div class="sidebarListItem__avatar"> | ||
| {user object=$boxComment->getUserProfile() type='avatar24' ariaHidden='true' tabindex='-1'} | ||
| </div> | ||
|
|
||
| <div class="sidebarCommentContent"> | ||
| <small>{@$boxComment->getExcerpt(50)}</small> | ||
|
|
||
| <div class="sidebarListItem__content"> | ||
| <h3 class="sidebarListItem__title"> | ||
| <a href="{$boxComment->getLink()}" class="sidebarListItem__link">{$boxComment->title}</a> | ||
| </h3> | ||
|
|
||
| <div class="sidebarListItem__description"> | ||
| {unsafe:$boxComment->getExcerpt(150)} | ||
| </div> | ||
| </div> | ||
| <div> | ||
| <small>{user object=$boxComment->getUserProfile()} <span class="separatorLeft">{@$boxComment->time|time}</span></small> | ||
|
|
||
| <div class="sidebarListItem__meta"> | ||
| <div class="sidebarListItem__meta__author"> | ||
| {user object=$boxComment->getUserProfile() tabindex='-1'} | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__meta__time"> | ||
| {time time=$boxComment->time} | ||
| </div> | ||
| </div> | ||
| </li> | ||
| {/foreach} | ||
| </ul> | ||
| </ol> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,29 @@ | ||
| <ul class="sidebarItemList"> | ||
| <ol class="sidebarList"> | ||
| {foreach from=$usersOnlineList item=userOnline} | ||
| <li class="box32"> | ||
| {user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'} | ||
|
|
||
| <div class="sidebarItemTitle"> | ||
| <h3> | ||
| <li class="sidebarListItem"> | ||
| <div class="sidebarListItem__avatar"> | ||
| {user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'} | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__content"> | ||
| <h3 class="sidebarListItem__title"> | ||
| {event name='beforeUsername'} | ||
| {user object=$userOnline} | ||
| {user object=$userOnline class='sidebarListItem__link'} | ||
| </h3> | ||
| {if MODULE_USER_RANK} | ||
| {if $userOnline->getUserTitle()} | ||
| <p><span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {@$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span></p> | ||
| {/if} | ||
| {if $userOnline->getRank() && $userOnline->getRank()->rankImage} | ||
| <p><span class="userRankImage">{@$userOnline->getRank()->getImage()}</span></p> | ||
| {/if} | ||
| {/if} | ||
| </div> | ||
|
|
||
| {if MODULE_USER_RANK} | ||
| <div class="sidebarListItem__meta"> | ||
| <div class="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} | ||
| {if $userOnline->getRank() && $userOnline->getRank()->rankImage} | ||
| <p><span class="userRankImage">{@$userOnline->getRank()->getImage()}</span></p> | ||
| {/if} | ||
| </div> | ||
| </div> | ||
| {/if} | ||
| </li> | ||
| {/foreach} | ||
| </ul> | ||
| </ol> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,21 @@ | ||
| <ul class="sidebarItemList"> | ||
| <ol class="sidebarList"> | ||
| {foreach from=$birthdayUserProfiles item=birthdayUserProfile} | ||
| <li class="box32"> | ||
| {user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'} | ||
|
|
||
| <div class="sidebarItemTitle"> | ||
| <h3>{user object=$birthdayUserProfile}</h3> | ||
| <small>{$birthdayUserProfile->getBirthday()}</small> | ||
| <li class="sidebarListItem"> | ||
| <div class="sidebarListItem__avatar"> | ||
| {user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'} | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__content"> | ||
| <h3 class="sidebarListItem__title"> | ||
| {user object=$birthdayUserProfile class='sidebarListItem__link'} | ||
| </h3> | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__meta"> | ||
| <div class="sidebarListItem__meta__birthday"> | ||
| {$birthdayUserProfile->getBirthday()} | ||
| </div> | ||
| </div> | ||
| </li> | ||
| {/foreach} | ||
| </ul> | ||
| </ol> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,31 @@ | ||
| <ul class="sidebarItemList"> | ||
| <ol class="sidebarList"> | ||
| {foreach from=$boxUsers item=boxUser} | ||
| <li class="box24"> | ||
| {user object=$boxUser type='avatar24' ariaHidden='true' tabindex='-1'} | ||
|
|
||
| <div class="sidebarItemTitle"> | ||
| <h3>{user object=$boxUser}</h3> | ||
| {capture assign='__boxUserLanguageItem'}{lang __optional=true}wcf.user.boxList.description.{$boxSortField}{/lang}{/capture} | ||
| {if $__boxUserLanguageItem} | ||
| <small>{@$__boxUserLanguageItem}</small> | ||
| <li class="sidebarListItem"> | ||
| <div class="sidebarListItem__avatar"> | ||
| {user object=$boxUser type='avatar32' ariaHidden='true' tabindex='-1'} | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__content"> | ||
| <h3 class="sidebarListItem__title"> | ||
| {user object=$boxUser class='sidebarListItem__link'} | ||
| </h3> | ||
| </div> | ||
|
|
||
| <div class="sidebarListItem__meta"> | ||
| {if $boxSortField == 'activityPoints'} | ||
| <div class="sidebarListItem__meta__points"> | ||
| {lang}wcf.user.boxList.description.activityPoints{/lang} | ||
| </div> | ||
| {elseif $boxSortField == 'likesReceived'} | ||
| <div class="sidebarListItem__meta__likes"> | ||
| {lang}wcf.user.boxList.description.likesReceived{/lang} | ||
| </div> | ||
| {elseif $boxSortField == 'registrationDate'} | ||
| <div class="sidebarListItem__meta__time"> | ||
| {time time=$boxUser->registrationDate} | ||
| </div> | ||
| {/if} | ||
| </div> | ||
| </li> | ||
| {/foreach} | ||
| </ul> | ||
| </ol> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.