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

Fixed the custom line thickness of the flot line graphs

This commit is contained in:
Alejandro Gallardo Escobar 2016-05-30 19:31:01 +02:00
parent 7cec21d839
commit 6e2cddc48d
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -918,13 +918,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
//~ { color: criticalw, yaxis: { to: -1 } } //~ { color: criticalw, yaxis: { to: -1 } }
//~ ]; //~ ];
lineWidht = $('#hidden-lineWidhtGraph').val(); var lineWidth = $('#hidden-line_width_graph').val() || 1;
if (typeof(lineWidht)=='undefined') {
WidhtLine = 1;
}
else {
WidhtLine = lineWidht;
}
// Data // Data
data_base.push({ data_base.push({
@ -939,7 +933,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
fillColor: { fillColor: {
colors: [ { opacity: 0.9 }, { opacity: 0.9 } ] colors: [ { opacity: 0.9 }, { opacity: 0.9 } ]
}, },
lineWidth: WidhtLine, lineWidth: lineWidth,
steps: steps_chart steps: steps_chart
}, },
points: { show: points_show } points: { show: points_show }

2
pandora_console/include/graphs/functions_flot.php
View File

@ -216,7 +216,6 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
if ($threshold) { if ($threshold) {
$nbuttons++; $nbuttons++;
} }
$return .= html_print_input_hidden ('lineWidhtGraph', $config['custom_graph_width'],true);
$menu_width = 25 * $nbuttons + 15; $menu_width = 25 * $nbuttons + 15;
if ( $dashboard == false AND $vconsole == false) { if ( $dashboard == false AND $vconsole == false) {
$return .= "<div id='menu_$graph_id' class='menu_graph' " . $return .= "<div id='menu_$graph_id' class='menu_graph' " .
@ -241,6 +240,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
$return .= "</div>"; $return .= "</div>";
} }
} }
$return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true);
$return .= "<div id='timestamp_$graph_id' class='timestamp_graph' style='font-size:".$font_size."pt;display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px; z-index:1000;'></div>"; $return .= "<div id='timestamp_$graph_id' class='timestamp_graph' style='font-size:".$font_size."pt;display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px; z-index:1000;'></div>";
$return .= "<div id='$graph_id' class='graph $adapt_key' style='width: ".$width."px; height: ".$height."px;'></div>"; $return .= "<div id='$graph_id' class='graph $adapt_key' style='width: ".$width."px; height: ".$height."px;'></div>";
if ($menu) { if ($menu) {

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

@ -116,7 +116,7 @@ if ($view_graph) {
include ("general/noaccess.php"); include ("general/noaccess.php");
exit; exit;
} }
html_print_input_hidden ('lineWidhtGraph', $config['custom_graph_width']); html_print_input_hidden ('line_width_graph', $config['custom_graph_width']);
html_print_input_hidden ('custom_graph', 1); html_print_input_hidden ('custom_graph', 1);
$url = "index.php?" . $url = "index.php?" .
"sec=reporting&" . "sec=reporting&" .