Ticket #2105 - Get rid of dynamic Bars and Plus icons.

install/sql/system.sql

@@ -3591,12 +3591,12 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 
 -- site toolbar menu
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_toolbar_site', 'system', 'main-menu', '_sys_menu_item_title_system_main_menu', '', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-sys_site\', this, \'site\');', '', 'a:bars', '', 2147483647, 1, 1, 1),
+('sys_toolbar_site', 'system', 'main-menu', '_sys_menu_item_title_system_main_menu', '', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-sys_site\', this, \'site\');', '', 'bars', '', 2147483647, 1, 1, 1),
 ('sys_toolbar_site', 'system', 'search', '_sys_menu_item_title_system_search', '', 'javascript:void(0);', 'bx_menu_slide_inline(''#bx-sliding-menu-search'', this, ''site'');', '', 'search', '', 2147483647, 1, 1, 2);
 
 -- member toolbar menu
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_toolbar_member', 'system', 'add-content', '_sys_menu_item_title_system_add_content', '', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-sys_add_content\', this, \'site\');', '', 'a:plus', '', '', 0, 510, 1, 1, 0),
+('sys_toolbar_member', 'system', 'add-content', '_sys_menu_item_title_system_add_content', '', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-sys_add_content\', this, \'site\');', '', 'plus', '', '', 0, 510, 1, 1, 0),
 ('sys_toolbar_member', 'system', 'account', '_sys_menu_item_title_system_account_menu', '_sys_menu_item_title_account_menu', 'javascript:void(0);', 'bx_menu_slide_inline(''#bx-sliding-menu-account'', this, ''site'');', '', 'user',  'a:3:{s:6:"module";s:6:"system";s:6:"method";s:21:"profile_notifications";s:5:"class";s:20:"TemplServiceProfiles";}', 'sys_account_popup', 1, 510, 1, 0, 1),
 ('sys_toolbar_member', 'system', 'login', '_sys_menu_item_title_system_login', '', 'page.php?i=login', '', '', 'user',  '', '', 0, 1, 1, 0, 2);
 

modules/boonex/decorous/data/template/system/_header_js_custom.html

@@ -21,7 +21,8 @@
         //mobile only - open sidebar when user clicks the hamburger menu
         sidebarTrigger.on('click', function(event){
             event.preventDefault();
-            $([sidebar, sidebarTrigger]).toggleClass('nav-is-visible');
+            sidebar.toggleClass('nav-is-visible');
+            sidebarTrigger.toggleClass('bx-menu-tab-active');
         });
 
         function checkScrollbarPosition() {

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

@@ -7,18 +7,20 @@
 	<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-def-centered 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-clearfix">
-                    <a href="#0" class="cd-nav-trigger">Menu<span></span></a>
-                    <div id="bx-logo-container">
-                        <bx_injection:injection_logo_before />
-                            __main_logo__
-                        <bx_injection:injection_logo_after />
+                    <div id="bx-toolbar-content" class="bx-clearfix">
+                        <div id="bx-menu-toolbar-1-container">
+                            <bx_menu:sys_toolbar_site />
+                        </div>
+                        <div id="bx-logo-container">
+                            <bx_injection:injection_logo_before />
+                                __main_logo__
+                            <bx_injection:injection_logo_after />
+                        </div>
+                        <div id="bx-menu-toolbar-2-container" class="cd-nav">
+                            <bx_menu:sys_toolbar_member />
+                        </div>
                     </div>
-		            <div id="bx-menu-toolbar-2-container" class="cd-nav">
-		                <bx_menu:sys_toolbar_member />
-		            </div>
-		        </div>
-			</div>
+                </div>
 	    </div>
 	</div>
 

modules/boonex/decorous/data/template/system/css/general.css

@@ -93,100 +93,6 @@
   }
 }
 
