#13 - menu remake

inc/js/functions.js

@@ -252,7 +252,7 @@ function bx_center_content (sSel, sBlockStyle) {
  */
 function bx_menu_popup (o, e, options) {
     var options = options || {};
-    var o = $.extend({}, $.fn.dolPopupDefaultOptions, options, {url: 'menu.php?o=' + o});
+    var o = $.extend({}, $.fn.dolPopupDefaultOptions, options, {id: o, url: 'menu.php?o=' + o});
     $(e).dolPopupAjax(o);
 }
 

inc/js/jquery.dolPopup.js

@@ -227,7 +227,7 @@
                 bx_loading_content($('#bx-popup-ajax-wrapper-' + id + ' .bx-popup-content-wrapped'), true, true);
 
                 $('#bx-popup-ajax-wrapper-' + id).dolPopup({
-                    pointer: $.isWindow(e[0]) ? false : {el:e, align:'center'},
+                    pointer: $.isWindow(e[0]) ? false : $.extend({}, {el:e, align:'center'}, options.pointer),
                     onHide: function () {
                         if (!$.isWindow(e[0]))
                             bx_menu_on(e, false);

install/sql/v70.sql

@@ -2839,15 +2839,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`, `order`) VALUES
-('sys_toolbar_site', 'system', 'main-menu', '_sys_menu_item_title_system_main_menu', '', 'javascript:void(0);', 'bx_menu_popup(''sys_site'', this);', '', 'reorder', '', 2147483647, 1, 1),
-('sys_toolbar_site', 'system', 'search', '_sys_menu_item_title_system_search', '', 'javascript:void(0);', 'alert(''TODO: search popup here''); return false;', '', 'search', '', 2147483647, 1, 2);
+('sys_toolbar_site', 'system', 'main-menu', '_sys_menu_item_title_system_main_menu', '', 'javascript:void(0);', 'bx_menu_popup(''sys_site'', this);', '', 'reorder', '', 2147483647, 1, 1);
 
 -- member toolbar menu
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `order`) VALUES
-('sys_toolbar_member', 'system', 'add-content', '_sys_menu_item_title_system_add_content', '', 'javascript:void(0)', 'bx_menu_popup(''sys_add_content'', this);', '', 'plus', 'sys_add_content', 510, 1, 1),
-('sys_toolbar_member', 'system', 'notifications', '_sys_menu_item_title_system_notifications', '', 'javascript:void(0);', 'alert(''TODO: notification popup here''); return false;', '', 'flag', '', 510, 1, 2),
-('sys_toolbar_member', 'system', 'account', '_sys_menu_item_title_system_account', '', 'javascript:void(0);', 'bx_menu_popup(''sys_account'', this);', '', 'user', 'sys_account', 510, 1, 3),
-('sys_toolbar_member', 'system', 'create-account', '_sys_menu_item_title_system_create_account', '', 'page.php?i=create-account', '', '', 'user', '', 1, 1, 4);
+('sys_toolbar_member', 'system', 'account', '_sys_menu_item_title_system_account', '', 'javascript:void(0);', 'bx_menu_popup(''sys_account'', this);', '', 'user', 'sys_account', 510, 1, 1),
+('sys_toolbar_member', 'system', 'create-account', '_sys_menu_item_title_system_create_account', '', 'page.php?i=create-account', '', '', 'user', '', 1, 1, 2);
 
 -- add content menu
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `order`) VALUES

template/_sub_header.html

@@ -13,12 +13,12 @@
 
         <div id="bx-toolbar-content" class="bx-clearfix">
 
-            <div id="bx-menu-toolbar-1-container" class="bx-def-media-phone-hide">
+            <div id="bx-menu-toolbar-1-container">
                 <bx_menu:sys_toolbar_site />
             </div>
 
 
-            <div id="bx-logo-container" class="bx-def-font-h1 bx-def-media-phone-hide">
+            <div id="bx-logo-container" class="bx-def-font-h1">
 
                 <bx_injection:injection_logo_before />
                     __main_logo__

template/css/general.css

@@ -29,25 +29,25 @@
 
 #bx-menu-toolbar-1-container,
 #bx-menu-toolbar-2-container {
+    position:absolute;
+    top:0px;
     padding-top:5px;
-    width:35%;
 }
 
 #bx-menu-toolbar-1-container {
-    float:left;
+    left:0px;
     text-align:left;
 }
 
 #bx-menu-toolbar-2-container {
-    float:right;
+    right:0px;
     text-align:right;
 }
 
-#bx-logo-container {    
-    float:left;
-    width:30%;
-
-    line-height: 60px;
+#bx-logo-container {
+    min-height: 54px;
+    padding-top: 6px; 
+    vertical-align: middle;
     text-align: center; 
     text-shadow: 0px 0px 2px #000;
 }

template/css/menu.css

@@ -159,6 +159,10 @@ ul.bx-menu-main {
 
 /* --------------- toolbar menu */
 
+#bx-popup-ajax-wrapper-sys_site .bx-popup-content-wrapped {
+    padding:12px;
+}
+
 #bx-menu-toolbar-1-container .bx-menu-toolbar {
     float:left;
 }

template/menu_main.html

@@ -1,5 +1,3 @@
 <ul id="bx-menu-main" class="bx-menu-main bx-def-font-h3 bx-clearfix">
-    <li class="bx-def-padding-sec-left bx-def-padding-right"><a href="javascript:void(0);" onclick="bx_menu_popup('sys_site', this, {pointer:{align:'left'}});"><i class="sys-icon reorder"></i></a><span>&nbsp;</span></li>
-    <li class="bx-menu-main-submenu-div bx-def-padding-right"><i class="sys-icon angle-right"></i></li> 
-    <li class="bx-def-padding-right"><i class="sys-icon __icon__ bx-def-margin-sec-right"></i><span>__title__</span></li>
+    <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover"><!-- TODO: maybe will be used later <i class="sys-icon __icon__ bx-def-margin-sec-right"></i> --><a href="__link__">__title__</a></li>
 </ul>

template/menu_main_submenu.html

@@ -1,6 +1,12 @@
 <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-def-font-h3 bx-clearfix">
-    <li class="bx-menu-main-submenu-div bx-def-padding-sec-right"><i class="sys-icon angle-right"></i></li>
+    <li class="bx-menu-main-submenu-div bx-def-padding-sec-left bx-def-padding-sec-right"><i class="sys-icon angle-right"></i></li>
     <bx_repeat:menu_items>
-        <li class="bx-def-padding-sec-right bx-def-padding-sec-left __class_add__"><a href="__link__" target="__target__" onclick="__onclick__">__title__</a></li>
+        <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover __class_add__"><a href="__link__" target="__target__" onclick="__onclick__">__title__</a></li>
     </bx_repeat:menu_items>
 </ul>
+<script language="javascript">
+    $(document).ready(function () {
+        // add default class to active menu items
+        $('.bx-menu-main-submenu > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
+    });
+</script>

template/scripts/BxBaseMenuSubmenu.php

@@ -51,6 +51,7 @@ class BxBaseMenuSubmenu extends BxTemplMenu
         $aVars = array (
             'object' => $this->_sObject,
             'title' => $aMenuItemSelected['title'],
+            'link' => $aMenuItemSelected['link'],
             'icon' => $aMenuItemSelected['icon'],
         );