Sidebar optimization

diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl
index 11ba24abe23c16b1eb0cf63f49014e128e9e8558..7a5730c2b022b223bf7571857cdc2c4fb8417e50 100644 (file)
--- a/com.woltlab.wcf/template/footer.tpl
+++ b/com.woltlab.wcf/template/footer.tpl
@@ -3,6 +3,10 @@
                        {if $skipBreadcrumbs|empty}{include file='breadcrumbs' __microdata=false}{/if}
                        
                </section>
+               
+               {if $sidebarOrientation|isset && $sidebarOrientation == 'right'}
+                       {@$__sidebar}
+               {/if} 
        </div>
 </div>
 

diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index d84155eed60d7a648c99a67f0f3393db64913be0..54a540138bb64c1f3917dec5111c47bcda188143 100644 (file)
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -45,27 +45,33 @@
 
 <div id="main" 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>
-               {if $sidebar|isset}
-                       <aside class="sidebar"{if $sidebarOrientation|isset && $sidebarOrientation == 'right'} data-is-open="{if $sidebarCollapsed}false{else}true{/if}" data-sidebar-name="{$sidebarName}"{/if}>
-                               <div>
-                                       {event name='sidebarBoxesTop'}
-                                       
-                                       {@$sidebar}
-                                       
-                                       {event name='sidebarBoxesBottom'}
-                               </div>
-                       </aside>
-                       
-                       {if $sidebarOrientation|isset && $sidebarOrientation == 'right'}
-                               <script type="text/javascript">
-                                       //<![CDATA[
-                                       $(function() {
-                                               new WCF.Collapsible.Sidebar();
-                                       });
-                                       //]]>
-                               </script>
+               {capture assign='__sidebar'}
+                       {if $sidebar|isset}
+                               <aside class="sidebar"{if $sidebarOrientation|isset && $sidebarOrientation == 'right'} data-is-open="{if $sidebarCollapsed}false{else}true{/if}" data-sidebar-name="{$sidebarName}"{/if}>
+                                       <div>
+                                               {event name='sidebarBoxesTop'}
+                                               
+                                               {@$sidebar}
+                                               
+                                               {event name='sidebarBoxesBottom'}
+                                       </div>
+                               </aside>
+                               
+                               {if $sidebarOrientation|isset && $sidebarOrientation == 'right'}
+                                       <script type="text/javascript">
+                                               //<![CDATA[
+                                               $(function() {
+                                                       new WCF.Collapsible.Sidebar();
+                                               });
+                                               //]]>
+                                       </script>
+                               {/if}
                        {/if}
-               {/if}
+               {/capture}
+               
+               {if !$sidebarOrientation|isset || $sidebarOrientation == 'left'}
+                       {@$__sidebar}
+               {/if} 
                                
                <section id="content" class="content">
                        

diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less
index 27156eb76d630788e6984cde7940386c45b66f3b..f3bda629cbf4a09d4553d2ff074fbbf91f246532 100644 (file)
--- a/wcfsetup/install/files/style/layout.less
+++ b/wcfsetup/install/files/style/layout.less
@@ -643,15 +643,6 @@
        }
        
        &.sidebarOrientationRight {
-               direction: rtl;
-               
-               > div {
-                       > .sidebar,
-                       > .content {
-                               direction: ltr;
-                       }
-               }
-               
                &.sidebarCollapsed > div {
                        > .sidebar {
                                width: 20px;