From c022c35cb0e2fee76b39de32f59a89311b88ba82 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 19 Aug 2022 18:49:39 +0200 Subject: [PATCH] Convert legacy icons --- .../files/acp/templates/categoryList.tpl | 4 +++- .../files/acp/templates/contactSettings.tpl | 8 +++++-- .../files/acp/templates/cronjobList.tpl | 12 +++++++--- .../devtoolsMissingLanguageItemList.tpl | 4 +++- .../templates/devtoolsProjectPipEntryList.tpl | 4 +++- .../acp/templates/devtoolsProjectPipList.tpl | 8 +++++-- .../files/acp/templates/languageList.tpl | 16 +++++++++++--- .../install/files/acp/templates/mediaList.tpl | 8 +++++-- .../files/acp/templates/menuItemList.tpl | 4 +++- .../files/acp/templates/noticeList.tpl | 4 +++- .../templates/notificationPresetSettings.tpl | 22 +++++++++++-------- .../files/acp/templates/optionFieldList.tpl | 12 ++++++++-- .../install/files/acp/templates/package.tpl | 8 +++++-- .../packageInstallationStepPrepare.tpl | 4 +++- .../files/acp/templates/packageList.tpl | 11 +++++----- .../packageUninstallationStepPrepare.tpl | 4 +++- .../acp/templates/packageUpdateServerList.tpl | 4 +++- .../install/files/acp/templates/pageAdd.tpl | 10 ++++++++- .../files/acp/templates/pageHeaderSearch.tpl | 6 ++--- .../install/files/acp/templates/pageList.tpl | 11 +++++++--- .../templates/pluginStorePurchasedItems.tpl | 20 ++++++++++++----- .../files/acp/templates/reactionTypeList.tpl | 8 +++++-- .../files/acp/templates/smileyList.tpl | 4 +++- .../files/acp/templates/trophyList.tpl | 4 +++- .../files/acp/templates/userProfileMenu.tpl | 4 +++- .../acp/templates/useroptionsOptionType.tpl | 8 ++++++- 26 files changed, 156 insertions(+), 56 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/categoryList.tpl b/wcfsetup/install/files/acp/templates/categoryList.tpl index 5a168bb126..e0ee487293 100644 --- a/wcfsetup/install/files/acp/templates/categoryList.tpl +++ b/wcfsetup/install/files/acp/templates/categoryList.tpl @@ -108,7 +108,9 @@ - + + {icon size=16 name='arrows-up-down-left-right'} + {if $objectType->getProcessor()->canEditCategory()} {objectAction action="toggle" isDisabled=$category->isDisabled} diff --git a/wcfsetup/install/files/acp/templates/contactSettings.tpl b/wcfsetup/install/files/acp/templates/contactSettings.tpl index 28893ba8af..e510ec2699 100644 --- a/wcfsetup/install/files/acp/templates/contactSettings.tpl +++ b/wcfsetup/install/files/acp/templates/contactSettings.tpl @@ -90,9 +90,13 @@ {$recipient} - + + {icon size=16 name='arrows-up-down-left-right'} + {objectAction action="toggle" isDisabled=$recipient->isDisabled} - + + {icon size=16 name='pencil'} + {if $recipient->originIsSystem} {icon size=16 name='xmark'} diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl index 7ac8708bfb..e749918851 100644 --- a/wcfsetup/install/files/acp/templates/cronjobList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl @@ -50,15 +50,21 @@ {foreach from=$objects item=cronjob} - + {if $cronjob->canBeDisabled()} {objectAction action="toggle" isDisabled=$cronjob->isDisabled} {else} {if !$cronjob->isDisabled} - + + {icon size=16 name='square-check'} + {else} - + + {icon size=16 name='square'} + {/if} {/if} diff --git a/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl b/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl index 861a965de4..f1d3420235 100644 --- a/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl +++ b/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl @@ -48,7 +48,9 @@ {objectAction action="delete" confirmMessage='wcf.acp.devtools.missingLanguageItem.delete.confirmMessage'} - + {@$logEntry->getObjectID()} {if $logEntry->getLanguage()}{$logEntry->getLanguage()}{else}{$logEntry->languageID}{/if} diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl index 05fc177349..767447b3f2 100644 --- a/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl +++ b/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl @@ -78,7 +78,9 @@ {icon size=16 name='pencil'} - + {foreach from=$entryList->getKeys() key=key item=languageItem} {$entry[$key]} diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectPipList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectPipList.tpl index f5ec611422..4c03e63133 100644 --- a/wcfsetup/install/files/acp/templates/devtoolsProjectPipList.tpl +++ b/wcfsetup/install/files/acp/templates/devtoolsProjectPipList.tpl @@ -55,8 +55,12 @@ {icon size=16 name='plus'} {icon size=16 name='list'} {else} - - + + {icon size=16 name='plus'} + + + {icon size=16 name='list'} + {/if} diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl index 65ffeab659..e1b363da36 100644 --- a/wcfsetup/install/files/acp/templates/languageList.tpl +++ b/wcfsetup/install/files/acp/templates/languageList.tpl @@ -44,10 +44,20 @@ {if !$language->isDefault} {objectAction action="toggle" isDisabled=$language->isDisabled} - + {else} - - + + {if $language->isDisabled} + {icon size=16 name='square'} + {else} + {icon size=16 name='square-check'} + {/if} + + + {icon size=16 name='circle-check'} + {/if} {icon size=16 name='pencil'} diff --git a/wcfsetup/install/files/acp/templates/mediaList.tpl b/wcfsetup/install/files/acp/templates/mediaList.tpl index edf871dae9..687b6f0ae7 100644 --- a/wcfsetup/install/files/acp/templates/mediaList.tpl +++ b/wcfsetup/install/files/acp/templates/mediaList.tpl @@ -130,7 +130,9 @@ - + {objectAction action="delete" confirmMessage=""} {event name='rowButtons'} diff --git a/wcfsetup/install/files/acp/templates/menuItemList.tpl b/wcfsetup/install/files/acp/templates/menuItemList.tpl index 129a528c91..32b18a6b62 100644 --- a/wcfsetup/install/files/acp/templates/menuItemList.tpl +++ b/wcfsetup/install/files/acp/templates/menuItemList.tpl @@ -40,7 +40,9 @@ {$menuItemNode->getTitle()} - + + {icon size=16 name='arrows-up-down-left-right'} + {if $menuItemNode->canDisable()} {objectAction action="toggle" isDisabled=$menuItemNode->isDisabled} {else} diff --git a/wcfsetup/install/files/acp/templates/noticeList.tpl b/wcfsetup/install/files/acp/templates/noticeList.tpl index 92d05ea858..75bcb64eaa 100644 --- a/wcfsetup/install/files/acp/templates/noticeList.tpl +++ b/wcfsetup/install/files/acp/templates/noticeList.tpl @@ -39,7 +39,9 @@ {$notice->noticeName} - + + {icon size=16 name='arrows-up-down-left-right'} + {objectAction action="toggle" isDisabled=$notice->isDisabled} {icon size=16 name='pencil'} {objectAction action="delete" objectTitle=$notice->noticeName} diff --git a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl index 2b06fd46ea..17a3343249 100644 --- a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl +++ b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl @@ -60,21 +60,25 @@
{if $event->supportsEmailNotification()} - - {if $settings[$event->eventID][mailNotificationType] === 'none'} - - {else} - - {/if} + {/if}
diff --git a/wcfsetup/install/files/acp/templates/optionFieldList.tpl b/wcfsetup/install/files/acp/templates/optionFieldList.tpl index 587c8b86b4..909ce26c11 100644 --- a/wcfsetup/install/files/acp/templates/optionFieldList.tpl +++ b/wcfsetup/install/files/acp/templates/optionFieldList.tpl @@ -11,8 +11,16 @@ {if $isSearchMode|empty || !$optionData[hideLabelInSearch]} diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl index 839102ecd3..f5a89d6bc9 100644 --- a/wcfsetup/install/files/acp/templates/package.tpl +++ b/wcfsetup/install/files/acp/templates/package.tpl @@ -130,7 +130,9 @@ {if $requiredPackage->canUninstall()} - + {else} {icon size=16 name='xmark'} @@ -173,7 +175,9 @@ {if $dependentPackage->canUninstall()} - + {else} {icon size=16 name='xmark'} diff --git a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl index 0079df85d3..41851bd8fb 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl +++ b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl @@ -1,6 +1,8 @@
- + + {icon size=48 name='spinner'} +

