Ticket #1590 - Remove custom Login/Join links from Member Toolbar.

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

@@ -20,6 +20,10 @@
     text-align: left;
 }
 
+#bx-logo-container a span {
+    vertical-align: middle;
+}
+
 
 /*---Toolbar ---*/
 .bx-toolbar-content {

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

@@ -334,27 +334,6 @@ ul.bx-menu-toolbar li a .bx-menu-item-addon {
 #bx-menu-toolbar-2-container .bx-menu-toolbar li.bx-menu-item-account .bx-menu-toolbar-item-title {
 	display: none;
 }
-
-#bx-menu-toolbar-2-container .bx-menu-toolbar li.bx-menu-item-bx_lucid_login .bx-btn, 
-#bx-menu-toolbar-2-container .bx-menu-toolbar li.bx-menu-item-bx_lucid_join .bx-btn {
-	border-color: rgba(20, 80, 100, 0.1);
-	background-color: rgba(238, 241, 244, 1);
-
-	font-size: 0.8125rem;
-	font-weight: normal;
-	color: rgba(29, 75, 96, 1);
-}
-
-#bx-menu-toolbar-2-container .bx-menu-toolbar li.bx-menu-item-bx_lucid_login .bx-btn:hover,
-#bx-menu-toolbar-2-container .bx-menu-toolbar li.bx-menu-item-bx_lucid_join .bx-btn:hover {
-	background-color: rgba(255, 255, 255, 1.0);
-}
-
-#bx-menu-toolbar-2-container .bx-menu-toolbar li.bx-menu-item-bx_lucid_login .bx-btn span,
-#bx-menu-toolbar-2-container .bx-menu-toolbar li.bx-menu-item-bx_lucid_join .bx-btn span {
-	margin-left: 0;
-	margin-right: 0;
-}
 	
 #bx-menu-toolbar-2-container .bx-menu-toolbar li .sys-icon-a {
 	margin-top: 0px;

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

@@ -27,8 +27,8 @@ class BxTemplMenuToolbar extends BxBaseMenuToolbar
         if($this->_bSiteToolbar && in_array($a['name'], array('search')))
             return false;
 
-		//--- Hide 'Login' from Member Toolbar
-        if(!$this->_bSiteToolbar && in_array($a['name'], array('login', 'add-content')))
+        //--- Hide 'Login' from Member Toolbar
+        if(!$this->_bSiteToolbar && in_array($a['name'], array('add-content')))
             return false;
 
         $a = BxTemplMenu::_getMenuItem ($a);
@@ -36,8 +36,8 @@ class BxTemplMenuToolbar extends BxBaseMenuToolbar
             return $a;
 
         $a['bx_if:unit'] = array(
-        	'condition' => false,
-        	'content' => array()
+            'condition' => false,
+            'content' => array()
         );
 
         $a['class_add_a'] = '';
@@ -46,12 +46,6 @@ class BxTemplMenuToolbar extends BxBaseMenuToolbar
                 $a['class_add'] = 'bx-def-media-phone-hide';
                 break;
 
-            case 'bx_lucid_join':
-            case 'bx_lucid_login':
-                $a['class_add'] = '';
-                $a['class_add_a'] = ' bx-btn ' . str_replace('_', '-', $a['name']);
-                break;
-
             case 'main-menu':
                 $a['class_add_a'] = ' cd-dropdown-trigger';
                 $a['link'] = 'javascript:void(0)';
@@ -62,14 +56,13 @@ class BxTemplMenuToolbar extends BxBaseMenuToolbar
         return $a;
     }
 
-	protected function _getTmplVarsAddon($mixedAddon, $aMenuItem)
+    protected function _getTmplVarsAddon($mixedAddon, $aMenuItem)
     {
         return array(
             'addon' => $mixedAddon,
             'addonf' => $this->_oTemplate->parseHtmlByTemplateName('menu_item_addon_small', array(
-		        'content' => $mixedAddon
-		    ))
-			
+                'content' => $mixedAddon
+            ))
         );
     }
 }

modules/boonex/lucid/install/sql/disable.sql

@@ -20,7 +20,7 @@ DELETE FROM `sys_menu_templates` WHERE `template`='menu_dropdown_site.html' AND
 DELETE FROM `sys_objects_menu` WHERE `object`='bx_lucid_dropdown_site';
 
 -- MENU: member toolbar
-DELETE FROM `sys_menu_items` WHERE `set_name`='sys_toolbar_member' AND `name` IN ('bx_lucid_search', 'bx_lucid_login', 'bx_lucid_join');
+DELETE FROM `sys_menu_items` WHERE `set_name`='sys_toolbar_member' AND `name` IN ('bx_lucid_search');
 
 -- MENU: home page submenu
 DELETE FROM `sys_objects_menu` WHERE `object`='bx_lucid_homepage_submenu';

modules/boonex/lucid/install/sql/enable.sql

@@ -25,9 +25,7 @@ INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `templat
 -- MENU: member toolbar
 SET @iMIOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name` = 'sys_toolbar_member' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `hidden_on`, `active`, `copyable`, `order`) VALUES
-('sys_toolbar_member', 'system', 'bx_lucid_search', '_bx_lucid_menu_item_title_system_search', '', 'javascript:void(0);', 'bx_menu_slide_inline(''#bx-sliding-menu-search'', this, ''site'');', '', 'search', '', '', 0, 2147483647, 7, 1, 0, 0),
-('sys_toolbar_member', 'system', 'bx_lucid_login', '_bx_lucid_menu_item_title_system_login', '_bx_lucid_menu_item_title_login', 'page.php?i=login', '', '', '',  '', '', 0, 1, 7, 1, 0, @iMIOrder + 1),
-('sys_toolbar_member', 'system', 'bx_lucid_join', '_bx_lucid_menu_item_title_system_join', '_bx_lucid_menu_item_title_join', 'page.php?i=create-account', '', '', '',  '', '', 0, 1, 7, 1, 0, @iMIOrder + 2);
+('sys_toolbar_member', 'system', 'bx_lucid_search', '_bx_lucid_menu_item_title_system_search', '', 'javascript:void(0);', 'bx_menu_slide_inline(''#bx-sliding-menu-search'', this, ''site'');', '', 'search', '', '', 0, 2147483647, 7, 1, 0, 0);
 
 -- MENU: home page submenu
 INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES