From d8584858f3ea8fcd93616b27f0ccf2c81e308554 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 18 Oct 2011 22:07:48 +0200 Subject: [PATCH] Moved icons from wcfPages to WCF.Icon Closes #221 --- wcfsetup/install/files/acp/templates/packageList.tpl | 7 +++++++ wcfsetup/install/files/js/WCF.js | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index a46af54681..47e9ac2846 100644 --- a/wcfsetup/install/files/acp/templates/packageList.tpl +++ b/wcfsetup/install/files/acp/templates/packageList.tpl @@ -9,6 +9,13 @@ new WCF.ACP.PackageUninstallation($('.package .uninstallButton')); {if $pluginsCount > 1} + WCF.Icon.addObject({ + 'wcf.icon.arrow.down': 'icon/dropDown1.svg', + 'wcf.icon.next': 'icon/next1.svg', + 'wcf.icon.next.disabled': 'icon/next1D.svg', + 'wcf.icon.previous': 'icon/previous1.svg', + 'wcf.icon.previous.disabled': 'icon/previous1D.svg' + }); new WCF.ACP.Package.List({@($pluginsCount / 1)|ceil}); {/if} }); diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 5eca4be532..dc0d0ef179 100644 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -2950,11 +2950,11 @@ $.widget('ui.wcfPages', { maxPage: 1, // icons - previousIcon: RELATIVE_WCF_DIR + 'icon/previous1.svg', - previousDisabledIcon: RELATIVE_WCF_DIR + 'icon/previous1D.svg', - arrowDownIcon: RELATIVE_WCF_DIR + 'icon/dropDown1.svg', - nextIcon: RELATIVE_WCF_DIR + 'icon/next1.svg', - nextDisabledIcon: RELATIVE_WCF_DIR + 'icon/next1D.svg', + previousIcon: WCF.Icon.get('wcf.icon.previous'), + previousDisabledIcon: WCF.Icon.get('wcf.icon.previous.disabled'), + arrowDownIcon: WCF.Icon.get('wcf.icon.arrow.down'), + nextIcon: WCF.Icon.get('wcf.icon.next'), + nextDisabledIcon: WCF.Icon.get('wcf.icon.next.disabled'), // language // we use options here instead of language variables, because the paginator is not only usable with pages -- 2.20.1