From: Luzifr Date: Thu, 26 Jan 2012 14:34:02 +0000 (+0100) Subject: One more time "buttons" X-Git-Tag: 2.0.0_Beta_1~1388^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0ef2492896723310758734884eb57573042466dc;p=GitHub%2FWoltLab%2FWCF.git One more time "buttons" (this time page navigation) - Someone please fix the implementation in the "WCF.js"-file. I've done my best. ;-) --- diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css index 9618b05ffa..aa13e99292 100644 --- a/wcfsetup/install/files/acp/style/wcf.css +++ b/wcfsetup/install/files/acp/style/wcf.css @@ -3046,7 +3046,7 @@ tr .columnURL { /* ToDo */ -:not(.threadStatus) > .pageNavigation { +:not(.statusDisplay) > .pageNavigation { margin: 7px 0; float: left; } @@ -3126,7 +3126,7 @@ tr .columnURL { } .pageNavigation ul li.children > a { - margin-right: -30px; + margin-right: -17px; position: relative; z-index: 10; } @@ -3137,10 +3137,15 @@ tr .columnURL { } .pageNavigation ul li.children img { - height: 9px; + position: relative; width: 7px; + height: 9px; + bottom: 1px; + left: 20px; } +/* ToDo: Dropdown */ + .pageNavigation ul li.children .dropdown { text-align: left; border-color: transparent; @@ -3206,15 +3211,15 @@ tr .columnURL { /* Special */ -.threadStatus .pageNavigation { - font-size: 75%; +.statusDisplay .pageNavigation { + font-size: 80%; } -.threadStatus .pageNavigation ul li { +.statusDisplay .pageNavigation ul li { min-width: 9px; } -.threadStatus .pageNavigation ul li:not(.skip) a { +.statusDisplay .pageNavigation ul li:not(.skip) a { padding: 1px 3px; } diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index bd558cafcc..7e158adf1b 100644 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -1771,7 +1771,7 @@ WCF.MultipleLanguageInput.prototype = { _prepareElement: function(enableOnInit) { this._element.wrap('
'); var $wrapper = this._element.parent(); - var $button = $('

enable i18n

').prependTo($wrapper); + var $button = $('

enable i18n

').prependTo($wrapper); $button.click($.proxy(this._enable, this)); WCF.CloseOverlayHandler.addCallback(this._element.wcfIdentify(), $.proxy(this._closeSelection, this)); @@ -4440,7 +4440,7 @@ $.widget('ui.wcfPages', { var $pageList = $(''); this.element.append($pageList); - var $previousElement = $('
  • ').addClass('skip'); + var $previousElement = $('
  • ').addClass('button skip'); $pageList.append($previousElement); if (this.options.activePage > 1) { @@ -4505,14 +4505,14 @@ $.widget('ui.wcfPages', { var $leftChildren = $('
  • '); $pageList.append($leftChildren); - var $leftChildrenLink = $('…'); + var $leftChildrenLink = $(''); $leftChildren.append($leftChildrenLink); $leftChildrenLink.click($.proxy(this._startInput, this)); var $leftChildrenImage = $(''); $leftChildrenLink.append($leftChildrenImage); - var $leftChildrenInput = $(''); + var $leftChildrenInput = $(''); $leftChildren.append($leftChildrenInput); $leftChildrenInput.keydown($.proxy(this._handleInput, this)); $leftChildrenInput.keyup($.proxy(this._handleInput, this)); @@ -4548,14 +4548,14 @@ $.widget('ui.wcfPages', { var $rightChildren = $('
  • '); $pageList.append($rightChildren); - var $rightChildrenLink = $('…'); + var $rightChildrenLink = $(''); $rightChildren.append($rightChildrenLink); $rightChildrenLink.click($.proxy(this._startInput, this)); var $rightChildrenImage = $(''); $rightChildrenLink.append($rightChildrenImage); - var $rightChildrenInput = $(''); + var $rightChildrenInput = $(''); $rightChildren.append($rightChildrenInput); $rightChildrenInput.keydown($.proxy(this._handleInput, this)); $rightChildrenInput.keyup($.proxy(this._handleInput, this)); @@ -4581,7 +4581,7 @@ $.widget('ui.wcfPages', { $pageList.append(this._renderLink(this.options.maxPage)); // add next button - var $nextElement = $('
  • ').addClass('skip'); + var $nextElement = $('
  • ').addClass('button skip'); $pageList.append($nextElement); if (this.options.activePage < this.options.maxPage) { @@ -4612,7 +4612,7 @@ $.widget('ui.wcfPages', { * @return $(element) */ _renderLink: function(page, lineBreak) { - var $pageElement = $('
  • '); + var $pageElement = $('
  • '); if (lineBreak != undefined && lineBreak) { $pageElement.addClass('break'); } diff --git a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php index dfbab8296a..22698ab4e3 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php @@ -57,10 +57,10 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { protected function makeLink($link, $pageNo, $activePage, $break = false) { // first page if ($activePage != $pageNo) { - return ''.StringUtil::formatInteger($pageNo).''."\n"; + return '
  • '.StringUtil::formatInteger($pageNo).'
    • '."\n"; } else { - return '
  • '.StringUtil::formatInteger($pageNo).'
    • '."\n"; + return '
  • '.StringUtil::formatInteger($pageNo).'
    • '."\n"; } } @@ -101,10 +101,10 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { // previous page $previousTitle = WCF::getLanguage()->getDynamicVariable('wcf.global.page.previous'); if ($tagArgs['page'] > 1) { - $html .= ''."\n"; + $html .= ''."\n"; } else { - $html .= ''."\n"; + $html .= ''."\n"; } // first page @@ -153,7 +153,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { $html .= $this->makeLink($link, 2, $tagArgs['page']); } else { - $html .= '
  • …
      '."\n"; + $html .= '
      • '."\n"; $k = 0; $step = intval(ceil(($left - 2) / self::SHOW_SUB_LINKS)); @@ -177,7 +177,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { $html .= $this->makeLink($link, $tagArgs['pages'] - 1, $tagArgs['page']); } else { - $html .= '
      • …
          '."\n"; + $html .= '
          • '."\n"; $k = 0; $step = intval(ceil(($tagArgs['pages'] - $right) / self::SHOW_SUB_LINKS)); @@ -196,7 +196,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { // next page $nextTitle = WCF::getLanguage()->getDynamicVariable('wcf.global.page.next'); if ($tagArgs['page'] && $tagArgs['page'] < $tagArgs['pages']) { - $html .= ''."\n"; + $html .= ''."\n"; } else { $html .= ''."\n"; diff --git a/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php index 018b4d2c06..b1e1cc3c0f 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php @@ -49,7 +49,7 @@ class SmallpagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { * @return string */ protected function makeLink($link, $pageNo) { - return '
          • '.StringUtil::formatInteger($pageNo).'
            • '."\n"; + return '
          • '.StringUtil::formatInteger($pageNo).'
            • '."\n"; } /** @@ -90,7 +90,7 @@ class SmallpagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { if ($tagArgs['pages'] > self::SHOW_LINKS) { // jumper - $html .= '
          • …
            • '."\n"; + $html .= '
          • …
            • '."\n"; // last page $html .= $this->makeLink($link, $tagArgs['pages']);