From fbfeab12aa0428cc910525d24e7b13cd344fbed0 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 28 May 2013 15:20:41 +0200
Subject: [PATCH] Sidebar optimization

---
 com.woltlab.wcf/template/footer.tpl      |  4 +++
 com.woltlab.wcf/template/header.tpl      | 46 +++++++++++++-----------
 wcfsetup/install/files/style/layout.less |  9 -----
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl
index 11ba24abe2..7a5730c2b0 100644
--- 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 d84155eed6..54a540138b 100644
--- 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 27156eb76d..f3bda629cb 100644
--- 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;
-- 
2.20.1