new header and menu

Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
This commit is contained in:
Tatiana Llorente 2019-03-05 12:54:11 +01:00
parent 12a287f322
commit 7be5d3e9e0
21 changed files with 316 additions and 617 deletions

View File

@ -1,7 +1,7 @@
<?php
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@ -17,6 +17,7 @@ require_once 'include/functions_notifications.php';
// Check permissions
// Global errors/warnings checking.
config_check();
?>
<div id="header_table">
@ -46,55 +47,6 @@ require_once 'include/functions_notifications.php';
}
}
/*
echo '<div id="alert_messages" style="display: none"></div>';
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';
$maintenance_link_open_txt = '<a href="'.$maintenance_link.'" title="'.$maintenance_title.'" class="'.$maintenance_class.'" id="show_systemalert_dialog">';
$maintenance_link_open_img = '<a href="'.$maintenance_link.'" title="'.$maintenance_title.'" class="'.$maintenance_class.'">';
$maintenance_link_close = '</a>';
if (!$pandora_management) {
$maintenance_img = '';
} else {
$maintenance_img = $maintenance_link_open_img.html_print_image(
'images/header_alert_gray.png',
true,
[
'title' => __(
'You have %d warning(s)',
$config['alert_cnt']
),
// 'id' => 'yougotalert',
'class' => 'bot',
]
).'<p><span>'.$config['alert_cnt'].'</span></p>'.$maintenance_link_close;
}
} 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 = '<div id="header_alert">'.$maintenance_img.'</div>';
*/
// Messages
/*
$msg_cnt = messages_get_count($config['id_user']);
if ($msg_cnt > 0) {
echo '<div id="dialog_messages" style="display: none"></div>';
$header_message = '<div id="header_message"><a href="ajax.php?page=operation/messages/message_list" title="'.__('Message overview').'" id="show_messages_dialog">';
$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 .= '<p><span>'.$msg_cnt.'</span></p></a></div>';
}*/
// Chat messages
$header_chat = "<div id='header_chat'><span id='icon_new_messages_chat' style='display: none;'>";
@ -149,63 +101,6 @@ require_once 'include/functions_notifications.php';
}
// clippy
if ($config['tutorial_mode'] !== 'expert' && !$config['disable_help']) {
$header_clippy = '<div id="header_clippy"><a href="javascript: show_clippy();">'.html_print_image(
'images/clippy_icon_gray.png',
true,
[
'id' => 'clippy',
'class' => 'clippy',
'alt' => __('%s assistant', get_product_name()),
'title' => __(
'%s assistant',
get_product_name()
),
]
).'</a></div>';
}
// 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) {
// 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) {
// 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 {
// 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 = '<a class="white" href="index.php?sec=gservers&amp;sec2=godmode/servers/modificar_server&amp;refr=60">';
$servers_link_close = '</a>';
$header_server = '<div id="header_server">'.$servers_link_open.$servers_check_img.$servers_link_close.'</div>';
*/
// Main help icon
if (!$config['disable_help']) {
$header_help = '<div id="header_help"><a href="#" class="modalpopup" id="helpmodal">'.html_print_image(
'images/header_help_gray.png',
true,
[
'title' => __('Main help'),
'id' => 'helpmodal',
'class' => 'modalpopup',
]
).'</a></div>';
}
// ======= Autorefresh code =============================
$autorefresh_txt = '';
$autorefresh_additional = '';
@ -257,6 +152,7 @@ require_once 'include/functions_notifications.php';
}
$autorefresh_link_close = '</a>';
$display_counter = 'display:block';
} else {
$autorefresh_img = html_print_image('images/header_refresh_disabled_gray.png', true, ['class' => 'bot autorefresh_disabled', 'alt' => 'lightning', 'title' => __('Disabled autorefresh')]);
@ -265,6 +161,8 @@ require_once 'include/functions_notifications.php';
$autorefresh_link_open_img = '';
$autorefresh_link_open_txt = '';
$autorefresh_link_close = '';
$display_counter = 'display:none';
}
} else {
$autorefresh_img = html_print_image('images/header_refresh_disabled_gray.png', true, ['class' => 'bot autorefresh_disabled', 'alt' => 'lightning', 'title' => __('Disabled autorefresh')]);
@ -274,10 +172,12 @@ require_once 'include/functions_notifications.php';
$autorefresh_link_open_img = '';
$autorefresh_link_open_txt = '';
$autorefresh_link_close = '';
$display_counter = 'display:none';
}
$header_autorefresh = '<div id="header_autorefresh">'.$autorefresh_link_open_img.$autorefresh_img.$autorefresh_link_close.'</div>';
$header_autorefresh_counter = '<div id="header_autorefresh_counter">'.$autorefresh_link_open_txt.$autorefresh_txt.$autorefresh_link_close.$autorefresh_additional.'</div>';
$header_autorefresh_counter = '<div id="header_autorefresh_counter" style="'.$display_counter.'">'.$autorefresh_link_open_txt.$autorefresh_txt.$autorefresh_link_close.$autorefresh_additional.'</div>';
// qr
@ -287,7 +187,7 @@ require_once 'include/functions_notifications.php';
$show_qr_code_header = 'display: inline;';
}
$header_qr = '<div id="header_qr"><div style="'.$show_qr_code_header.'" id="qr_code_container"><a href="javascript: show_dialog_qrcode();">'.html_print_image(
$header_qr = '<div id="header_qr" style="'.$show_qr_code_header.'"><div id="qr_code_container"><a href="javascript: show_dialog_qrcode();">'.html_print_image(
'images/qrcode_icon_gray.png',
true,
[
@ -323,19 +223,19 @@ require_once 'include/functions_notifications.php';
$header_logout .= html_print_image('images/header_logout_gray.png', true, ['alt' => __('Logout'), 'class' => 'bot', 'title' => __('Logout')]);
$header_logout .= '</a></div>';
// echo '<div class="header_left">'.$header_discovery, $header_alert, $header_message, $header_chat.'</div><div class="header_center">'.$header_searchbar, $header_clippy, $header_help, $header_server, $header_autorefresh, $header_autorefresh_counter, $header_qr.'</div><div class="header_right">'.$header_user, $header_logout.'</div>';
echo '<div class="header_left">'.$header_autorefresh, $header_autorefresh_counter, $header_qr, $header_chat.'</div><div class="header_center">'.$header_searchbar, $header_discovery.'</div><div class="header_right">'.$header_user, $header_logout.'</div>';
echo '<div class="header_left">'.$header_autorefresh, $header_autorefresh_counter, $header_qr, $header_chat.'</div>
<div class="header_center">'.$header_searchbar, $header_discovery.'</div>
<div class="header_right">'.$header_user, $header_logout.'</div>';
?>
</div> <!--div que cierra #table_header_inner -->
</div> <!--div que cierra #table_header -->
</div> <!-- Closes #table_header_inner -->
</div> <!-- Closes #table_header -->
<!-- Notifications content wrapper-->
<div id='notification-content' style='display:none;' /></div>
<!-- Old style div wrapper -->
<div id="alert_messages" style="display: none"></div>;
<div id="alert_messages" style="display: none"></div>
<script type="text/javascript">
/* <![CDATA[ */
@ -581,7 +481,6 @@ require_once 'include/functions_notifications.php';
?>
$("a.autorefresh_txt").toggle ();
$("#combo_refr").toggle ();
$("#combo_refr").css('padding-right', '9px');
href = $("a.autorefresh").attr ("href");
<?php
if ($select[0]['time_autorefresh']) {
@ -623,6 +522,7 @@ require_once 'include/functions_notifications.php';
<?php
if ($_GET['refr']) {
?>
$("#header_autorefresh").css('padding-right', '5px');
var refr_time = <?php echo (int) get_parameter('refr', 0); ?>;
var t = new Date();
t.setTime (t.getTime () +
@ -643,7 +543,6 @@ require_once 'include/functions_notifications.php';
$("a.autorefresh").click (function () {
$("a.autorefresh_txt").toggle ();
$("#combo_refr").toggle ();
$("#combo_refr").css('padding-right', '9px');
$("select#ref").change (function () {
href = $("a.autorefresh").attr ("href");
$(document).attr ("location", href + this.value);
@ -653,4 +552,4 @@ require_once 'include/functions_notifications.php';
});
});
/* ]]> */
</script>
</script>

View File

@ -21,22 +21,7 @@ if (! isset($config['id_user'])) {
$(document).ready(function(){
var menuType_value = localStorage.getItem("menuType");
if (menuType_value == 'collapsed' || menuType_value == '' || menuType_value == null || menuType_value == undefined) {
if(menuType_value == '' || menuType_value == null || menuType_value == undefined){
localStorage.setItem("menuType", "collapsed");
}
$('#menu_full').removeClass('menu_full_classic').addClass('menu_full_collapsed');
$('.logo_full').css('display','none');
$('.logo_icon').css('display','block');
$('div#title_menu').removeClass('title_menu_classic').addClass('title_menu_collapsed');
$('div#page').removeClass('page_classic').addClass('page_collapsed');
$('#header_table').removeClass('header_table_classic').addClass('header_table_collapsed');
$('#button_collapse').removeClass('button_classic').addClass('button_collapsed');
$('ul.submenu').css('left', '59px');
$('li.menu_icon').removeClass("no_hidden_menu").addClass('menu_icon_collapsed');
}
else if (menuType_value == 'classic') {
if (menuType_value == 'classic') {
$('#menu_full').removeClass('menu_full_collapsed').addClass('menu_full_classic');
$('.logo_icon').css('display','none');
$('.logo_full').css('display','block');
@ -48,18 +33,26 @@ $(document).ready(function(){
$('li.menu_icon').removeClass('menu_icon_collapsed').addClass("no_hidden_menu");
}
else{
console.log('else no ha elegido aun, default-else');
localStorage.setItem("menuType", "collapsed");
if(menuType_value != 'collapsed'){
localStorage.setItem("menuType", "collapsed");
}
$('#menu_full').removeClass('menu_full_classic').addClass('menu_full_collapsed');
$('.logo_full').css('display','none');
$('.logo_icon').css('display','block');
$('div#title_menu').removeClass('title_menu_classic').addClass('title_menu_collapsed');
$('div#page').removeClass('page_classic').addClass('page_collapsed');
$('#header_table').removeClass('header_table_classic').addClass('header_table_collapsed');
$('#button_collapse').removeClass('button_classic').addClass('button_collapsed');
$('ul.submenu').css('left', '59px');
$('li.menu_icon').removeClass("no_hidden_menu").addClass('menu_icon_collapsed');
}
});
// Set the height of the menu.
$(window).on('load', function (){
$("#menu_full").height($("#container").height());
});
// Set the height of the menu.
$(window).on('load', function (){
$("#menu_full").height($("#container").height());
});
</script>
<?php
@ -72,13 +65,28 @@ if (isset($config['autohidden_menu']) && $config['autohidden_menu']) {
// Menu container prepared to autohide menu
echo '<div id="menu_full">';
$custom_logo = 'images/custom_logo/'.$config['custom_logo'];
$custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
if (!defined('PANDORA_ENTERPRISE')) {
$logo_title = get_product_name().' Opensource';
$custom_logo = 'images/custom_logo/pandora_logo_head_green.png';
$custom_logo_collapsed = 'images/custom_logo/pandora_logo_green_collapsed.png';
} else {
if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo)) {
$custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
}
$logo_title = get_product_name().' Enterprise';
}
echo '<div class="logo_green"><a href="index.php?sec=main">';
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', 'style' => 'display:none']);
echo html_print_image($custom_logo, true, ['border' => '0', 'width' => '215', 'alt' => $logo_title, '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', 'style' => 'display:block']);
echo html_print_image($custom_logo_collapsed, true, ['border' => '0', 'width' => '60', 'alt' => $logo_title, 'class' => 'logo_icon', 'style' => 'display:block']);
}
echo '</a></div>';
@ -108,11 +116,6 @@ echo '<div id="button_collapse" class="button_collapse"></div>';
echo '</div>';
// menu_container
ui_require_jquery_file('cookie');
/*
$config_fixed_menu = false;
if (isset($config['fixed_menu'])) {
$config_fixed_menu = $config['fixed_menu'];
}*/
$config_fixed_header = false;
if (isset($config['fixed_header'])) {
@ -123,10 +126,8 @@ if (isset($config['fixed_header'])) {
<script type="text/javascript" language="javascript">
/* <![CDATA[ */
$('#button_collapse').on('click', function() {
//var classic_menu;
$('#button_collapse').on('click', function() {
if($('#menu_full').hasClass('menu_full_classic')){
localStorage.setItem("menuType", "collapsed");
$('ul.submenu').css('left', '59px');
@ -135,9 +136,6 @@ $('#button_collapse').on('click', function() {
localStorage.setItem("menuType", "classic");
$('ul.submenu').css('left', '214px');
}
else{
console.log('else');
}
$('.logo_full').toggle();
$('.logo_icon').toggle();
@ -147,32 +145,15 @@ $('#button_collapse').on('click', function() {
$('div#page').toggleClass('page_classic page_collapsed');
$('#header_table').toggleClass('header_table_classic header_table_collapsed');
$('li.menu_icon').toggleClass("no_hidden_menu menu_icon_collapsed");
console.log('entra click: '+localStorage.menuType);
});
var autohidden_menu = <?php echo $autohidden_menu; ?>;
//var fixed_menu =
<?php
// echo json_encode((bool) $config_fixed_menu);
?>
var fixed_header = <?php echo json_encode((bool) $config_fixed_header); ?>;
var id_user = "<?php echo $config['id_user']; ?>";
var cookie_name = id_user + '-pandora_menu_state';
var cookie_name_encoded = btoa(cookie_name);
var click_display = "<?php echo $config['click_display']; ?>";
//var classic_menu = parseInt("
<?php
// echo $config['classic_menu'];
?>
var menuState = $.cookie(cookie_name_encoded);
@ -210,127 +191,199 @@ function close_submenus () {
handsIn = 0;
handsIn2 = 0;
if(!click_display){
$('.menu_icon').mouseenter(function() {
/**
* Positionate the submenu elements. Add a negative top.
*
* @param int index It is the position of li.menu_icon in the ul.
* @param string id_submenu It is the id of first level submenu.
* @param string id_submenu2 It is the id of second level submenu.
* @param int item_height It is the height of a menu item (28 o 35).
*
* @return (int) The position (in px).
*/
function menu_calculate_top(index, id_submenu, id_submenu2, item_height){
var level1 = index;
var level2 = $('#'+id_submenu+' ul.submenu > li').length;
var level3 = $('#'+id_submenu2+' > li.sub_subMenu').length;
var item_height = item_height;
level2--;
if (id_submenu2 !== false) {
// If level3 is set, the position is calculated like box is in the center.
// wiouth considering level2 box can be moved.
level3--;
total = (level1 + level3);
comp = level3;
} else {
total = (level1 + level2);
comp = level2;
}
// Positionate in the middle
if (total > 12 && ((total < 18) || ((level1 - comp) <= 4))) {
return - ( Math.floor(comp / 2) * item_height);
}
// Positionate in the bottom
if (total >= 18) {
return (- comp * item_height);
}
// return 0 by default
return 0;
}
/**
* Get the menu items to be positioned.
*
* @param string item It is the selector of the current element.
*
* @return Add the top position in a inline style.
*/
function get_menu_items(item){
var item_height = parseInt(item.css('min-height'));
var id_submenu = item.attr('id');
var id_submenu2 = false;
var index = item.index();
if(item.parent().hasClass('godmode')){
index = index+6; // This is because the menu has divided in two parts.
}
var top_submenu = menu_calculate_top(index, id_submenu, id_submenu2, item_height);
top_submenu = top_submenu+'px';
$('#'+id_submenu+' ul.submenu').css('top', top_submenu);
$('.has_submenu').mouseenter(function() {
id_submenu2 = item.attr('id');
id_submenu2 = $('#'+id_submenu2+' ul.submenu2').attr('id');
var top_submenu2 = menu_calculate_top(index, id_submenu, id_submenu2, item_height);
top_submenu2 = top_submenu2+'px';
$('#'+id_submenu2).css('top', top_submenu2);
});
}
/*
* Show and hide submenus
*/
if(!click_display){
$('.menu_icon').mouseenter(function() {
table_hover = $(this);
handsIn = 1;
openTime = new Date().getTime();
$("ul#sub"+table_hover[0].id).show();
get_menu_items(table_hover);
if( typeof(table_noHover) != 'undefined')
if ( "ul#sub"+table_hover[0].id != "ul#sub"+table_noHover[0].id )
$("ul#sub"+table_noHover[0].id).hide();
}).mouseleave(function() {
table_noHover = $(this);
handsIn = 0;
setTimeout(function() {
opened = new Date().getTime() - openTime;
if(opened > 3000 && handsIn == 0) {
openTime = 4000;
$("ul#sub"+table_noHover[0].id).hide();
}
}, 2500);
});
}else{
$(document).ready(function() {
if (autohidden_menu) {
$('.menu_icon').on("click", function() {
if( typeof(table_hover) != 'undefined'){
$("ul#sub"+table_hover[0].id).hide();
}
table_hover = $(this);
handsIn = 1;
openTime = new Date().getTime();
$("ul#sub"+table_hover[0].id).show();
if( typeof(table_noHover) != 'undefined')
if ( "ul#sub"+table_hover[0].id != "ul#sub"+table_noHover[0].id )
$("ul#sub"+table_noHover[0].id).hide();
get_menu_items(table_hover);
}).mouseleave(function() {
table_noHover = $(this);
handsIn = 0;
setTimeout(function() {
opened = new Date().getTime() - openTime;
if(opened > 3000 && handsIn == 0) {
openTime = 4000;
$("ul#sub"+table_noHover[0].id).hide(); //table_hover
if(opened > 5000 && handsIn == 0) {
openTime = 6000;
$("ul#sub"+table_noHover[0].id).hide();
}
}, 2500);
}, 5500);
});
} else {
$('.menu_icon').on("click", function() {
if( typeof(table_hover) != 'undefined'){
$("ul#sub"+table_hover[0].id).hide();
}
table_hover = $(this);
handsIn = 1;
openTime = new Date().getTime();
$("ul#sub"+table_hover[0].id).show();
get_menu_items(table_hover);
});
}
});
}
$('.has_submenu').mouseenter(function() {
table_hover2 = $(this);
handsIn2 = 1;
openTime2 = new Date().getTime();
$("#sub"+table_hover2[0].id).show();
if( typeof(table_noHover2) != 'undefined')
if ( "ul#sub"+table_hover2[0].id != "ul#sub"+table_noHover2[0].id )
$("ul#sub"+table_noHover2[0].id).hide();
}).mouseleave(function() {
table_noHover2 = table_hover2;
handsIn2 = 0;
setTimeout(function() {
opened = new Date().getTime() - openTime2;
if(opened >= 3000 && handsIn2 == 0) {
openTime2 = 4000;
$("ul#sub"+table_hover2[0].id).hide();
}
}, 3500);
});
$(document).ready(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();
});
}else{
$(document).ready(function() {
if (autohidden_menu) {
$('.menu_icon').on("click", function() {
if( typeof(table_hover) != 'undefined'){
$("ul#sub"+table_hover[0].id).hide();
}
table_hover = $(this);
handsIn = 1;
openTime = new Date().getTime();
$("ul#sub"+table_hover[0].id).show();
}).mouseleave(function() {
table_noHover = $(this);
handsIn = 0;
setTimeout(function() {
opened = new Date().getTime() - openTime;
if(opened > 5000 && handsIn == 0) {
openTime = 6000;
$("ul#sub"+table_noHover[0].id).hide(); //table_hover
}
}, 5500);
});
} else {
$('.menu_icon').on("click", function() {
if( typeof(table_hover) != 'undefined'){
$("ul#sub"+table_hover[0].id).hide();
}
table_hover = $(this);
handsIn = 1;
openTime = new Date().getTime();
$("ul#sub"+table_hover[0].id).show();
});
}
$('#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();
});
}
$('.has_submenu').mouseenter(function() {
table_hover2 = $(this);
handsIn2 = 1;
openTime2 = new Date().getTime();
$("#sub"+table_hover2[0].id).show();
if( typeof(table_noHover2) != 'undefined')
if ( "ul#sub"+table_hover2[0].id != "ul#sub"+table_noHover2[0].id )
$("ul#sub"+table_noHover2[0].id).hide();
}).mouseleave(function() {
table_noHover2 = table_hover2;
handsIn2 = 0;
setTimeout(function() {
opened = new Date().getTime() - openTime2;
if(opened >= 3000 && handsIn2 == 0) {
openTime2 = 4000;
$("ul#sub"+table_hover2[0].id).hide();
}
}, 3500);
$('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();
});
$(document).ready(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();
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();
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
});
});
});
</script>

View File

@ -120,17 +120,6 @@ 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_switch(
'classic_menu',
1,
$config['classic_menu'],
true
);
$row++;
*/
echo '<fieldset>';
echo '<legend>'.__('Behaviour configuration').'</legend>';
html_print_table($table_behaviour);
@ -278,12 +267,12 @@ function logo_custom_enterprise($name, $logo)
}
$table_styles->data[$row][0] = __('Custom logo (header)').ui_print_help_icon('custom_logo', true);
$table_styles->data[$row][0] = __('Custom logo (menu)').ui_print_help_icon('custom_logo', true);
$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo', $config['custom_logo']);
$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal');
$row++;
$table_styles->data[$row][0] = __('Custom logo collapsed (header)').ui_print_help_icon('custom_logo_collapsed', true);
$table_styles->data[$row][0] = __('Custom logo collapsed (menu)').ui_print_help_icon('custom_logo_collapsed', true);
$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo_collapsed', $config['custom_logo_collapsed']);
$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_logo_collapsed_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal');
$row++;
@ -545,16 +534,7 @@ $table_styles->data[$row][1] = html_print_checkbox_switch(
true
);
$row++;
/*
$table_styles->data[$row][0] = __('Fixed menu');
$table_styles->data[$row][1] = html_print_checkbox_switch(
'fixed_menu',
1,
$config['fixed_menu'],
true
);
$row++;
*/
// For 5.1 Autohidden menu feature
$table_styles->data['autohidden'][0] = __('Autohidden menu');

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 610 B

After

Width:  |  Height:  |  Size: 653 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 791 B

After

Width:  |  Height:  |  Size: 342 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 272 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 208 B

View File

@ -309,6 +309,10 @@ function config_update_config()
if (!config_update_value('auditdir', get_parameter('auditdir'))) {
$error_update[] = __('Audit log directory');
}
if (!config_update_value('unique_ip', get_parameter('unique_ip'))) {
$error_update[] = __('unique_ip');
}
break;
case 'enterprise':
@ -1032,11 +1036,6 @@ function config_update_config()
$error_update[] = __('Fixed header');
}
/*
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');
}
@ -1117,11 +1116,6 @@ function config_update_config()
$error_update[] = __('Default height of the chart image');
}
/*
if (!config_update_value('classic_menu', (bool) get_parameter('classic_menu', false))) {
$error_update[] = __('Classic menu mode');
}*/
// --------------------------------------------------
// CUSTOM VALUES POST PROCESS
// --------------------------------------------------
@ -1793,11 +1787,6 @@ function config_process_config()
config_update_value('fixed_graph', false);
}
/*
if (!isset($config['fixed_menu'])) {
config_update_value('fixed_menu', false);
}*/
if (!isset($config['custom_favicon'])) {
config_update_value('custom_favicon', '');
}
@ -2518,11 +2507,6 @@ function config_process_config()
}
}
/*
if (!isset($config['classic_menu'])) {
config_update_value('classic_menu', 0);
}*/
if (!isset($config['csv_divider'])) {
config_update_value('csv_divider', ';');
}

View File

@ -342,11 +342,8 @@ function menu_print_menu(&$menu)
$sub_title = '';
}
// Added a top on inline styles
$top = menu_calculate_top($config['count_main_menu'], $count_sub, $count_sub2);
// Add submenu2 to submenu string
$submenu_output .= '<ul style= top:'.$top."px; id='sub".str_replace(' ', '_', $sub['id'])."' class=submenu2>";
$submenu_output .= '<ul id="sub'.str_replace(' ', '_', $sub['id']).'" class="submenu2">';
$submenu_output .= $submenu2_list;
$submenu_output .= '</ul>';
}
@ -396,8 +393,7 @@ function menu_print_menu(&$menu)
$visible = false;
}
$top = menu_calculate_top($config['count_main_menu'], $count_sub);
$output .= '<ul id="subicon_'.$id.'" class="submenu'.($visible ? '' : ' invisible').'" style="top: '.$top.'px">';
$output .= '<ul id="subicon_'.$id.'" class="submenu'.($visible ? '' : ' invisible').'">';
$output .= $submenu_output;
$output .= '</ul>';
}
@ -717,56 +713,3 @@ function menu_sec3_in_sec2($sec, $sec2, $sec3)
return false;
}
// Positionate the menu element. Added a negative top.
// 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= '<script>
$(document).ready(function(){
parseInt($("#icon_oper-agents").css("min-height"));
});
</script>';
*/
$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.
// wiouth considering level2 box can be moved.
$level3--;
$total = ($level1 + $level3);
$comp = $level3;
} else {
$total = ($level1 + $level2);
$comp = $level2;
}
// Positionate in the middle
if ($total > 12 && (($total < 18) || (($level1 - $comp) <= 4))) {
return - ( floor($comp / 2) * $item_height);
}
// Positionate in the bottom
if ($total >= 18) {
return (- $comp * $item_height);
}
// return 0 by default
return 0;
}

View File

@ -5,7 +5,8 @@
?>
<h1>Custom logo (Branding)</h1>
This option is used to display your own logo in the <?php echo get_product_name(); ?> header. You can use any kind of graphic in PNG format. There is a fixed width/height for any image displayed here of 206x47 pixels.
This option allows uploading your own logo, which will be visible in the <?php echo get_product_name(); ?> menu. This logo will be visible when the menu is expanded.
<br><br>
Upload your custom branding logo, using the file manager to /images/custom_logo directory.
The image must have PNG format and a size of 215x60 pixels.
<br><br>
You must upload your logo to the /images/custom_logo directory.

View File

@ -0,0 +1,12 @@
<?php
/**
* @package Include/help/en
*/
?>
<h1>Custom logo (Branding)</h1>
This option allows uploading your own logo, which will be visible in the <?php echo get_product_name(); ?> menu. This logo will be visible when the menu is collapsed.
<br><br>
The image must have PNG format and a size of 60x60 pixels.
<br><br>
You must upload your logo to the /images/custom_logo directory.

View File

@ -1,15 +1,12 @@
<?php
/**
* @package Include/help/en
* @package Include/help/es
*/
?>
<h1> Logo de Cliente (Marca comunitaria de empresa)</h1>
Esta opción se utiliza para poder desplegar su propio logo en la cabecera de <?php echo get_product_name(); ?>. Puede utilizar cualquier tipo de gráfica en formato PNG. Hay una ancho/alto para cualquier imagen desplegada aquí de 206x47 píxeles.
<h1> Logo (Marca de empresa)</h1>
Esta opción sirve para poder subir su propio logo, que estará visible en el menú de <?php echo get_product_name(); ?>. Este logo será visible cuando el menú esté desplegado.
<br><br>
Suba su logo de marca de empresa utilizando el directorio /images/custom_logo directory.
La imagen debe tener el formato PNG y un tamaño de 215x60 pixeles.
<br><br>
Debe subir su logo al directorio /images/custom_logo.

View File

@ -0,0 +1,12 @@
<?php
/**
* @package Include/help/es
*/
?>
<h1> Logo (Marca de empresa)</h1>
Esta opción sirve para poder subir su propio logo, que estará visible en el menú de <?php echo get_product_name(); ?>. Este logo será visible cuando el menú esté plegado.
<br><br>
La imagen debe tener el formato PNG y un tamaño de 60x60 pixeles.
<br><br>
Debe subir su logo al directorio /images/custom_logo.

View File

@ -5,8 +5,8 @@
?>
<h1>カスタムロゴ</h1>
ここに指定した画像ファイルを、オリジナルロゴとして <?php echo get_product_name(); ?> のヘッダーに表示することができます。
表示可能な画像ファイルは PNG 形式です。
画像サイズは、206x47ピクセルに修正されます。
This option allows uploading your own logo, which will be visible in the <?php echo get_product_name(); ?> menu. This logo will be visible when the menu is expanded.
<br><br>
カスタムロゴは、ファイルマネージャを使って /images/custom_logo ディレクトリへアップロードしてください。
The image must have PNG format and a size of 215x60 pixels.
<br><br>
You must upload your logo to the /images/custom_logo directory.

View File

@ -0,0 +1,13 @@
<?php
/**
* @package Include/help/ja
*/
?>
<h1>カスタムロゴ</h1>
This option allows uploading your own logo, which will be visible in the <?php echo get_product_name(); ?> menu. This logo will be visible when the menu is collapsed.
<br><br>
The image must have PNG format and a size of 60x60 pixels.
<br><br>
You must upload your logo to the /images/custom_logo directory.

View File

@ -42,8 +42,6 @@
}
.menu li.selected,
.menu li.not_selected {
border: 0px none black; /* borrar?? */
border-bottom: 0px none #d4d4d4; /* borrar?? */
margin: 0;
}
@ -58,7 +56,6 @@ li:hover ul {
}
.submenu_text {
/* padding: 10.5px; eee */
margin-left: 0px;
width: 100%;
color: #9ca4a6;
@ -66,10 +63,6 @@ li:hover ul {
font-size: 9.4pt;
}
.menu li.subselected a {
background-color: grey !important; /* borrar?? */
}
.menu a:hover {
text-decoration: none;
border: 0px;
@ -111,16 +104,11 @@ li:hover ul {
border-left: 1px;
}
/*.menu li.has_submenu > a > div,*/
.menu li.has_submenu /*> .SubNoLink*/ {
.menu li.has_submenu {
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; /* borrar?? */
}
.menu li.submenu_not_selected a,
.menu li.submenu2_not_selected a {
font-weight: normal !important;
@ -160,9 +148,6 @@ li.sub_subMenu.selected {
background: url(../../images/op_network.menu_gray.png) no-repeat;
}
#icon_oper-agents {
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 {
@ -226,7 +211,6 @@ li.sub_subMenu.selected {
background: url(../../images/links.menu_gray.png) no-repeat;
}
#icon_god-um_messages {
border-color: #777; /* borrar?? */
background: url(../../images/um_messages.menu_gray.png) no-repeat;
}
@ -234,7 +218,6 @@ li.sub_subMenu.selected {
z-index: 3;
position: absolute;
left: -80px;
background-color: #aaa; /* borrar?? */
}
.notification_ball {
@ -290,99 +273,25 @@ ul li a:hover {
* ---------------------------------------------------------------------
*/
.menu_icon {
/*transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out;*/
}
.menu_icon:hover {
/*transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out;*/
background-color: #282828 !important;
}
.submenu_not_selected:hover {
/* transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out;*/
background-color: #202020 !important;
}
.submenu_selected:hover {
background-color: #202020 !important;
}
.sub_subMenu {
/*transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;*/
}
.sub_subMenu:hover {
/* transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;*/
background-color: #161616 !important;
}
.menu li.selected {
box-shadow: inset 4px 0 #80ba27;
}
/* creo que no se usan
.is_submenu2 li {
background-color: #ff0000;
}
.is_submenu2 {
background-color: #222222 !important;
}
*/
.operation {
background-color: #343434 !important;
border-top-right-radius: 5px; /* borrar?? */
border-right-style: solid; /* borrar?? */
border-right-width: 0px; /* borrar?? */
padding-top: 20px !important;
}
@ -433,6 +342,9 @@ ul li a:hover {
.selected#icon_oper-extensions {
background: url(../../images/extensions.menu_white.png) no-repeat;
}
.selected#icon_god-discovery {
background: url(../../images/gm_discovery.menu_white.png) no-repeat;
}
.selected#icon_god-resources {
background: url(../../images/gm_resources.menu_white.png) no-repeat;
}
@ -465,25 +377,20 @@ ul li a:hover {
}
#menu_full {
/*height: 100%; /*Lo he quitado para que no ocupe todo el alto y fixed */
width: 60px; /* It is changed for classic menu (215px)*/
position: fixed; /*Fixed: Lo he quitado para que no ocupe todo el alto y fixed */ /*absolute*/
width: 60px; /* This is overwritten by the classic menu (215px) */
position: fixed;
z-index: 1;
top: 0;
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 */
/*overflow-x: hidden;*/
}
.button_collapse {
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)*/
width: 60px; /* This is overwritten by the classic menu (215px) */
text-align: center;
color: #fff;
cursor: pointer;
@ -529,6 +436,7 @@ ul li a:hover {
background-position: center;
}
/* Menu height: 601px, 720px, 735px */
@media screen and (max-height: 720px) {
.menu li,
.menu li a,
@ -536,12 +444,7 @@ ul li a:hover {
min-height: 28px !important;
}
}
/*
Medidas menu:
601 verde y rojo
720 azul
735 normal
*/
@media screen and (max-height: 735px) {
.operation {
padding-top: 10px !important;

View File

@ -405,7 +405,7 @@ div#page {
clear: both;
width: auto;
margin-top: 20px !important;
padding-left: 60px; /* It is changed for classic menu (215px)*/
padding-left: 60px; /* This is overwritten by the classic menu (215px)*/
margin-right: 35px;
margin-left: 35px;
}
@ -681,7 +681,7 @@ div#menu {
width: 45px;
float: left;
z-index: 2000;
position: absolute; /*Lo he quitado para que no ocupe todo el alto y fixed */
position: absolute;
}
div#head {
@ -988,14 +988,6 @@ input.color_cloud_min[disabled] {
center !important;
}
input.color_cloud_min {
background: #fefefe url(../../images/color_cloud_item.png) no-repeat center !important;
}
input.color_cloud_min[disabled] {
background: #fefefe url(../../images/color_cloud_item.disabled.png) no-repeat
center !important;
}
div#cont {
position: fixed;
max-height: 320px;
@ -2039,7 +2031,7 @@ div#pandora_logo_header {
margin: 0px;
padding: 0px;
margin-top: 0px;
padding-left: 95px; /* It is changed for classic menu */
padding-left: 95px; /* This is overwritten by the classic menu */
padding-right: 35px;
}
@ -2083,16 +2075,7 @@ div#pandora_logo_header {
padding-left: 15px;
}
#header_table_inner > div {
/* border: solid 1px pink;*/
}
#header_table_inner > div > div {
/* border: solid 1px fuchsia;*/
}
#header_table_inner td a,
#header_table_inner td span {
#header_table_inner #header_user span {
color: #777;
}
@ -2102,8 +2085,7 @@ div#pandora_logo_header {
vertical-align: middle;
}
#header_user img,
#header_autorefresh {
#header_user img {
padding-right: 5px;
}
@ -2153,10 +2135,10 @@ a.autorefresh_txt,
color: #1c1c1c;
font-size: 8.5pt;
}
/*
#combo_refr select {
margin-right: 8px;
}
}*/
.disabled_module {
color: #aaa;
@ -2167,22 +2149,6 @@ div.warn {
padding: 2px 1px 6px 25px;
}
.submenu_not_selected {
/*transition-property: background-color;
transition-duration: 0.5s;
transition-timing-function: ease-out;
-webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color;
-moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out;
-o-transition-property: background-color;
-o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out;
font-weight: normal !important;*/
}
/* Submenus havent borders */
.submenu_not_selected,
.submenu_selected,
@ -2908,8 +2874,9 @@ input.search_input {
margin-left: 2px;
padding-left: 15px;
padding-right: 40px;
color: #999;
color: #777;
font-family: "Open Sans", sans-serif;
font-size: 8.5pt;
border-top-left-radius: 50px;
border-bottom-left-radius: 50px;
border-top-right-radius: 50px;
@ -3299,16 +3266,16 @@ div.div_groups_status {
#title_menu {
color: #9ca4a6;
float: right;
width: 65%;
width: 72%;
letter-spacing: 0pt;
font-size: 10pt;
white-space: pre-wrap;
padding-top: 0 !important; /* está inline */
padding-top: 0 !important;
font-family: "Open Sans", sans-serif;
}
.no_hidden_menu {
background-position: 18% 50% !important;
background-position: 11% 50% !important;
}
#menu_tab li.nomn,
@ -4607,59 +4574,6 @@ div#dialog_messages table th:last-child {
/* jQuery dialog */
/* --- SWITCH --- */
.toogle_switch {
position: relative;
display: inline-block;
width: 30px;
height: 17px;
}
.p-switch input {
opacity: 0;
width: 0;
height: 0;
}
.p-slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: 0.4s;
transition: 0.4s;
border-radius: 34px;
}
.p-slider:before {
position: absolute;
content: "";
height: 13px;
width: 13px;
left: 2px;
bottom: 2px;
background-color: white;
-webkit-transition: 0.4s;
transition: 0.4s;
border-radius: 50%;
}
input:checked + .p-slider {
background-color: #82b92e;
}
input:focus + .p-slider {
box-shadow: 0 0 1px #82b92e;
}
input:checked + .p-slider:before {
-webkit-transform: translateX(13px);
-ms-transform: translateX(13px);
transform: translateX(13px);
}
.p-switch {
position: relative;
display: inline-block;
@ -4814,7 +4728,6 @@ input:checked + .p-slider:before {
background-color: #82b92e;
width: 27px;
height: 27px;
background-size: 21px;
cursor: pointer;
border-radius: 5px;
}

View File

@ -1023,23 +1023,12 @@ if (get_parameter('login', 0) !== 0) {
// Header
if ($config['pure'] == 0) {
if ($config['classic_menu']) {
// ya no existe BORRAR!!!
echo '<div id="container"><div id="head">';
include 'general/header.php';
echo '</div><div id="menu">';
include 'general/main_menu.php';
echo '</div>';
echo '<button onclick="topFunction()" id="top_btn" title="Go to top"></button>';
echo '<div id="page">';
} else {
echo '<div id="container"><div id="head">';
include 'general/header.php';
echo '</div><div id="page"><div id="menu">';
include 'general/main_menu.php';
echo '</div>';
echo '<button onclick="topFunction()" id="top_btn" title="Go to top"></button>';
}
echo '<div id="container"><div id="head">';
include 'general/header.php';
echo '</div><div id="page"><div id="menu">';
include 'general/main_menu.php';
echo '</div>';
echo '<button onclick="topFunction()" id="top_btn" title="Go to top"></button>';
} else {
echo '<div id="main_pure">';
// Require menu only to build structure to use it in ACLs