Quickfix of issue #14: Website Toolbar now moves above meta navigatio…

…n when double top menu is used.
holzweg · Mar 20, 2012 · e933ec6 · e933ec6
1 parent 01c278e
commit e933ec6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/design/hwboot/stylesheets/less/websitetoolbar.less b/design/hwboot/stylesheets/less/websitetoolbar.less
@@ -10,11 +10,7 @@ div#ezwt
 body.floating-wt div#ezwt
 {
     /* This elements offsetHeight is used to set padding-top on header in floating_toolbar.tpl, so avoid border on this element */
-    position: fixed;
     z-index: 9999;
-    top: 40px;
-    left: 0px;
-    opacity: 0.85;
     -webkit-transition-duration: 250ms;
     -moz-transition-duration: 250ms;
     -ms-transition-duration: 250ms;

diff --git a/design/hwboot/templates/page_header.tpl b/design/hwboot/templates/page_header.tpl
@@ -1,5 +1,11 @@
 {include uri='design:page_header_logo.tpl'}
 
+{* Website Toolbar just above meta nav, if using a double top menu (since it would interfere with navigation level 2 if placed below the top menu.) *}
+{if and( $pagedata.website_toolbar, $pagedata.is_edit|not, eq($pagedata.top_menu, 'double_top') )}
+        {include uri='design:page_toolbar.tpl'}
+        {set $top_padding = sum( $top_padding, $toolbar_height )}	
+{/if}
+
 <div id="metanav" class="alert well">
 	<div class="container">
 		<ul>

diff --git a/design/hwboot/templates/pagelayout.tpl b/design/hwboot/templates/pagelayout.tpl
@@ -55,7 +55,8 @@
 
     <body>
 
-        {if and( $pagedata.website_toolbar, $pagedata.is_edit|not)}
+        {* Website Toolbar on top, if using a flat top menu *}
+        {if and( $pagedata.website_toolbar, $pagedata.is_edit|not, eq($pagedata.top_menu, 'flat_top') )}
                 {include uri='design:page_toolbar.tpl'}
                 {set $top_padding = sum( $top_padding, $toolbar_height )}	
         {/if}
@@ -68,6 +69,7 @@
 
 		{include uri='design:page_header.tpl'}
 
+
         <div id="page" class="container">
             {if and( is_set( $pagedata.persistent_variable.extra_template_list ), $pagedata.persistent_variable.extra_template_list|count() )}
                 {foreach $pagedata.persistent_variable.extra_template_list as $extra_template}