Skip to content

List views #6250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Apr 11, 2025
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
6 changes: 1 addition & 5 deletions com.woltlab.wcf/option.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1355,11 +1355,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
<defaultvalue>1</defaultvalue>
<options>module_trophy</options>
</option>
<option name="message_sidebar_enable_articles">
<categoryname>message.sidebar</categoryname>
<optiontype>boolean</optiontype>
<defaultvalue>1</defaultvalue>
</option>
<option name="message_sidebar_user_options">
<categoryname>message.sidebar</categoryname>
<optiontype>useroptions</optiontype>
Expand Down Expand Up @@ -1637,6 +1632,7 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
<option name="enable_woltlab_news"/>
<option name="users_online_record_no_guests"/>
<option name="blacklist_sfs_action"/>
<option name="message_sidebar_enable_articles"/>
<category name="security.blacklist"/>
<category name="security.blacklist.custom"/>
</delete>
Expand Down
126 changes: 17 additions & 109 deletions com.woltlab.wcf/templates/articleList.tpl
Original file line number Diff line number Diff line change
@@ -1,139 +1,47 @@
{capture append='headContent'}
{if $pageNo < $pages}
<link rel="next" href="{link controller='ArticleList'}pageNo={@$pageNo+1}{/link}">
{if $listView->getPageNo() < $listView->countPages()}
<link rel="next" href="{link controller='ArticleList'}pageNo={$listView->getPageNo() + 1}{/link}">
{/if}
{if $pageNo > 1}
<link rel="prev" href="{link controller='ArticleList'}{if $pageNo > 2}pageNo={@$pageNo-1}{/if}{/link}">
{if $listView->getPageNo() > 1}
<link rel="prev" href="{link controller='ArticleList'}{if $listView->getPageNo() > 2}pageNo={$listView->getPageNo() - 1}{/if}{/link}">
{/if}

{if $__wcf->getUser()->userID}
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleRssFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
{if $__wcf->user->userID}
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleRssFeed'}at={$__wcf->user->userID}-{$__wcf->user->accessToken}{/link}">
{else}
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleRssFeed'}{/link}">
{/if}
{/capture}

{capture assign='contentHeaderNavigation'}
{if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle') || $__wcf->getSession()->getPermission('admin.content.article.canManageOwnArticles') || $__wcf->getSession()->getPermission('admin.content.article.canContributeArticle')}
{if $canManageArticles}
{if $availableLanguages|count > 1}
<li><a href="#" class="button buttonPrimary jsButtonArticleAdd">{icon name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
<li><button type="button" class="button buttonPrimary jsButtonArticleAdd">{icon name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
{else}
<li><a href="{link controller='ArticleAdd'}{/link}" class="button buttonPrimary">{icon name='plus'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
{/if}
{/if}
{/capture}

{capture assign='sidebarRight'}
{if !$labelGroups|empty}
<form id="sidebarForm" method="post" action="{link application='wcf' controller=$controllerName object=$controllerObject}{/link}">
<section class="box">
<h2 class="boxTitle">{lang}wcf.label.label{/lang}</h2>

<div class="boxContent">
<dl>
{include file='__labelSelection'}
</dl>
<div class="formSubmit">
<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
</div>
</div>
</section>
</form>

<script data-relocate="true">
$(function() {
WCF.Language.addObject({
'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
});

new WCF.Label.Chooser({ {implode from=$labelIDs key=groupID item=labelID}{@$groupID}: {@$labelID}{/implode} }, '#sidebarForm', undefined, true);
});
</script>
{/if}
{/capture}

{assign var='additionalLinkParameters' value=''}
{if $user}{capture append='additionalLinkParameters'}&userID={@$user->userID}{/capture}{/if}
{if $labelIDs|count}{capture append='additionalLinkParameters'}{foreach from=$labelIDs key=labelGroupID item=labelID}&labelIDs[{@$labelGroupID}]={@$labelID}{/foreach}{/capture}{/if}

{capture assign='contentInteractionPagination'}
{pages print=true assign='pagesLinks' controller='ArticleList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$additionalLinkParameters"}
{/capture}

{capture assign='contentInteractionButtons'}
<div class="contentInteractionButton dropdown jsOnly">
<button type="button" class="button small dropdownToggle">
{if $sortOrder === 'ASC'}
{icon name='arrow-down-short-wide'}
{else}
{icon name='arrow-down-wide-short'}
{/if}
<span>{lang}wcf.article.button.sort{/lang}</span>
</button>
<ul class="dropdownMenu">
<li>
<a href="{link controller='ArticleList'}pageNo={@$pageNo}{if $user}&userID={@$user->userID}{/if}&sortField=title&sortOrder={if $sortField == 'title' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">
{lang}wcf.global.title{/lang}
{if $sortField == 'title'}
{if $sortOrder === 'ASC'}
{icon name='caret-up' type='solid'}
{else}
{icon name='caret-down' type='solid'}
{/if}
{/if}
</a>
</li>
<li>
<a href="{link controller='ArticleList'}pageNo={@$pageNo}{if $user}&userID={@$user->userID}{/if}&sortField=time&sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">
{lang}wcf.global.date{/lang}
{if $sortField == 'time'}
{if $sortOrder === 'ASC'}
{icon name='caret-up' type='solid'}
{else}
{icon name='caret-down' type='solid'}
{/if}
{/if}
</a>
</li>

{event name='sortOptions'}
</ul>
</div>
{if $__wcf->user->userID}
<button type="button" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon name='check'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></button>
{/if}
{/capture}

{capture assign='contentInteractionDropdownItems'}
<li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleRssFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleRssFeed'}{/link}{/if}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
{if $__wcf->user->userID}
<li><a rel="alternate" href="{link controller='ArticleRssFeed'}at={$__wcf->user->userID}-{$__wcf->user->accessToken}{/link}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
{else}
<li><a rel="alternate" href="{link controller='ArticleRssFeed'}{/link}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
{/if}
{/capture}

{include file='header'}

{if $objects|count}
<div class="section">
{include file='articleListItems'}
</div>
{else}
<woltlab-core-notice type="info">{lang}wcf.global.noItems{/lang}</woltlab-core-notice>
{/if}

<footer class="contentFooter">
{hascontent}
<div class="paginationBottom">
{content}{@$pagesLinks}{/content}
</div>
{/hascontent}

{hascontent}
<nav class="contentFooterNavigation">
<ul>
{content}{event name='contentFooterNavigation'}{/content}
</ul>
</nav>
{/hascontent}
</footer>
<div class="section">
{unsafe:$listView->render()}
</div>

{if $__wcf->user->userID}
<script data-relocate="true">
Expand All @@ -143,7 +51,7 @@
</script>
{/if}

{if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle') || $__wcf->getSession()->getPermission('admin.content.article.canManageOwnArticles') || $__wcf->getSession()->getPermission('admin.content.article.canContributeArticle')}
{if $canManageArticles}
{include file='shared_articleAddDialog'}
{/if}

Expand Down
Loading
Loading