{lang}wcf.acp.package.{@$installationType}.title{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index 3c2929b5b9..a75717ece7 100644 --- a/wcfsetup/install/files/acp/templates/packageList.tpl +++ b/wcfsetup/install/files/acp/templates/packageList.tpl @@ -97,7 +97,9 @@ {if $package->canUninstall()} - + {else} {icon size=16 name='xmark'} @@ -110,10 +112,9 @@ {$package} {if $taintedApplications[$package->packageID]|isset} - + + {icon size=16 name='warning'} + {/if} {if $package->authorURL}{$package->author}{else}{$package->author}{/if} diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl index fa06540ee6..002b9841d8 100644 --- a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl +++ b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl @@ -1,6 +1,8 @@
- + + {icon size=48 name='spinner'} +

{lang}wcf.acp.package.uninstallation.title{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl index 7472214894..42fc4747ec 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl @@ -44,7 +44,9 @@ {if $updateServer->canDisable()} {objectAction action="toggle" isDisabled=$updateServer->isDisabled} {else} - + + {icon size=16 name='square-check'} + {/if} {icon size=16 name='pencil'} {if $updateServer->canDelete()} diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl index 2af46722be..7f18540c13 100644 --- a/wcfsetup/install/files/acp/templates/pageAdd.tpl +++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl @@ -480,7 +480,15 @@
    {foreach from=$availableBoxes item=availableBox}
  • - +
    • {/foreach}
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl index a1a619ad3e..e132e52e73 100644 --- a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl +++ b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl @@ -1,5 +1,5 @@
@@ -18,8 +18,8 @@ -
diff --git a/wcfsetup/install/files/acp/templates/pageList.tpl b/wcfsetup/install/files/acp/templates/pageList.tpl index 321df39d0f..9227934168 100644 --- a/wcfsetup/install/files/acp/templates/pageList.tpl +++ b/wcfsetup/install/files/acp/templates/pageList.tpl @@ -135,7 +135,9 @@ {if !$page->requireObjectID} {icon size=16 name='magnifying-glass'} {else} - + + {icon size=16 name='magnifying-glass'} + {/if} {event name='rowButtons'} @@ -144,11 +146,14 @@ {$page->name} {if $page->applicationPackageID === null} - {lang}wcf.acp.page.application.error.missing{/lang} + {icon size=16 name='triangle-exclamation'} + {lang}wcf.acp.page.application.error.missing{/lang} {else} {$page->getDisplayLink()} {if $page->controllerCustomURL || $page->pageType !== 'system'} - + + {icon size=16 name='circle-exclamation'} + {/if} {/if} diff --git a/wcfsetup/install/files/acp/templates/pluginStorePurchasedItems.tpl b/wcfsetup/install/files/acp/templates/pluginStorePurchasedItems.tpl index 8a997b5f18..9ae7276387 100644 --- a/wcfsetup/install/files/acp/templates/pluginStorePurchasedItems.tpl +++ b/wcfsetup/install/files/acp/templates/pluginStorePurchasedItems.tpl @@ -40,15 +40,25 @@ {if $product[status] == 'install'} - + {elseif $product[status] == 'update'} - + {elseif $product[status] == 'upToDate'} - + + {icon size=16 name='check'} + {elseif $product[status] == 'requireUpdate'} - + + {icon size=16 name='ban'} + {else} - + + {icon size=16 name='ban'} + {/if} {$product[packageName]} diff --git a/wcfsetup/install/files/acp/templates/reactionTypeList.tpl b/wcfsetup/install/files/acp/templates/reactionTypeList.tpl index 90d87c7544..dd8e31151f 100644 --- a/wcfsetup/install/files/acp/templates/reactionTypeList.tpl +++ b/wcfsetup/install/files/acp/templates/reactionTypeList.tpl @@ -41,13 +41,17 @@ {@$reactionType->renderIcon()} {$reactionType->getTitle()} - + + {icon size=16 name='arrows-up-down-left-right'} + {assign var='reactionTypeIsDisabled' value=true} {if $reactionType->isAssignable} {assign var='reactionTypeIsDisabled' value=false} {/if} {objectAction action="toggle" isDisabled=$reactionTypeIsDisabled disableTitle='wcf.acp.reactionType.isAssignable' enableTitle='wcf.acp.reactionType.isNotAssignable'} - + + {icon size=16 name='pencil'} + {objectAction action="delete" objectTitle=$reactionType->getTitle()} {event name='itemButtons'} diff --git a/wcfsetup/install/files/acp/templates/smileyList.tpl b/wcfsetup/install/files/acp/templates/smileyList.tpl index 2651eb0ac3..d4872594a5 100644 --- a/wcfsetup/install/files/acp/templates/smileyList.tpl +++ b/wcfsetup/install/files/acp/templates/smileyList.tpl @@ -51,7 +51,9 @@ {@$smiley->getHtml()} {$smiley->getTitle()} {$smiley->smileyCode}{foreach from=$smiley->getAliases() item='alias'} {$alias}{/foreach} - + + {icon size=16 name='arrows-up-down-left-right'} + {objectAction action="delete" objectTitle=$smiley->smileyCode} diff --git a/wcfsetup/install/files/acp/templates/trophyList.tpl b/wcfsetup/install/files/acp/templates/trophyList.tpl index c9218df29c..c9c1448c61 100644 --- a/wcfsetup/install/files/acp/templates/trophyList.tpl +++ b/wcfsetup/install/files/acp/templates/trophyList.tpl @@ -41,7 +41,9 @@ {$trophy->getTitle()} - + + {icon size=16 name='arrows-up-down-left-right'} + {objectAction action="toggle" isDisabled=$trophy->isDisabled} {icon size=16 name='pencil'} {objectAction action="delete" objectTitle=$trophy->getTitle()} diff --git a/wcfsetup/install/files/acp/templates/userProfileMenu.tpl b/wcfsetup/install/files/acp/templates/userProfileMenu.tpl index 1e3cef4d8d..fe6b9ee073 100644 --- a/wcfsetup/install/files/acp/templates/userProfileMenu.tpl +++ b/wcfsetup/install/files/acp/templates/userProfileMenu.tpl @@ -32,7 +32,9 @@ {$menuItem} - + + {icon size=16 name='arrows-up-down-left-right'} + diff --git a/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl b/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl index cdf84f5e50..a677fc6581 100644 --- a/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl @@ -28,7 +28,13 @@ {foreach from=$availableOptions item=availableOption}
  • - + + {icon size=16 name='arrows-up-down-left-right'} + +
    • {/foreach} -- 2.20.1