Added arrow-icons. Fixed wcfPages-Widget.

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 1945d274a6a5937ec7679219abe2f746a36f0caa..880f6aa0820e272748cf82ba0f339f36c0810120 100644 (file)
--- 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 2c48e0b85f5c0d332f1c33cd01c30427dd62897f..3076ffce815348c340db8b19336075fa57919736 100755 (executable)
--- 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 = $('<img src="' + this.options.previousDisabledIcon + '" alt="" />');
+                               var $previousImage = $('<img src="' + this.options.previousIcon + '" alt="" class="disabled" />');
                                $previousElement.append($previousImage);
                                $previousElement.addClass('disabled');
                        }
@@ -6799,7 +6795,7 @@ $.widget('ui.wcfPages', {
                                $nextLink.append($nextImage);
                        }
                        else {
-                               var $nextImage = $('<img src="' + this.options.nextDisabledIcon + '" alt="" />');
+                               var $nextImage = $('<img src="' + this.options.nextIcon + '" alt="" class="disabled" />');
                                $nextElement.append($nextImage);
                                $nextElement.addClass('disabled');
                        }