Added ACP-'To Top' link, increase ACP menu width

diff --git a/wcfsetup/install/files/acp/style/layout.scss b/wcfsetup/install/files/acp/style/layout.scss
index ba1902a0e00cd27934ccd15ef6681921fd646df4..0a298b174f0296b134b1017b607ccc27f099e115 100644 (file)
--- a/wcfsetup/install/files/acp/style/layout.scss
+++ b/wcfsetup/install/files/acp/style/layout.scss
@@ -1,3 +1,5 @@
+$wcfAcpMenuWidth: 150px;
+
 .layoutBoundary {
        margin: 0;
        max-width: none;
@@ -29,7 +31,7 @@
                        align-items: center;
                        background-color: rgb(52, 73, 94);
                        display: flex;
-                       flex: 0 0 120px;
+                       flex: 0 0 $wcfAcpMenuWidth;
                        height: 50px;
                        justify-content: center;
                        margin: 0;
@@ -100,7 +102,7 @@
        
        .acpPageMenu {
                background-color: rgb(44, 62, 80);
-               flex: 0 0 120px;
+               flex: 0 0 $wcfAcpMenuWidth;
                text-align: center;
                overflow: hidden;
                

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 4e6bd3e478f4c9036f5f539f8c4410cfea107868..dac2e7efe6346596cdd2942786186a363b531795 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -89,6 +89,7 @@
                                'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}',
                                'wcf.global.pageDirection': '{lang}wcf.global.pageDirection{/lang}',
                                'wcf.global.reason': '{lang}wcf.global.reason{/lang}',
+                               'wcf.global.scrollUp': '{lang}wcf.global.scrollUp{/lang}',
                                'wcf.global.success': '{lang}wcf.global.success{/lang}',
                                'wcf.global.success.add': '{lang}wcf.global.success.add{/lang}',
                                'wcf.global.success.edit': '{lang}wcf.global.success.edit{/lang}',

diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js b/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
index 43a7925128386a3a67ce54dc76f2181456d35552..32dfb3a3f6abb81d5978f0999f403ddd29c3ac4b 100644 (file)
--- a/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
@@ -13,13 +13,13 @@ define(
                'favico',                  'enquire',                'perfect-scrollbar',      'WoltLab/WCF/Date/Time/Relative',
                'Ui/SimpleDropdown',       'WoltLab/WCF/Ui/Mobile',  'WoltLab/WCF/Ui/TabMenu', 'WoltLab/WCF/Ui/FlexibleMenu',
                'Ui/Dialog',               'WoltLab/WCF/Ui/Tooltip', 'WoltLab/WCF/Language',   'WoltLab/WCF/Environment',
-               'WoltLab/WCF/Date/Picker', 'EventHandler',           'Core'
+               'WoltLab/WCF/Date/Picker', 'EventHandler',           'Core',                   'WoltLab/WCF/Ui/Page/JumpToTop'
        ], 
        function(
                 favico,                   enquire,                  perfectScrollbar,         DateTimeRelative,
                 UiSimpleDropdown,         UiMobile,                 UiTabMenu,                UiFlexibleMenu,
                 UiDialog,                 UiTooltip,                Language,                 Environment,
-                DatePicker,               EventHandler,             Core
+                DatePicker,               EventHandler,             Core,                     UiPageJumpToTop
        )
 {
        "use strict";
@@ -65,6 +65,8 @@ define(
                        UiDialog.setup();
                        UiTooltip.setup();
                        
+                       new UiPageJumpToTop();
+                       
                        // convert method=get into method=post
                        var forms = elBySelAll('form[method=get]');
                        for (var i = 0, length = forms.length; i < length; i++) {

diff --git a/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js b/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js
index a0ce412ce5e8de41025a8945cf59d1eddf0d958e..6ff3dd0a95bfb2d9b9ea83503a4f1a2c5f2012f1 100644 (file)
--- a/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js
@@ -8,12 +8,12 @@
  */
 define(
        [
-               'Ajax',                           'WoltLab/WCF/Bootstrap',         'WoltLab/WCF/Controller/Sitemap', 'WoltLab/WCF/Controller/Style/Changer',
-               'WoltLab/WCF/Controller/Popover', 'WoltLab/WCF/Ui/Page/JumpToTop', 'WoltLab/WCF/Ui/User/Ignore'
+               'Ajax',                           'WoltLab/WCF/Bootstrap',      'WoltLab/WCF/Controller/Sitemap', 'WoltLab/WCF/Controller/Style/Changer',
+               'WoltLab/WCF/Controller/Popover', 'WoltLab/WCF/Ui/User/Ignore'
        ],
        function(
-               Ajax,                              Bootstrap,                       ControllerSitemap,                ControllerStyleChanger,
-               ControllerPopover,                 UiPageJumpToTop,                 UiUserIgnore
+               Ajax,                              Bootstrap,                    ControllerSitemap,                ControllerStyleChanger,
+               ControllerPopover,                 UiUserIgnore
        )
 {
        "use strict";
@@ -41,8 +41,6 @@ define(
                        this._initUserPopover();
                        this._invokeBackgroundQueue(options.backgroundQueue.url, options.backgroundQueue.force);
                        
-                       new UiPageJumpToTop();
-                       
                        UiUserIgnore.init();
                },