* luci/app/livestats: fix load diagram, improvements for diagram layout, fix menu order

3 files changed, 6 insertions, 5 deletions

diff --git a/applications/luci-livestats/luasrc/view/livestats/loadavg.htm b/applications/luci-livestats/luasrc/view/livestats/loadavg.htm
index a4e8fae00a..f1d434b5d2 100644
--- a/applications/luci-livestats/luasrc/view/livestats/loadavg.htm
+++ b/applications/luci-livestats/luasrc/view/livestats/loadavg.htm
@@ -25,14 +25,14 @@
 			2000,
 
 			// Data sources
-			[ "1", "1 Minute Load", "2", "5 Minutes Load", "3", "15 Minutes Load" ],
+			[ 0, "1 Minute Load", 1, "5 Minutes Load", 2, "15 Minutes Load" ],
 
 			// Graph layout options
-			{ shouldFill: false, strokeColor: null,
+			{ shouldFill: false, drawBackground: false, strokeColor: null,
 			  strokeColorTransform: "asFillColor",
 			  title: 'Average Load', strokeWidth: 1,
 			  padding: { left: 70, right: 10, top: 10, bottom: 20 },
-			  instances: [ false ] }
+			  instances: [ false ], yAxis: [ 0, 2 ] }
 		);
 	}
 
diff --git a/applications/luci-livestats/luasrc/view/livestats/traffic.htm b/applications/luci-livestats/luasrc/view/livestats/traffic.htm
index d914fddc44..083b5cc2e6 100644
--- a/applications/luci-livestats/luasrc/view/livestats/traffic.htm
+++ b/applications/luci-livestats/luasrc/view/livestats/traffic.htm
@@ -32,7 +32,7 @@
 			[ "1", "received Bytes/s", "9", "transmitted Bytes/s" ],
 
 			// Graph layout options
-			{ shouldFill: false, strokeColor: null,
+			{ shouldFill: true, drawBackground: false, strokeColor: null,
 			  strokeColorTransform: "asFillColor",
 			  title: 'Traffic on interface "%s"',
 			  separateDS: true, strokeWidth: 0.5, height: 140,
diff --git a/applications/luci-livestats/luasrc/view/livestats/wireless.htm b/applications/luci-livestats/luasrc/view/livestats/wireless.htm
index 2ee60139e0..2e34df978e 100644
--- a/applications/luci-livestats/luasrc/view/livestats/wireless.htm
+++ b/applications/luci-livestats/luasrc/view/livestats/wireless.htm
@@ -17,7 +17,8 @@
 			[ "Noise level", null, "Signal level", null ],
 
 			// Graph layout options
-			{ yAxis: [ 0, 150 ], title: 'Wifi Interface "%s": Signal and Noise',
+			{ drawBackground: false, yAxis: [ 0, 150 ],
+			  title: 'Wifi Interface "%s": Signal and Noise',
 			  padding: { left: 40, right: 10, top: 10, bottom: 20 } }
 		);
 	}