From d68b4e0362780a0ad8ea7da41168e2a37645e6ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Magnus=20K=C3=BChn?= Date: Thu, 28 Jun 2012 14:59:16 +0200 Subject: [PATCH] Added arrow-icons. Fixed wcfPages-Widget. --- com.woltlab.wcf/template/headInclude.tpl | 12 ++++++++---- wcfsetup/install/files/js/WCF.js | 12 ++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl index 1945d274a6..880f6aa082 100644 --- a/com.woltlab.wcf/template/headInclude.tpl +++ b/com.woltlab.wcf/template/headInclude.tpl @@ -73,10 +73,14 @@ 'wcf.icon.loading': '{icon size='S'}spinner{/icon}', 'wcf.icon.opened': '{icon size='S'}arrowDownInverse{/icon}', 'wcf.icon.closed': '{icon size='S'}arrowRightInverse{/icon}', - 'wcf.icon.previous': '{icon size='S'}previous1{/icon}', - 'wcf.icon.previous.disabled': '{icon size='S'}previous1D{/icon}', - 'wcf.icon.next': '{icon size='S'}next1{/icon}', - 'wcf.icon.next.disabled': '{icon size='S'}next1D{/icon}', + 'wcf.icon.arrow.left': '{icon size='S'}arrowLeft{/icon}', + 'wcf.icon.arrow.left.circle': '{icon size='S'}circleArrowLeft{/icon}', + 'wcf.icon.arrow.right': '{icon size='S'}arrowRight{/icon}', + 'wcf.icon.arrow.right.circle': '{icon size='S'}circleArrowRight{/icon}', + 'wcf.icon.arrow.down': '{icon size='S'}arrowDown{/icon}', + 'wcf.icon.arrow.down.circle': '{icon size='S'}circleArroDown{/icon}', + 'wcf.icon.arrow.up': '{icon size='S'}arrowUp{/icon}', + 'wcf.icon.arrow.up.circle': '{icon size='S'}circleArrowUp{/icon}', 'wcf.icon.dropdown': '{icon size='S'}dropdown{/icon}', 'wcf.icon.edit': '{icon size='S'}edit{/icon}' {event name='javascriptIconImport'} diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 2c48e0b85f..3076ffce81 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -6592,10 +6592,8 @@ $.widget('ui.wcfPages', { // icons previousIcon: null, - previousDisabledIcon: null, arrowDownIcon: null, nextIcon: null, - nextDisabledIcon: null, // language // we use options here instead of language variables, because the paginator is not only usable with pages @@ -6609,10 +6607,8 @@ $.widget('ui.wcfPages', { _create: function() { if (this.options.nextPage === null) this.options.nextPage = WCF.Language.get('wcf.global.page.next'); if (this.options.previousPage === null) this.options.previousPage = WCF.Language.get('wcf.global.page.previous'); - if (this.options.previousIcon === null) this.options.previousIcon = WCF.Icon.get('wcf.icon.previous'); - if (this.options.previousDisabledIcon === null) this.options.previousDisabledIcon = WCF.Icon.get('wcf.icon.previous.disabled'); - if (this.options.nextIcon === null) this.options.nextIcon = WCF.Icon.get('wcf.icon.next'); - if (this.options.nextDisabledIcon === null) this.options.nextDisabledIcon = WCF.Icon.get('wcf.icon.next.disabled'); + if (this.options.previousIcon === null) this.options.previousIcon = WCF.Icon.get('wcf.icon.arrow.left.circle'); + if (this.options.nextIcon === null) this.options.nextIcon = WCF.Icon.get('wcf.icon.arrow.right.circle'); if (this.options.arrowDownIcon === null) this.options.arrowDownIcon = WCF.Icon.get('wcf.icon.arrow.down'); this.element.addClass('pageNavigation'); @@ -6658,7 +6654,7 @@ $.widget('ui.wcfPages', { $previousLink.append($previousImage); } else { - var $previousImage = $(''); + var $previousImage = $(''); $previousElement.append($previousImage); $previousElement.addClass('disabled'); } @@ -6799,7 +6795,7 @@ $.widget('ui.wcfPages', { $nextLink.append($nextImage); } else { - var $nextImage = $(''); + var $nextImage = $(''); $nextElement.append($nextImage); $nextElement.addClass('disabled'); } -- 2.20.1