tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-4104-Cambios-vista-gráfica-de-módulo' into ent-4101-Cambios-vista-gráfica-de-módulo

This commit is contained in:
Tatiana Llorente 2019-05-28 08:55:15 +02:00
parent 11e5a4ce18 2fd37b531e
commit a6c0a082a7
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/styles/pandora.css
View File

@ -3640,14 +3640,15 @@ table.events_show_more_table tr:nth-child(odd) td {
background-color: #ffffff; background-color: #ffffff;
} }
table.events_show_more_table tr:nth-child(even) td { table.events_show_more_table tr:nth-child(even) td {
background-color: #f5f5f5; background-color: #f9f9f9;
border-top: 1px solid #cacaca; border-top: 1px solid #e0e0e0;
border-bottom: 1px solid #cacaca; border-bottom: 1px solid #e0e0e0;
} }
table.events_show_more_table tr td { table.events_show_more_table tr td {
height: 22px; height: 33px;
padding: 4px; max-height: 33px;
min-height: 33px;
} }
table.events_show_more_table tr td:first-child { table.events_show_more_table tr td:first-child {
@ -5828,7 +5829,7 @@ a#qr_code_agent_view {
.module_graph_menu_content, .module_graph_menu_content,
.module_graph_menu_header { .module_graph_menu_header {
width: 92%; width: 95%;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
margin: 0 auto; margin: 0 auto;
box-sizing: border-box; box-sizing: border-box;

2
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -499,7 +499,7 @@ if (!empty($network_interfaces)) {
$params_json = json_encode($params); $params_json = json_encode($params);
$params_encoded = base64_encode($params_json); $params_encoded = base64_encode($params_json);
$win_handle = dechex(crc32($interface['status_module_id'].$interface_name)); $win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
$graph_link = "<a href=\"javascript:winopeng('operation/agentes/interface_traffic_graph_win.php?params=$params_encoded','$win_handle')\">".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).'</a>'; $graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=$params_encoded','$win_handle', 1000, 650)\">".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).'</a>';
} else { } else {
$graph_link = ''; $graph_link = '';
} }

4
pandora_console/operation/agentes/interface_traffic_graph_win.php
View File

@ -214,7 +214,7 @@ if ($date > $now) {
$data = []; $data = [];
$data[0] = __('Show percentil'); $data[0] = __('Show percentil');
$data[1] = html_print_checkbox('show_percentil', 1, (bool) $show_percentil, true); $data[1] = html_print_checkbox_switch('show_percentil', 1, (bool) $show_percentil, true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
@ -225,7 +225,7 @@ if ($date > $now) {
'images/tip.png', 'images/tip.png',
true true
); );
$data[1] = html_print_checkbox('fullscale', 1, (bool) $fullscale, true); $data[1] = html_print_checkbox_switch('fullscale', 1, (bool) $fullscale, true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';

16
pandora_console/operation/agentes/stat_win.php
View File

@ -304,7 +304,7 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
} }
} }
$data[1] = html_print_checkbox( $data[1] = html_print_checkbox_switch(
'draw_events', 'draw_events',
1, 1,
(bool) $draw_events, (bool) $draw_events,
@ -323,14 +323,14 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
$data = []; $data = [];
$data[0] = __('Show alerts'); $data[0] = __('Show alerts');
$data[1] = html_print_checkbox('draw_alerts', 1, (bool) $draw_alerts, true); $data[1] = html_print_checkbox_switch('draw_alerts', 1, (bool) $draw_alerts, true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
/* /*
$data = array(); $data = array();
$data[0] = __('Show event graph'); $data[0] = __('Show event graph');
$data[1] = html_print_checkbox ("show_events_graph", 1, (bool) $show_events_graph, true); $data[1] = html_print_checkbox_switch ("show_events_graph", 1, (bool) $show_events_graph, true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
*/ */
@ -340,25 +340,25 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
case 'sparse': case 'sparse':
$data = []; $data = [];
$data[0] = __('Show percentil'); $data[0] = __('Show percentil');
$data[1] = html_print_checkbox('show_percentil', 1, (bool) $show_percentil, true); $data[1] = html_print_checkbox_switch('show_percentil', 1, (bool) $show_percentil, true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
$data = []; $data = [];
$data[0] = __('Time compare (Overlapped)'); $data[0] = __('Time compare (Overlapped)');
$data[1] = html_print_checkbox('time_compare_overlapped', 1, (bool) $time_compare_overlapped, true); $data[1] = html_print_checkbox_switch('time_compare_overlapped', 1, (bool) $time_compare_overlapped, true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
$data = []; $data = [];
$data[0] = __('Time compare (Separated)'); $data[0] = __('Time compare (Separated)');
$data[1] = html_print_checkbox('time_compare_separated', 1, (bool) $time_compare_separated, true); $data[1] = html_print_checkbox_switch('time_compare_separated', 1, (bool) $time_compare_separated, true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
$data = []; $data = [];
$data[0] = __('Show unknown graph'); $data[0] = __('Show unknown graph');
$data[1] = html_print_checkbox('unknown_graph', 1, (bool) $unknown_graph, true); $data[1] = html_print_checkbox_switch('unknown_graph', 1, (bool) $unknown_graph, true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
break; break;
@ -366,7 +366,7 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
$data = []; $data = [];
$data[0] = __('Show full scale graph (TIP)'); $data[0] = __('Show full scale graph (TIP)');
$data[1] = html_print_checkbox( $data[1] = html_print_checkbox_switch(
'fullscale', 'fullscale',
1, 1,
(bool) $fullscale, (bool) $fullscale,