From b70bd2f30348dea4be75e3bd66f1538ec04c840a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 20 Aug 2017 09:02:57 +0200
Subject: [PATCH] traffic graph: firefox complains abou missing "px", better
 padding

---
 plist                    |  1 -
 src/www/status_graph.php | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/plist b/plist
index 92c189034..e8ca637f4 100644
--- a/plist
+++ b/plist
@@ -750,7 +750,6 @@
 /usr/local/opnsense/www/css/jquery.bootgrid.css
 /usr/local/opnsense/www/css/jquery.tokenize.css
 /usr/local/opnsense/www/css/nv.d3.css
-/usr/local/opnsense/www/css/nv.d3.min.css
 /usr/local/opnsense/www/fonts/FontAwesome.otf
 /usr/local/opnsense/www/fonts/fontawesome-webfont.eot
 /usr/local/opnsense/www/fonts/fontawesome-webfont.svg
diff --git a/src/www/status_graph.php b/src/www/status_graph.php
index eef36e00a..3e6b860f5 100644
--- a/src/www/status_graph.php
+++ b/src/www/status_graph.php
@@ -125,7 +125,7 @@ include("head.inc");
 <style>
 .minigraph path {
     stroke: steelblue;
-    stroke-width: 1;
+    stroke-width: 1px;
     fill: none;
 }
 .minigraph {
@@ -255,22 +255,22 @@ include("head.inc");
 						})
 					var svg = document.createElementNS(d3.ns.prefix.svg, 'g');
 					var graphIn = d3.select(svg).append("svg:svg")
-						  .attr("width", w + m[1] + m[3])
-						  .attr("height", h + m[0] + m[2])
+						  .attr("width", w + m[1] + m[3] + "px")
+						  .attr("height", h + m[0] + m[2] + "px")
 						.append("svg:g")
 						  .attr("transform", "translate(" + m[3] + "," + m[0] + ")");
 					var svg2 = document.createElementNS(d3.ns.prefix.svg, 'g');
 					var graphOut = d3.select(svg).append("svg:svg")
-						  .attr("width", w + m[1] + m[3])
-						  .attr("height", h + m[0] + m[2])
+						  .attr("width", w + m[1] + m[3] + "px")
+						  .attr("height", h + m[0] + m[2] + "px")
 						.append("svg:g")
 						  .attr("transform", "translate(" + m[3] + "," + m[0] + ")");
 			html.push('<tr>');
 			html.push('<td>'+record.host+'</td>');
                     graphIn.append("svg:path").attr("d", line(record.historyin));
                     graphOut.append("svg:path").attr("d", line(record.historyout));
-                    html.push('<td style="width: 55px;">' +formatSizeUnits(record.in)+'</td><td style="padding: 0; width: ' + w + '; height: ' + h + ';"><svg class="minigraph" style="width: ' + w  + '; height: ' + h + ';">' + graphIn.html() + '</svg></td>');
-                    html.push('<td style="width: 55px;">' +formatSizeUnits(record.out)+'</td><td style="padding: 0; width: ' + w + '; height: ' + h + ';"><svg class="minigraph" style="width: ' + w  + '; height: ' + h + ';">' + graphOut.html() + '</svg></td>');
+                    html.push('<td style="width: 55px;">' +formatSizeUnits(record.in)+'</td><td style="width: ' + w + 'px; height: ' + h + 'px;"><svg class="minigraph" style="width: ' + w  + 'px; height: ' + h + 'px;">' + graphIn.html() + '</svg></td>');
+                    html.push('<td style="width: 55px;">' +formatSizeUnits(record.out)+'</td><td style="width: ' + w + 'px; height: ' + h + 'px;"><svg class="minigraph" style="width: ' + w  + 'px; height: ' + h + 'px;">' + graphOut.html() + '</svg></td>');
 			html.push('<td>'+formatSizeUnits(record.totalin)+'</td>');
 			html.push('<td>'+formatSizeUnits(record.totalout)+'</td>');
 			html.push('</tr>');