Small style optimization

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index bd115b5c271b0d80463f07602ad2f2b3be739f71..da236e17496d96b0ef80dc5b9f7a5fcda6682256 100644 (file)
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -11,7 +11,7 @@
        </div>
 </div>
 
-<footer id="pageFooter" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if} footer">
+<footer id="pageFooter" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if} footer{if $sidebarOrientation|isset && $sidebar|isset} sidebarOrientation{@$sidebarOrientation|ucfirst}{if $sidebarOrientation == 'right' && $sidebarCollapsed} sidebarCollapsed{/if}{/if}">
        <div>
                <nav id="footerNavigation" class="navigation navigationFooter">
                        {include file='footerMenu'}

diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index 7559b88e7f3d83035abccdbeccfa786a0d6f8186..cd7dc120989b8142192ee12558a83a2714dd7226 100644 (file)
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -1,6 +1,6 @@
 <a id="top"></a>
 
-<header id="pageHeader" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}">
+<header id="pageHeader" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}{if $sidebarOrientation|isset && $sidebar|isset} sidebarOrientation{@$sidebarOrientation|ucfirst}{if $sidebarOrientation == 'right' && $sidebarCollapsed} sidebarCollapsed{/if}{/if}">
        <div>
                <nav id="topMenu" class="userPanel">
                        <div class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}">

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 9afb7d5a999c839df36d729ee88c06a833f91a1a..b5862ab4400c64c30fe062293282362d1911e8ce 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -4562,10 +4562,10 @@ WCF.Collapsible.Sidebar = Class.extend({
         */
        _renderSidebar: function() {
                if (this._isOpen) {
-                       this._mainContainer.removeClass('sidebarCollapsed');
+                       $('.sidebarOrientationLeft, .sidebarOrientationRight').removeClass('sidebarCollapsed');
                }
                else {
-                       this._mainContainer.addClass('sidebarCollapsed');
+                       $('.sidebarOrientationLeft, .sidebarOrientationRight').addClass('sidebarCollapsed');
                }
                
                // update button position