X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_status%2Fbandwidth.htm;h=0c53c95bed3f6b50babe38639b8a86017098283e;hp=da683737064a7ef6185ae12ab43b80465d4ddfd2;hb=2aad24cec13cbc4765cbbc5502832184713b823f;hpb=e415f27419700d3259f367d73d0afcba1593b66c

diff --git a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
index da6837370..0c53c95be 100644
--- a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
@@ -71,25 +71,25 @@ $Id$
 
 	function bandwidth_label(bytes, br)
 	{
-		var uby = 'KByte';
+		var uby = '<%:kB/s%>';
 		var kby = (bytes / 1024);
 
 		if (kby >= 1024)
 		{
-			uby = 'MByte';
+			uby = '<%:MB/s%>';
 			kby = kby / 1024;
 		}
 
-		var ubi = 'KBit';
+		var ubi = '<%:kbit/s%>';
 		var kbi = (bytes * 8 / 1024);
 
 		if (kbi >= 1024)
 		{
-			ubi = 'MBit';
+			ubi = '<%:Mbit/s%>';
 			kbi = kbi / 1024;
 		}
 
-		return String.format("%f %s/s%s(%f %s/s)",
+		return String.format("%f %s%s(%f %s)",
 			kbi.toFixed(2), ubi,
 			br ? '<br />' : ' ',
 			kby.toFixed(2), uby
@@ -147,7 +147,7 @@ $Id$
 
 
 				/* plot horizontal time interval lines */
-				for (var i = step * 60; i < width; i += step * 60)
+				for (var i = width % (step * 60); i < width; i += step * 60)
 				{
 					var line = G.createElementNS('http://www.w3.org/2000/svg', 'line');
 						line.setAttribute('x1', i);
@@ -160,7 +160,7 @@ $Id$
 						text.setAttribute('x', i + 5);
 						text.setAttribute('y', 15);
 						text.setAttribute('style', 'fill:#999999; font-size:9pt');
-						text.appendChild(G.createTextNode(Math.round(i / step / 60) + 'm'));
+						text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
 
 					label_25.parentNode.appendChild(line);
 					label_25.parentNode.appendChild(text);
@@ -169,7 +169,7 @@ $Id$
 				label_scale.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 3);
 
 				/* render datasets, start update interval */
-				XHR.poll(3, '<%=build_url("admin/status/bandwidth_status", curdev)%>', null,
+				XHR.poll(3, '<%=build_url("admin/status/realtime/bandwidth_status", curdev)%>', null,
 					function(x, data)
 					{
 						var data_max   = 0;
@@ -188,11 +188,14 @@ $Id$
 								continue;
 
 							/* normalize difference against time interval */
-							var time_delta = data[i][TIME] - data[i-1][TIME];
-							if (time_delta)
+							if (i > 0)
 							{
-								data_rx.push((data[i][RXB] - data[i-1][RXB]) / time_delta);
-								data_tx.push((data[i][TXB] - data[i-1][TXB]) / time_delta);
+								var time_delta = data[i][TIME] - data[i-1][TIME];
+								if (time_delta)
+								{
+									data_rx.push((data[i][RXB] - data[i-1][RXB]) / time_delta);
+									data_tx.push((data[i][TXB] - data[i-1][TXB]) / time_delta);
+								}
 							}
 						}
 
@@ -285,23 +288,23 @@ $Id$
 <table style="width:100%; table-layout:fixed" cellspacing="5">
 	<tr>
 		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:Inbound:%></strong></td>
-		<td id="rx_bw_cur">0 kbit/s<br />(0 KB/s)</td>
+		<td id="rx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 
 		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
-		<td id="rx_bw_avg">0 kbit/s<br />(0 KB/s)</td>
+		<td id="rx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 
 		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
-		<td id="rx_bw_peak">0 kbit/s<br />(0 KB/s)</td>
+		<td id="rx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 	</tr>
 	<tr>
 		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:Outbound:%></strong></td>
-		<td id="tx_bw_cur">0 kbit/s<br />(0 KB/s)</td>
+		<td id="tx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 
 		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
-		<td id="tx_bw_avg">0 kbit/s<br />(0 KB/s)</td>
+		<td id="tx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 
 		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
-		<td id="tx_bw_peak">0 kbit/s<br />(0 KB/s)</td>
+		<td id="tx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 	</tr>
 </table>