-.cd-nav-trigger {
-  /* navigation trigger - visible on mobile devices only */
-  position: absolute;
-  display: block;
-  top: 0px;
-  left: 0px;
-  width: 3rem;
-  height: 3rem;
-  margin-right: 0px;
-  /* hide text */
-  overflow: hidden;
-  white-space: nowrap;
-  color: transparent !important;
-}
-.cd-nav-trigger span, 
-.cd-nav-trigger span::before, 
-.cd-nav-trigger span::after {
-  /* hamburger icon in CSS */
-  position: absolute;
-  display: inline-block;
-  height: 3px;
-  width: 24px;
-  background: #ffffff;
-}
-.cd-nav-trigger span {
-  /* line in the center */
-  position: absolute;
-  top: 50%;
-  right: 5px;
-  margin-top: -2px;
-  -webkit-transition: background 0.2s;
-  -moz-transition: background 0.2s;
-  transition: background 0.2s;
-}
-.cd-nav-trigger span::before, 
-.cd-nav-trigger span::after {
-  /* other 2 lines */
-  content: '';
-  right: 0;
-  /* Force Hardware Acceleration in WebKit */
-  -webkit-transform: translateZ(0);
-  -moz-transform: translateZ(0);
-  -ms-transform: translateZ(0);
-  -o-transform: translateZ(0);
-  transform: translateZ(0);
-  -webkit-backface-visibility: hidden;
-  backface-visibility: hidden;
-  -webkit-transform-origin: 0% 50%;
-  -moz-transform-origin: 0% 50%;
-  -ms-transform-origin: 0% 50%;
-  -o-transform-origin: 0% 50%;
-  transform-origin: 0% 50%;
-  -webkit-transition: -webkit-transform 0.2s;
-  -moz-transition: -moz-transform 0.2s;
-  transition: transform 0.2s;
-}
-.cd-nav-trigger span::before {
-  /* menu icon top line */
-  top: -6px;
-}
-.cd-nav-trigger span::after {
-  /* menu icon bottom line */
-  top: 6px;
-}
-.cd-nav-trigger.nav-is-visible span {
-  /* hide line in the center */
-  background: rgba(255, 255, 255, 0);
-}
-.cd-nav-trigger.nav-is-visible span::before, 
-.cd-nav-trigger.nav-is-visible span::after {
-  /* keep visible other 2 lines */
-  background: white;
-}
-.cd-nav-trigger.nav-is-visible span::before {
-  -webkit-transform: translateX(4px) translateY(-3px) rotate(45deg);
-  -moz-transform: translateX(4px) translateY(-3px) rotate(45deg);
-  -ms-transform: translateX(4px) translateY(-3px) rotate(45deg);
-  -o-transform: translateX(4px) translateY(-3px) rotate(45deg);
-  transform: translateX(4px) translateY(-3px) rotate(45deg);
-}
-.cd-nav-trigger.nav-is-visible span::after {
-  -webkit-transform: translateX(4px) translateY(2px) rotate(-45deg);
-  -moz-transform: translateX(4px) translateY(2px) rotate(-45deg);
-  -ms-transform: translateX(4px) translateY(2px) rotate(-45deg);
-  -o-transform: translateX(4px) translateY(2px) rotate(-45deg);
-  transform: translateX(4px) translateY(2px) rotate(-45deg);
-}
-@media only screen and (min-width: 720px) {
-  .cd-nav-trigger {
-    display: none;
-  }
-}
-
-
 /*--- Top Navigation ---*/
 @media only screen and (min-width: 720px) {
   .cd-nav {

modules/boonex/decorous/data/template/system/menu_toolbar.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-toolbar bx-menu-object-__object__">
     <bx_repeat:menu_items>
         <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ bx-def-padding-thd-leftright __class_add__">
-            <a href="__link__" target="__target__" onclick="__onclick__" class="bx-def-font-contrasted"><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright">__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon></a>
+            <a href="__link__" target="__target__" onclick="__onclick__" class="bx-def-font-contrasted __class_add_a__"><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright">__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon></a>
         </li>
     </bx_repeat:menu_items>
 </ul>

modules/boonex/decorous/data/template/system/scripts/BxTemplMenuToolbar.php

@@ -12,9 +12,45 @@
  */
 class BxTemplMenuToolbar extends BxBaseMenuToolbar
 {
+    protected $_bSiteToolbar;
+
     public function __construct ($aObject, $oTemplate = false)
     {
         parent::__construct ($aObject, $oTemplate);
+
+        $this->_bSiteToolbar = $this->_sObject == 'sys_toolbar_site';
+    }
+
+    protected function _getMenuItem ($a)
+    {
+    	//--- Hide 'Search' from Site Toolbar
+        if($this->_bSiteToolbar && in_array($a['name'], array('search')))
+            return false;
+
+        $a = BxTemplMenu::_getMenuItem ($a);
+        if($a === false)
+            return $a;
+
+        $a['bx_if:unit'] = array(
+            'condition' => false,
+            'content' => array()
+        );
+
+        $a['class_add_a'] = '';
+        switch ($a['name']) {
+            case 'bx_lucid_search':
+                $a['class_add'] = 'bx-def-media-phone-hide';
+                break;
+
+            case 'main-menu':
+                $a['class_add'] = ' bx-def-media-desktop-hide bx-def-media-tablet-hide';
+                $a['class_add_a'] = ' cd-nav-trigger';
+                $a['link'] = 'javascript:void(0)';
+                $a['onclick'] = '';
+                break;
+        }
+
+        return $a;
     }
 }
 

modules/boonex/ocean/data/template/system/css/menu.css

@@ -9,6 +9,8 @@ ul.bx-menu-toolbar li a {
 
     line-height: 64px;
     line-height: 4rem;
+
+    color: #ffffff;
 }
 
 ul.bx-menu-toolbar li a img {