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

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

* include/graphs/flot/pandora.flot.js
	include/graphs/functions_flot.php: Fixed problem with the overview
	graph in IE9 for incident #477



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9304 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2014-01-09 15:02:28 +00:00
parent be56740004
commit df8b32048a
3 changed files with 11 additions and 3 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-09 Sergio Martin <sergio.martin@artica.es>
* include/graphs/flot/pandora.flot.js
include/graphs/functions_flot.php: Fixed problem with the overview
graph in IE9 for incident #477
2014-01-09 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php: added function "https_is_running".

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

@ -965,8 +965,10 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
if (menu) {
var parent_height;
$('#menu_overview_'+graph_id).click(function() {
$('#overview_'+graph_id).toggle();
//adjust_menu(graph_id, plot, parent_height);
if ( $('#overview_'+graph_id).css('visibility') == 'hidden' )
$('#overview_'+graph_id).css('visibility','visible');
else
$('#overview_'+graph_id).css('visibility','hidden');
});
$('#menu_threshold_'+graph_id).click(function() {

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

@ -131,7 +131,7 @@ 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 .= "<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='overview_$graph_id' class='overview_graph' style='display:none; margin-left:0px; margin-top:20px; width: ".$width."px; height:50px;'></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 ($water_mark != '') {
$return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='$water_mark'></div>";