tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '66-pequenos-arreglos-en-interfaz-de-creacion-de-graficas-combinadas' into 'develop'

Browse Source 
Improve custom graph interface - #66

See merge request !179
This commit is contained in:
Enrique Camargo 2017-02-21 12:39:01 +01:00
commit 32806a5538
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_ui.php
View File

@ -2411,16 +2411,10 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "",
$separator_class = "separator_view"; $separator_class = "separator_view";
} }
$buffer = '<div id="'.$type2.'" style=""><div id="menu_tab_left">'; $buffer = '<div id="'.$type2.'" style=""><div id="menu_tab_left">';
$buffer .= '<ul class="mn"><li class="' . $type . '">&nbsp;' . '&nbsp; '; $buffer .= '<ul class="mn"><li class="' . $type . '">&nbsp;' . '&nbsp; ';
if(strpos($title, "Monitoring » Services »") != -1){
$title = str_replace("Monitoring » Services » Service Map » ",'',$title);
}
$buffer .= '<span style="margin-right:10px;">' . $buffer .= '<span style="margin-right:10px;">' .
ui_print_truncate_text($title, $numChars); ui_print_truncate_text($title, $numChars);

9
pandora_console/operation/reporting/graph_viewer.php
View File

@ -132,6 +132,9 @@ if ($view_graph) {
if (check_acl ($config['id_user'], 0, "RW")) { if (check_acl ($config['id_user'], 0, "RW")) {
$options = array( $options = array(
'graph_list' => array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs">' .
html_print_image("images/list.png", true, array ("title" => __('Graph list'))) .'</a>'),
'main' => array('active' => false, 'main' => array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=main&edit_graph=1&id=' . $id_graph . '">' . 'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=main&edit_graph=1&id=' . $id_graph . '">' .
html_print_image("images/chart.png", true, array ("title" => __('Main data'))) .'</a>'), html_print_image("images/chart.png", true, array ("title" => __('Main data'))) .'</a>'),
@ -161,10 +164,10 @@ if ($view_graph) {
} }
// Header // Header
ui_print_page_header (__('Reporting') . " &raquo; " .
__('Custom graphs') . " - " . $graph['name'],
"images/chart.png", false, "", false, $options);
ui_print_page_header ($graph['name'],
"images/chart.png", false, "", false, $options);
$graph_return = custom_graphs_print($id_graph, $height, $width, $period, $stacked, true, $unixdate, false, 'white', $graph_return = custom_graphs_print($id_graph, $height, $width, $period, $stacked, true, $unixdate, false, 'white',
array(), '', array(), array(), true, true, true, true, 1, false, false, $percentil, false); array(), '', array(), array(), true, true, true, true, 1, false, false, $percentil, false);
if ($graph_return){ if ($graph_return){