From 989166a354ac717bf00c0582a757d89717a07275 Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Tue, 17 Jun 2014 15:42:31 +0000
Subject: [PATCH] 2014-06-17 Sergio Martin <sergio.martin@artica.es>
* include/graphs/functions_flot.php: Fix height of the
div with events info in graphs
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10222 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 5 +++++
pandora_console/include/graphs/functions_flot.php | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 9f53db8086..157a9f8403 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-17 Sergio Martin <sergio.martin@artica.es>
+
+ * include/graphs/functions_flot.php: Fix height of the
+ div with events info in graphs
+
2014-06-17 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/agentes/module_manager_editor_common.php,
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 8e2ee96b01..6edb2e1a3d 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -241,10 +241,9 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_in
$return .= "<a href='javascript:'><img id='menu_overview_$graph_id' src='".$homeurl."images/chart_curve_overview.png' alt='".__('Overview graph')."' title='".__('Overview graph')."'></a>
</div>";
}
- $extra_height = $height - 50;
$extra_width = (int)($width / 3);
- $return .= "<div id='extra_$graph_id' style='font-size: ".$font_size."pt; display:none; position:absolute; overflow: auto; height: ".$extra_height."px; width: ".$extra_width."px; background:#fff; padding: 2px 2px 2px 2px; border: solid #000 1px;'></div>";
+ $return .= "<div id='extra_$graph_id' style='font-size: ".$font_size."pt; display:none; position:absolute; overflow: auto; max-height: ".($height+50)."px; width: ".$extra_width."px; background:#fff; padding: 2px 2px 2px 2px; border: solid #000 1px;'></div>";
// Process extra data
$events = array();