diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 0bf8ad17f4..f6e9c112a1 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -16,12 +16,20 @@ require_once 'include/functions_notifications.php'; // Check permissions // Global errors/warnings checking. -// config_check(); + config_check(); ?>
'.notifications_print_ball( + $notifications_numbers['notifications'], + $notifications_numbers['last_id'] + ).'
'; + + // ======= Alerts =============================================== $check_minor_release_available = false; $pandora_management = check_acl($config['id_user'], 0, 'PM'); @@ -38,9 +46,10 @@ require_once 'include/functions_notifications.php'; } } - echo ''; + /* + echo ''; - if ($config['alert_cnt'] > 0) { + if ($config['alert_cnt'] > 0) { $maintenance_link = 'javascript:'; $maintenance_title = __('System alerts detected - Please fix as soon as possible'); $maintenance_class = $maintenance_id = 'show_systemalert_dialog white'; @@ -64,26 +73,27 @@ require_once 'include/functions_notifications.php'; ] ).'

'.$config['alert_cnt'].'

'.$maintenance_link_close; } - } else { + } else { if (!$pandora_management) { $maintenance_img = ''; } else { $maintenance_img = html_print_image('images/header_ready_gray.png', true, ['title' => __('There are not warnings'), 'id' => 'yougotalert', 'class' => 'bot']); } - } - - $header_alert = '
'.$maintenance_img.'
'; + } + $header_alert = '
'.$maintenance_img.'
'; + */ // Messages - $msg_cnt = messages_get_count($config['id_user']); - if ($msg_cnt > 0) { + /* + $msg_cnt = messages_get_count($config['id_user']); + if ($msg_cnt > 0) { echo ''; $header_message = '
'; $header_message .= html_print_image('images/header_email.png', true, ['title' => __('You have %d unread message(s)', $msg_cnt), 'id' => 'yougotmail', 'class' => 'bot', 'style' => 'width:24px;']); $header_message .= '

'.$msg_cnt.'

