Skip to content

Refactor devtools templates #6352

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 2 commits into from
Jun 19, 2025
Merged

Refactor devtools templates #6352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fca6912
Remove unnecessary `@` and replace all other `@` with `unsafe:`
Cyperghost Jun 16, 2025
be1eab0
Use `woltlab-core-pagination` instead of deprecated `{pages}`
Cyperghost Jun 16, 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
10 changes: 5 additions & 5 deletions com.woltlab.wcf/templates/__devtoolsLanguageChooser.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

var languages = {
{implode from=$__wcf->getLanguage()->getLanguages() item=_language}
'{@$_language->languageID}': {
iconPath: '{@$_language->getIconPath()|encodeJS}',
languageName: '{@$_language|encodeJS}',
languageCode: '{@$_language->languageCode|encodeJS}'
'{$_language->languageID}': {
iconPath: '{unsafe:$_language->getIconPath()|encodeJS}',
languageName: '{unsafe:$_language|encodeJS}',
languageCode: '{unsafe:$_language->languageCode|encodeJS}'
}
{/implode}
};
Expand Down Expand Up @@ -51,7 +51,7 @@
});
};

LanguageChooser.init('pageLanguageContainer', 'pageLanguageID', {@$__wcf->getLanguage()->languageID}, languages, callback);
LanguageChooser.init('pageLanguageContainer', 'pageLanguageID', {$__wcf->getLanguage()->languageID}, languages, callback);
});
</script>
{/if}
10 changes: 5 additions & 5 deletions wcfsetup/install/files/acp/templates/__devtoolsLanguageChooser.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

var languages = {
{implode from=$__wcf->getLanguage()->getLanguages() item=_language}
'{@$_language->languageID}': {
iconPath: '{@$_language->getIconPath()|encodeJS}',
languageName: '{@$_language|encodeJS}',
languageCode: '{@$_language->languageCode|encodeJS}'
'{$_language->languageID}': {
iconPath: '{unsafe:$_language->getIconPath()|encodeJS}',
languageName: '{unsafe:$_language|encodeJS}',
languageCode: '{unsafe:$_language->languageCode|encodeJS}'
}
{/implode}
};
Expand All @@ -31,7 +31,7 @@
});
};

LanguageChooser.init('pageLanguageContainer', 'pageLanguageID', {@$__wcf->getLanguage()->languageID}, languages, callback);
LanguageChooser.init('pageLanguageContainer', 'pageLanguageID', {$__wcf->getLanguage()->languageID}, languages, callback);
});
</script>
{/if}
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/__devtoolsProjectExcludedPackagesFormField.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
'wcf.acp.devtools.project.excludedPackage.excludedPackage': '{jslang __literal=true}wcf.acp.devtools.project.excludedPackage.excludedPackage{/jslang}'
});

new ExcludedPackagesFormField('{@$field->getPrefixedId()|encodeJS}', [
new ExcludedPackagesFormField('{unsafe:$field->getPrefixedId()|encodeJS}', [
{implode from=$field->getValue() item=excludedPackage}
{
packageIdentifier: '{$excludedPackage[packageIdentifier]}',
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/__devtoolsProjectInstallationJavaScript.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'wcf.acp.package.install.title': '{jslang}wcf.acp.package.install.title{/jslang}'
});

DevtoolsProjectInstallationConfirmation.init({@$project->projectID}, '{@$project->name|encodeJS}');
DevtoolsProjectInstallationConfirmation.init({$project->projectID}, '{unsafe:$project->name|encodeJS}');
});
</script>
{/if}
Expand Down
24 changes: 12 additions & 12 deletions wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
*}{if !$field->checkDependencies()} style="display: none;"{/if}{*
*}>
<dt>{if $field->getLabel() !== null}<label for="{$field->getPrefixedId()}">{@$field->getLabel()}</label>{/if}</dt>
<dt>{if $field->getLabel() !== null}<label for="{$field->getPrefixedId()}">{unsafe:$field->getLabel()}</label>{/if}</dt>
<dd>
<div class="row rowColGap formGrid">
<dl class="col-xs-12 col-md-10">
Expand Down Expand Up @@ -62,7 +62,7 @@
<select id="{$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_pip">
<option value="" selected disabled>{lang}wcf.acp.devtools.project.instruction.packageInstallationPlugin{/lang}</option>
{foreach from=$packageInstallationPlugins item=packageInstallationPlugin}
<option value="{$packageInstallationPlugin->pluginName}">{@$packageInstallationPlugin->pluginName}</option>
<option value="{$packageInstallationPlugin->pluginName}">{$packageInstallationPlugin->pluginName}</option>
{/foreach}
</select>
</dd>
Expand All @@ -82,7 +82,7 @@
<select id="{$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_application">
<option value="" selected disabled>{lang}wcf.acp.devtools.project.instruction.application{/lang}</option>
{foreach from=$apps item=app}
<option value="{$app->getAbbreviation()}">{@$app->getAbbreviation()}</option>
<option value="{$app->getAbbreviation()}">{$app->getAbbreviation()}</option>
{/foreach}
</select>
</dd>
Expand Down Expand Up @@ -129,7 +129,7 @@
<select name="pip">
<option value="" selected>{lang}wcf.global.noSelection{/lang}</option>
{foreach from=$packageInstallationPlugins item=packageInstallationPlugin}
<option value="{$packageInstallationPlugin->pluginName}">{@$packageInstallationPlugin->pluginName}</option>
<option value="{$packageInstallationPlugin->pluginName}">{$packageInstallationPlugin->pluginName}</option>
{/foreach}
</select>
</dd>
Expand All @@ -149,7 +149,7 @@
<select name="application">
<option value="" selected>{lang}wcf.global.noSelection{/lang}</option>
{foreach from=$apps item=app}
<option value="{$app->getAbbreviation()}">{@$app->getAbbreviation()}</option>
<option value="{$app->getAbbreviation()}">{$app->getAbbreviation()}</option>
{/foreach}
</select>
</dd>
Expand Down Expand Up @@ -201,12 +201,12 @@
'wcf.global.form.error.noValidSelection': '{jslang}wcf.global.form.error.noValidSelection{/jslang}'
});

