X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fwifi_overview.htm;h=97d900d5cf8def5203db4c846bd5dda97bb4be2d;hp=22d27cb1cd59c3eb754cf62a90341e62f511d4f7;hb=03ed541b7613206010ddfbfc5a8fb6af5cbbf106;hpb=0453e50932ab03c172ef18727673a2d874d93c52

diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index 22d27cb1cd..97d900d5cf 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
 Copyright 2008-2009 Steven Barth <steven@midlink.org>
-Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2008-2013 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.
@@ -9,8 +9,6 @@ You may obtain a copy of the License at
 
 	http://www.apache.org/licenses/LICENSE-2.0
 
-$Id$
-
 -%>
 
 <%-
@@ -25,25 +23,30 @@ $Id$
 
 	ntm.init(uci)
 
-	function guess_wifi_hw(ifname)
+	function guess_wifi_hw(dev)
 		local bands = ""
+		local ifname = dev:name()
 		local name, idx = ifname:match("^([a-z]+)(%d+)")
 		idx = tonumber(idx)
 
 		if has_iwinfo then
-			local iw = luci.sys.wifi.getiwinfo(ifname)
-			local bl = iw.hwmodelist
+			local bl = dev.iwinfo.hwmodelist
 			if bl and next(bl) then
 				if bl.a then bands = bands .. "a" end
 				if bl.b then bands = bands .. "b" end
 				if bl.g then bands = bands .. "g" end
 				if bl.n then bands = bands .. "n" end
 			end
+
+			local hw = dev.iwinfo.hardware_name
+			if hw then
+				return "%s 802.11%s" %{ hw, bands }
+			end
 		end
 
 		-- wl.o
 		if name == "wl" then
-			local name = "Broadcom 802.11%s Wireless Controller" % bands
+			local name = translatef("Broadcom 802.11%s Wireless Controller", bands)
 			local nm   = 0
 
 			local fd = nixio.open("/proc/bus/pci/devices", "r")
@@ -53,7 +56,7 @@ $Id$
 					if ln:match("wl$") then
 						if nm == idx then
 							local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)")
-							name = string.format(
+							name = translatef(
 								"Broadcom BCM%04x 802.11 Wireless Controller",
 								tonumber(version, 16)
 							)
@@ -71,23 +74,23 @@ $Id$
 
 		-- madwifi
 		elseif name == "ath" or name == "wifi" then
-			return "Atheros 802.11%s Wireless Controller" % bands
+			return translatef("Atheros 802.11%s Wireless Controller", bands)
 
 		-- ralink
 		elseif name == "ra" then
-			return "RaLink 802.11%s Wireless Controller" % bands
+			return translatef("RaLink 802.11%s Wireless Controller", bands)
 
 		-- hermes
 		elseif name == "eth" then
-			return "Hermes 802.11b Wireless Controller"
+			return translate("Hermes 802.11b Wireless Controller")
 
 		-- hostap
 		elseif name == "wlan" and fs.isdirectory("/proc/net/hostap/" .. ifname) then
-			return "Prism2/2.5/3 802.11b Wireless Controller"
+			return translate("Prism2/2.5/3 802.11b Wireless Controller")
 
 		-- dunno yet
 		else
-			return "Generic 802.11%s Wireless Controller" % bands
+			return translatef("Generic 802.11%s Wireless Controller", bands)
 		end
 	end
 
@@ -124,10 +127,14 @@ $Id$
 
 	var is_reconnecting = false;
 
+	function nowrap(s) {
+		return s.replace(/ /g, '&#160;');
+	}
+
 	function wifi_shutdown(id, toggle) {
 		var reconnect = (toggle.getAttribute('active') == 'false');
 
-		if (!reconnect && !confirm(String.format('<%:Really shutdown network ?\nYou might lose access to this router if you are connected via this interface.%>')))
+		if (!reconnect && !confirm(String.format('<%:Really shutdown network ?\nYou might lose access to this device if you are connected via this interface.%>')))
 			return;
 
 		is_reconnecting = true;
@@ -136,7 +143,7 @@ $Id$
 		if (s)
 		{
 			s.parentNode.style.display = 'block';
-			s.innerHTML = '<%:Waiting for router...%>';
+			s.innerHTML = '<%:Waiting for changes to be applied...%>';
 		}
 
 		for (var net in wifidevs)
@@ -204,7 +211,7 @@ $Id$
 					var sig = document.getElementById(iw.id + '-iw-signal');
 					if (sig)
 						sig.innerHTML = String.format(
-							'<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" /><br />' +
+							'<img src="%s" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>" /><br />' +
 							'<small>%d%%</small>', icon, iw.signal, iw.noise, p
 						);
 
@@ -256,8 +263,8 @@ $Id$
 					{
 						if (is_assoc)
 							dev.innerHTML = String.format(
-								'<strong><%:Channel%>:</strong> %s (%s GHz) | ' +
-								'<strong><%:Bitrate%>:</strong> %s Mb/s',
+								'<strong><%:Channel%>:</strong> %s (%s <%:GHz%>) | ' +
+								'<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%>',
 									iw.channel ? iw.channel : '?',
 									iw.frequency ? iw.frequency : '?',
 									iw.bitrate ? iw.bitrate : '?'
@@ -296,28 +303,28 @@ $Id$
 								icon = "<%=resource%>/icons/signal-75-100.png";
 
 							tr.insertCell(-1).innerHTML = String.format(
-								'<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />',
+								'<img src="%s" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>" />',
 								icon, assoclist[j].signal, assoclist[j].noise
 							);
 
-							tr.insertCell(-1).innerHTML = String.format('%h', iw.ssid ? iw.ssid : '?');
+							tr.insertCell(-1).innerHTML = nowrap(String.format('%h', iw.ssid ? iw.ssid : '?'));
 							tr.insertCell(-1).innerHTML = assoclist[j].bssid;
 
 							tr.insertCell(-1).innerHTML = arptable[assoclist[j].bssid]
 								? arptable[assoclist[j].bssid] : '?';
 
-							tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].signal);
-							tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].noise);
+							tr.insertCell(-1).innerHTML = nowrap(String.format('%d <%:dBm%>', assoclist[j].signal));
+							tr.insertCell(-1).innerHTML = nowrap(String.format('%d <%:dBm%>', assoclist[j].noise));
 
