Use new templates for object action delete and toggle icons

diff --git a/wcfsetup/install/files/acp/templates/adList.tpl b/wcfsetup/install/files/acp/templates/adList.tpl
index 0b6febe125469d51502a2d5973dfb1305afcea20..1d94fa77d2a51880818d25e7a7a8191898ed3580 100644 (file)
--- a/wcfsetup/install/files/acp/templates/adList.tpl
+++ b/wcfsetup/install/files/acp/templates/adList.tpl
@@ -40,9 +40,9 @@
                                                
                                                <span class="statusDisplay sortableButtonContainer">
                                                        <span class="icon icon16 fa-arrows sortableNodeHandle"></span>
-                                                       <span class="icon icon16 fa-{if !$ad->isDisabled}check-{/if}square-o jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.{if $ad->isDisabled}enable{else}disable{/if}{/lang}" data-object-action="toggle"></span>
+                                                       {include file='__objectActionToogleIcon' object=$ad}
                                                        <a href="{link controller='AdEdit' object=$ad}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-                                                       <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.ad.delete.confirmMessage{/lang}"></span>
+                                                       {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.ad.delete.confirmMessage'}
                                                        
                                                        {event name='itemButtons'}
                                                </span>

diff --git a/wcfsetup/install/files/acp/templates/bbcodeList.tpl b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
index dfdf3e266c4c6e62c63189a308e4e95dd5220a0b..1a777753840528ba10f5beffbcc1bcd8d5f81dec 100644 (file)
--- a/wcfsetup/install/files/acp/templates/bbcodeList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
@@ -39,7 +39,7 @@
                                                <td class="columnIcon">
                                                        <a href="{link controller='BBCodeEdit' object=$bbcode}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
                                                        {if $bbcode->canDelete()}
-                                                               <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.bbcode.delete.sure{/lang}"></span>
+                                                               {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.bbcode.delete.sure'}
                                                        {else}
                                                                <span class="icon icon16 fa-times disabled"></span>
                                                        {/if}

diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
index 2ed1879ff3c1d269514c55768c2dc804e772867e..a025dd2707e9d028a49d8a41209828df13626a2c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
@@ -36,9 +36,9 @@
                                {foreach from=$objects item='mediaProvider'}
                                        <tr class="jsMediaProviderRow jsObjectActionObject" data-object-id="{@$mediaProvider->getObjectID()}">
                                                <td class="columnIcon">
-                                                       <span class="icon icon16 fa-{if !$mediaProvider->isDisabled}check-{/if}square-o jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.{if !$mediaProvider->isDisabled}disable{else}enable{/if}{/lang}" data-object-action="toggle"></span>
+                                                       {include file='__objectActionToogleIcon' object=$mediaProvider}
                                                        <a href="{link controller='BBCodeMediaProviderEdit' object=$mediaProvider}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-                                                       <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.bbcode.mediaProvider.delete.sure{/lang}"></span>
+                                                       {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.bbcode.mediaProvider.delete.sure'}
                                                        
                                                        {event name='rowButtons'}
                                                </td>

diff --git a/wcfsetup/install/files/acp/templates/boxList.tpl b/wcfsetup/install/files/acp/templates/boxList.tpl
index 49a829d49f60df5355d13853f35d2fbb38ee35d0..f4855f6ed8c82b33af5ce85bb9dcedf304450120 100644 (file)
--- a/wcfsetup/install/files/acp/templates/boxList.tpl
+++ b/wcfsetup/install/files/acp/templates/boxList.tpl
@@ -117,10 +117,11 @@
                                {foreach from=$objects item=box}
                                        <tr class="jsBoxRow jsObjectActionObject" data-object-id="{@$box->getObjectID()}">
                                                <td class="columnIcon">
-                                                       <span class="icon icon16 fa-{if !$box->isDisabled}check-{/if}square-o jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.{if !$box->isDisabled}disable{else}enable{/if}{/lang}" data-object-action="toggle"></span>
+                                                       {include file='__objectActionToogleIcon' object=$box}
                                                        <a href="{link controller='BoxEdit' id=$box->boxID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
                                                        {if $box->canDelete()}
-                                                               <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.box.delete.confirmMessage{/lang}"></span>
+                                                               {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.box.delete.confirmMessage'}
+
                                                        {else}
                                                                <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
                                                        {/if}

diff --git a/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl b/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
index 047f01f809d665e3356d5f1078890ed7c6cc70a1..94c94f09a62728adc9debd7810e44dce68c2324c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
@@ -37,9 +37,9 @@
                                        {foreach from=$objects item='question'}
                                                <tr class="jsQuestionRow jsObjectActionObject" data-object-id="{@$question->getObjectID()}">
                                                        <td class="columnIcon">
-                                                               <span class="icon icon16 fa-{if !$question->isDisabled}check-{/if}square-o jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.{if $question->isDisabled}enable{else}disable{/if}{/lang}" data-object-action="toggle"></span>
+                                                               {include file='__objectActionToogleIcon' object=$question}
                                                                <a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-                                                               <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.captcha.question.delete.confirmMessage{/lang}"></span>
+                                                               {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.captcha.question.delete.confirmMessage'}
                                                                
                                                                {event name='rowButtons'}
                                                        </td>

diff --git a/wcfsetup/install/files/acp/templates/contactSettings.tpl b/wcfsetup/install/files/acp/templates/contactSettings.tpl
index 15b41174bf9bd5eb2752909c2be9effea78ffe2b..8b41322e91d98a99bd8f785199dc07b2f1f11998 100644 (file)
--- a/wcfsetup/install/files/acp/templates/contactSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/contactSettings.tpl
@@ -50,10 +50,10 @@
                                {foreach from=$optionList item=option}
                                        <tr class="sortableNode jsOptionRow jsObjectActionObject" data-object-id="{@$option->optionID}">
                                                <td class="columnIcon">
-                                                       <span class="icon icon16 fa-{if !$option->isDisabled}check-{/if}square-o jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.{if $option->isDisabled}enable{else}disable{/if}{/lang}" data-object-action="toggle"></span>
+                                                       {include file='__objectActionToogleIcon' object=$option}
                                                        <a href="{link controller='ContactOptionEdit' id=$option->optionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
                                                        {if $option->canDelete()}
-                                                               <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete"  data-confirm-message="{lang __encode=true}wcf.acp.customOption.delete.confirmMessage{/lang}"></span>
+                                                               {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.customOption.delete.confirmMessage'}
                                                        {else}
                                                                <span class="icon icon16 fa-times disabled"></span>
                                                        {/if}
@@ -89,12 +89,12 @@
                                                
                                                <span class="statusDisplay sortableButtonContainer">
                                                        <span class="icon icon16 fa-arrows sortableNodeHandle"></span>
-                                                       <span class="icon icon16 fa-{if !$recipient->isDisabled}check-square-o{else}square-o{/if} jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.{if $recipient->isDisabled}enable{else}disable{/if}{/lang}" data-object-action="toggle"></span>
+                                                       {include file='__objectActionToogleIcon' object=$recipient}
                                                        <a href="{link controller='ContactRecipientEdit' id=$recipient->recipientID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil"></a>
                                                        {if $recipient->originIsSystem}
                                                                <span class="icon icon16 fa-times disabled"></span>
                                                        {else}
-                                                               <span title="{lang}wcf.global.button.delete{/lang}" class="jsObjectAction jsTooltip icon icon16 fa-times pointer" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.contact.recipient.delete.confirmMessage{/lang}">
+                                                               {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.contact.recipient.delete.confirmMessage'}
                                                        {/if}
                                                        
                                                        {event name='itemButtons'}

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index aa231df46bc92435981f0ba895849c19891d34fb..56d2d3914718038773cde3139c5fafcef7c70124 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -53,7 +53,7 @@
                                                                <span class="icon icon16 fa-play jsExecuteButton jsTooltip pointer" title="{lang}wcf.acp.cronjob.execute{/lang}" data-object-id="{@$cronjob->cronjobID}"></span>
                                                                
                                                                {if $cronjob->canBeDisabled()}
-                                                                       <span class="icon icon16 fa-{if !$cronjob->isDisabled}check-{/if}square-o jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.{if !$cronjob->isDisabled}disable{else}enable{/if}{/lang}" data-object-action="toggle"></span>
+                                                                       {include file='__objectActionToogleIcon' object=$cronjob}
                                                                {else}
                                                                        {if !$cronjob->isDisabled}
                                                                                <span class="icon icon16 fa-check-square-o disabled" title="{lang}wcf.global.button.disable{/lang}"></span>
@@ -68,7 +68,7 @@
                                                                        <span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
                                                                {/if}
                                                                {if $cronjob->isDeletable()}
-                                                                       <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.cronjob.delete.sure{/lang}"></span>
+                                                                       {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.cronjob.delete.sure'}
                                                                {else}
                                                                        <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
                                                                {/if}

diff --git a/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl b/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
index e991a1e19101e74e8e68f551c374e83cebf05409..5c26d0db8677afded84fee6434e741b02cf2b198 100644 (file)
--- a/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
@@ -47,7 +47,7 @@
                                {foreach from=$objects item=logEntry}
                                        <tr class="jsObjectRow jsObjectActionObject" data-object-id="{@$logEntry->getObjectID()}">
                                                <td class="columnIcon">
-                                                       <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.devtools.missingLanguageItem.delete.confirmMessage{/lang}"></span>
+                                                       {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.devtools.missingLanguageItem.delete.confirmMessage'}
                                                        <span class="icon icon16 fa-align-justify jsStackTraceButton jsTooltip pointer" title="{lang}wcf.acp.devtools.missingLanguageItem.showStackTrace{/lang}" data-stack-trace="{$logEntry->getStackTrace()}"></span>
                                                </td>
                                                <td class="columnID">{@$logEntry->getObjectID()}</td>

diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
index c938c0d27765cdbaa6cf59c0cd96d106b60919ef..28d6b97d857ac81dda60941feb4a3115809c028b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
@@ -48,7 +48,7 @@
                                                        </td>
                                                        <td class="columnIcon">
                                                                <a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-                                                               <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.devtools.project.delete.confirmMessage{/lang}"></span>
+                                                               {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.devtools.project.delete.confirmMessage'}
                                                        </td>
                                                        <td class="columnID">{@$object->getObjectID()}</td>
                                                        <td class="columnText"><a href="{link controller='DevtoolsProjectEdit' id=$object->getObjectID()}{/link}">{$object->name}</a></td>

diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index c7618d9cfce999ce7fe66682f0bfbfea4298155f..baf60d7ebe7adcbd9e3d596f989d376057ce609d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -74,7 +74,7 @@
                                                <td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$tag->tagID}"></td>
                                                <td class="columnIcon">
                                                        <a href="{link controller='TagEdit' object=$tag}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-                                                       <span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-action="delete" data-confirm-message="{lang __encode=true}wcf.acp.tag.delete.sure{/lang}"></span>
+                                                       {include file='__objectActionDeleteIcon' objectActionConfirmMessage='wcf.acp.tag.delete.sure'}
                                                        
                                                        {event name='rowButtons'}
                                                </td>