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

5 files changed, 19 insertions, 22 deletions

diff --git a/applications/luci-livestats/htdocs/luci-static/resources/livestats/GraphRPC.js b/applications/luci-livestats/htdocs/luci-static/resources/livestats/GraphRPC.js
index 9ac291fd0..a7a89ffd2 100644
--- a/applications/luci-livestats/htdocs/luci-static/resources/livestats/GraphRPC.js
+++ b/applications/luci-livestats/htdocs/luci-static/resources/livestats/GraphRPC.js
@@ -25,7 +25,6 @@ function Graph(container, id, options, transform) {
 }
 
 Graph.prototype.addDataset = function(name, ds) {
-	if( window.console ) console.debug("AddDataset: " + name);
 	if( !this.layout ) {
 		this.layout = new PlotKit.Layout( this.type, this.options );
 	}
@@ -41,7 +40,6 @@ Graph.prototype.addDataset = function(name, ds) {
 }
 
 Graph.prototype.updateDataset = function(name, value) {
-	if( window.console ) console.debug("UpdateDataset: " + name + " " + value);
 	if( this.dataset[name] ) {
 		var ds = this.dataset[name];
 
@@ -140,39 +138,37 @@ GraphRPC.prototype.dispatchResponse = function(response) {
 					this.graphs[gid].updateDataset(
 						name, instance
 							? response[instance][this.ds[i]]
-							: response[parseInt(this.ds[i])]
+							: response[this.ds[i]]
 					);
 					this.graphs[gid].redraw();
 				}
 			}
 		}
 		else {
-			if( !this.graphs[instance] ) {
-				this.graphs[instance] = new Graph(
-					this.container, instance, this.options, this.transform
+			var gid = instance || 'livegraph';
+			if( !this.graphs[gid] ) {
+				this.graphs[gid] = new Graph(
+					this.container, gid, this.options, this.transform
 				);
-				if( window.console ) console.debug("NG: " + instance);
 
 				for( var i = 0; i < this.ds.length; i += 2 ) {
 					var name = this.ds[i+1] || this.ds[i];
-					if( window.console ) console.debug("ADS: " + name);
-					this.graphs[instance].addDataset(name);
+					this.graphs[gid].addDataset(name);
 				}
 
-				this.graphs[instance].draw();
+				this.graphs[gid].draw();
 			}
 			else {
 				for( var i = 0; i < this.ds.length; i += 2 ) {
 					var name = this.ds[i+1] || this.ds[i];
-					if( window.console ) console.debug("UDS: " + name + " " + response[instance][this.ds[i]]);
-					this.graphs[instance].updateDataset(
+					this.graphs[gid].updateDataset(
 						name, instance
 							? response[instance][this.ds[i]]
-							: response[parseInt(this.ds[i])]
+							: response[this.ds[i]]
 					);
 				}
 
-				this.graphs[instance].redraw();
+				this.graphs[gid].redraw();
 			}
 		}
 	}
diff --git a/applications/luci-livestats/luasrc/controller/livestats.lua b/applications/luci-livestats/luasrc/controller/livestats.lua
index 0ca227622..5211f7925 100644
--- a/applications/luci-livestats/luasrc/controller/livestats.lua
+++ b/applications/luci-livestats/luasrc/controller/livestats.lua
@@ -19,7 +19,7 @@ function index()
 	require("luci.i18n")
 	luci.i18n.loadc("livestats")
 
-	entry( {"admin", "status", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("livestat_wireless", "Live Wireless Statistics") ).i18n = "livestat"
-	entry( {"admin", "status", "trafstat"}, template("livestats/traffic"),  luci.i18n.translate("livestat_traffic",  "Live Traffic Statistics")  ).i18n = "livestat"
-	entry( {"admin", "status", "loadavg"},  template("livestats/loadavg"),  luci.i18n.translate("livestat_loadavg",  "Live Load Statistics")     ).i18n = "livestat"
+	entry( {"admin", "status", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("livestat_wireless", "Live Wireless Statistics"), 90 ).i18n = "livestat"
+	entry( {"admin", "status", "trafstat"}, template("livestats/traffic"),  luci.i18n.translate("livestat_traffic",  "Live Traffic Statistics"),  91 ).i18n = "livestat"
+	entry( {"admin", "status", "loadavg"},  template("livestats/loadavg"),  luci.i18n.translate("livestat_loadavg",  "Live Load Statistics"),     92 ).i18n = "livestat"
 end
diff --git a/applications/luci-livestats/luasrc/view/livestats/loadavg.htm b/applications/luci-livestats/luasrc/view/livestats/loadavg.htm
index a4e8fae00..f1d434b5d 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 d914fddc4..083b5cc2e 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 2ee60139e..2e34df978 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 } }
 		);
 	}