Show content of the right sidebar below the main content (mobile view)

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index a350ed6fc2a1e3c9445bc902e10be0f0daa0ed41..9660ef1fd5b1207f1eef80d44ad69357feb890fc 100644 (file)
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -43,10 +43,7 @@
                        {/capture}
                                
                        {if $__sidebarRightContent|trim}
-                               {if !$__sidebarRightShow|isset}{assign var='__sidebarRightShow' value='wcf.global.button.showSidebarRight'|phrase}{/if}
-                               {if !$__sidebarRightHide|isset}{assign var='__sidebarRightHide' value='wcf.global.button.hideSidebar'|phrase}{/if}
-                               
-                               <aside class="sidebar boxesSidebarRight" aria-label="{lang}wcf.page.sidebar.right{/lang}" data-show-sidebar="{$__sidebarRightShow}" data-hide-sidebar="{$__sidebarRightHide}">
+                               <aside class="sidebar boxesSidebarRight" aria-label="{lang}wcf.page.sidebar.right{/lang}">
                                        <div class="boxContainer">
                                                {if MODULE_WCF_AD && $__disableAds|empty && $__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}
                                                        <div class="box boxBorderless">

diff --git a/ts/WoltLabSuite/Core/Ui/Mobile.ts b/ts/WoltLabSuite/Core/Ui/Mobile.ts
index 89c363d0ac3d763220747f3929f4de0b9a761bb6..7f53aa4bc260da34613dca6bddf50d5659cf1bbc 100644 (file)
--- a/ts/WoltLabSuite/Core/Ui/Mobile.ts
+++ b/ts/WoltLabSuite/Core/Ui/Mobile.ts
@@ -362,7 +362,7 @@ export function setup(enableMobileMenu: boolean, pageMenuMainProvider: PageMenuM
   _enableMobileMenu = enableMobileMenu;
   _pageMenuMainProvider = pageMenuMainProvider;
 
-  document.querySelectorAll(".sidebar").forEach((sidebar: HTMLElement) => {
+  document.querySelectorAll(".boxesSidebarLeft").forEach((sidebar: HTMLElement) => {
     _sidebars.push(sidebar);
   });
 

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js
index ade8133efc461a40ba0bd2c69e88daecf7d1ca70..126feade120019afe0fad030bf63c75e284b1057 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js
@@ -303,7 +303,7 @@ define(["require", "exports", "tslib", "focus-trap", "../Core", "../Dom/Change/L
     function setup(enableMobileMenu, pageMenuMainProvider) {
         _enableMobileMenu = enableMobileMenu;
         _pageMenuMainProvider = pageMenuMainProvider;
-        document.querySelectorAll(".sidebar").forEach((sidebar) => {
+        document.querySelectorAll(".boxesSidebarLeft").forEach((sidebar) => {
             _sidebars.push(sidebar);
         });
         if (Environment.touch()) {

diff --git a/wcfsetup/install/files/style/layout/box.scss b/wcfsetup/install/files/style/layout/box.scss
index 3f9dea9f76cba9599b666bb646bdbc7c9956849b..263716f8ef9163eb49ad8373d8d95d4791eaa22f 100644 (file)
--- a/wcfsetup/install/files/style/layout/box.scss
+++ b/wcfsetup/install/files/style/layout/box.scss
@@ -605,7 +605,7 @@
 
                > .content {
                        flex: 0 0 100%;
-                       order: 3;
+                       order: 2;
                }
 
                > .boxesSidebarLeft {
@@ -613,12 +613,11 @@
                }
 
                > .boxesSidebarRight {
-                       order: 2;
+                       order: 3;
                }
        }
 
-       .boxesSidebarLeft,
-       .boxesSidebarRight {
+       .boxesSidebarLeft {
                flex: 1 0 100%;
                pointer-events: none;
 
@@ -659,17 +658,6 @@
                        content: attr(data-hide-navigation);
                }
        }
-
-       .boxesSidebarLeft:not(.open) + .content + .boxesSidebarRight:not(.open) {
-               border-left: 1px solid $wcfContentBackground;
-               margin-left: 10px;
-               margin-top: 0;
-       }
-
-       .content:first-child + .boxesSidebarRight {
-               margin-bottom: 20px;
-               margin-top: 0;
-       }
 }
 
 /* styling for boxes in <contentTop>/<contentBottom> position */

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index ab9691ab7b4cfc4d530eb4df7df4e8a88e453b93..5d7bbf9f62617dddf378214d2b0d9694d73a3805 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3996,7 +3996,6 @@ Dateianhänge:
                <item name="wcf.global.button.hideSidebar"><![CDATA[Sidebar verbergen]]></item>
                <item name="wcf.global.button.showSidebar"><![CDATA[Sidebar anzeigen]]></item>
                <item name="wcf.global.button.showSidebarLeft"><![CDATA[Linke Sidebar]]></item>
-               <item name="wcf.global.button.showSidebarRight"><![CDATA[Rechte Sidebar]]></item>
                <item name="wcf.global.button.showMenu"><![CDATA[Menü anzeigen]]></item>
                <item name="wcf.global.button.hideMenu"><![CDATA[Menü verbergen]]></item>
                <item name="wcf.global.button.markAsRead"><![CDATA[Als gelesen markieren]]></item>
@@ -5622,5 +5621,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
        <item name="wcf.search.matchExactly" />
        <item name="wcf.search.subjectOnly" />
        <item name="wcf.article.search.categories" />
+       <item name="wcf.global.button.showSidebarRight" />
 </delete>
 </language>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 09ef97636cfcc0eac4a6e26ca3772faa484167dd..4c82fd7071b1934f9110a3fc47594e6530859968 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3944,7 +3944,6 @@ Attachments:
                <item name="wcf.global.button.hideSidebar"><![CDATA[Hide Sidebar]]></item>
                <item name="wcf.global.button.showSidebar"><![CDATA[Show Sidebar]]></item>
                <item name="wcf.global.button.showSidebarLeft"><![CDATA[Sidebar Left]]></item>
-               <item name="wcf.global.button.showSidebarRight"><![CDATA[Sidebar Right]]></item>
                <item name="wcf.global.button.showMenu"><![CDATA[Show Menu]]></item>
                <item name="wcf.global.button.hideMenu"><![CDATA[Hide Menu]]></item>
                <item name="wcf.global.button.markAsRead"><![CDATA[Mark as Read]]></item>
@@ -5624,5 +5623,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
        <item name="wcf.search.matchExactly" />
        <item name="wcf.search.subjectOnly" />
        <item name="wcf.article.search.categories" />
+       <item name="wcf.global.button.showSidebarRight" />
 </delete>
 </language>