From 7eec14930997efdb09884752ae0b74f14dfda621 Mon Sep 17 00:00:00 2001
From: Nils Steinger <git@n-st.de>
Date: Mon, 21 Sep 2015 22:00:55 +0200
Subject: [PATCH] Set minigraph image dimensions in HTML so graph popups will
 have correct dimensions when the graph images haven't been loaded yet

---
 html/includes/common/generic-graph.inc.php | 2 +-
 html/includes/functions.inc.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/includes/common/generic-graph.inc.php b/html/includes/common/generic-graph.inc.php
index 81776efe1..086239df7 100644
--- a/html/includes/common/generic-graph.inc.php
+++ b/html/includes/common/generic-graph.inc.php
@@ -324,5 +324,5 @@ else {
     if (empty($widget_settings['title'])) {
         $widget_settings['title']     = $widget_settings['graph_'.$type]['hostname']." / ".$widget_settings['graph_'.$type]['name']." / ".$widget_settings['graph_type'];
     }
-    $common_output[]                  = '<img class="minigraph-image" src="graph.php?'.$param.'&from='.$config['time'][$widget_settings['graph_range']].'&to='.$config['time']['now'].'&width='.$widget_dimensions['x'].'&height='.$widget_dimensions['y'].'&type='.$widget_settings['graph_type'].'&legend='.($widget_settings['graph_legend'] == 1 ? 'yes' : 'no').'&absolute=1"/>';
+    $common_output[]                  = '<img class="minigraph-image" width="'.$widget_dimensions['x'].'" height="'.$widget_dimensions['y'].'" src="graph.php?'.$param.'&from='.$config['time'][$widget_settings['graph_range']].'&to='.$config['time']['now'].'&width='.$widget_dimensions['x'].'&height='.$widget_dimensions['y'].'&type='.$widget_settings['graph_type'].'&legend='.($widget_settings['graph_legend'] == 1 ? 'yes' : 'no').'&absolute=1"/>';
 }
diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index b4ab63c70..67d062b4c 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -182,7 +182,7 @@ function get_percentage_colours($percentage) {
 
 
 function generate_minigraph_image($device, $start, $end, $type, $legend='no', $width=275, $height=100, $sep='&amp;', $class='minigraph-image',$absolute_size=0) {
-    return '<img class="'.$class.'" src="graph.php?'.implode($sep, array('device='.$device['device_id'], "from=$start", "to=$end", "width=$width", "height=$height", "type=$type", "legend=$legend", "absolute=$absolute_size")).'">';
+    return '<img class="'.$class.'" width="'.$width.'" height="'.$height.'" src="graph.php?'.implode($sep, array('device='.$device['device_id'], "from=$start", "to=$end", "width=$width", "height=$height", "type=$type", "legend=$legend", "absolute=$absolute_size")).'">';
 
 }//end generate_minigraph_image()