Skip to content
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
4 changes: 2 additions & 2 deletions wcfsetup/install/files/acp/templates/__objectTypePipGui.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
Language.addObject({
'wcf.form.field.className.description.interface': '{jslang __literal=true}wcf.form.field.className.description.interface{/jslang}',
{implode from=$definitionNames item=definitionName}
'wcf.acp.pip.objectType.definitionName.{@$definitionName}.description': '{jslang __literal=true __optional=true}wcf.acp.pip.objectType.definitionName.{@$definitionName}.description{/jslang}'
'wcf.acp.pip.objectType.definitionName.{$definitionName}.description': '{jslang __literal=true __optional=true}wcf.acp.pip.objectType.definitionName.{$definitionName}.description{/jslang}'
{/implode}
});

var definitionInterfaces = {
{implode from=$definitionInterfaces key=definitionID item=interfaceName}
{@$definitionID}: '{@$interfaceName|encodeJS}'
{$definitionID}: '{unsafe:$interfaceName|encodeJS}'
{/implode}
};

Expand Down
20 changes: 10 additions & 10 deletions wcfsetup/install/files/acp/templates/__pageAddContent.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

{if $pageType == 'html' || $pageType == 'tpl'}
<ul class="codemirrorToolbar">
<li><button type="button" id="codemirror-{@$__pageContentID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}">{icon name='file'}</button></li>
<li><button type="button" id="codemirror-{@$__pageContentID}-page" class="jsTooltip" title="{lang}wcf.editor.button.page{/lang}">{icon name='file-lines'}</button></li>
<li><button type="button" id="codemirror-{$__pageContentID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}">{icon name='file'}</button></li>
<li><button type="button" id="codemirror-{$__pageContentID}-page" class="jsTooltip" title="{lang}wcf.editor.button.page{/lang}">{icon name='file-lines'}</button></li>
</ul>
<script data-relocate="true">
{include file='mediaJavaScript'}
Expand All @@ -25,27 +25,27 @@
'wcf.page.search.results': '{jslang}wcf.page.search.results{/jslang}',
});

new AcpUiCodeMirrorMedia('{@$__pageContentID}');
new AcpUiCodeMirrorPage('{@$__pageContentID}');
new AcpUiCodeMirrorMedia('{unsafe:$__pageContentID|encodeJS}');
new AcpUiCodeMirrorPage('{unsafe:$__pageContentID|encodeJS}');
});
</script>
{/if}

