Updated wcfPages to current pagination html structure, etc

  * corrected html and class structure of js pagination
  * re-added icons to headinclude.tpl
  * commented out events for page number input, because it's also not working in "normal" pagination for now

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index d995fe8c57552ffe19d4c2e085dd6e191a95b50a..42e71c38461ffcbf220ce7c8c24d627fe574d276 100644 (file)
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -66,7 +66,12 @@
                WCF.Icon.addObject({
                        'wcf.icon.loading': '{icon size='S'}spinner{/icon}',
                        'wcf.icon.opened': '{icon size='S'}opened2{/icon}',
-                       'wcf.icon.closed': '{icon size='S'}closed2{/icon}'
+                       'wcf.icon.closed': '{icon size='S'}closed2{/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.dropdown': '{icon size='S'}dropdown1{/icon}'
                        {event name='javascriptIconImport'}
                });
                

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index b3227b4b0e169200c69d0efc20b118ac885dc85e..0027ca5df89f2d64fd58efb5ae24d76afaeda9a6 100644 (file)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -3992,7 +3992,7 @@ $.widget('ui.wcfPages', {
                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.arrowDownIcon === null) this.options.arrowDownIcon = WCF.Icon.get('wcf.icon.arrow.down');
+               if (this.options.arrowDownIcon === null) this.options.arrowDownIcon = WCF.Icon.get('wcf.icon.dropdown');
                
                this.element.addClass('pageNavigation');
                
@@ -4023,13 +4023,12 @@ $.widget('ui.wcfPages', {
                        this.element.children().remove();
                        
                        var $pageList = $('<ul></ul>');
-                       this.element.append($pageList);
                        
                        var $previousElement = $('<li></li>').addClass('skip');
                        $pageList.append($previousElement);
                        
                        if (this.options.activePage > 1) {
-                               var $previousLink = $('<a' + ((this.options.previousPage != null) ? (' title="' + this.options.previousPage + '"') : ('')) + '></a>');
+                               var $previousLink = $('<a' + ((this.options.previousPage != null) ? (' title="' + this.options.previousPage + '" class="balloonTooltip"') : ('')) + '></a>');
                                $previousElement.append($previousLink);
                                this._bindSwitchPage($previousLink, this.options.activePage - 1);
                                
@@ -4090,22 +4089,28 @@ $.widget('ui.wcfPages', {
                                        var $leftChildren = $('<li class="children"></li>');
                                        $pageList.append($leftChildren);
                                        
-                                       var $leftChildrenLink = $('<a>&hellip;</a>');
+                                       var $leftChildrenLink = $('<a class="dropdownCaption">&hellip;</a>');
                                        $leftChildren.append($leftChildrenLink);
-                                       $leftChildrenLink.click($.proxy(this._startInput, this));
+                                       // commented all page number input events out, because the normal pagination also
+                                       // don't have this function at this moment. This may get completely removed or
+                                       // updated as soon as this gets reimplemented in the normal pagination -- Markus Bartz
+//                                     $leftChildrenLink.click($.proxy(this._startInput, this));
                                        
                                        var $leftChildrenImage = $('<img src="' + this.options.arrowDownIcon + '" alt="" />');
                                        $leftChildrenLink.append($leftChildrenImage);
                                        
                                        var $leftChildrenInput = $('<input type="text" name="pageNo" class="tiny" />');
                                        $leftChildren.append($leftChildrenInput);
-                                       $leftChildrenInput.keydown($.proxy(this._handleInput, this));
-                                       $leftChildrenInput.keyup($.proxy(this._handleInput, this));
-                                       $leftChildrenInput.blur($.proxy(this._stopInput, this));
+//                                     $leftChildrenInput.keydown($.proxy(this._handleInput, this));
+//                                     $leftChildrenInput.keyup($.proxy(this._handleInput, this));
+//                                     $leftChildrenInput.blur($.proxy(this._stopInput, this));
                                        
                                        var $leftChildrenContainer = $('<div class="dropdown"></div>');
                                        $leftChildren.append($leftChildrenContainer);
                                        
+                                       var $leftPointerContainer = $('<span class="pointer"><span></span></span>');
+                                       $leftChildrenContainer.append($leftPointerContainer);
+                                       
                                        var $leftChildrenList = $('<ul></u>');
                                        $leftChildrenContainer.append($leftChildrenList);
                                        
@@ -4133,22 +4138,25 @@ $.widget('ui.wcfPages', {
                                        var $rightChildren = $('<li class="children"></li>');
                                        $pageList.append($rightChildren);
                                        
-                                       var $rightChildrenLink = $('<a>&hellip;</a>');
+                                       var $rightChildrenLink = $('<a class="dropdownCaption">&hellip;</a>');
                                        $rightChildren.append($rightChildrenLink);
-                                       $rightChildrenLink.click($.proxy(this._startInput, this));
+//                                     $rightChildrenLink.click($.proxy(this._startInput, this));
                                        
                                        var $rightChildrenImage = $('<img src="' + this.options.arrowDownIcon + '" alt="" />');
                                        $rightChildrenLink.append($rightChildrenImage);
                                        
                                        var $rightChildrenInput = $('<input type="text" name="pageNo" class="tiny" />');
                                        $rightChildren.append($rightChildrenInput);
-                                       $rightChildrenInput.keydown($.proxy(this._handleInput, this));
-                                       $rightChildrenInput.keyup($.proxy(this._handleInput, this));
-                                       $rightChildrenInput.blur($.proxy(this._stopInput, this));
+//                                     $rightChildrenInput.keydown($.proxy(this._handleInput, this));
+//                                     $rightChildrenInput.keyup($.proxy(this._handleInput, this));
+//                                     $rightChildrenInput.blur($.proxy(this._stopInput, this));
                                        
                                        var $rightChildrenContainer = $('<div class="dropdown"></div>');
                                        $rightChildren.append($rightChildrenContainer);
                                        
+                                       var $rightPointerContainer = $('<span class="pointer"><span></span></span>');
+                                       $rightChildrenContainer.append($rightPointerContainer);
+                                       
                                        var $rightChildrenList = $('<ul></ul>');
                                        $rightChildrenContainer.append($rightChildrenList);
                                        
@@ -4170,7 +4178,7 @@ $.widget('ui.wcfPages', {
                        $pageList.append($nextElement);
                        
                        if (this.options.activePage < this.options.maxPage) {
-                               var $nextLink = $('<a' + ((this.options.nextPage != null) ? (' title="' + this.options.nextPage + '"') : ('')) + '></a>').addClass('ballonTooltip');
+                               var $nextLink = $('<a' + ((this.options.nextPage != null) ? (' title="' + this.options.nextPage + '" class="balloonTooltip"') : ('')) + '></a>');
                                $nextElement.append($nextLink);
                                this._bindSwitchPage($nextLink, this.options.activePage + 1);
                                
@@ -4182,6 +4190,8 @@ $.widget('ui.wcfPages', {
                                $nextElement.append($nextImage);
                                $nextElement.addClass('disabled');
                        }
+                       
+                       this.element.append($pageList);
                }
                else {
                        // otherwise hide the paginator if not already hidden