diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 6b02af10cf..2062bf372a 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -302,6 +302,10 @@ $(document).ready( function() { $("ul#sub"+table_hover[0].id).hide(); if( typeof(table_hover2) != 'undefined') $("ul#sub"+table_hover2[0].id).hide(); + $('#menu').css('width', '45px'); + $('li.menu_icon').removeClass( " no_hidden_menu"); + $('ul.submenu').css('left', '44px'); + $('div#title_menu').hide(); }); $('div.menu>ul>li>ul>li>a').click(function(){ @@ -310,6 +314,10 @@ $(document).ready( function() { $("ul#sub"+table_hover[0].id).hide(); if( typeof(table_hover2) != 'undefined') $("ul#sub"+table_hover2[0].id).hide(); + $('#menu').css('width', '45px'); + $('li.menu_icon').removeClass( " no_hidden_menu"); + $('ul.submenu').css('left', '44px'); + $('div#title_menu').hide(); }); $('div.menu>ul>li>ul>li>ul>li>a').click(function(){ openTime = 4000; @@ -317,6 +325,10 @@ $(document).ready( function() { $("ul#sub"+table_hover[0].id).hide(); if( typeof(table_hover2) != 'undefined') $("ul#sub"+table_hover2[0].id).hide(); + $('#menu').css('width', '45px'); + $('li.menu_icon').removeClass( " no_hidden_menu"); + $('ul.submenu').css('left', '44px'); + $('div#title_menu').hide(); }); }); diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index e7cf61fc1d..1dfd0294fc 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -25,7 +25,7 @@ $menu_godmode = array (); $menu_godmode['class'] = 'godmode'; if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "AD")) { - $menu_godmode["gagente"]["text"] = __('Resource management'); + $menu_godmode["gagente"]["text"] = __('Resources'); $menu_godmode["gagente"]["sec2"] = "godmode/agentes/modificar_agente"; $menu_godmode["gagente"]["id"] = "god-agents"; @@ -67,7 +67,7 @@ if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, } if (check_acl ($config['id_user'], 0, "UM")) { - $menu_godmode["gusuarios"]["text"] = __('Profile management'); + $menu_godmode["gusuarios"]["text"] = __('Profiles'); $menu_godmode["gusuarios"]["sec2"] = "godmode/users/user_list"; $menu_godmode["gusuarios"]["id"] = "god-users"; @@ -84,7 +84,7 @@ if (check_acl ($config['id_user'], 0, "UM")) { } if (check_acl ($config['id_user'], 0, "PM")) { - $menu_godmode["gmodules"]["text"] = __('Configuration management'); + $menu_godmode["gmodules"]["text"] = __('Configuration'); $menu_godmode["gmodules"]["sec2"] = "godmode/modules/manage_network_templates"; $menu_godmode["gmodules"]["id"] = "god-modules"; @@ -121,7 +121,7 @@ if (check_acl ($config['id_user'], 0, "PM")) { } if (check_acl ($config['id_user'], 0, "LM") || check_acl ($config['id_user'], 0, "AD")) { - $menu_godmode["galertas"]["text"] = __('Manage alerts'); + $menu_godmode["galertas"]["text"] = __('Alerts'); $menu_godmode["galertas"]["sec2"] = "godmode/alerts/alert_list"; $menu_godmode["galertas"]["id"] = "god-alerts"; @@ -143,7 +143,7 @@ if (check_acl ($config['id_user'], 0, "LM") || check_acl ($config['id_user'], 0, if (check_acl ($config['id_user'], 0, "EW")) { // Manage events - $menu_godmode["geventos"]["text"] = __('Manage events'); + $menu_godmode["geventos"]["text"] = __('Events'); $menu_godmode["geventos"]["sec2"] = "godmode/events/events&section=filter"; $menu_godmode["geventos"]["id"] = "god-events"; @@ -161,7 +161,7 @@ if (check_acl ($config['id_user'], 0, "EW")) { if (check_acl ($config['id_user'], 0, "AW")) { // Servers - $menu_godmode["gservers"]["text"] = __('Manage servers'); + $menu_godmode["gservers"]["text"] = __('Servers'); $menu_godmode["gservers"]["sec2"] = "godmode/servers/modificar_server"; $menu_godmode["gservers"]["id"] = "god-servers"; @@ -241,11 +241,8 @@ if (check_acl ($config['id_user'], 0, "PM")) { $sub["godmode/admin_access_logs"]["text"] = __('System audit log'); $sub["godmode/setup/links"]["text"] = __('Links'); $sub["godmode/update_manager/update_manager"]["text"] = __('Update manager'); - $sub["extras/pandora_diag"]["text"] = __('Diagnostic info'); - $sub["godmode/setup/news"]["text"] = __('Site news'); - $sub["godmode/setup/file_manager"]["text"] = __('File manager'); $sub["gextmaneger"]["sub2"] = $sub2; - if (check_acl ($config['id_user'], 0, "DM")) {//meter en extensiones + if (check_acl ($config['id_user'], 0, "DM")) { $sub["gdbman"]["text"] = __('DB maintenance'); $sub["gdbman"]["type"] = "direct"; $sub["gdbman"]["subtype"] = "nolink"; @@ -258,6 +255,9 @@ if (check_acl ($config['id_user'], 0, "PM")) { $sub["gdbman"]["sub2"] = $sub2; } + $sub["extras/pandora_diag"]["text"] = __('Diagnostic info'); + $sub["godmode/setup/news"]["text"] = __('Site news'); + $sub["godmode/setup/file_manager"]["text"] = __('File manager'); $menu_godmode["gextensions"]["sub"] = $sub; } diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index bcc0825dd0..3313dc16cb 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -32,7 +32,8 @@ margin: 0; } .menu li.selected { - box-shadow: inset 4px 0 #00AF21; + box-shadow: inset 4px 0 #80BA27; + background-color: #585858 !important; } .menu li a { @@ -46,7 +47,6 @@ li:hover ul { display: block; } .submenu_text{ - background-repeat: no-repeat !important; padding: 11px; margin-left: 0px; color: #fff; @@ -62,7 +62,6 @@ li:hover ul { display: block; } border:0px; } .submenu { - font-family: Georgia,"Times New Roman","Bitstream Charter",Times,serif; margin: 0px 0px 0px 0px; position: absolute; z-index: 999; @@ -108,11 +107,11 @@ li:hover ul { display: block; } border-left: 1px; } .menu li.has_submenu > a > div { - background: url(../../images/arrow.png) no-repeat 90% 50% !important; + background: url(../../images/arrow.png) no-repeat 90% 50%; z-index: 1; /* Positions it on top of the rest */ } .menu li.has_submenu .flecha{ - background: url(../../images/arrow.png) no-repeat 90% 50% !important; + background: url(../../images/arrow.png) no-repeat 90% 50%; z-index: 1; /* Positions it on top of the rest */ } @@ -239,7 +238,6 @@ li:hover ul { display: block; } background-color: #AAA; } - ul { margin: 0; padding: 0; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index c7a0e38130..0e88ac4e68 100755 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -2196,7 +2196,16 @@ ul.operation li a:hover { } .menu_icon:hover{ - background-color: #585858; + background-color: #585858 !important; +} +.submenu_not_selected:hover{ + background-color: #585858 !important; +} +.submenu_selected:hover{ + background-color: #585858 !important; +} +.sub_subMenu:hover{ + background-color: #585858 !important; } /* ul.operation ul.submenu li a:hover { @@ -2254,17 +2263,12 @@ li.links a:hover { font-weight: bold; } -.operation.ul, ul.operation .operation ul { - background-color: #373737 !important; -} - -.menu ul { - background-color: #555 !important; +.operation { + background-color: #333 !important; } .menu li, .menu .li.not_selected { border-radius: 0px 0px 0px 0px; - background-color: #373737 !important; display: block; min-height: 35px; border-bottom: 0px none #424242; @@ -2870,15 +2874,14 @@ table#policy_modules td * { float: right; width: 70%; letter-spacing: 0pt; - font-size: 7pt; + font-size: 8pt; white-space: pre-wrap; } .no_hidden_menu{ - background-position: 12% 50% !important; + background-position: 11% 50% !important; } - #menu_tab li.nomn, #menu_tab li.nomn_high { background-color: #ECECEC; padding-right: 3px; @@ -2911,6 +2914,13 @@ table#policy_modules td * { padding: 10px; } +.godmode, .menu_icon ul li{ + background-color: #222; +} +.operation .menu_icon ul li{ + background-color: #333; +} + .godmode{ border-top: 4px solid !important; } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 0e74d2c5e8..690763c49d 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -255,13 +255,13 @@ if (check_acl ($config['id_user'], 0, "RR")) { // Events reading if (check_acl ($config['id_user'], 0, "ER")) { // Events - $menu_operation["eventos"]["text"] = __('View events'); + $menu_operation["eventos"]["text"] = __('Events'); $menu_operation["eventos"]["refr"] = 0; $menu_operation["eventos"]["sec2"] = "operation/events/events"; $menu_operation["eventos"]["id"] = "oper-events"; $sub = array (); - $sub["operation/events/events"]["text"] = __('Events'); + $sub["operation/events/events"]["text"] = __('View events'); $sub["operation/events/event_statistics"]["text"] = __('Statistics'); //RSS