From ee4c3d43d3ae6522f6543dc1cc81d5c2fcc4f6c5 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 9 Apr 2013 23:09:03 +0200
Subject: [PATCH] Fixed small style issues

---
 com.woltlab.wcf/template/footer.tpl                    |  2 +-
 com.woltlab.wcf/template/header.tpl                    | 10 ++++++----
 .../install/files/lib/data/style/ActiveStyle.class.php |  6 +++++-
 wcfsetup/setup/db/install.sql                          |  2 --
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl
index e7d1bc4b16..16946c128e 100644
--- a/com.woltlab.wcf/template/footer.tpl
+++ b/com.woltlab.wcf/template/footer.tpl
@@ -6,7 +6,7 @@
 	</div>
 </div>
 
-<footer id="pageFooter" class="layoutFluid footer">
+<footer id="pageFooter" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if} footer">
 	<div>
 		<nav id="footerNavigation" class="navigation navigationFooter clearfix">
 			{include file='footerMenu'}
diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index 86c1ad929b..cf6ff06f08 100644
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -1,9 +1,9 @@
 <a id="top"></a>
 
-<header id="pageHeader" class="layoutFluid">
+<header id="pageHeader" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}">
 	<div>
 		<nav id="topMenu" class="userPanel">
-			<div class="layoutFluid clearfix">
+			<div class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if} clearfix">
 				{hascontent}
 					<ul class="userPanelItems">
 						{content}{event name='topMenu'}{/content}
@@ -16,7 +16,9 @@
 		
 		<div id="logo" class="logo">
 			<a href="{link}{/link}">
-				<img src="{@$__wcf->getPath('wbb')}images/wbbLogo2.svg" alt="" style="height: 90px; width: 246px;" />
+				{if $__wcf->getStyleHandler()->getStyle()->getPageLogo()}
+					<img src="{$__wcf->getStyleHandler()->getStyle()->getPageLogo()}" alt="" />
+				{/if}
 				{event name='headerLogo'}
 			</a>
 		</div>
@@ -38,7 +40,7 @@
 	</div>
 </header>
 
-<div id="main" class="layoutFluid{if $sidebarOrientation|isset && $sidebar|isset} sidebarOrientation{@$sidebarOrientation|ucfirst} clearfix{if $sidebarOrientation == 'right' && $sidebarCollapsed} sidebarCollapsed{/if}{/if}">
+<div id="main" class="{if $__wcf->getStyleHandler()->getStyle()->getVariable('useFluidLayout')}layoutFluid{else}layoutFixed{/if}{if $sidebarOrientation|isset && $sidebar|isset} sidebarOrientation{@$sidebarOrientation|ucfirst} clearfix{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}>
diff --git a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
index 4eea8930f1..0798f9da0f 100644
--- a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
+++ b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
@@ -39,6 +39,10 @@ class ActiveStyle extends DatabaseObjectDecorator {
 	 * @return	string
 	 */
 	public function getPageLogo() {
-		return $this->getImage($this->object->getVariable('pageLogo'));
+		if ($this->object->getVariable('pageLogo')) {
+			return $this->getImage($this->object->getVariable('pageLogo'));
+		}
+		
+		return '';
 	}
 }
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 82e592e516..1badc9cd8b 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -994,7 +994,5 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDisable
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDisabledColor', 'rgba(0, 153, 0, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useFluidLayout', '1');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogo', '');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoHeight', 'auto');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoWidth', 'auto');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('individualLess', '');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('overrideLess', '');
-- 
2.20.1