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

2014-01-13 Sergio Martin <sergio.martin@artica.es> 

* include/graphs/functions_flot.php: fix unecessary space under the
	area graphs when menu is not setted. If is setted, this space is
	for the overview graph. Incident #499



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9313 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2014-01-13 10:29:12 +00:00
parent 4f5bd30ce3
commit 03de0a1813
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2014-01-13 Sergio Martin <sergio.martin@artica.es>
* include/graphs/functions_flot.php: fix unecessary space under the
area graphs when menu is not setted. If is setted, this space is
for the overview graph. Incident #499
2014-01-10 Miguel de Dios <miguel.dedios@artica.es> 2014-01-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: fixed the show simple values in * include/functions_visual_map.php: fixed the show simple values in

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

@ -131,7 +131,13 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_in
$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:".$font_size."pt'></p>"; $return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:".$font_size."pt'></p>";
$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>";
$return .= "<div id='overview_$graph_id' class='overview_graph' style='visibility: hidden; margin-left:0px; margin-top:20px; width: ".$width."px; height:100px;'></div>"; if($menu) {
$height = 100;
}
else {
$height = 0;
}
$return .= "<div id='overview_$graph_id' class='overview_graph' style='visibility: hidden; margin-left:0px; margin-top:20px; width: ".$width."px; height: ".$height ."px;'></div>";
if ($water_mark != '') { if ($water_mark != '') {
$return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='$water_mark'></div>"; $return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='$water_mark'></div>";