Skip to content

Refactor frontend templates #6358

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.

Sign up for GitHub

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
Cyperghost merged 3 commits into from
Jun 27, 2025
Merged

Refactor frontend templates #6358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
566cef0
Remove unnecessary `@` and replace all other `@` with `unsafe:`
Cyperghost Jun 18, 2025
410bb87
Use `woltlab-core-pagination` instead of deprecated `{pages}`
Cyperghost Jun 18, 2025
46a98ca
Use the `time` TemplatePlugin and no longer the deprecated `time` or …
Cyperghost Jun 18, 2025
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
8 changes: 4 additions & 4 deletions com.woltlab.wcf/templates/__labelSelection.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<dt><label>{$labelGroup->getTitle()}</label></dt>
<dd>
<ul class="labelList jsOnly">
<li class="dropdown labelChooser" id="labelGroup{@$labelGroup->groupID}" data-group-id="{@$labelGroup->groupID}">
<div class="dropdownToggle" data-toggle="labelGroup{@$labelGroup->groupID}"><span class="badge label">{lang}wcf.label.none{/lang}</span></div>
<li class="dropdown labelChooser" id="labelGroup{$labelGroup->groupID}" data-group-id="{$labelGroup->groupID}">
<div class="dropdownToggle" data-toggle="labelGroup{$labelGroup->groupID}"><span class="badge label">{lang}wcf.label.none{/lang}</span></div>
<div class="dropdownMenu">
<ul class="scrollableDropdownMenu">
{foreach from=$labelGroup item=label}
<li data-label-id="{@$label->labelID}"><span>{@$label->render()}</span></li>
<li data-label-id="{$label->labelID}"><span>{unsafe:$label->render()}</span></li>
{/foreach}
</ul>
</div>
Expand All @@ -17,7 +17,7 @@
{if $noLabelSelectionNoScript|empty}
<noscript>
{foreach from=$labelGroups item=labelGroup}
<select name="labelIDs[{@$labelGroup->groupID}]">
<select name="labelIDs[{$labelGroup->groupID}]">
<option value="0">{lang}wcf.label.none{/lang}</option>
<option value="-1">{lang}wcf.label.withoutSelection{/lang}</option>
{foreach from=$labelGroup item=label}
Expand Down
30 changes: 20 additions & 10 deletions com.woltlab.wcf/templates/categoryTrophyList.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,29 @@
<div class="contentHeaderTitle">
<h1 class="contentTitle">{$category->getTitle()}</h1>
{if $category && $category->getDescription()}
<p class="contentHeaderDescription">{if $category->descriptionUseHtml}{@$category->getDescription()}{else}{$category->getDescription()}{/if}</p>
<p class="contentHeaderDescription">{if $category->descriptionUseHtml}{unsafe:$category->getDescription()}{else}{$category->getDescription()}{/if}</p>
{/if}
</div>
</header>
{/capture}

{capture assign='headContent'}
{if $pageNo < $pages}
<link rel="next" href="{link controller='CategoryTrophyList' object=$category}pageNo={@$pageNo+1}{/link}">
<link rel="next" href="{link controller='CategoryTrophyList' object=$category pageNo=$pageNo+1}{/link}">
{/if}
{if $pageNo > 1}
<link rel="prev" href="{link controller='CategoryTrophyList' object=$category}{if $pageNo > 2}pageNo={@$pageNo-1}{/if}{/link}">
<link rel="prev" href="{link controller='CategoryTrophyList' object=$category}{if $pageNo > 2}pageNo={$pageNo-1}{/if}{/link}">
{/if}
{/capture}

{capture assign='contentInteractionPagination'}
{pages print=true assign='pagesLinks' controller='CategoryTrophyList' object=$category link="pageNo=%d"}
{if $pages > 1}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='CategoryTrophyList' object=$category}{/link}"
></woltlab-core-pagination>
{/if}
{/capture}

{include file='header'}
Expand All @@ -31,11 +37,11 @@
<ol class="containerList trophyCategoryList doubleColumned">
{foreach from=$objects item=trophy}
<li class="box64">
<div>{@$trophy->renderTrophy(64)}</div>
<div>{unsafe:$trophy->renderTrophy(64)}</div>

