X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fwifi_overview.htm;h=312fd08654c900f0ebd7066287ef89182ee96ac5;hp=ab5d7a21348b05c6f8cc30c4d7a970786638b56f;hb=ef444d511d2558e0d4c2ec25c5890b87057b9691;hpb=9aad27f48eb5e101dafb7802f1c21a37fb5f205c

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 ab5d7a213..312fd0865 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.
@@ -23,19 +23,25 @@ You may obtain a copy of the License at
 
 	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
+				if bl.ac then bands = bands .. "ac" end
+			end
+
+			local hw = dev.iwinfo.hardware_name
+			if hw then
+				return "%s 802.11%s" %{ hw, bands }
 			end
 		end
 
@@ -129,7 +135,7 @@ You may obtain a copy of the License at
 	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 device if you are connected via this interface.%>')))
+		if (!reconnect && !confirm(String.format('<%:Really shut down network?\nYou might lose access to this device if you are connected via this interface.%>')))
 			return;
 
 		is_reconnecting = true;
@@ -182,7 +188,7 @@ You may obtain a copy of the License at
 				for( var i = 0; i < st.length; i++ )
 				{
 					var iw = st[i];
-					var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel);
+					var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && iw.mode != 'Unknown');
 					var p = iw.quality;
 					var q = is_assoc ? p : -1;
 
@@ -213,7 +219,7 @@ You may obtain a copy of the License at
 					var toggle = document.getElementById(iw.id + '-iw-toggle');
 					if (toggle)
 					{
-						if (is_assoc)
+						if (!iw.disabled)
 						{
 							toggle.className = 'cbi-button cbi-button-reset';
 							toggle.value = '<%:Disable%>';
@@ -226,7 +232,7 @@ You may obtain a copy of the License at
 							toggle.title = '<%:Activate this network%>';
 						}
 
-						toggle.setAttribute('active', is_assoc);
+						toggle.setAttribute('active', !iw.disabled);
 					}
 
 					var info = document.getElementById(iw.id + '-iw-status');
@@ -365,7 +371,7 @@ You may obtain a copy of the License at
 			<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">