{if $pageType == 'text'}
<textarea name="content[{@$languageID}]" id="{@$__pageContentID}"
<textarea name="content[{$languageID}]" id="{$__pageContentID}"
{if $pageType == 'text'}
class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.page{$action|ucfirst}-{if $action == 'edit'}{@$pageID}{else}0{/if}-{@$languageID}"
{if $action === 'edit'}data-autosave-last-edit-time="{@$page->lastUpdateTime}"{/if}
class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.page{$action|ucfirst}-{if $action == 'edit'}{$pageID}{else}0{/if}-{$languageID}"
{if $action === 'edit'}data-autosave-last-edit-time="{$page->lastUpdateTime}"{/if}
{/if}
>{if !$content[$languageID]|empty}{$content[$languageID]}{/if}</textarea>
{include file='shared_wysiwygCmsToolbar' wysiwygSelector=$__pageContentID}
{include file='shared_wysiwyg' wysiwygSelector=$__pageContentID}
{else}
<div dir="ltr">
<textarea name="content[{@$languageID}]" id="{@$__pageContentID}"
<textarea name="content[{$languageID}]" id="{$__pageContentID}"
{if $pageType == 'text'}
class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.page{$action|ucfirst}-{if $action == 'edit'}{@$pageID}{else}0{/if}-{@$languageID}"
{if $action === 'edit'}data-autosave-last-edit-time="{@$page->lastUpdateTime}"{/if}
class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.page{$action|ucfirst}-{if $action == 'edit'}{$pageID}{else}0{/if}-{$languageID}"
{if $action === 'edit'}data-autosave-last-edit-time="{$page->lastUpdateTime}"{/if}
{/if}
>{if !$content[$languageID]|empty}{$content[$languageID]}{/if}</textarea>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
{foreach from=$pageNodeList item=pageNode}
{capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.{$pageNode->identifier}{/lang}{/capture}
{if $pageObjectIDLanguageItem}
'wcf.page.pageObjectID.{$pageNode->identifier}': '{@$pageObjectIDLanguageItem|encodeJS}',
'wcf.page.pageObjectID.{$pageNode->identifier}': '{unsafe:$pageObjectIDLanguageItem|encodeJS}',
{/if}
{capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.search.{$pageNode->identifier}{/lang}{/capture}
{if $pageObjectIDLanguageItem}
'wcf.page.pageObjectID.search.{$pageNode->identifier}': '{@$pageObjectIDLanguageItem|encodeJS}',
'wcf.page.pageObjectID.search.{$pageNode->identifier}': '{unsafe:$pageObjectIDLanguageItem|encodeJS}',
{/if}
{/foreach}
});
Expand Down
8 changes: 4 additions & 4 deletions wcfsetup/install/files/acp/templates/adAdd.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<script data-relocate="true">
$(function() {
new WCF.ACP.Ad.LocationHandler({
{implode from=$variablesDescriptions key=objectType item=description}'{$objectType}': '{@$description|encodeJS}'{/implode}
{implode from=$variablesDescriptions key=objectType item=description}'{$objectType}': '{unsafe:$description|encodeJS}'{/implode}
});
});
</script>
Expand Down Expand Up @@ -73,7 +73,7 @@
<option value="0"{if !$objectTypeID} selected{/if}>{lang}wcf.global.noSelection{/lang}</option>
{foreach from=$locations key='locationGroupLabel' item='locationGroup'}
{assign var='__firstLocationID' value=$locationGroup|key}
<optgroup label="{$locationGroupLabel}" data-category-name="{@$locationObjectTypes[$__firstLocationID]->categoryname}">
<optgroup label="{$locationGroupLabel}" data-category-name="{$locationObjectTypes[$__firstLocationID]->categoryname}">
{foreach from=$locationGroup key='locationID' item='location'}
<option value="{$locationID}"{if $locationObjectTypes[$locationID]->page} data-page="{$locationObjectTypes[$locationID]->page}"{/if}{if $objectTypeID == $locationID} selected{/if}>{$location}</option>
{/foreach}
Expand Down Expand Up @@ -120,7 +120,7 @@
</header>

{foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.page'] item='pageConditionObjectType'}
{@$pageConditionObjectType->getProcessor()->getHtml()}
{unsafe:$pageConditionObjectType->getProcessor()->getHtml()}
{/foreach}
</section>

Expand All @@ -131,7 +131,7 @@
</header>

{foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.pointInTime'] item='pointInTimeConditionObjectType'}
{@$pointInTimeConditionObjectType->getProcessor()->getHtml()}
{unsafe:$pointInTimeConditionObjectType->getProcessor()->getHtml()}
{/foreach}
</section>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@

{foreach from=$pageNodeList item=pageNode}
{if !$pageNode->isDisabled && !$pageNode->requireObjectID && !$pageNode->excludeFromLandingPage}
<option value="{$pageNode->pageID}"{if $pageNode->pageID == $application->landingPageID} selected{/if} data-identifier="{@$pageNode->identifier}">{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
<option value="{$pageNode->pageID}"{if $pageNode->pageID == $application->landingPageID} selected{/if} data-identifier="{$pageNode->identifier}">{if $pageNode->getDepth() > 1}{unsafe:"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
{/if}
{/foreach}
</select>
Expand Down
88 changes: 48 additions & 40 deletions wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@
</h2>

<dl>
<dt><label for="attributes[{ldelim}@$attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
<dt><label for="attributes[{ldelim}$attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
<dd>
<input type="text" id="attributes[{ldelim}@$attributeNo}][attributeHtml]" name="attributes[{ldelim}@$attributeNo}][attributeHtml]" value="" class="long">
<input type="text" id="attributes[{ldelim}$attributeNo}][attributeHtml]" name="attributes[{ldelim}$attributeNo}][attributeHtml]" value="" class="long">
</dd>
</dl>

<dl>
<dt><label for="attributes[{ldelim}@$attributeNo}][validationPattern]">{lang}wcf.acp.bbcode.attribute.validationPattern{/lang}</label></dt>
<dt><label for="attributes[{ldelim}$attributeNo}][validationPattern]">{lang}wcf.acp.bbcode.attribute.validationPattern{/lang}</label></dt>
<dd>
<input type="text" id="attributes[{ldelim}@$attributeNo}][validationPattern]" name="attributes[{ldelim}@$attributeNo}][validationPattern]" value="" class="long">
<input type="text" id="attributes[{ldelim}$attributeNo}][validationPattern]" name="attributes[{ldelim}$attributeNo}][validationPattern]" value="" class="long">
</dd>
</dl>

<dl>
<dt></dt>
<dd>
<label for="attributes[{ldelim}@$attributeNo}][required]"><input type="checkbox" id="attributes[{ldelim}@$attributeNo}][required]" name="attributes[{ldelim}@$attributeNo}][required]" value="1"> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
<label for="attributes[{ldelim}$attributeNo}][required]"><input type="checkbox" id="attributes[{ldelim}$attributeNo}][required]" name="attributes[{ldelim}$attributeNo}][required]" value="1"> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
</dd>
</dl>

<dl>
<dt></dt>
<dd>
<label for="attributes[{ldelim}@$attributeNo}][useText]"><input type="checkbox" id="attributes[{ldelim}@$attributeNo}][useText]" name="attributes[{ldelim}@$attributeNo}][useText]" value="1"> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
<label for="attributes[{ldelim}$attributeNo}][useText]"><input type="checkbox" id="attributes[{ldelim}$attributeNo}][useText]" name="attributes[{ldelim}$attributeNo}][useText]" value="1"> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
<small>{lang}wcf.acp.bbcode.attribute.useText.description{/lang}</small>
</dd>
</dl>
Expand All @@ -43,37 +43,45 @@
{/capture}

<script data-relocate="true">
require(['WoltLabSuite/Core/Template'], (Template) => {
$(function() {
$('.jsDeleteButton').click(function (event) {
$(event.target).parent().parent().remove();
require(['WoltLabSuite/Core/Template', 'WoltLabSuite/Core/Dom/Util'], (Template, { hide, show }) => {
document.querySelectorAll('.jsDeleteButton').forEach((btn) => {
btn.addEventListener('click', () => {
btn.closest('.section').remove();
});

var attributeNo = {if !$attributes|count}0{else}{assign var='lastAttribute' value=$attributes|end}{$lastAttribute->attributeNo+1}{/if};
var attributeTemplate = new Template('{@$attributeTemplate|encodeJS}');

$('.jsAddButton').click(function (event) {
var $html = $($.parseHTML(attributeTemplate.fetch({ attributeNo: attributeNo++ })));
$html.find('.jsDeleteButton').click(function (event) {
$(event.target).parent().parent().remove();
});

let attributeNo = {if !$attributes|count}0{else}{assign var='lastAttribute' value=$attributes|end}{$lastAttribute->attributeNo+1}{/if};
const attributeTemplate = new Template('{unsafe:$attributeTemplate|encodeJS}');

document.querySelectorAll('.jsAddButton').forEach((btn) => {
btn.addEventListener('click', () => {
const html = attributeTemplate.fetch({ attributeNo: attributeNo++ });
const tempDiv = document.createElement('div');
tempDiv.innerHTML = html;
const section = tempDiv.firstElementChild;
section.querySelectorAll('.jsDeleteButton').forEach((delBtn) => {
delBtn.addEventListener('click', () => {
delBtn.closest('.section').remove();
});
});
$('#attributeFieldset').append($html);
document.getElementById('attributeFieldset').appendChild(section);
});

var $buttonSettings = $('.jsButtonSetting');
var $showButton = $('#showButton');
function toggleButtonSettings() {
if ($showButton.is(':checked')) {
$buttonSettings.show();
}
else {
$buttonSettings.hide();
}
});

const buttonSettings = document.querySelectorAll('.jsButtonSetting');
const showButton = document.getElementById('showButton');
function toggleButtonSettings() {
if (showButton.checked) {
buttonSettings.forEach(el => show(el));
} else {
buttonSettings.forEach(el => hide(el));
}

$showButton.change(toggleButtonSettings);
}

if (showButton) {
showButton.addEventListener('change', toggleButtonSettings);
toggleButtonSettings();
});
}
});
</script>

Expand Down Expand Up @@ -180,7 +188,7 @@
{elseif $errorType == 'multilingual'}
{lang}wcf.global.form.error.multilingual{/lang}
{else}
{lang}wcf.acp.bbcode.buttonLabel.error.{@$errorType}{/lang}
{lang}wcf.acp.bbcode.buttonLabel.error.{$errorType}{/lang}
{/if}
</small>
{/if}
Expand All @@ -201,7 +209,7 @@
{if $errorType == 'empty'}
{lang}wcf.global.form.error.empty{/lang}
{else}
{lang}wcf.acp.bbcode.wysiwygIcon.error.{@$errorType}{/lang}
{lang}wcf.acp.bbcode.wysiwygIcon.error.{$errorType}{/lang}
{/if}
</small>
{/if}
Expand Down Expand Up @@ -231,16 +239,16 @@
</h2>

<dl{if $errorField == 'attributeHtml'|concat:$attribute->attributeNo} class="formError"{/if}>
<dt><label for="attributes[{@$attribute->attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
<dt><label for="attributes[{$attribute->attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
<dd>
<input type="text" id="attributes[{@$attribute->attributeNo}][attributeHtml]" name="attributes[{@$attribute->attributeNo}][attributeHtml]" value="{$attribute->attributeHtml}" class="long">
<input type="text" id="attributes[{$attribute->attributeNo}][attributeHtml]" name="attributes[{$attribute->attributeNo}][attributeHtml]" value="{$attribute->attributeHtml}" class="long">
</dd>
</dl>

<dl{if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo} class="formError"{/if}>
<dt><label for="attributes[{@$attribute->attributeNo}][validationPattern]">{lang}wcf.acp.bbcode.attribute.validationPattern{/lang}</label></dt>
<dt><label for="attributes[{$attribute->attributeNo}][validationPattern]">{lang}wcf.acp.bbcode.attribute.validationPattern{/lang}</label></dt>
<dd>
<input type="text" id="attributes[{@$attribute->attributeNo}][validationPattern]" name="attributes[{@$attribute->attributeNo}][validationPattern]" value="{$attribute->validationPattern}" class="long">
<input type="text" id="attributes[{$attribute->attributeNo}][validationPattern]" name="attributes[{$attribute->attributeNo}][validationPattern]" value="{$attribute->validationPattern}" class="long">
{if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo}
<small class="innerError">
{if $errorType == 'invalid'}
Expand All @@ -253,13 +261,13 @@

<dl{if $errorField == 'attributeRequired'|concat:$attribute->attributeNo} class="formError"{/if}>
<dd>
<label for="attributes[{@$attribute->attributeNo}][required]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][required]" name="attributes[{@$attribute->attributeNo}][required]" value="1"{if $attribute->required} checked{/if}> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
<label for="attributes[{$attribute->attributeNo}][required]"><input type="checkbox" id="attributes[{$attribute->attributeNo}][required]" name="attributes[{$attribute->attributeNo}][required]" value="1"{if $attribute->required} checked{/if}> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
</dd>
</dl>

<dl{if $errorField == 'attributeUseText'|concat:$attribute->attributeNo} class="formError"{/if}>
<dd>
<label for="attributes[{@$attribute->attributeNo}][useText]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][useText]" name="attributes[{@$attribute->attributeNo}][useText]" value="1"{if $attribute->useText} checked{/if}> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
<label for="attributes[{$attribute->attributeNo}][useText]"><input type="checkbox" id="attributes[{$attribute->attributeNo}][useText]" name="attributes[{$attribute->attributeNo}][useText]" value="1"{if $attribute->useText} checked{/if}> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
<small>{lang}wcf.acp.bbcode.attribute.useText.description{/lang}</small>
</dd>
</dl>
Expand Down
14 changes: 7 additions & 7 deletions wcfsetup/install/files/acp/templates/bulkProcessing.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
dialogTitle: '{jslang}{$pageTitle}{/jslang}',
className: "wcf\\system\\worker\\BulkProcessingWorker",
parameters: {
bulkProcessingID: {@$bulkProcessingID},
bulkProcessingID: {$bulkProcessingID},
},
});
});
Expand Down Expand Up @@ -63,12 +63,12 @@
<dt></dt>
<dd>
{foreach from=$actions item=actionObjectType}
<label><input type="radio" name="action" value="{$actionObjectType->action}"{if $actionObjectType->action == $action} checked{/if}> {lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</label>
<label><input type="radio" name="action" value="{$actionObjectType->action}"{if $actionObjectType->action == $action} checked{/if}> {lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{$actionObjectType->action}{/lang}</label>
{/foreach}

{if $errorField == 'action'}
<small class="innerError">
{lang}wcf.global.form.error.{@$errorType}{/lang}
{lang}wcf.global.form.error.{$errorType}{/lang}
</small>
{/if}
</dd>
Expand All @@ -77,10 +77,10 @@

{foreach from=$actions item=actionObjectType}
{if $actionObjectType->getProcessor()->getHTML()}
<section class="section jsBulkProcessingActionSettings" data-action="{@$actionObjectType->action}" {if $actionObjectType->action != $action}style="display: none;"{/if}>
<h2 class="sectionTitle">{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</h2>
<section class="section jsBulkProcessingActionSettings" data-action="{$actionObjectType->action}" {if $actionObjectType->action != $action}style="display: none;"{/if}>
<h2 class="sectionTitle">{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{$actionObjectType->action}{/lang}</h2>

{@$actionObjectType->getProcessor()->getHTML()}
{unsafe:$actionObjectType->getProcessor()->getHTML()}
</section>
{/if}
{/foreach}
Expand All @@ -91,7 +91,7 @@
{hascontent}<p class="sectionDescription">{content}{lang __optional=true}{$objectType->getProcessor()->getLanguageItemPrefix()}.conditions.descriptions{/lang}{/content}</p>{/hascontent}
</header>

{@$objectType->getProcessor()->getConditionHTML()}
{unsafe:$objectType->getProcessor()->getConditionHTML()}
</section>

<div class="formSubmit">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<header class="contentHeader">
<div class="contentHeaderTitle">
<h1 class="contentTitle">{@$objectType->getProcessor()->getLanguageVariable($action)}</h1>
<h1 class="contentTitle">{unsafe:$objectType->getProcessor()->getLanguageVariable($action)}</h1>
</div>

{hascontent}
Expand All @@ -12,7 +12,7 @@
{if $action == 'edit' && $categoryNodeList !== null && $categoryNodeList->hasChildren()}
<li class="dropdown">
<a class="button dropdownToggle">
{icon name='sort'} <span>{@$objectType->getProcessor()->getLanguageVariable('button.choose')}</span>
{icon name='sort'} <span>{unsafe:$objectType->getProcessor()->getLanguageVariable('button.choose')}</span>
</a>
<div class="dropdownMenu">
<ul class="scrollableDropdownMenu">
Expand All @@ -28,7 +28,7 @@

{if $objectType->getProcessor()->canDeleteCategory() || $objectType->getProcessor()->canEditCategory()}
<li>
<a href="{link controller=$listController application=$objectType->getProcessor()->getApplication()}{/link}" class="button">{icon name='list'} <span>{@$objectType->getProcessor()->getLanguageVariable('button.list')}</span></a>
<a href="{link controller=$listController application=$objectType->getProcessor()->getApplication()}{/link}" class="button">{icon name='list'} <span>{unsafe:$objectType->getProcessor()->getLanguageVariable('button.list')}</span></a>
</li>
{/if}

Expand All @@ -39,6 +39,6 @@
{/hascontent}
</header>

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

{include file='footer'}
Loading