<div class="containerHeadline">
<h3><a href="{$trophy->getLink()}">{@$trophy->getTitle()}</a></h3>
{if !$trophy->getDescription()|empty}<p><small>{@$trophy->getDescription()}</small></p>{/if}
<h3><a href="{$trophy->getLink()}">{unsafe:$trophy->getTitle()}</a></h3>
{if !$trophy->getDescription()|empty}<p><small>{unsafe:$trophy->getDescription()}</small></p>{/if}
<p><small>{lang items=$trophy->awarded}wcf.user.trophy.trophyAwarded{/lang}</small></p>
</div>
</li>
Expand All @@ -47,11 +53,15 @@
{/if}

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{@$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='CategoryTrophyList' object=$category}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{hascontent}
<nav class="contentFooterNavigation">
Expand Down
6 changes: 3 additions & 3 deletions com.woltlab.wcf/templates/cms.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
{if $content->content}
{if $page->pageType == 'text'}
<div class="section cmsContent htmlContent">
{@$content->getFormattedContent()}
{unsafe:$content->getFormattedContent()}
</div>
{elseif $page->pageType == 'html'}
{@$content->getParsedContent()}
{unsafe:$content->getParsedContent()}
{elseif $page->pageType == 'tpl'}
{@$page->getParsedTemplate($content)}
{unsafe:$page->getParsedTemplate($content)}
{/if}
{/if}

Expand Down
30 changes: 20 additions & 10 deletions com.woltlab.wcf/templates/combinedTagged.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{capture assign='pageTitle'}{lang}wcf.tagging.combinedTaggedObjects.{@$objectType}{/lang} {lang}wcf.tagging.combinedTaggedObjects{/lang}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture}
{capture assign='pageTitle'}{lang}wcf.tagging.combinedTaggedObjects.{$objectType}{/lang} {lang}wcf.tagging.combinedTaggedObjects{/lang}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture}

{capture assign='contentHeader'}
<header class="contentHeader">
<div class="contentHeaderTitle">
<h1 class="contentTitle">{lang}wcf.tagging.combinedTaggedObjects.{@$objectType}{/lang} {lang}wcf.tagging.combinedTaggedObjects{/lang}</h1>
<h1 class="contentTitle">{lang}wcf.tagging.combinedTaggedObjects.{$objectType}{/lang} {lang}wcf.tagging.combinedTaggedObjects{/lang}</h1>
</div>
</header>
{/capture}

{capture assign='linkParameters'}{implode from=$combinedTags item=tag glue='&'}tagIDs[]={@$tag->tagID}{/implode}{/capture}
{capture assign='linkParameters'}{implode from=$combinedTags item=tag glue='&'}tagIDs[]={$tag->tagID}{/implode}{/capture}

{capture assign='headContent'}
{if $pageNo < $pages}
<link rel="next" href="{link controller='CombinedTagged'}{@$linkParameters}&objectType={@$objectType}&pageNo={@$pageNo+1}{/link}">
<link rel="next" href="{link controller='CombinedTagged' objectType=$objectType pageNo=$pageNo+1}{unsafe:$linkParameters}{/link}">
{/if}
{if $pageNo > 1}
<link rel="prev" href="{link controller='CombinedTagged'}{@$linkParameters}&objectType={@$objectType}{if $pageNo > 2}&pageNo={@$pageNo-1}{/if}{/link}">
<link rel="prev" href="{link controller='CombinedTagged' objectType=$objectType}{unsafe:$linkParameters}{if $pageNo > 2}&pageNo={$pageNo-1}{/if}{/link}">
{/if}
<link rel="canonical" href="{link controller='CombinedTagged'}{@$linkParameters}&objectType={@$objectType}{if $pageNo > 1}&pageNo={@$pageNo}{/if}{/link}">
<link rel="canonical" href="{link controller='CombinedTagged' objectType=$objectType}{unsafe:$linkParameters}{if $pageNo > 1}&pageNo={$pageNo}{/if}{/link}">
{/capture}

{capture assign='sidebarRight'}
Expand Down Expand Up @@ -48,7 +48,13 @@
{/capture}

{capture assign='contentInteractionPagination'}
{pages print=true assign=pagesLinks controller='CombinedTagged' link="$linkParameters&objectType=$objectType&pageNo=%d"}
{if $pages > 1}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='CombinedTagged' objectType=$objectType}{unsafe:$linkParameters}{/link}"
></woltlab-core-pagination>
{/if}
{/capture}

{capture assign='contentInteractionButtons'}
Expand All @@ -64,11 +70,15 @@
{/if}

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{@$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='CombinedTagged' objectType=$objectType}{unsafe:$linkParameters}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{hascontent}
<nav class="contentFooterNavigation">
Expand Down
18 changes: 9 additions & 9 deletions com.woltlab.wcf/templates/contentInteraction.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{if !$beforeContentInteraction|empty}
{@$beforeContentInteraction}
{unsafe:$beforeContentInteraction}
{/if}