var instructionsTemplate = new Template('{@$instructionsTemplate|encodeJS}');
var instructionsEditDialogTemplate = new Template('{@$instructionsEditDialogContent|encodeJS}');
var instructionEditDialogTemplate = new Template('{@$instructionEditDialogContent|encodeJS}');
var instructionsTemplate = new Template('{unsafe:$instructionsTemplate|encodeJS}');
var instructionsEditDialogTemplate = new Template('{unsafe:$instructionsEditDialogContent|encodeJS}');
var instructionEditDialogTemplate = new Template('{unsafe:$instructionEditDialogContent|encodeJS}');

new InstructionsFormField(
'{@$field->getPrefixedId()|encodeJS}',
'{unsafe:$field->getPrefixedId()|encodeJS}',
instructionsTemplate,
instructionsEditDialogTemplate,
instructionEditDialogTemplate,
Expand All @@ -223,7 +223,7 @@
{foreach from=$field->getValidationErrors() item=validationError}
{if $validationError->getInformation()[instructions]|isset && $validationError->getInformation()[instructions] === $instructionsKey && !$validationError->getInformation()[instruction]|isset}
{if $__instructionsHasError},{/if}
'{@$validationError->getMessage()|encodeJS}'
'{unsafe:$validationError->getMessage()|encodeJS}'

{assign var='__instructionsHasError' value=true}
{/if}
Expand All @@ -242,7 +242,7 @@
{foreach from=$field->getValidationErrors() item=validationError}
{if $validationError->getInformation()[instructions]|isset && $validationError->getInformation()[instructions] === $instructionsKey && $validationError->getInformation()[instruction]|isset && $validationError->getInformation()[instruction] === $instructionKey}
{if $__instructionHasError},{/if}
'{@$validationError->getMessage()|encodeJS}'
'{unsafe:$validationError->getMessage()|encodeJS}'

{assign var='__instructionHasError' value=true}
{/if}
Expand All @@ -255,7 +255,7 @@
{/implode}
{/if}
],
type: '{@$instructions[type]}'
type: '{unsafe:$instructions[type]|encodeJS}'
}
{/implode}
]
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/__devtoolsProjectOptionalPackagesFormField.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
'wcf.acp.devtools.project.optionalPackage.optionalPackage': '{jslang __literal=true}wcf.acp.devtools.project.optionalPackage.optionalPackage{/jslang}'
});