'; - } + }*/ // Chat messages @@ -158,28 +168,29 @@ require_once 'include/functions_notifications.php'; // Servers check - $servers = []; - $servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver'); - $servers['up'] = (int) servers_check_status(); - $servers['down'] = ($servers['all'] - $servers['up']); - if ($servers['up'] == 0) { + /* + $servers = []; + $servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver'); + $servers['up'] = (int) servers_check_status(); + $servers['down'] = ($servers['all'] - $servers['up']); + if ($servers['up'] == 0) { // All Servers down or no servers at all $servers_check_img = html_print_image('images/header_down_gray.png', true, ['alt' => 'cross', 'class' => 'bot', 'title' => __('All systems').': '.__('Down')]); - } else if ($servers['down'] != 0) { + } else if ($servers['down'] != 0) { // Some servers down $servers_check_img = html_print_image('images/header_warning_gray.png', true, ['alt' => 'error', 'class' => 'bot', 'title' => $servers['down'].' '.__('servers down')]); - } else { + } else { // All servers up $servers_check_img = html_print_image('images/header_ready_gray.png', true, ['alt' => 'ok', 'class' => 'bot', 'title' => __('All systems').': '.__('Ready')]); - } + } - unset($servers); - // Since this is the header, we don't like to trickle down variables. - $servers_link_open = ''; - $servers_link_close = ''; - - $header_server = '
'.$servers_link_open.$servers_check_img.$servers_link_close.'
'; + unset($servers); + // Since this is the header, we don't like to trickle down variables. + $servers_link_open = ''; + $servers_link_close = ''; + $header_server = '
'.$servers_link_open.$servers_check_img.$servers_link_close.'
'; + */ // Main help icon if (!$config['disable_help']) { @@ -313,8 +324,8 @@ require_once 'include/functions_notifications.php'; $header_logout .= '
'; - // echo '
'.$header_alert, $header_message, $header_chat.'
'.$header_searchbar, $header_clippy, $header_help, $header_server, $header_autorefresh, $header_autorefresh_counter, $header_qr.'
'.$header_user, $header_logout.'
'; - echo '
'.$header_chat.'
'.$header_searchbar, $header_clippy, $header_help, $header_autorefresh, $header_autorefresh_counter, $header_qr.'
'.$header_user, $header_logout.'
'; + // echo '
'.$header_discovery, $header_alert, $header_message, $header_chat.'
'.$header_searchbar, $header_clippy, $header_help, $header_server, $header_autorefresh, $header_autorefresh_counter, $header_qr.'
'.$header_user, $header_logout.'
'; + echo '
'.$header_autorefresh, $header_autorefresh_counter, $header_qr, $header_chat.'
'.$header_searchbar, $header_discovery.'
'.$header_user, $header_logout.'
'; ?> @@ -600,12 +611,6 @@ require_once 'include/functions_notifications.php'; $("#agent_access").css("display",""); }); - /* function blinkmail(){ - //$("#yougotmail").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkmail); - } - function blinkalert(){ - $("#yougotalert").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkalert); - }*/ function blinkpubli(){ $(".publienterprise").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkpubli); } diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index d0e2070583..21c9713a48 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -80,7 +80,7 @@ if (!empty($all_data)) { $data['server_sanity'] = format_numeric((100 - $data['module_sanity']), 1); } ?> - +
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index d20ce9335e..d8a03bc59d 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -19,39 +19,14 @@ if (! isset($config['id_user'])) { ?> '; - echo '
'; if (isset($config['custom_logo'])) { - echo html_print_image('images/custom_logo/'.$config['custom_logo'], true, ['border' => '0', 'width' => '215', 'alt' => 'Logo', 'class' => 'logo_full']); + echo html_print_image('images/custom_logo/'.$config['custom_logo'], true, ['border' => '0', 'width' => '215', 'alt' => 'Logo', 'class' => 'logo_full', 'style' => 'display:none']); } if (isset($config['custom_logo_collapsed'])) { - echo html_print_image('images/custom_logo/'.$config['custom_logo_collapsed'], true, ['border' => '0', 'width' => '60', 'alt' => 'Logo', 'class' => 'logo_icon']); + echo html_print_image('images/custom_logo/'.$config['custom_logo_collapsed'], true, ['border' => '0', 'width' => '60', 'alt' => 'Logo', 'class' => 'logo_icon', 'style' => 'display:block']); } echo '
'; @@ -155,23 +102,17 @@ if (check_acl($config['id_user'], 0, 'AW') require 'godmode/menu.php'; echo '
'; -echo ''; -echo ''; -/* - echo '
'; - html_print_input_hidden('button_collapse', 1); - echo '
'; -*/ + // require ("links_menu.php"); echo ''; // menu_container ui_require_jquery_file('cookie'); - -$config_fixed_menu = false; -if (isset($config['fixed_menu'])) { +/* + $config_fixed_menu = false; + if (isset($config['fixed_menu'])) { $config_fixed_menu = $config['fixed_menu']; -} +}*/ $config_fixed_header = false; if (isset($config['fixed_header'])) { @@ -184,34 +125,20 @@ if (isset($config['fixed_header'])) { -//var classic_menu; -//$(document).ready(function(){ +//var classic_menu; $('#button_collapse').on('click', function() { - -/* - var elem = document.getElementById('button_collapse'); -elem.className = elem.className.replace('button_collapse', 'cambiar'); -*/ if($('#menu_full').hasClass('menu_full_classic')){ localStorage.setItem("menuType", "collapsed"); - //$('#button_collapse').css('color','pink'); - document.getElementById("menu_type").innerHTML = localStorage.menuType; - $('ul.submenu').css('left', '59px');//hacer que esto se haga aqui - $('#top_btn').css('left', '0px'); + $('ul.submenu').css('left', '59px'); } else if($('#menu_full').hasClass('menu_full_collapsed')){ localStorage.setItem("menuType", "classic"); - //$('#button_collapse').css('color','blue'); - document.getElementById("menu_type").innerHTML = localStorage.menuType; - $('ul.submenu').css('left', '214px');//hacer que esto se haga aqui - $('#top_btn').css('left', '77.5px'); + $('ul.submenu').css('left', '214px'); } else{ console.log('else'); } - /* $('.logo_full').toggleClass("logo_show logo_hide"); - $('.logo_icon').toggleClass('logo_hide logo_show');*/ $('.logo_full').toggle(); $('.logo_icon').toggle(); $('#menu_full').toggleClass('menu_full_classic menu_full_collapsed'); @@ -222,53 +149,31 @@ elem.className = elem.className.replace('button_collapse', 'cambiar'); $('li.menu_icon').toggleClass("no_hidden_menu menu_icon_collapsed"); - - console.log('entra click'); - console.log(localStorage.menuType); -/* -if ($('#button_collapse').text() == 'classic') { - classic_menu = true; -} -else { - classic_menu = false; -} -console.log('aqui comprueba click, y si el menu no ha cambiado, no deberia recargar todo'); -console.log(classic_menu); -*/ - + console.log('entra click: '+localStorage.menuType); }); -//}); var autohidden_menu = ; -var fixed_menu = ; +//var fixed_menu = + +; var fixed_header = ; var id_user = ""; var cookie_name = id_user + '-pandora_menu_state'; var cookie_name_encoded = btoa(cookie_name); var click_display = ""; -//var classic_menu = parseInt(""); +//var classic_menu = parseInt(" + +"); + -//if ((isNaN(classic_menu)) || (classic_menu == 0)) { -//f(localStorage.menuType == 'classic'){ -/* -if ($('#button_collapse').text() == 'classic') { - classic_menu = true; -} -else { - classic_menu = false; -} -console.log('aqui comprueba si es classic_menu'); -console.log(classic_menu); -*/ -/* -if (classic_menu) { - autohidden_menu = 1; -} -*/ var menuState = $.cookie(cookie_name_encoded); if (!menuState) { @@ -295,175 +200,7 @@ function close_submenus () { $('div.menu>ul>li.selected>ul').addClass('invisible'); } -$(document).ready( function() { -// repeticion de if - -var classic_menu; -if ($('#menu_type').text() == 'classic') { - classic_menu = true; - -} -else { - classic_menu = false; - -} - - - -console.log('aqui comprueba repeticion '); -console.log(classic_menu); -// fin repeticion de if - - - //Daniel maya 02/06/2016 Fixed menu position--INI - /* if (fixed_menu) { - $('div#menu') - .css('position', 'fixed') - .css('z-index', '9000') - .css('top','80px') - }else{ - $('div#menu') - .css('z-index', '9000') - } - if (fixed_header) { - $('div#menu') - .css('position', 'fixed') - .css('z-index', '9000') - .css('top','80px') - $('#menu_tab_frame_view').css('margin-top','20px') - }*/ - - //console.log(click_display); - - // if (autohidden_menu) { - handsInMenu = 0; - openTimeMenu = 0; - if (classic_menu) { - //$('div#title_menu').show(); - handsInMenu = 1; - openTimeMenu = new Date().getTime(); - /*$('#menu').css('width', '145px'); - $('#menu').css('position', 'block'); - $('div#menu').css('top', '80px'); - $('li.menu_icon').removeClass('menu_icon_collapsed').addClass("no_hidden_menu");*/ - /*$('ul.submenu').css('left', '214px');*/ - /* $('#menu_full').css('width','215px'); - $('.button_collapse').css('width','215px'); - $('div#page').addClass('page_classic'); - $('#header_table').addClass('header_table_classic'); */ - console.log('a (es clasico)'); - /*$('#menu').mouseleave(function() { - handsInMenu = 0; - setTimeout(function() { - openedMenu = new Date().getTime() - openTimeMenu; - if(openedMenu > 1000 && handsInMenu == 0) { - /* $('#menu').css('width', '145px'); - $('#menu').css('position', 'block');*/ - /* console.log('a'); - console.log(classic_menu); - /* $('li.menu_icon').removeClass('menu_icon_collapsed').addClass("no_hidden_menu");*/ - /* $('ul.submenu').css('left', '214px'); - /* $('#menu_full').css('width','215px'); - $('.button_collapse').css('width','215px'); - $('div#page').addClass('page_classic'); - $('#header_table').addClass('header_table_classic');*/ - /* } - }, 2500); - });*/ - } - else { - //NO ES CLASSIC MENU - if(!click_display){ - $('#menu').mouseenter(function() { - // $('div#title_menu').show(); - handsInMenu = 1; - openTimeMenu = new Date().getTime(); - /*$('#menu').css('width', '145px');*/ - console.log('b (collapsed)'); - /* $('li.menu_icon').removeClass('menu_icon_collapsed').addClass("no_hidden_menu");*/ - $('li.menu_icon').find('li').addClass("no_hidden_menu"); - /*$('ul.submenu').css('left', '214px');*/ - /*$('#menu_full').css('width','215px'); - $('.button_collapse').css('width','215px'); - $('div#page').addClass('page_classic'); - $('#header_table').addClass('header_table_classic'); */ - }).mouseleave(function() { - handsInMenu = 0; - setTimeout(function() { - openedMenu = new Date().getTime() - openTimeMenu; - if(openedMenu > 1000 && handsInMenu == 0) { - console.log('c (collapsed)'); - /* $('#menu').css('width', '45px'); - $('li.menu_icon').removeClass("no_hidden_menu").addClass('menu_icon_collapsed');*/ - $('li.menu_icon').find('li').removeClass( " no_hidden_menu" ); - /* $('ul.submenu').css('left', '44px');*/ - //$('div#title_menu').hide(); - } - }, 2500); - }); - }else{ - $(document).ready(function() { - $('#menu').on("click", function() { - //$('div#title_menu').show(); - handsInMenu = 1; - openTimeMenu = new Date().getTime(); - /* $('#menu').css('width', '145px');*/ - console.log('d (collapsed)'); - /* $('li.menu_icon').removeClass('menu_icon_collapsed').addClass("no_hidden_menu");*/ - $('li.menu_icon').find('li').addClass("no_hidden_menu"); - /* $('ul.submenu').css('left', '44px');*/ - /* $('#menu_full').css('width','215px'); - $('.button_collapse').css('width','215px'); - $('div#page').addClass('page_classic'); - $('#header_table').addClass('header_table_classic'); */ - }) - .mouseleave(function() { - handsInMenu = 0; - setTimeout(function() { - openedMenu = new Date().getTime() - openTimeMenu; - if(openedMenu > 1000 && handsInMenu == 0) { - console.log('e (collapsed)'); - /* $('#menu').css('width', '45px'); - $('li.menu_icon').removeClass("no_hidden_menu").addClass('menu_icon_collapsed');*/ - $('li.menu_icon').find('li').removeClass( " no_hidden_menu" ); - /* $('ul.submenu').css('left', '44px');*/ - //$('div#title_menu').hide(); - } - }, 5500); - }); - }); - } - } - /* } - else { - $('div#title_menu').hide(); - if(!click_display){ - $('#menu').mouseenter(function() { - handsInMenu = 1; - openTimeMenu = new Date().getTime(); - $('ul.submenu').css('left', '44px'); - }).mouseleave(function() { - handsInMenu = 0; - setTimeout(function() { - openedMenu = new Date().getTime() - openTimeMenu; - if(openedMenu > 1000 && handsInMenu == 0) { - console.log('f'); - $('li.menu_icon').removeClass("no_hidden_menu").addClass('menu_icon_collapsed'); - $('li.menu_icon').find('li').removeClass( " no_hidden_menu" ); - $('ul.submenu').css('left', '44px'); - } - }, 2500); - }); - } - } - } - } - } - } - } - }*/ -}); /* ]]> */ @@ -551,122 +288,49 @@ console.log(classic_menu); $(document).ready(function() { - - // if (!classic_menu) { - //Daniel maya 02/06/2016 Display menu with click --INI - if(!click_display){ - $('#container').click(function() { - openTime = 4000; - if( typeof(table_hover) != 'undefined') - $("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").addClass('menu_icon_collapsed'); - $('ul.submenu').css('left', '44px');*/ - //$('div#title_menu').hide(); - console.log('m (collapsed)'); - }); - }else{ - $('#main').click(function() { - openTime = 4000; - if( typeof(table_hover) != 'undefined') - $("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").addClass('menu_icon_collapsed'); - $('ul.submenu').css('left', '44px');*/ - // $('div#title_menu').hide(); - console.log('n (collapsed)'); - }); - } - //Daniel maya 02/06/2016 Display menu with click --END - /* } - else { - if(!click_display){ - $('#container').click(function() { - openTime = 4000; - if( typeof(table_hover) != 'undefined') - $("ul#sub"+table_hover[0].id).hide(); - if( typeof(table_hover2) != 'undefined') - $("ul#sub"+table_hover2[0].id).hide(); - /*$('#menu').css('width', '145px');*/ - /* $('ul.submenu').css('left', '214px'); - $('#menu_full').css('width','215px'); - $('.button_collapse').css('width','215px'); - $('div#page').addClass('page_classic'); - $('#header_table').addClass('header_table_classic'); */ - /* console.log('o (es clasico)'); - }); - }else{ - $('#main').click(function() { - openTime = 4000; - if( typeof(table_hover) != 'undefined') - $("ul#sub"+table_hover[0].id).hide(); - if( typeof(table_hover2) != 'undefined') - $("ul#sub"+table_hover2[0].id).hide(); - /*$('#menu').css('width', '145px');*/ - /* $('ul.submenu').css('left', '214px'); - $('#menu_full').css('width','215px'); - $('.button_collapse').css('width','215px'); - $('div#page').addClass('page_classic'); - $('#header_table').addClass('header_table_classic'); */ - /* console.log('p (es clasico)'); - }); - } - }*/ - - // if (classic_menu) { - $('div.menu>ul>li>ul>li>a').click(function() { + if(!click_display){ + $('#container').click(function() { openTime = 4000; if( typeof(table_hover) != 'undefined') $("ul#sub"+table_hover[0].id).hide(); if( typeof(table_hover2) != 'undefined') $("ul#sub"+table_hover2[0].id).hide(); - /* $('ul.submenu').css('left', '214px');*/ - console.log('q (es clasico)'); - }); + + console.log('m'); // cuando no es de click, pero pinchas (dentro o fuera) (¿sirve de algo?) + }); + }else{ + $('#main').click(function() { + openTime = 4000; + if( typeof(table_hover) != 'undefined') + $("ul#sub"+table_hover[0].id).hide(); + if( typeof(table_hover2) != 'undefined') + $("ul#sub"+table_hover2[0].id).hide(); + + console.log('n'); //al pinchar fuera (es de click) + }); + } + + + $('div.menu>ul>li>ul>li>a').click(function() { + openTime = 4000; + if( typeof(table_hover) != 'undefined') + $("ul#sub"+table_hover[0].id).hide(); + if( typeof(table_hover2) != 'undefined') + $("ul#sub"+table_hover2[0].id).hide(); - $('div.menu>ul>li>ul>li>ul>li>a').click(function() { - openTime = 4000; - if( typeof(table_hover) != 'undefined') - $("ul#sub"+table_hover[0].id).hide(); - if( typeof(table_hover2) != 'undefined') - $("ul#sub"+table_hover2[0].id).hide(); - /*$('ul.submenu').css('left', '214px');*/ - console.log('r (es clasico)'); - }); - /* } - else { - $('div.menu>ul>li>ul>li>a').click(function() { - openTime = 4000; - if( typeof(table_hover) != 'undefined') - $("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").addClass('menu_icon_collapsed'); - $('ul.submenu').css('left', '44px');*/ - //$('div#title_menu').hide(); - /* console.log('s (no es clasico)'); - }); - - $('div.menu>ul>li>ul>li>ul>li>a').click(function() { - openTime = 4000; - if( typeof(table_hover) != 'undefined') - $("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").addClass('menu_icon_collapsed'); - $('ul.submenu').css('left', '44px');*/ - // $('div#title_menu').hide(); - /* console.log('t (no es clasico)'); - }); - }*/ + console.log('q'); //al pinchar en un enlace de un submenu + }); + + $('div.menu>ul>li>ul>li>ul>li>a').click(function() { + openTime = 4000; + if( typeof(table_hover) != 'undefined') + $("ul#sub"+table_hover[0].id).hide(); + if( typeof(table_hover2) != 'undefined') + $("ul#sub"+table_hover2[0].id).hide(); + + console.log('r'); //al pinchar en un enlace de un sub-submenu + }); + }); - - diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 6aeab7bd8b..e74844585f 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -120,15 +120,16 @@ if (enterprise_installed()) { $row++; } -$table_behaviour->data[$row][0] = __('Classic menu mode').ui_print_help_tip(__('Text menu options always visible, don\'t hide'), true); -$table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch( +/* + $table_behaviour->data[$row][0] = __('Classic menu mode').ui_print_help_tip(__('Text menu options always visible, don\'t hide'), true); + $table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch( 'classic_menu', 1, $config['classic_menu'], true -); -$row++; - + ); + $row++; +*/ echo '
'; echo ''.__('Behaviour configuration').''; html_print_table($table_behaviour); @@ -543,16 +544,16 @@ $table_styles->data[$row][1] = html_print_checkbox_toogle_switch( true ); $row++; - -$table_styles->data[$row][0] = __('Fixed menu'); -$table_styles->data[$row][1] = html_print_checkbox_toogle_switch( +/* + $table_styles->data[$row][0] = __('Fixed menu'); + $table_styles->data[$row][1] = html_print_checkbox_toogle_switch( 'fixed_menu', 1, $config['fixed_menu'], true -); -$row++; - + ); + $row++; +*/ // For 5.1 Autohidden menu feature $table_styles->data['autohidden'][0] = __('Autohidden menu'); $table_styles->data['autohidden'][1] = html_print_checkbox_toogle_switch( diff --git a/pandora_console/images/builder.menu_gray.png b/pandora_console/images/builder.menu_gray.png index 9c3b0b6ff3..bee9c472ba 100644 Binary files a/pandora_console/images/builder.menu_gray.png and b/pandora_console/images/builder.menu_gray.png differ diff --git a/pandora_console/images/button_classic_menu.png b/pandora_console/images/button_classic_menu.png index edbe81cd69..c84ab30c21 100644 Binary files a/pandora_console/images/button_classic_menu.png and b/pandora_console/images/button_classic_menu.png differ diff --git a/pandora_console/images/button_collapse_menu.png b/pandora_console/images/button_collapse_menu.png index d3a5112439..17b91bab38 100644 Binary files a/pandora_console/images/button_collapse_menu.png and b/pandora_console/images/button_collapse_menu.png differ diff --git a/pandora_console/images/custom_logo/pandora_logo_head_green.png b/pandora_console/images/custom_logo/pandora_logo_head_green.png index a0f4e1deac..f2c8b2ca44 100644 Binary files a/pandora_console/images/custom_logo/pandora_logo_head_green.png and b/pandora_console/images/custom_logo/pandora_logo_head_green.png differ diff --git a/pandora_console/images/extensions.menu_gray.png b/pandora_console/images/extensions.menu_gray.png index 173ee9e195..7e7c768645 100644 Binary files a/pandora_console/images/extensions.menu_gray.png and b/pandora_console/images/extensions.menu_gray.png differ diff --git a/pandora_console/images/gm_alerts.menu_gray.png b/pandora_console/images/gm_alerts.menu_gray.png index 39c96d566e..fb8decf7fc 100644 Binary files a/pandora_console/images/gm_alerts.menu_gray.png and b/pandora_console/images/gm_alerts.menu_gray.png differ diff --git a/pandora_console/images/gm_configuration.menu_gray.png b/pandora_console/images/gm_configuration.menu_gray.png index f791bed3e2..1d69e0f85b 100644 Binary files a/pandora_console/images/gm_configuration.menu_gray.png and b/pandora_console/images/gm_configuration.menu_gray.png differ diff --git a/pandora_console/images/gm_discovery.menu.png b/pandora_console/images/gm_discovery.menu.png index 0f396c08c6..65fcf321e4 100644 Binary files a/pandora_console/images/gm_discovery.menu.png and b/pandora_console/images/gm_discovery.menu.png differ diff --git a/pandora_console/images/gm_events.menu_gray.png b/pandora_console/images/gm_events.menu_gray.png index aee937f912..09bcd60c8f 100644 Binary files a/pandora_console/images/gm_events.menu_gray.png and b/pandora_console/images/gm_events.menu_gray.png differ diff --git a/pandora_console/images/gm_resources.menu_gray.png b/pandora_console/images/gm_resources.menu_gray.png index 7733a069d1..7915645c47 100644 Binary files a/pandora_console/images/gm_resources.menu_gray.png and b/pandora_console/images/gm_resources.menu_gray.png differ diff --git a/pandora_console/images/gm_servers.menu_gray.png b/pandora_console/images/gm_servers.menu_gray.png index b4df2425e4..c32c8e06c2 100644 Binary files a/pandora_console/images/gm_servers.menu_gray.png and b/pandora_console/images/gm_servers.menu_gray.png differ diff --git a/pandora_console/images/gm_setup.menu_gray.png b/pandora_console/images/gm_setup.menu_gray.png index 339fb5684f..14e6cf1031 100644 Binary files a/pandora_console/images/gm_setup.menu_gray.png and b/pandora_console/images/gm_setup.menu_gray.png differ diff --git a/pandora_console/images/gm_users.menu_gray.png b/pandora_console/images/gm_users.menu_gray.png index a0bd6a2d21..94261dcdbc 100644 Binary files a/pandora_console/images/gm_users.menu_gray.png and b/pandora_console/images/gm_users.menu_gray.png differ diff --git a/pandora_console/images/header_user_admin_green.png b/pandora_console/images/header_user_admin_green.png index 82a225f790..5179d6b263 100644 Binary files a/pandora_console/images/header_user_admin_green.png and b/pandora_console/images/header_user_admin_green.png differ diff --git a/pandora_console/images/links.menu_gray.png b/pandora_console/images/links.menu_gray.png index c390e9a268..7520e0f056 100644 Binary files a/pandora_console/images/links.menu_gray.png and b/pandora_console/images/links.menu_gray.png differ diff --git a/pandora_console/images/op_events.menu_gray.png b/pandora_console/images/op_events.menu_gray.png index 4073f154b0..84ab4bebf2 100644 Binary files a/pandora_console/images/op_events.menu_gray.png and b/pandora_console/images/op_events.menu_gray.png differ diff --git a/pandora_console/images/op_monitoring.menu_gray.png b/pandora_console/images/op_monitoring.menu_gray.png index 3d1bc0e007..5456d64b1d 100644 Binary files a/pandora_console/images/op_monitoring.menu_gray.png and b/pandora_console/images/op_monitoring.menu_gray.png differ diff --git a/pandora_console/images/op_network.menu_gray.png b/pandora_console/images/op_network.menu_gray.png index 62d9a30161..4d76055f8a 100644 Binary files a/pandora_console/images/op_network.menu_gray.png and b/pandora_console/images/op_network.menu_gray.png differ diff --git a/pandora_console/images/op_reporting.menu_gray.png b/pandora_console/images/op_reporting.menu_gray.png index b568d4c1b2..3e99cf9064 100644 Binary files a/pandora_console/images/op_reporting.menu_gray.png and b/pandora_console/images/op_reporting.menu_gray.png differ diff --git a/pandora_console/images/op_workspace.menu_gray.png b/pandora_console/images/op_workspace.menu_gray.png index 13d2f5d2cd..4689daeaed 100644 Binary files a/pandora_console/images/op_workspace.menu_gray.png and b/pandora_console/images/op_workspace.menu_gray.png differ diff --git a/pandora_console/images/to_top_menu_hover.png b/pandora_console/images/to_top_menu_hover.png new file mode 100644 index 0000000000..4f6d3b852f Binary files /dev/null and b/pandora_console/images/to_top_menu_hover.png differ diff --git a/pandora_console/images/um_messages.menu_gray.png b/pandora_console/images/um_messages.menu_gray.png index 955957ff1f..b76bf8d6b4 100644 Binary files a/pandora_console/images/um_messages.menu_gray.png and b/pandora_console/images/um_messages.menu_gray.png differ diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index efb08fc02d..6c54271b70 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -1032,9 +1032,10 @@ function config_update_config() $error_update[] = __('Fixed header'); } - if (!config_update_value('fixed_menu', get_parameter('fixed_menu'))) { + /* + if (!config_update_value('fixed_menu', get_parameter('fixed_menu'))) { $error_update[] = __('Fixed menu'); - } + }*/ if (!config_update_value('paginate_module', get_parameter('paginate_module'))) { $error_update[] = __('Paginate module'); @@ -1116,9 +1117,10 @@ function config_update_config() $error_update[] = __('Default height of the chart image'); } - if (!config_update_value('classic_menu', (bool) get_parameter('classic_menu', false))) { + /* + if (!config_update_value('classic_menu', (bool) get_parameter('classic_menu', false))) { $error_update[] = __('Classic menu mode'); - } + }*/ // -------------------------------------------------- // CUSTOM VALUES POST PROCESS @@ -1791,9 +1793,10 @@ function config_process_config() config_update_value('fixed_graph', false); } - if (!isset($config['fixed_menu'])) { + /* + if (!isset($config['fixed_menu'])) { config_update_value('fixed_menu', false); - } + }*/ if (!isset($config['custom_favicon'])) { config_update_value('custom_favicon', ''); @@ -2515,9 +2518,10 @@ function config_process_config() } } - if (!isset($config['classic_menu'])) { + /* + if (!isset($config['classic_menu'])) { config_update_value('classic_menu', 0); - } + }*/ if (!isset($config['csv_divider'])) { config_update_value('csv_divider', ';'); diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index d6384595a8..c0ae82b4ec 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -723,6 +723,28 @@ function menu_sec3_in_sec2($sec, $sec2, $sec3) // 35px is the height of a menu item function menu_calculate_top($level1, $level2, $level3=false) { + /* + if(menu verde ){ + $item_height = 28; + } + else{ + $item_height = 35; + } + */ + + // $(".menu li").css("min-height"); + // console.log( parseInt($("#icon_oper-agents").css("min-height"))); + /* + $item_height= ''; + */ + $item_height = 35; + + // echo ' '.$level1.' '.$level2.' '.$level3.' '; $level2--; if ($level3 !== false) { // If level3 is set, the position is calculated like box is in the center. @@ -737,12 +759,12 @@ function menu_calculate_top($level1, $level2, $level3=false) // Positionate in the middle if ($total > 12 && (($total < 18) || (($level1 - $comp) <= 4))) { - return - ( floor($comp / 2) * 39); + return - ( floor($comp / 2) * $item_height); } // Positionate in the bottom if ($total >= 18) { - return (- $comp * 39); + return (- $comp * $item_height); } // return 0 by default diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 63b9c3a0db..faa72fb288 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -16,16 +16,25 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +.operation li, +.godmode li { + display: flex !important; + justify-content: flex-start; + align-items: center; +} + +.operation > li.menu_icon.no_hidden_menu, +.godmode > li.menu_icon.no_hidden_menu { + justify-content: flex-end; +} + .operation .menu_icon ul.submenu > li, .godmode .menu_icon ul.submenu > li { background-color: #282828; + padding-left: 10px; + padding-right: 10px; } -.menu { - border-width: 0px 0px 0px 0px; - border-style: none; - border-color: #777; -} .menu ul { list-style-type: none; padding: 0; @@ -33,14 +42,15 @@ } .menu li.selected, .menu li.not_selected { - border: 0px none black; - border-bottom: 0px none #d4d4d4; + border: 0px none black; /* borrar?? */ + border-bottom: 0px none #d4d4d4; /* borrar?? */ margin: 0; } .menu li a { color: #ffffff; text-decoration: none; + width: 100%; } li:hover ul { @@ -48,16 +58,16 @@ li:hover ul { } .submenu_text { - padding: 10.5px; + /* padding: 10.5px; eee */ margin-left: 0px; width: 100%; - color: #91a2a7; + color: #9ca4a6; font-family: "Open Sans", sans-serif; - font-size: 10pt; + font-size: 9.4pt; } .menu li.subselected a { - background-color: grey !important; + background-color: grey !important; /* borrar?? */ } .menu a:hover { @@ -68,25 +78,23 @@ li:hover ul { margin: 0px 0px 0px 0px; position: absolute; z-index: 999; - /*left: 44px;*/ - min-height: 35px; - /*height: 35px;*/ - width: 180px; + width: 214px; } .submenu2 { position: absolute; z-index: 999; - left: 180px; + left: 214px; + width: 214px; } .sub_subMenu { - min-height: 35px !important; - /*height: 35px;*/ - width: 180px; font-weight: normal !important; background-color: #202020; + padding-left: 10px; + padding-right: 10px; } + .sub_subMenu.selected { font-weight: 600 !important; } @@ -103,17 +111,14 @@ li:hover ul { border-left: 1px; } -.menu li.has_submenu > a > div { - background: url(../../images/arrow.png) no-repeat 80% 50%; - z-index: 1; /* Positions it on top of the rest */ -} -.menu li.has_submenu > .SubNoLink { - background: url(../../images/arrow.png) no-repeat 80% 50%; +/*.menu li.has_submenu > a > div,*/ +.menu li.has_submenu /*> .SubNoLink*/ { + background: url(../../images/arrow.png) no-repeat 95% 50%; z-index: 1; /* Positions it on top of the rest */ } .is_submenu2 { - background-color: #e4e4e4 !important; + background-color: #e4e4e4 !important; /* borrar?? */ } .menu li.submenu_not_selected a, @@ -155,9 +160,9 @@ li.sub_subMenu.selected { background: url(../../images/op_network.menu_gray.png) no-repeat; } #icon_oper-agents { - border-top-right-radius: 5px; - border-right-style: solid; - border-right-width: 0px; + border-top-right-radius: 5px; /* borrar?? */ + border-right-style: solid; /* borrar?? */ + border-right-width: 0px; /* borrar?? */ background: url(../../images/op_monitoring.menu_gray.png) no-repeat; } #icon_oper-events { @@ -188,7 +193,7 @@ li.sub_subMenu.selected { /* Godmode images */ #icon_god-discovery { - background: url(../../images/gm_discovery.menu.png) no-repeat 50% 50%; + background: url(../../images/gm_discovery.menu.png) no-repeat; } #icon_god-resources { background: url(../../images/gm_resources.menu_gray.png) no-repeat; @@ -221,7 +226,7 @@ li.sub_subMenu.selected { background: url(../../images/links.menu_gray.png) no-repeat; } #icon_god-um_messages { - border-color: #777; + border-color: #777; /* borrar?? */ background: url(../../images/um_messages.menu_gray.png) no-repeat; } @@ -229,7 +234,7 @@ li.sub_subMenu.selected { z-index: 3; position: absolute; left: -80px; - background-color: #aaa; + background-color: #aaa; /* borrar?? */ } .notification_ball { @@ -286,7 +291,7 @@ ul li a:hover { */ .menu_icon { - transition-property: background-color; + /*transition-property: background-color; transition-duration: 0.5s; transition-timing-function: ease-out; -webkit-transition-property: background-color; @@ -297,11 +302,11 @@ ul li a:hover { -moz-transition-timing-function: ease-out; -o-transition-property: background-color; -o-transition-duration: 0.5s; - -o-transition-timing-function: ease-out; + -o-transition-timing-function: ease-out;*/ } .menu_icon:hover { - transition-property: background-color; + /*transition-property: background-color; transition-duration: 0.5s; transition-timing-function: ease-out; -webkit-transition-property: background-color; @@ -312,11 +317,11 @@ ul li a:hover { -moz-transition-timing-function: ease-out; -o-transition-property: background-color; -o-transition-duration: 0.5s; - -o-transition-timing-function: ease-out; + -o-transition-timing-function: ease-out;*/ background-color: #282828 !important; } .submenu_not_selected:hover { - transition-property: background-color; + /* transition-property: background-color; transition-duration: 0.5s; transition-timing-function: ease-out; -webkit-transition-property: background-color; @@ -327,14 +332,14 @@ ul li a:hover { -moz-transition-timing-function: ease-out; -o-transition-property: background-color; -o-transition-duration: 0.5s; - -o-transition-timing-function: ease-out; + -o-transition-timing-function: ease-out;*/ background-color: #202020 !important; } .submenu_selected:hover { background-color: #202020 !important; } .sub_subMenu { - transition-property: background-color; + /*transition-property: background-color; transition-duration: 0.5s; transition-timing-function: ease-out; -webkit-transition-property: background-color; @@ -344,10 +349,10 @@ ul li a:hover { -moz-transition-duration: 0.5s; -moz-transition-timing-function: ease-out; -o-transition-property: background-color; - -o-transition-duration: 0.5s; + -o-transition-duration: 0.5s;*/ } .sub_subMenu:hover { - transition-property: background-color; + /* transition-property: background-color; transition-duration: 0.5s; transition-timing-function: ease-out; -webkit-transition-property: background-color; @@ -357,7 +362,7 @@ ul li a:hover { -moz-transition-duration: 0.5s; -moz-transition-timing-function: ease-out; -o-transition-property: background-color; - -o-transition-duration: 0.5s; + -o-transition-duration: 0.5s;*/ background-color: #161616 !important; } @@ -375,9 +380,9 @@ ul li a:hover { */ .operation { background-color: #343434 !important; - border-top-right-radius: 5px; - border-right-style: solid; - border-right-width: 0px; + border-top-right-radius: 5px; /* borrar?? */ + border-right-style: solid; /* borrar?? */ + border-right-width: 0px; /* borrar?? */ padding-top: 20px !important; } @@ -393,12 +398,15 @@ ul li a:hover { } .menu li, -.menu .li.not_selected { - border-radius: 0px 0px 0px 0px; - display: block; +.menu li a, +.menu li div { min-height: 35px; - border-bottom: 0px none #424242; - vertical-align: middle; + display: flex; + align-items: center; +} + +.menu li div { + background-clip: text; /* Very important to fix a bug in Firefox */ } .godmode { @@ -465,14 +473,14 @@ ul li a:hover { left: 0; background-color: #343434; border-bottom: solid 3px #343434; - /*min-height: 943px;*/ - padding-bottom: 40px; /*Lo he quitado para que no ocupe todo el alto y fixed */ + min-height: 943px; + /*padding-bottom: 40px;*/ /*Lo he quitado para que no ocupe todo el alto y fixed */ /*overflow-x: hidden;*/ } .button_collapse { - height: 55px; - background-color: #4d4d4d; + height: 38px; + background-color: #6c6c6d; /*bottom: 0; /* Lo he quitado para que no ocupe todo el alto y fixed*/ /*position: fixed; /*coemntar tb*/ width: 60px; /* It is changed for classic menu (215px)*/ @@ -491,19 +499,6 @@ ul li a:hover { align-items: center; } -.operation > li.menu_icon.no_hidden_menu, -.godmode > li.menu_icon.no_hidden_menu { - display: flex; - justify-content: flex-end; - align-items: center; -} - -.operation > li.menu_icon, -.godmode > li.menu_icon { - padding-top: 2px; /* 3px */ - padding-bottom: 2px; -} - .operation div, .operation a, .godmode div, @@ -534,95 +529,57 @@ ul li a:hover { background-position: center; } -#top_btn { - display: none; - position: fixed; - bottom: 100px; - left: 0px; - border: none; - outline: none; - background: url("../../images/to_top_menu.png") no-repeat center; - background-color: #82b92e; - width: 60px; - height: 60px; - /* Estos borrarles despues xk sera img */ - color: white; - cursor: pointer; - font-size: 17px; - border-radius: 5px; -} - -#top_btn:hover { - background-color: #4d4d4d; - /* border: 2px solid #fff;*/ -} - -@media screen and (max-height: 600px) { - .operation > li.menu_icon, - .godmode > li.menu_icon { - padding-top: 1px; - padding-bottom: 1px; - } - .operation { - padding-top: 10px !important; - } - .button_collapse { - margin-top: 10px; - background-color: green; - } +@media screen and (max-height: 720px) { .menu li, - .menu .li.not_selected { - min-height: 25px !important; - } - .button_collapse { - height: 45px; - } - .submenu_text { - /* padding: 7.5px;*/ - } -} - -@media screen and (min-height: 601px) and (max-height: 700px) { - .operation > li.menu_icon, - .godmode > li.menu_icon { - padding-top: 1px; - padding-bottom: 2px; - } - .operation { - padding-top: 10px !important; - } - .button_collapse { - margin-top: 10px; - background-color: red; - } - .menu li, - .menu .li.not_selected { - min-height: 25px !important; - } - .button_collapse { - height: 48px; - } - .submenu_text { - /*padding: 7.5px;*/ - } -} - -@media screen and (min-height: 701px) and (max-height: 845px) { - .operation { - padding-top: 10px !important; - } - .button_collapse { - margin-top: 10px; - background-color: blue; - } - .menu li, - .menu .li.not_selected { + .menu li a, + .menu li div { min-height: 28px !important; } - .button_collapse { - height: 50px; +} +/* +Medidas menu: +601 verde y rojo +720 azul +735 normal +*/ +@media screen and (max-height: 735px) { + .operation { + padding-top: 10px !important; } - .submenu_text { - /*padding: 7.5px;*/ + .button_collapse { + margin-top: 10px; } } + +/* + * --------------------------------------------------------------------- + * - STYLES TO CHANGE CLASSIC MENU AND COLLAPSED MENU - + * --------------------------------------------------------------------- + */ +.page_classic { + padding-left: 215px !important; +} + +.page_collapsed { + padding-left: 60px !important; +} + +.header_table_classic { + padding-left: 250px !important; /* 215 + 35 */ +} + +.header_table_collapsed { + padding-left: 95px !important; /* 60 + 35 */ +} + +.title_menu_classic { + display: flex !important; +} + +.title_menu_collapsed { + display: none !important; +} + +.menu_icon_collapsed { + background-position: 50% 50% !important; +} diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 779deb39c7..70fb57a231 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -197,6 +197,9 @@ a:hover { color: #373737; text-decoration: underline; } +:focus { + outline-color: #82b92e; +} a:focus, input:focus, button:focus { @@ -403,8 +406,8 @@ div#page { width: auto; margin-top: 20px !important; padding-left: 60px; /* It is changed for classic menu (215px)*/ - margin-right: 30px; - margin-left: 30px; + margin-right: 35px; + margin-left: 35px; } body.pure { @@ -657,7 +660,7 @@ div#foot a, div#foot span { font-family: "Open Sans", sans-serif; font-size: 8.5pt; - color: #91a2a7; + color: #9ca4a6; } /* @@ -687,7 +690,7 @@ div#head { height: 60px; padding-top: 0px; margin: 0 auto; - border-bottom: 1px solid #91a2a7; + border-bottom: 1px solid #9ca4a6; min-width: 882px; background-color: #fff; color: #000; @@ -1317,7 +1320,7 @@ div.title_line { margin-top: 0; } -/* --- Submenu --- */ +/* --- Tabs Submenu --- */ ul.subsubmenu { border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; @@ -1325,12 +1328,10 @@ ul.subsubmenu { -moz-border-bottom-left-radius: 5px; -webkit-border-bottom-right-radius: 5px; -webkit-border-bottom-left-radius: 5px; - - background: #ececec !important; } ul.subsubmenu li { - background-color: #ececec; + background-color: #fff; font-weight: bold; text-decoration: none; font-size: 14px; @@ -2038,8 +2039,8 @@ div#pandora_logo_header { margin: 0px; padding: 0px; margin-top: 0px; - padding-left: 90px; /* It is changed for classic menu */ - padding-right: 30px; + padding-left: 95px; /* It is changed for classic menu */ + padding-right: 35px; } #header_table_inner { @@ -2143,13 +2144,6 @@ div#pandora_logo_header { font-family: "Open Sans", sans-serif; } -@media screen and (max-width: 1024px) { - #header_user span, - #header_searchbar a.tip img { - display: none; - } -} - .autorefresh_disabled { cursor: not-allowed !important; } @@ -2174,7 +2168,7 @@ div.warn { } .submenu_not_selected { - transition-property: background-color; + /*transition-property: background-color; transition-duration: 0.5s; transition-timing-function: ease-out; -webkit-transition-property: background-color; @@ -2186,7 +2180,7 @@ div.warn { -o-transition-property: background-color; -o-transition-duration: 0.5s; -o-transition-timing-function: ease-out; - font-weight: normal !important; + font-weight: normal !important;*/ } /* Submenus havent borders */ @@ -3303,7 +3297,7 @@ div.div_groups_status { } #title_menu { - color: #91a2a7; + color: #9ca4a6; float: right; width: 65%; letter-spacing: 0pt; @@ -3319,7 +3313,7 @@ div.div_groups_status { #menu_tab li.nomn, #menu_tab li.nomn_high { - /*background-color: #ececec;*/ + background-color: #fff; padding-right: 3px; padding-left: 3px; font-weight: bold; @@ -3331,6 +3325,10 @@ div.div_groups_status { height: 28px; } +#menu_tab li:hover { + background-color: #ececec; +} + #menu_tab li.nomn_high, #menu_tab li.nomn_high span { color: #fff; @@ -4445,10 +4443,10 @@ div#dialog_messages table th:last-child { */ .notification-ball { - border: white solid 2px; - border-radius: 50px; - width: 18px; - height: 18px; + border: #343434 solid 2px; + border-radius: 50%; + width: 20px; + height: 20px; display: flex; justify-content: center; align-items: center; @@ -4804,43 +4802,25 @@ input:checked + .p-slider:before { /* --- END TOAST --- */ -/* - * --------------------------------------------------------------------- - * - STYLES TO CHANGE CLASSIC MENU AND COLLAPSED MENU - - * --------------------------------------------------------------------- - */ -.page_classic { - padding-left: 215px !important; +/* Button for Go to top */ +#top_btn { + display: none; + position: fixed; + bottom: 100px; + right: 4px; + border: none; + outline: none; + background: url("../../images/to_top_menu.png") no-repeat center; + background-color: #82b92e; + width: 27px; + height: 27px; + background-size: 21px; + cursor: pointer; + border-radius: 5px; } -.page_collapsed { - padding-left: 60px !important; -} - -.header_table_classic { - padding-left: 245px !important; -} - -.header_table_collapsed { - padding-left: 90px !important; -} - -.title_menu_classic { - display: block !important; -} - -.title_menu_collapsed { - display: none !important; -} - -.logo_show { - display: block !important; -} - -.logo_hide { - display: none !important; -} - -.menu_icon_collapsed { - background-position: 50% 50% !important; +#top_btn:hover { + background: url("../../images/to_top_menu_hover.png") no-repeat center; + background-color: #fff; + border: 2px solid #82b92e; } diff --git a/pandora_console/index.php b/pandora_console/index.php index b68424d805..38e12621cb 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -1024,11 +1024,13 @@ if (get_parameter('login', 0) !== 0) { // Header if ($config['pure'] == 0) { if ($config['classic_menu']) { + // ya no existe BORRAR!!! echo '
'; + echo ''; echo '
'; } else { echo '
'; + echo ''; } } else { echo '
'; @@ -1248,6 +1251,27 @@ require 'include/php_to_js_values.php'; ?>