{capture assign='__contentInteractionPagination'}
{if $contentInteractionPagination|isset}{@$contentInteractionPagination}{/if}
{if $contentInteractionPagination|isset}{unsafe:$contentInteractionPagination}{/if}
{/capture}
{assign var='__contentInteractionPagination' value=$__contentInteractionPagination|trim}

{capture assign='__contentInteractionButtons'}
{event name='beforeButtons'}
{if $contentInteractionButtons|isset}{@$contentInteractionButtons}{/if}
{if $contentInteractionButtons|isset}{unsafe:$contentInteractionButtons}{/if}
{event name='afterButtons'}
{/capture}
{assign var='__contentInteractionButtons' value=$__contentInteractionButtons|trim}

{capture assign='__contentInteractionDropdownItems'}
{event name='beforeDropdownItems'}
{if $contentInteractionDropdownItems|isset}{@$contentInteractionDropdownItems}{/if}
{if $contentInteractionDropdownItems|isset}{unsafe:$contentInteractionDropdownItems}{/if}
{event name='afterDropdownItems'}
{/capture}
{assign var='__contentInteractionDropdownItems' value=$__contentInteractionDropdownItems|trim}

{capture assign='__contentInteractionShareButton'}
{if $contentInteractionShareButton|isset}{@$contentInteractionShareButton}{/if}
{if $contentInteractionShareButton|isset}{unsafe:$contentInteractionShareButton}{/if}
{/capture}
{assign var='__contentInteractionShareButton' value=$__contentInteractionShareButton|trim}

Expand All @@ -32,21 +32,21 @@
{unsafe:$contentInteractionTabsComponent->render()}
{elseif $__contentInteractionPagination}
<div class="contentInteractionPagination paginationTop">
{@$__contentInteractionPagination}
{unsafe:$__contentInteractionPagination}
</div>
{/if}

{if $__contentInteractionButtons || $__contentInteractionDropdownItems || $__contentInteractionShareButton}
<div class="contentInteractionButtonContainer">
{if $__contentInteractionButtons}
<div class="contentInteractionButtons">
{@$__contentInteractionButtons}
{unsafe:$__contentInteractionButtons}
</div>
{/if}

{if $__contentInteractionShareButton}
<div class="contentInteractionShareButton">
{@$__contentInteractionShareButton}
{unsafe:$__contentInteractionShareButton}
</div>
{/if}

Expand All @@ -55,7 +55,7 @@
<button type="button" class="button small dropdownToggle" aria-label="{lang}wcf.global.button.more{/lang}">{icon name='ellipsis-vertical'}</button>

<ul class="contentInteractionDropdownItems dropdownMenu">
{@$__contentInteractionDropdownItems}
{unsafe:$__contentInteractionDropdownItems}
</ul>
</div>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/customOptionFieldList.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{assign var=option value=$optionData[object]}
<dl class="{if $errorType|is_array && $errorType[$option->optionName]|isset} formError{/if}">
<dt{if $optionData[cssClassName]} class="{$optionData[cssClassName]}"{/if}><label for="{$option->optionName}">{$option->getTitle()}</label>{if $option->required} <span class="customOptionRequired">*</span>{/if}</dt>
<dd>{@$optionData[html]}
<dd>{unsafe:$optionData[html]}
<small>{$option->getDescription()}</small>

{if $errorType|is_array && $errorType[$option->optionName]|isset}
Expand Down
22 changes: 16 additions & 6 deletions com.woltlab.wcf/templates/deletedContentList.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{capture assign='pageTitle'}{lang}wcf.moderation.deletedContent.{@$objectType}{/lang}{/capture}
{capture assign='pageTitle'}{lang}wcf.moderation.deletedContent.{$objectType}{/lang}{/capture}

{capture assign='sidebarRight'}
<section class="box" data-static-box-identifier="com.woltlab.wcf.DeletedContentListMenu">
Expand All @@ -18,10 +18,16 @@
</section>
{/capture}

{capture assign='contentTitle'}{lang}wcf.moderation.deletedContent.{@$objectType}{/lang}{/capture}
{capture assign='contentTitle'}{lang}wcf.moderation.deletedContent.{$objectType}{/lang}{/capture}