-							tr.insertCell(-1).innerHTML = (assoclist[j].rx_mcs > -1)
-								? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[j].rx_rate / 1000, assoclist[j].rx_mcs, assoclist[j].rx_40mhz ? 40 : 20)
-								: String.format('%.1f Mbit/s', assoclist[j].rx_rate / 1000)
-							;
+							tr.insertCell(-1).innerHTML = nowrap((assoclist[j].rx_mcs > -1)
+								? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].rx_rate / 1000, assoclist[j].rx_mcs, assoclist[j].rx_40mhz ? 40 : 20)
+								: String.format('%.1f <%:Mbit/s%>', assoclist[j].rx_rate / 1000)
+							);
 
-							tr.insertCell(-1).innerHTML = (assoclist[j].tx_mcs > -1)
-								? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[j].tx_rate / 1000, assoclist[j].tx_mcs, assoclist[j].tx_40mhz ? 40 : 20)
-								: String.format('%.1f Mbit/s', assoclist[j].tx_rate / 1000)
-							;
+							tr.insertCell(-1).innerHTML = nowrap((assoclist[j].tx_mcs > -1)
+								? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].tx_rate / 1000, assoclist[j].tx_mcs, assoclist[j].tx_40mhz ? 40 : 20)
+								: String.format('%.1f <%:Mbit/s%>', assoclist[j].tx_rate / 1000)
+							);
 
 							rowstyle = (rowstyle == 1) ? 2 : 1;
 						}
@@ -350,7 +357,7 @@ $Id$
 <fieldset class="cbi-section" style="display:none">
 	<legend><%:Reconnecting interface%></legend>
 	<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
-	<span id="iw-rc-status"><%:Waiting for router...%></span>
+	<span id="iw-rc-status"><%:Waiting for changes to be applied...%></span>
 </fieldset>
 
 <div class="cbi-map">
@@ -363,7 +370,7 @@ $Id$
 			<tr>
 				<td style="width:34px"><img src="<%=resource%>/icons/wifi_big_disabled.png" style="float:left; margin-right:10px" id="<%=dev:name()%>-iw-upstate" /></td>
 				<td colspan="2" style="text-align:left">
-					<big><strong><%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>)</strong></big><br />
+					<big><strong><%=guess_wifi_hw(dev)%> (<%=dev:name()%>)</strong></big><br />
 					<span id="<%=dev:name()%>-iw-devinfo"></span>
 				</td>
 				<td style="width:310px;text-align:right">
@@ -388,7 +395,7 @@ $Id$
 					<td class="cbi-value-field" style="width:310px;text-align:right">
 						<input id="<%=net:id()%>-iw-toggle" type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="wifi_shutdown('<%=net:id()%>', this)" title="<%:Delete this network%>" value="<%:Enable%>" />
 						<input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" />
-						<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this router if you are connected via this network.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>'" title="<%:Delete this network%>" value="<%:Remove%>" />
+						<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this network.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>'" title="<%:Delete this network%>" value="<%:Remove%>" />
 					</td>
 				</tr>
 				<% end %>
@@ -414,8 +421,8 @@ $Id$
 			<tr class="cbi-section-table-titles">
 				<th class="cbi-section-table-cell"></th>
 				<th class="cbi-section-table-cell"><%:SSID%></th>
-				<th class="cbi-section-table-cell"><%:MAC%></th>
-				<th class="cbi-section-table-cell"><%:Address%></th>
+				<th class="cbi-section-table-cell"><%:MAC-Address%></th>
+				<th class="cbi-section-table-cell"><%:IPv4-Address%></th>
 				<th class="cbi-section-table-cell"><%:Signal%></th>
 				<th class="cbi-section-table-cell"><%:Noise%></th>
 				<th class="cbi-section-table-cell"><%:RX Rate%></th>