Ticket #1915

modules/boonex/lucid/data/template/system/_sub_footer.html

@@ -52,32 +52,7 @@
 
     </div> <!-- .cd-main-content-wrp -->
 
-    <div id="bx-toolbar" class="bx-header bx-def-image-bg-header bx-def-color-bg-header bx-def-border-header bx-shadow-header bx-def-z-index-nav cd-main-header">
-        <div class="bx-toolbar-content-hgap bx-def-padding-sec-leftright bx-def-box-sizing">
-            <div class="bx-toolbar-content-wrapper bx-content-padding-header">
-                <div id="bx-toolbar-content" class="bx-toolbar-content bx-clearfix">
-                    <div id="bx-menu-toolbar-1-container" class="bx-toolbar-item bx-ti-left">
-                    	<!-- <a href="#0" class="cd-nav-trigger cd-dropdown-trigger">Menu<span></span></a> -->
-                    	
-                        <bx_menu:sys_toolbar_site />
-                    </div>
-                    <div id="bx-logo-container" class="bx-toolbar-item bx-ti-logo">
-                        <bx_injection:injection_logo_before />
-                            __main_logo__
-                        <bx_injection:injection_logo_after />
-                    </div>
-                    <div id="bx-menu-main-container" class="bx-toolbar-item bx-ti-menu bx-ti-stretcher">
-						<bx_menu:sys_site />
-                    </div>
-                    <div id="bx-menu-toolbar-2-container" class="bx-toolbar-item bx-ti-right cd-nav">
-                        <bx_menu:sys_toolbar_member />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-	<bx_menu:sys_site_action />
+    <bx_menu:sys_site_action />
 </div>
 
 <bx_include_auto:_footer.html />

modules/boonex/lucid/data/template/system/_sub_header.html

@@ -1,7 +1,32 @@
 <bx_include_auto:_header.html />
 
 <div class="bx-main">
-	<bx_injection:top />
+        <bx_injection:top />
+
+        <div id="bx-toolbar" class="bx-header bx-def-image-bg-header bx-def-color-bg-header bx-def-border-header bx-shadow-header bx-def-z-index-nav cd-main-header">
+            <div class="bx-toolbar-content-hgap bx-def-padding-sec-leftright bx-def-box-sizing">
+                <div class="bx-toolbar-content-wrapper bx-content-padding-header">
+                    <div id="bx-toolbar-content" class="bx-toolbar-content bx-clearfix">
+                        <div id="bx-menu-toolbar-1-container" class="bx-toolbar-item bx-ti-left">
+                            <!-- <a href="#0" class="cd-nav-trigger cd-dropdown-trigger">Menu<span></span></a> -->
+
+                            <bx_menu:sys_toolbar_site />
+                        </div>
+                        <div id="bx-logo-container" class="bx-toolbar-item bx-ti-logo">
+                            <bx_injection:injection_logo_before />
+                                __main_logo__
+                            <bx_injection:injection_logo_after />
+                        </div>
+                        <div id="bx-menu-main-container" class="bx-toolbar-item bx-ti-menu bx-ti-stretcher">
+                                                    <bx_menu:sys_site />
+                        </div>
+                        <div id="bx-menu-toolbar-2-container" class="bx-toolbar-item bx-ti-right cd-nav">
+                            <bx_menu:sys_toolbar_member />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
 
 	<div class="cd-main-content-wrp">
 		<div class="cd-main-content bx-clearfix">

modules/boonex/lucid/data/template/system/menu_dropdown.html

@@ -1,6 +1,6 @@
 <div class="bx-lcd-menu-dropdown bx-def-z-index-modal cd-dropdown">
     <h2 class="cd-dropdown-title">
-    	<bx_if:show_logo_image><img src="__logo_url__" /></bx_if:show_logo_image>
+    	<bx_if:show_logo_image><img src="__logo_url__" alt="__logo_text__" /></bx_if:show_logo_image>
     	<bx_if:show_logo_text>__logo_text__</bx_if:show_logo_text>
     </h2>
     <a href="javascript:void(0)" class="cd-close">Close</a>

modules/boonex/lucid/data/template/system/scripts/BxTemplFunctions.php

@@ -88,19 +88,17 @@ class BxTemplFunctions extends BxBaseFunctions
 
         $sLogoUrl = $this->getMainLogoUrl();
         $bLogoUrl = !empty($sLogoUrl);
-        
-        $sLogoText = '';
-        if(!$bLogoUrl) {
-        	$sLogoText = BxDolDesigns::getInstance()->getSiteLogoAlt();
-        	if(empty($sLogoText))
-        		$sLogoText = getParam('site_title');
-        }
+
+        $sLogoText = BxDolDesigns::getInstance()->getSiteLogoAlt();
+        if(empty($sLogoText))
+            $sLogoText = getParam('site_title');
 
         $sCode .= $this->_oTemplate->parsePageByName('menu_dropdown.html', array(
 			'bx_if:show_logo_image' => array(
 				'condition' => $bLogoUrl,
 				'content' => array(
 					'logo_url' => $sLogoUrl,
+                                        'logo_text' => $sLogoText
 				)
 			),
 			'bx_if:show_logo_text' => array(