{capture assign='contentInteractionPagination'}
{pages print=true assign=pagesLinks controller='DeletedContentList' link="objectType=$objectType&pageNo=%d"}
{if $pages > 1}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='DeletedContentList' objectType=$objectType}{/link}"
></woltlab-core-pagination>
{/if}
{/capture}

{include file='header'}
Expand All @@ -33,11 +39,15 @@
{/if}

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{@$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='DeletedContentList' objectType=$objectType}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{hascontent}
<nav class="contentFooterNavigation">
Expand Down
8 changes: 4 additions & 4 deletions com.woltlab.wcf/templates/editHistory.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
{/if}
<td{if $line[0] === '+'} class="diffAdded"{elseif $line[0] === '-'} class="diffRemoved"{/if}{if $colspan} colspan="2"{assign var='colspan' value=false}{/if}>
{/if}
{if $line[0] === ' '}{@$line[1]}<br>{/if}
{if $line[0] === '-'}{@$line[1]}<br>{/if}
{if $line[0] === '+'}{@$line[1]}<br>{/if}
{if $line[0] === ' '}{unsafe:$line[1]}<br>{/if}
{if $line[0] === '-'}{unsafe:$line[1]}<br>{/if}
{if $line[0] === '+'}{unsafe:$line[1]}<br>{/if}
{assign var='prevType' value=$line[0]}
{/foreach}
</tbody>
Expand Down Expand Up @@ -110,7 +110,7 @@
{foreach from=$objects item=edit name=edit}
<tr class="jsEditRow">
<td class="columnIcon">
<button type="button" class="jsRevertButton jsTooltip" title="{lang}wcf.edit.revert{/lang}" data-object-id="{@$edit->entryID}" data-confirm-message="{lang __encode=true}wcf.edit.revert.confirmMessage{/lang}">
<button type="button" class="jsRevertButton jsTooltip" title="{lang}wcf.edit.revert{/lang}" data-object-id="{$edit->entryID}" data-confirm-message="{lang __encode=true}wcf.edit.revert.confirmMessage{/lang}">
{icon name='rotate-left'}
</button>
<input type="radio" name="oldID" value="{$edit->entryID}"{if $oldID == $edit->entryID} checked{/if}> <input type="radio" name="newID" value="{$edit->entryID}"{if $newID == $edit->entryID} checked{/if}>
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/emailActivation.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{include file='authFlowHeader'}

{@$form->getHtml()}
{unsafe:$form->getHtml()}

{include file='authFlowFooter'}
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/emailNewActivationCode.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{include file='authFlowHeader'}

{@$form->getHtml()}
{unsafe:$form->getHtml()}

{include file='authFlowFooter'}
22 changes: 16 additions & 6 deletions com.woltlab.wcf/templates/following.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
{capture assign='contentTitleBadge'}<span class="badge">{#$items}</span>{/capture}

{capture assign='contentInteractionPagination'}
{pages print=true assign=pagesLinks controller='Following' link="pageNo=%d"}
{if $pages > 1}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='Following'}{/link}"
></woltlab-core-pagination>
{/if}
{/capture}

{include file='header' __sidebarLeftHasMenu=true}
Expand All @@ -12,7 +18,7 @@
<div class="section sectionContainerList">
<ol class="containerList userList jsReloadPageWhenEmpty jsObjectActionContainer" data-object-action-class-name="wcf\data\user\follow\UserFollowAction">
{foreach from=$objects item=user}
<li class="jsFollowing jsObjectActionObject" data-object-id="{@$user->getObjectID()}">
<li class="jsFollowing jsObjectActionObject" data-object-id="{$user->getObjectID()}">
<div class="box48">
{user object=$user type='avatar48' ariaHidden='true' tabindex='-1'}

Expand All @@ -21,7 +27,7 @@

<nav class="jsMobileNavigation buttonGroupNavigation">
<ul class="buttonList iconList jsOnly">
<li><a class="pointer jsTooltip jsObjectAction" data-object-action="delete" title="{lang}wcf.user.button.unfollow{/lang}" data-object-id="{@$user->followID}">{icon name='xmark'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
<li><a class="pointer jsTooltip jsObjectAction" data-object-action="delete" title="{lang}wcf.user.button.unfollow{/lang}" data-object-id="{$user->followID}">{icon name='xmark'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
{event name='userButtons'}
</ul>
</nav>
Expand All @@ -37,11 +43,15 @@
</div>

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{@$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='Following'}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{hascontent}
<nav class="contentFooterNavigation">
Expand Down
Loading
Loading