- {if $article->hasLabels()}
-
- {foreach from=$article->getLabels() item=label}
- {@$label->render('contentItemLabel')}
- {/foreach}
-
- {/if}
-
-
-
-
- {@$article->getFormattedTeaser()}
+ {hascontent}
+
+ {content}
+ {if $article->isDeleted}{lang}wcf.message.status.deleted{/lang}{/if}
+ {if !$article->isPublished()}{lang}wcf.message.status.disabled{/lang}{/if}
+ {if $article->isNew()}{lang}wcf.message.new{/lang}{/if}
+
+ {event name='contentItemBadges'}
+ {/content}
-
+ {/hascontent}
-
- {@$article->getUserProfile()->getAvatar()->getImageTag(32)}
-
-
-
-
- {@$article->getUserProfile()->getFormattedUsername()}
-
-
- {@$article->time|time}
+
+ {if $article->hasLabels()}
+
+ {foreach from=$article->getLabels() item=label}
+ {@$label->render('contentItemLabel')}
+ {/foreach}
-
+ {/if}
-
- {if MODULE_LIKE && $__wcf->getSession()->getPermission('user.like.canViewLike') && $article->cumulativeLikes}
-
- {include file='shared_topReaction' cachedReactions=$article->cachedReactions render='short'}
-
- {/if}
- {if $article->getDiscussionProvider()->getDiscussionCountPhrase()}{* empty phrase indicates that comments are disabled *}
-
- {icon name='comments'}
-
- {$article->getDiscussionProvider()->getDiscussionCount()}
-
-
- {/if}
-
- {event name='contentItemMetaIcons'}
+
+
+
+ {@$article->getFormattedTeaser()}
-
- {/if}
+
- {if MODULE_WCF_AD && !$disableAds}
- {if $tpl[foreach][articles][iteration] === 1}
+
+
+ {@$article->getUserProfile()->getAvatar()->getImageTag(32)}
+
+
+
+
+ {@$article->getUserProfile()->getFormattedUsername()}
+
+
+ {@$article->time|time}
+
+
+
+
+ {if MODULE_LIKE && $__wcf->getSession()->getPermission('user.like.canViewLike') && $article->cumulativeLikes}
+
+ {include file='shared_topReaction' cachedReactions=$article->cachedReactions render='short'}
+
+ {/if}
+ {if $article->getDiscussionProvider()->getDiscussionCountPhrase()}{* empty phrase indicates that comments are disabled *}
+
+ {icon name='comments'}
+
+ {$article->getDiscussionProvider()->getDiscussionCount()}
+
+
+ {/if}
+
+ {event name='contentItemMetaIcons'}
+
+
+
+ {/if}
+
+ {if MODULE_WCF_AD && !$disableAds}
+ {if $tpl[foreach][articles][iteration] === 1}
+ {hascontent}
+
+ {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.after1stArticle')}{/content}
+
+ {/hascontent}
+ {else}
+ {if $tpl[foreach][articles][iteration] % 2 === 0}
{hascontent}
- {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.after1stArticle')}{/content}
+ {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery2ndArticle')}{/content}
+
+ {/hascontent}
+ {/if}
+
+ {if $tpl[foreach][articles][iteration] % 3 === 0}
+ {hascontent}
+
+ {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery3rdArticle')}{/content}
+
+ {/hascontent}
+ {/if}
+
+ {if $tpl[foreach][articles][iteration] % 5 === 0}
+ {hascontent}
+
+ {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery5thArticle')}{/content}
{/hascontent}
- {else}
- {if $tpl[foreach][articles][iteration] % 2 === 0}
- {hascontent}
-
- {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery2ndArticle')}{/content}
-
- {/hascontent}
- {/if}
-
- {if $tpl[foreach][articles][iteration] % 3 === 0}
- {hascontent}
-
- {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery3rdArticle')}{/content}
-
- {/hascontent}
- {/if}
- {if $tpl[foreach][articles][iteration] % 5 === 0}
+ {if $tpl[foreach][articles][iteration] % 10 === 0}
{hascontent}
- {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery5thArticle')}{/content}
+ {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery10thArticle')}{/content}
{/hascontent}
-
- {if $tpl[foreach][articles][iteration] % 10 === 0}
- {hascontent}
-
- {content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery10thArticle')}{/content}
-
- {/hascontent}
- {/if}
{/if}
{/if}
{/if}
- {/foreach}
-
+ {/if}
+{/foreach}
diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index d01bc6bf84c..fe244053497 100644
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -1,67 +1,33 @@
{capture assign='pageTitle'}{$category->getTitle()}{/capture}
{capture assign='contentTitle'}{$category->getTitle()}{/capture}
-{capture assign='contentDescription'}{if $category->descriptionUseHtml}{@$category->getDescription()}{else}{$category->getDescription()}{/if}{/capture}
+{capture assign='contentDescription'}{if $category->descriptionUseHtml}{unsafe:$category->getDescription()}{else}{$category->getDescription()}{/if}{/capture}
{capture append='headContent'}
- {if $pageNo < $pages}
-
+ {if $listView->getPageNo() < $listView->countPages()}
+
{/if}
- {if $pageNo > 1}
-
+ {if $listView->getPageNo() > 1}
+
{/if}
- {if $__wcf->getUser()->userID}
-
+ {if $__wcf->user->userID}
+
{else}
{/if}
{/capture}
-{if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}
- {capture assign='contentHeaderNavigation'}
+{capture assign='contentHeaderNavigation'}
+ {if $canManageArticles}
{if $availableLanguages|count > 1}
-
{icon name='plus'} {lang}wcf.acp.article.add{/lang}
+
{else}
-
{icon name='plus'} {lang}wcf.acp.article.add{/lang}
+
{icon name='plus'} {lang}wcf.acp.article.add{/lang}
{/if}
- {/capture}
-{/if}
-
-{capture assign='sidebarRight'}
- {if !$labelGroups|empty}
-
-
-
{/if}
{/capture}
-{capture assign='contentInteractionPagination'}
- {pages print=true assign='pagesLinks' controller='CategoryArticleList' object=$category link="pageNo=%d"}
-{/capture}
-
{capture assign='contentInteractionButtons'}
{include file='__userObjectWatchButton' isSubscribed=$category->isSubscribed() objectType='com.woltlab.wcf.article.category' objectID=$category->categoryID}
@@ -71,34 +37,18 @@
{/capture}
{capture assign='contentInteractionDropdownItems'}
-
+ {if $__wcf->user->userID}
+
+ {else}
+
+ {/if}
{/capture}
{include file='header'}
-{if $objects|count}
-
- {include file='articleListItems'}
-
-{else}
-
{lang}wcf.global.noItems{/lang}
-{/if}
-
-
+
+ {unsafe:$listView->render()}
+
{if $__wcf->user->userID}
{/if}
-{include file='shared_articleAddDialog'}
+{if $canManageArticles}
+ {include file='shared_articleAddDialog'}
+{/if}
{include file='footer'}
diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index 00869064fe9..8381f614965 100644
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -109,11 +109,6 @@
{#$userProfile->trophyPoints}
{/if}
- {if MESSAGE_SIDEBAR_ENABLE_ARTICLES && $userProfile->articles}
-
{lang}wcf.user.articles{/lang}
-
{#$userProfile->articles}
- {/if}
-
{event name='userCredits'}
{if MESSAGE_SIDEBAR_USER_OPTIONS && $userProfile->isAccessible('canViewProfile')}
diff --git a/com.woltlab.wcf/templates/shared_interactionButton.tpl b/com.woltlab.wcf/templates/shared_interactionButton.tpl
index 1035e86ce72..75dbcf82f1d 100644
--- a/com.woltlab.wcf/templates/shared_interactionButton.tpl
+++ b/com.woltlab.wcf/templates/shared_interactionButton.tpl
@@ -1,15 +1,9 @@
-{if $contextMenuOptions}
-
-
-
-
-
-{else}
-