new OptionalPackagesFormField('{@$field->getPrefixedId()|encodeJS}', [
new OptionalPackagesFormField('{unsafe:$field->getPrefixedId()|encodeJS}', [
{implode from=$field->getValue() item=optionalPackage}
{
packageIdentifier: '{$optionalPackage[packageIdentifier]}'
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/__devtoolsProjectRequiredPackagesFormField.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
'wcf.acp.devtools.project.requiredPackage.requiredPackage': '{jslang __literal=true}wcf.acp.devtools.project.requiredPackage.requiredPackage{/jslang}'
});

new RequiredPackagesFormField('{@$field->getPrefixedId()|encodeJS}', [
new RequiredPackagesFormField('{unsafe:$field->getPrefixedId()|encodeJS}', [
{implode from=$field->getValue() item=requiredPackage}
{
file: {if $requiredPackage[file]}true{else}false{/if},
Expand Down
34 changes: 20 additions & 14 deletions wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,40 @@
{/hascontent}
</header>

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}
{pages print=true assign=pagesLinks controller='DevtoolsMissingLanguageItemList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='DevtoolsMissingLanguageItemList' sortField=$sortField sortOrder=$sortOrder}{/link}">
</woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $items}
<div id="missingLanguageItemTable" class="section tabularBox">
<table class="table jsObjectActionContainer" data-object-action-class-name="wcf\data\devtools\missing\language\item\DevtoolsMissingLanguageItemAction">
<thead>
<tr>
<th class="columnID{if $sortField === 'itemID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='DevtoolsMissingLanguageItemList'}sortField=itemID&sortOrder={if $sortField === 'itemID' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
<th class="columnText{if $sortField === 'languageID'} active {@$sortOrder}{/if}"><a href="{link controller='DevtoolsMissingLanguageItemList'}sortField=languageID&sortOrder={if $sortField === 'languageID' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.missingLanguageItem.languageID{/lang}</a></th>
<th class="columnText{if $sortField === 'languageItem'} active {@$sortOrder}{/if}"><a href="{link controller='DevtoolsMissingLanguageItemList'}sortField=languageItem&sortOrder={if $sortField === 'languageItem' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.missingLanguageItem.languageItem{/lang}</a></th>
<th class="columnText{if $sortField === 'lastTime'} active {@$sortOrder}{/if}"><a href="{link controller='DevtoolsMissingLanguageItemList'}sortField=lastTime&sortOrder={if $sortField === 'lastTime' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.missingLanguageItem.lastTime{/lang}</a></th>
<th class="columnID{if $sortField === 'itemID'} active {$sortOrder}{/if}" colspan="2"><a href="{link controller='DevtoolsMissingLanguageItemList'}sortField=itemID&sortOrder={if $sortField === 'itemID' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
<th class="columnText{if $sortField === 'languageID'} active {$sortOrder}{/if}"><a href="{link controller='DevtoolsMissingLanguageItemList'}sortField=languageID&sortOrder={if $sortField === 'languageID' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.missingLanguageItem.languageID{/lang}</a></th>
<th class="columnText{if $sortField === 'languageItem'} active {$sortOrder}{/if}"><a href="{link controller='DevtoolsMissingLanguageItemList'}sortField=languageItem&sortOrder={if $sortField === 'languageItem' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.missingLanguageItem.languageItem{/lang}</a></th>
<th class="columnText{if $sortField === 'lastTime'} active {$sortOrder}{/if}"><a href="{link controller='DevtoolsMissingLanguageItemList'}sortField=lastTime&sortOrder={if $sortField === 'lastTime' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.missingLanguageItem.lastTime{/lang}</a></th>

{event name='columnHeads'}
</tr>
</thead>

<tbody class="jsReloadPageWhenEmpty">
{foreach from=$objects item=logEntry}
<tr class="jsObjectRow jsObjectActionObject" data-object-id="{@$logEntry->getObjectID()}">
<tr class="jsObjectRow jsObjectActionObject" data-object-id="{$logEntry->getObjectID()}">
<td class="columnIcon">
{objectAction action="delete" confirmMessage='wcf.acp.devtools.missingLanguageItem.delete.confirmMessage'}
<button type="button" class="jsStackTraceButton jsTooltip" title="{lang}wcf.acp.devtools.missingLanguageItem.showStackTrace{/lang}" data-stack-trace="{$logEntry->getStackTrace()}">
{icon name='align-justify'}
</button>
</td>
<td class="columnID">{@$logEntry->getObjectID()}</td>
<td class="columnID">{$logEntry->getObjectID()}</td>
<td class="columnText">{if $logEntry->getLanguage()}{$logEntry->getLanguage()}{else}{$logEntry->languageID}{/if}</td>
<td class="columnText">{$logEntry->languageItem}</td>
<td class="columnDate">{@$logEntry->lastTime|time}</td>
Expand All @@ -63,11 +65,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='DevtoolsMissingLanguageItemList' sortField=$sortField sortOrder=$sortOrder}{/link}">
</woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{hascontent}
<nav class="contentFooterNavigation">
Expand Down
12 changes: 6 additions & 6 deletions wcfsetup/install/files/acp/templates/devtoolsNotificationTestDialog.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{if $event[title]|isset}
<dl>
<dt>{lang}wcf.global.title{/lang}</dt>
<dd>{@$event[title]}</dd>
<dd>{unsafe:$event[title]}</dd>
</dl>
{else}
<dl>
Expand All @@ -22,7 +22,7 @@
{if $event[message]|isset}
<dl>
<dt>{lang}wcf.acp.devtools.notificationTest.message{/lang}</dt>
<dd>{@$event[message]}</dd>
<dd>{unsafe:$event[message]}</dd>
</dl>
{else}
<dl>
Expand All @@ -34,7 +34,7 @@
{if $event[link]|isset}
<dl>
<dt>{lang}wcf.acp.devtools.notificationTest.link{/lang}</dt>
<dd><a href="{@$event[link]}">{@$event[link]}</a></dd>
<dd><a href="{$event[link]}">{$event[link]}</a></dd>
</dl>
{else}
<dl>
Expand Down Expand Up @@ -78,7 +78,7 @@
<dl>
{foreach from=$events item=event}
<dt>{$event[description]}</dt>
<dd>{if $event[title]|isset}{@$event[title]}{else}<pre>{$event[titleException]}</pre>{/if}</dd>
<dd>{if $event[title]|isset}{unsafe:$event[title]}{else}<pre>{$event[titleException]}</pre>{/if}</dd>
{/foreach}
</dl>
</section>
Expand All @@ -89,7 +89,7 @@
<dl>
{foreach from=$events item=event}
<dt>{$event[description]}</dt>
<dd>{if $event[message]|isset}{@$event[message]}{else}<pre>{$event[messageException]}</pre>{/if}</dd>
<dd>{if $event[message]|isset}{unsafe:$event[message]}{else}<pre>{$event[messageException]}</pre>{/if}</dd>
{/foreach}
</dl>
</section>
Expand All @@ -100,7 +100,7 @@
<dl>
{foreach from=$events item=event}
<dt>{$event[description]}</dt>
<dd>{if $event[link]|isset}<a href="{@$event[link]}">{@$event[link]}</a>{else}<pre>{$event[linkException]}</pre>{/if}</dd>
<dd>{if $event[link]|isset}<a href="{$event[link]}">{$event[link]}</a>{else}<pre>{$event[linkException]}</pre>{/if}</dd>
{/foreach}
</dl>
</section>
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/devtoolsProjectAdd.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
{/if}
{/if}

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

{include file='footer'}
8 changes: 4 additions & 4 deletions wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
<table class="table jsObjectActionContainer" data-object-action-class-name="wcf\data\devtools\project\DevtoolsProjectAction" id="devtoolsProjectList">
<thead>
<tr>
<th class="columnID{if $sortField === 'projectID'} active {@$sortOrder}{/if}" colspan="3"><a href="{link controller='DevtoolsProjectList'}sortField=projectID&sortOrder={if $sortField === 'projectID' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
<th class="columnText{if $sortField === 'name'} active {@$sortOrder}{/if}"><a href="{link controller='DevtoolsProjectList'}sortField=name&sortOrder={if $sortField === 'name' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.project.name{/lang}</a></th>
<th class="columnText{if $sortField === 'path'} active {@$sortOrder}{/if}"><a href="{link controller='DevtoolsProjectList'}sortField=path&sortOrder={if $sortField === 'path' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.project.path{/lang}</a></th>
<th class="columnID{if $sortField === 'projectID'} active {$sortOrder}{/if}" colspan="3"><a href="{link controller='DevtoolsProjectList'}sortField=projectID&sortOrder={if $sortField === 'projectID' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
<th class="columnText{if $sortField === 'name'} active {$sortOrder}{/if}"><a href="{link controller='DevtoolsProjectList'}sortField=name&sortOrder={if $sortField === 'name' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.project.name{/lang}</a></th>
<th class="columnText{if $sortField === 'path'} active {$sortOrder}{/if}"><a href="{link controller='DevtoolsProjectList'}sortField=path&sortOrder={if $sortField === 'path' && $sortOrder === 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.devtools.project.path{/lang}</a></th>

{event name='columnHeads'}
</tr>
Expand All @@ -67,7 +67,7 @@
<a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon name='pencil'}</a>
{objectAction action="delete" objectTitle=$object->name}
</td>
<td class="columnID">{@$object->getObjectID()}</td>
<td class="columnID">{$object->getObjectID()}</td>
<td class="columnText"><a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}">{$object->name}</a></td>
<td class="columnText"><small>{$object->path}</small></td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryAdd.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</nav>
</header>

{@$pipObject->getPip()->getAdditionalTemplateCode()}
{unsafe:$pipObject->getPip()->getAdditionalTemplateCode()}

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

{include file='footer'}
Loading