fixed visual error on snmp interfaces agent graphs black theme

This commit is contained in:
Marcos Alconada 2021-05-12 12:52:44 +00:00 committed by Daniel Rodriguez
parent fd7eb10f3e
commit f8eafa5015
4 changed files with 44 additions and 15 deletions

View File

@ -42,6 +42,10 @@ function pandora_realtime_graphs()
global $config; global $config;
check_login(); check_login();
if ($config['style'] === 'pandora_black') {
ui_require_css_file('pandora_black', 'include/styles/', true);
}
$id_network = get_parameter('id_network', 0); $id_network = get_parameter('id_network', 0);
$action = get_parameter('action', 'list'); $action = get_parameter('action', 'list');
@ -66,8 +70,8 @@ function pandora_realtime_graphs()
$long_index = []; $long_index = [];
$no_data_image = ''; $no_data_image = '';
$canvas = '<div id="graph_container">'; $canvas = '<div id="graph_container" class="graph_container">';
$canvas .= '<div id="chartLegend"></div>'; $canvas .= '<div id="chartLegend" class="chartLegend"></div>';
$width = 800; $width = 800;
$height = 300; $height = 300;
@ -239,7 +243,9 @@ function pandora_realtime_graphs()
echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/pandora_snmp_browser.js').'"></script>'; echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/pandora_snmp_browser.js').'"></script>';
echo '<script type="text/javascript" src="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.js').'"></script>'; echo '<script type="text/javascript" src="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.js').'"></script>';
echo '<link rel="stylesheet" type="text/css" href="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.css').'"></style>'; if ($config['style'] !== 'pandora_black') {
echo '<link rel="stylesheet" type="text/css" href="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.css').'"></style>';
}
// Store servers timezone offset to be retrieved from js. // Store servers timezone offset to be retrieved from js.
set_js_value('timezone_offset', date('Z', time())); set_js_value('timezone_offset', date('Z', time()));

View File

@ -1000,6 +1000,23 @@ table.databox {
.tactical_set { .tactical_set {
border-color: #707070; border-color: #707070;
} }
li.ui-tabs-tab.ui-corner-top.ui-state-default.ui-tab { li.ui-tabs-tab.ui-corner-top.ui-state-default.ui-tab {
border: 1px solid #707070; border: 1px solid #707070;
} }
.chartLegend {
width: 100%;
position: relative;
height: 30px;
}
.chartLegend table {
position: absolute;
right: 0px;
}
.graph_container {
width: 800px;
margin: 20px auto;
border-radius: 3px;
}

View File

@ -68,6 +68,9 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) {
} }
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>'; echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>';
if ($config['style'] === 'pandora_black') {
ui_require_css_file('pandora_black', 'include/styles/', true);
}
$interface_name = (string) $params['interface_name']; $interface_name = (string) $params['interface_name'];
$agent_id = (int) $params['agent_id']; $agent_id = (int) $params['agent_id'];
@ -190,6 +193,7 @@ $data[1] .= html_print_image(
[ [
'onclick' => "scwShow(scwID('text-start_date'),this);", 'onclick' => "scwShow(scwID('text-start_date'),this);",
'style' => 'vertical-align: bottom;', 'style' => 'vertical-align: bottom;',
'class' => 'invert_filter',
], ],
false, false,
false, false,
@ -251,7 +255,8 @@ $options[2] = 'x2';
$options[3] = 'x3'; $options[3] = 'x3';
$options[4] = 'x4'; $options[4] = 'x4';
$options[5] = __('Full'); $options[5] = __('Full');
$data[1] = html_print_select( /*
$data[1] = html_print_select(
$options, $options,
'zoom', 'zoom',
$zoom, $zoom,
@ -261,9 +266,9 @@ $data[1] = html_print_select(
true, true,
false, false,
false false
); );
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';*/
$form_table = html_print_table($table, true); $form_table = html_print_table($table, true);
$form_table .= '<div class="w100p right right_align">'; $form_table .= '<div class="w100p right right_align">';
@ -284,7 +289,7 @@ if (empty($server_id) === false) {
$menu_form .= html_print_input_hidden('server', $server_id, true); $menu_form .= html_print_input_hidden('server', $server_id, true);
} }
$menu_form .= '<div class="module_graph_menu_dropdown">'; $menu_form .= '<div class="module_graph_menu_dropdown mrgn_top_20px">';
$menu_form .= '<div id="module_graph_menu_header" class="module_graph_menu_header">'; $menu_form .= '<div id="module_graph_menu_header" class="module_graph_menu_header">';
$menu_form .= html_print_image( $menu_form .= html_print_image(
'images/arrow_down_green.png', 'images/arrow_down_green.png',
@ -312,13 +317,6 @@ $menu_form .= '</div>';
$menu_form .= '</form>'; $menu_form .= '</form>';
echo $menu_form; echo $menu_form;
echo '<div class="module_graph_menu_dropdown">
<div id="module_graph_menu_header" class="module_graph_menu_header">
'.html_print_image('images/arrow_down_green.png', true, ['class' => 'module_graph_menu_arrow', 'float' => 'left'], false, false, true).'
<span class="flex_2">'.__('Graph configuration menu').'</span></div>
<div class="module_graph_menu_content module_graph_menu_content_closed invisible" >'.$form_table.'</div>
</div>';
echo '</form>';
// Hidden div to forced title. // Hidden div to forced title.
html_print_div( html_print_div(

View File

@ -64,6 +64,10 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) {
$l10n->load_tables(); $l10n->load_tables();
} }
if ($config['style'] === 'pandora_black') {
ui_require_css_file('pandora_black', 'include/styles/', true);
}
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>'; echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>';
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@ -92,6 +96,10 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
include_javascript_dependencies_flot_graph(); include_javascript_dependencies_flot_graph();
?> ?>
</head> </head>
<?php
if ($config['style'] === 'pandora_black') {
}
?>
<body bgcolor="#ffffff" class='bg_white'> <body bgcolor="#ffffff" class='bg_white'>
<?php <?php
if (!check_acl($config['id_user'], 0, 'AR')) { if (!check_acl($config['id_user'], 0, 'AR')) {