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

Merge branch '1334-Dashboards-con-widgets-que-contienen-una-consola-visual-con-elementos-Auto-SLA-Graph' into 'develop' 

Fix resize sla graphs in visual console - #1334

See merge request artica/pandorafms!915
This commit is contained in:
vgilc 2017-10-26 10:00:33 +02:00
parent 0249234b20 806b282e8f
commit 5e8b4491fe
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -867,8 +867,6 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
include_javascript_dependencies_flot_graph(); include_javascript_dependencies_flot_graph();
$height+= 20;
$stacked_str = 'stack: stack,'; $stacked_str = 'stack: stack,';
// Get a unique identifier to graph // Get a unique identifier to graph
@ -876,10 +874,10 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
// Set some containers to legend, graph, timestamp tooltip, etc. // Set some containers to legend, graph, timestamp tooltip, etc.
if ($stat_win) { if ($stat_win) {
$return = "<div id='$graph_id' class='graph $adapt_key' style='width: ".$width."px; height: ".$height."px; display: inline-block;'></div>"; $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width."px; height: ".$height."px; display: inline-block;'></div>";
} }
else { else {
$return = "<div id='$graph_id' class='graph $adapt_key' style='width: ".$width."px; height: ".$height."px;'></div>"; $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width."px; height: ".$height."px;'></div>";
} }
$return .= "<div id='value_$graph_id' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>"; $return .= "<div id='value_$graph_id' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>";