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

Merge branch 'ent-5997-marca-horaria-graficas-modulos' into 'develop' 

Returned timestamp message for graphs

Closes pandora_enterprise#5997

See merge request artica/pandorafms!3306
This commit is contained in:
Alejandro Fraguas 2020-06-22 10:30:32 +02:00
parent ed7c51e685 cdf4109ad4
commit 01c72e09b4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,14 +226,13 @@ function flot_area_graph(
$config['custom_graph_width'],
true
);
/*
$return .= "<div id='timestamp_$graph_id'
class='timestamp_graph'
style=' font-size:".$params['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:".$params['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='";
if ($params['type'] == 'area_simple') {