X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fiface_overview.htm;h=957d91749dca5732ff1586f7e218b40479860a5c;hp=132a5dddf1e0e9dc6f9b00e63db2ae3fd81111fa;hb=895c65738100e29ce28ec9e65d060ce8e7cb3952;hpb=75e807e28912c89123df5a042a0a5df0b3bc936a

diff --git a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
index 132a5dddf..957d91749 100644
--- a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
@@ -8,7 +8,7 @@ You may obtain a copy of the License at
 
 	http://www.apache.org/licenses/LICENSE-2.0
 
-$Id: wifi_overview.htm 6280 2010-10-12 05:06:34Z jow $
+$Id$
 
 -%>
 
@@ -24,10 +24,8 @@ $Id: wifi_overview.htm 6280 2010-10-12 05:06:34Z jow $
 	end
 -%>
 
-<%+header%>
-
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript"><![CDATA[
+<script type="text/javascript">//<![CDATA[
 	function iface_shutdown(id, reconnect) {
 		if (!reconnect && !confirm(String.format('<%_Really shutdown interface "%s" ?\nYou might loose access to this router if you are connected via this interface.%>', id)))
 			return;
@@ -68,7 +66,7 @@ $Id: wifi_overview.htm 6280 2010-10-12 05:06:34Z jow $
 	var wifidevs = <%=luci.http.write_json(netdevs)%>;
 	var arptable = <%=luci.http.write_json(arpcache)%>;
 
-	(function() {
+	var update_status = function() {
 		iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "iface_status", table.concat(netlist, ","))%>', null,
 			function(x, ifcs)
 			{
@@ -158,19 +156,19 @@ $Id: wifi_overview.htm 6280 2010-10-12 05:06:34Z jow $
 							t.innerHTML = String.format(
 								'<strong><%:RX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />' +
 								'<strong><%:TX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />',
-									txb, txp, rxb, rxp
+									rxb, rxp, txb, txp
 							);
 						}
 					}
 				}
+
+				window.setTimeout(update_status, 5000);
 			}
 		)
+	};
 
-		window.setTimeout(arguments.callee, 5000);
-	})();
-]]></script>
-
-<h2><a id="content" name="content"><%:Interface Overview%></a></h2>
+	update_status();
+//]]></script>
 
 <fieldset class="cbi-section" style="display:none">
 	<legend><%:Reconnecting interface%></legend>
@@ -180,6 +178,8 @@ $Id: wifi_overview.htm 6280 2010-10-12 05:06:34Z jow $
 
 <div class="cbi-map">
 	<fieldset class="cbi-section">
+		<legend><%:Interface Overview%></legend>
+
 		<table class="cbi-section-table" style="margin:10px; empty-cells:hide">
 			<tr class="cbi-section-table-titles">
 				<th class="cbi-section-table-cell">&nbsp;</th>
@@ -194,7 +194,7 @@ $Id: wifi_overview.htm 6280 2010-10-12 05:06:34Z jow $
 					<td>
 						<span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net%></span>
 					</td>
-					<td class="cbi-value-field" style="width:16px; padding:3px; text-align:center" id="<%=net%>-ifc-signal">
+					<td class="cbi-value-field" style="min-width:16px; padding:3px; text-align:center" id="<%=net%>-ifc-signal">
 						<img src="<%=resource%>/icons/ethernet_disabled.png" style="width:16px; height:16px" /><br />
 						<small>?</small>
 					</td>
@@ -215,12 +215,9 @@ $Id: wifi_overview.htm 6280 2010-10-12 05:06:34Z jow $
 				</tr>
 			<% end %>
 		</table>
-	</fieldset>
 
-	<form action="<%=luci.dispatcher.build_url("admin/network/iface_add")%>" method="post">
-		<br />
-		<input type="submit" class="cbi-button cbi-button-apply" value="<%:Add new interface...%>" />
-	</form>
+		<form action="<%=luci.dispatcher.build_url("admin/network/iface_add")%>" method="post">
+			<input type="submit" class="cbi-button cbi-button-add" value="<%:Add new interface...%>" />
+		</form>
+	</fieldset>
 </div>
-
-<%+footer%>