diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 391c4ad066..fb89e53fe4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2014-08-04 Alejandro Gallardo + + * general/main_menu.php: Now the submenus opened by the + user remain opened when navigating through Pandora FMS. + 2014-08-04 Miguel de Dios * include/config_process.php: added global config var for the diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 73130c5e20..210fad0855 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -63,11 +63,39 @@ ui_require_jquery_file ('cookie'); var autohidden_menu = ; +var menuState = $.cookie(btoa('pandora_menu_state')); +if (!menuState) { + menuState = {}; +} +else { + menuState = JSON.parse(menuState); + $.each(menuState, function (index, value) { + if (value) + $('div.menu>ul>li#' + index + '>ul').show(); + }); +} + $(document).ready( function() { - $("img.toggle").click (function () { - $(this).siblings ("ul").toggle (); + $("img.toggle").click (function (e) { //In case the links gets activated, we don't want to follow link - return false; + e.preventDefault(); + + var menuItem = $(this).parent(); + var submenu = menuItem.children("ul"); + + if (submenu.is(":visible")) { + submenu.slideUp(); + + if (typeof menuState[menuItem.attr('id')] != 'undefined') + delete menuState[menuItem.attr('id')]; + } + else { + submenu.slideDown(); + + menuState[menuItem.attr('id')] = 1; + } + + $.cookie(btoa('pandora_menu_state'), JSON.stringify(menuState), {expires: 7}); }); $('#menu_container').hover (handlerIn, handlerOut); @@ -107,7 +135,7 @@ $(document).ready( function() { function show_menu_pretty() { $('div.menu ul li').css('background-position', ''); - $('ul.submenu li a, li.menu_icon a, li.links a').css('visibility', ''); + $('ul.submenu li a, li.menu_icon a, li.links a, div.menu>ul>li>img.toggle').show(); $('.titop').css('color', 'white'); $('.bg3').css('color', 'white'); $('.bg4').css('color', 'white'); @@ -120,7 +148,7 @@ $(document).ready( function() { function hide_menu_pretty() { $('div.menu li').css('background-position', '140px 3px'); - $('ul.submenu li a, li.menu_icon a, li.links a').css('visibility', 'hidden'); + $('ul.submenu li a, li.menu_icon a, li.links a, div.menu>ul>li>img.toggle').hide(); $('.titop').css('color', $('.titop').css('background-color')); $('.bg3').css('color', $('.bg3').css('background-color')); $('.bg4').css('color', $('.bg4').css('background-color'));