From abe07e478020936b1c63f0175e4e9b859cd0b063 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Thu, 21 Jan 2016 23:25:10 +0100 Subject: [PATCH] Style overhaul (WIP) Renamed .pageNavigation to .pagination Renamed .navigation/.navigationIcons to .pageNavigation/.pageNavigationIcons Removed obsolete some code/files --- .../templates/headIncludeJavaScript.tpl | 4 +- .../templates/pageNavbarBottom.tpl | 10 -- com.woltlab.wcf/templates/pageNavbarTop.tpl | 4 +- wcfsetup/install/files/acp/js/WCF.ACP.js | 6 +- .../install/files/acp/templates/header.tpl | 4 +- .../files/js/WoltLab/WCF/Ui/Page/JumpTo.js | 8 +- .../files/js/WoltLab/WCF/Ui/Pagination.js | 2 +- .../PagesFunctionTemplatePlugin.class.php | 2 +- ...SmallpagesFunctionTemplatePlugin.class.php | 2 +- .../install/files/style/layout/content.scss | 54 +++++++ .../files/style/layout/navigation.scss | 151 ------------------ .../files/style/layout/pageNavigation.scss | 50 ++++++ wcfsetup/install/files/style/ui/message.scss | 4 +- .../install/files/style/ui/pagination.scss | 39 +++++ wcfsetup/install/lang/de.xml | 2 +- wcfsetup/install/lang/en.xml | 2 +- 16 files changed, 163 insertions(+), 181 deletions(-) delete mode 100644 com.woltlab.wcf/templates/pageNavbarBottom.tpl delete mode 100644 wcfsetup/install/files/style/layout/navigation.scss create mode 100644 wcfsetup/install/files/style/layout/pageNavigation.scss create mode 100644 wcfsetup/install/files/style/ui/pagination.scss diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl index f938b8d995..082ef72e7f 100644 --- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl +++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl @@ -70,7 +70,7 @@ requirejs.config({ 'wcf.global.loading': '{lang}wcf.global.loading{/lang}', 'wcf.global.page.jumpTo': '{lang}wcf.global.page.jumpTo{/lang}', 'wcf.global.page.jumpTo.description': '{lang}wcf.global.page.jumpTo.description{/lang}', - 'wcf.global.page.pageNavigation': '{lang}wcf.global.page.pageNavigation{/lang}', + 'wcf.global.page.pagination': '{lang}wcf.global.page.pagination{/lang}', 'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}', 'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}', 'wcf.global.pageDirection': '{lang}wcf.global.pageDirection{/lang}', @@ -180,7 +180,7 @@ requirejs.config({ $(function() { new WCF.Effect.SmoothScroll(); - WCF.System.PageNavigation.init('.pageNavigation'); + WCF.System.PageNavigation.init('.pagination'); WCF.User.Profile.ActivityPointList.init(); {event name='javascriptInit'} diff --git a/com.woltlab.wcf/templates/pageNavbarBottom.tpl b/com.woltlab.wcf/templates/pageNavbarBottom.tpl deleted file mode 100644 index 880ffdcd42..0000000000 --- a/com.woltlab.wcf/templates/pageNavbarBottom.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
-
- {if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if} - - -
-
diff --git a/com.woltlab.wcf/templates/pageNavbarTop.tpl b/com.woltlab.wcf/templates/pageNavbarTop.tpl index 22cac09a91..7f9668f223 100644 --- a/com.woltlab.wcf/templates/pageNavbarTop.tpl +++ b/com.woltlab.wcf/templates/pageNavbarTop.tpl @@ -1,8 +1,8 @@ -
+
{if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if} -
    +
      • {if $headerNavigation|isset}{@$headerNavigation}{/if} {event name='navigationIcons'} diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index 467e0b7c04..a24429ec0b 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -1107,7 +1107,7 @@ WCF.ACP.Package.Search = Class.extend({ _setupPagination: function() { // remove previous instances this._content = { 1: this._packageSearchResultList.html() }; - this._packageSearchResultContainer.find('.pageNavigation').wcfPages('destroy').remove(); + this._packageSearchResultContainer.find('.pagination').wcfPages('destroy').remove(); if (this._pageCount > 1) { // TODO: Fix ui.wcfPages to properly synchronize multiple instances without triggering events @@ -1493,7 +1493,7 @@ WCF.ACP.Package.Update.Search = Class.extend({ } else { var $button = $('
    • ' + WCF.Language.get('wcf.acp.package.searchForUpdates') + '
      • '); - $button.click($.proxy(this._click, this)).prependTo($('.contentNavigation:eq(0) > nav:not(.pageNavigation) > ul')); + $button.click($.proxy(this._click, this)).prependTo($('.contentNavigation:eq(0) > nav:not(.pagination) > ul')); } }, @@ -1575,7 +1575,7 @@ WCF.ACP.PluginStore.PurchasedItems.Search = Class.extend({ }); var $button = $('
    • ' + WCF.Language.get('wcf.acp.pluginStore.purchasedItems.button.search') + '
      • '); - $button.prependTo($('.contentNavigation:eq(0) > nav:not(.pageNavigation) > ul')).click($.proxy(this._click, this)); + $button.prependTo($('.contentNavigation:eq(0) > nav:not(.pagination) > ul')).click($.proxy(this._click, this)); }, /** diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index 4ca46ad947..bdfcd879fe 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -84,7 +84,7 @@ 'wcf.global.loading': '{lang}wcf.global.loading{/lang}', 'wcf.global.page.jumpTo': '{lang}wcf.global.page.jumpTo{/lang}', 'wcf.global.page.jumpTo.description': '{lang}wcf.global.page.jumpTo.description{/lang}', - 'wcf.global.page.pageNavigation': '{lang}wcf.global.page.pageNavigation{/lang}', + 'wcf.global.page.pagination': '{lang}wcf.global.page.pagination{/lang}', 'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}', 'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}', 'wcf.global.pageDirection': '{lang}wcf.global.pageDirection{/lang}', @@ -131,7 +131,7 @@ if (jQuery.browser.touch) $('html').addClass('touch'); new WCF.Effect.SmoothScroll(); - WCF.System.PageNavigation.init('.pageNavigation'); + WCF.System.PageNavigation.init('.pagination'); {if $__wcf->user->userID} //new WCF.ACP.Search(); diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/JumpTo.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/JumpTo.js index 2c86accd5b..3e1c6d5a64 100644 --- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/JumpTo.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/JumpTo.js @@ -108,9 +108,9 @@ define(['Language', 'ObjectMap', 'Ui/Dialog'], function(Language, ObjectMap, UiD _dialogSetup: function() { var source = '
      ' - + '
      ' + + '
      ' + '
      ' - + '' + + '' + '' + '
      ' + '
      ' @@ -119,7 +119,7 @@ define(['Language', 'ObjectMap', 'Ui/Dialog'], function(Language, ObjectMap, UiD + '
'; return { - id: 'pageNavigationOverlay', + id: 'paginationOverlay', options: { onSetup: (function(content) { _input = elByTag('input', content)[0]; @@ -130,7 +130,7 @@ define(['Language', 'ObjectMap', 'Ui/Dialog'], function(Language, ObjectMap, UiD _buttonSubmit = elByTag('button', content)[0]; _buttonSubmit.addEventListener('click', this._submit.bind(this)); }).bind(this), - title: Language.get('wcf.global.page.pageNavigation') + title: Language.get('wcf.global.page.pagination') }, source: source }; diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Pagination.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Pagination.js index 9f07975741..11550e96c9 100644 --- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Pagination.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Pagination.js @@ -39,7 +39,7 @@ define(['Core', 'Language', 'ObjectMap', 'StringUtil', 'WoltLab/WCF/Ui/Page/Jump if (typeof this._options.callbackShouldSwitch !== 'function') this._options.callbackShouldSwitch = null; if (typeof this._options.callbackSwitch !== 'function') this._options.callbackSwitch = null; - this._element.classList.add('pageNavigation'); + this._element.classList.add('pagination'); this._element.classList.add('small'); this._rebuild(this._element); 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 5832e40d10..0122ea7d1c 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php @@ -33,7 +33,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { * CSS class name for