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

diff --git a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
deleted file mode 100644
index 0c53c95be..000000000
--- a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
+++ /dev/null
@@ -1,311 +0,0 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
--%>
-
-<%-
-	local ntm = require "luci.model.network".init()
-
-	local dev
-	local devices = { }
-	for _, dev in luci.util.vspairs(luci.sys.net.devices()) do
-		if dev ~= "lo" and not ntm:ignore_interface(dev) then
-			devices[#devices+1] = dev
-		end
-	end
-
-	local curdev = luci.dispatcher.context.requestpath
-	      curdev = curdev[#curdev] ~= "bandwidth" and curdev[#curdev] or devices[1]
--%>
-
-<%+header%>
-
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-	var bwxhr = new XHR();
-
-	var G;
-	var TIME = 0;
-	var RXB  = 1;
-	var RXP  = 2;
-	var TXB  = 3;
-	var TXP  = 4;
-
-	var width  = 760;
-	var height = 300;
-	var step   = 5;
-
-	var data_wanted = Math.floor(width / step);
-	var data_fill   = 0;
-	var data_stamp  = 0;
-
-	var data_rx = [ ];
-	var data_tx = [ ];
-
-	var line_rx;
-	var line_tx;
-
-	var label_25;
-	var label_50;
-	var label_75;
-
-	var label_rx_cur;
-	var label_rx_avg;
-	var label_rx_peak;
-
-	var label_tx_cur;
-	var label_tx_avg;
-	var label_tx_peak;
-
-	var label_scale;
-
-
-	function bandwidth_label(bytes, br)
-	{
-		var uby = '<%:kB/s%>';
-		var kby = (bytes / 1024);
-
-		if (kby >= 1024)
-		{
-			uby = '<%:MB/s%>';
-			kby = kby / 1024;
-		}
-
-		var ubi = '<%:kbit/s%>';
-		var kbi = (bytes * 8 / 1024);
-
-		if (kbi >= 1024)
-		{
-			ubi = '<%:Mbit/s%>';
-			kbi = kbi / 1024;
-		}
-
-		return String.format("%f %s%s(%f %s)",
-			kbi.toFixed(2), ubi,
-			br ? '<br />' : ' ',
-			kby.toFixed(2), uby
-		);
-	}
-
-	/* wait for SVG */
-	window.setTimeout(
-		function() {
-			var svg = document.getElementById('bwsvg');
-
-			try {
-				G = svg.getSVGDocument
-					? svg.getSVGDocument() : svg.contentDocument;
-			}
-			catch(e) {
-				G = document.embeds['bwsvg'].getSVGDocument();
-			}
-
-			if (!G)
-			{
-				window.setTimeout(arguments.callee, 1000);
-			}
-			else
-			{
-				/* find sizes */
-				width       = svg.offsetWidth  - 2;
-				height      = svg.offsetHeight - 2;
-				data_wanted = Math.ceil(width / step);
-
-				/* prefill datasets */
-				for (var i = 0; i < data_wanted; i++)
-				{
-					data_rx[i] = 0;
-					data_tx[i] = 0;
-				}
-
-				/* find svg elements */
-				line_rx = G.getElementById('rx');
-				line_tx = G.getElementById('tx');
-
-				label_25 = G.getElementById('label_25');
-				label_50 = G.getElementById('label_50');
-				label_75 = G.getElementById('label_75');
-
-				label_rx_cur  = document.getElementById('rx_bw_cur');
-				label_rx_avg  = document.getElementById('rx_bw_avg');
-				label_rx_peak = document.getElementById('rx_bw_peak');
-
-				label_tx_cur  = document.getElementById('tx_bw_cur');
-				label_tx_avg  = document.getElementById('tx_bw_avg');
-				label_tx_peak = document.getElementById('tx_bw_peak');
-
-				label_scale   = document.getElementById('scale');
-
-
-				/* plot horizontal time interval lines */
-				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);
-						line.setAttribute('y1', 0);
-						line.setAttribute('x2', i);
-						line.setAttribute('y2', '100%');
-						line.setAttribute('style', 'stroke:black;stroke-width:0.1');
-
-					var text = G.createElementNS('http://www.w3.org/2000/svg', 'text');
-						text.setAttribute('x', i + 5);
-						text.setAttribute('y', 15);
-						text.setAttribute('style', 'fill:#999999; font-size:9pt');
-						text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
-
-					label_25.parentNode.appendChild(line);
-					label_25.parentNode.appendChild(text);
-				}
-
-				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/realtime/bandwidth_status", curdev)%>', null,
-					function(x, data)
-					{
-						var data_max   = 0;
-						var data_scale = 0;
-
-						var data_rx_avg = 0;
-						var data_tx_avg = 0;
-
-						var data_rx_peak = 0;
-						var data_tx_peak = 0;
-
-						for (var i = data_stamp ? 0 : 1; i < data.length; i++)
-						{
-							/* skip overlapping entries */
-							if (data[i][TIME] <= data_stamp)
-								continue;
-
-							/* normalize difference against time interval */
-							if (i > 0)
-							{
-								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);
-								}
-							}
-						}
-
-						/* cut off outdated entries */
-						data_rx = data_rx.slice(data_rx.length - data_wanted, data_rx.length);
-						data_tx = data_tx.slice(data_tx.length - data_wanted, data_tx.length);
-
-						/* find peak */
-						for (var i = 0; i < data_rx.length; i++)
-						{
-							data_max = Math.max(data_max, data_rx[i]);
-							data_max = Math.max(data_max, data_tx[i]);
-
-							data_rx_peak = Math.max(data_rx_peak, data_rx[i]);
-							data_tx_peak = Math.max(data_tx_peak, data_tx[i]);
-
-							if (i > 0)
-							{
-								data_rx_avg = (data_rx_avg + data_rx[i]) / 2;
-								data_tx_avg = (data_tx_avg + data_tx[i]) / 2;
-							}
-							else
-							{
-								data_rx_avg = data_rx[i];
-								data_tx_avg = data_tx[i];
-							}
-						}
-
-						/* remember current timestamp, calculate horizontal scale */
-						data_stamp = data[data.length-1][TIME];
-						data_scale = height / (data_max * 1.1);
-
-
-						/* plot data */
-						var pt_rx = '0,' + height;
-						var pt_tx = '0,' + height;
-
-						var y_rx = 0;
-						var y_tx = 0;
-
-						for (var i = 0; i < data_rx.length; i++)
-						{
-							var x = i * step;
-
-							y_rx = height - Math.floor(data_rx[i] * data_scale);
-							y_tx = height - Math.floor(data_tx[i] * data_scale);
-
-							pt_rx += ' ' + x + ',' + y_rx;
-							pt_tx += ' ' + x + ',' + y_tx;
-						}
-
-						pt_rx += ' ' + width + ',' + y_rx + ' ' + width + ',' + height;
-						pt_tx += ' ' + width + ',' + y_tx + ' ' + width + ',' + height;
-
-
-						line_rx.setAttribute('points', pt_rx);
-						line_tx.setAttribute('points', pt_tx);
-
-						label_25.firstChild.data = bandwidth_label(1.1 * 0.25 * data_max);
-						label_50.firstChild.data = bandwidth_label(1.1 * 0.50 * data_max);
-						label_75.firstChild.data = bandwidth_label(1.1 * 0.75 * data_max);
-
-						label_rx_cur.innerHTML = bandwidth_label(data_rx[data_rx.length-1], true);
-						label_tx_cur.innerHTML = bandwidth_label(data_tx[data_tx.length-1], true);
-
-						label_rx_avg.innerHTML = bandwidth_label(data_rx_avg, true);
-						label_tx_avg.innerHTML = bandwidth_label(data_tx_avg, true);
-
-						label_rx_peak.innerHTML = bandwidth_label(data_rx_peak, true);
-						label_tx_peak.innerHTML = bandwidth_label(data_tx_peak, true);
-					}
-				);
-			}
-		}, 1000
-	);
-//]]></script>
-
-<h2><a id="content" name="content"><%:Realtime Traffic%></a></h2>
-
-<ul class="cbi-tabmenu">
-	<% for _, dev in ipairs(devices) do %>
-		<li class="cbi-tab<%= dev == curdev and "" or "-disabled" %>"><a href="<%=pcdata(dev)%>"><%=pcdata(dev)%></a></li>
-	<% end %>
-</ul>
-
-<embed id="bwsvg" style="width:100%; height:300px; border:1px solid #000000; background-color:#FFFFFF" src="<%=resource%>/bandwidth.svg" />
-<div style="text-align:right"><small id="scale">-</small></div>
-<br />
-
-<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 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 style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></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 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 style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
-		<td id="tx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
-	</tr>
-</table>
-
-<%+footer%>