Fixed small style issues

diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl
index e7d1bc4b16315382371d869e7215a3edd64295ac..16946c128e379de35b72f0b8a056a88db4442484 100644 (file)
--- 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 86c1ad929b1a8c8b6121bdcc7104974045327948..cf6ff06f08b289e71e99712994eabc3234009bda 100644 (file)
--- 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 4eea8930f147c167d346d728903dcad63151765e..0798f9da0fd559d71d6402227b314a952ad95fb6 100644 (file)
--- 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 82e592e516382acca4b400ae6bc73779248b666b..1badc9cd8bf2ec1b44eece932b3bbe2b8a47e0ca 100644 (file)
--- 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', '');