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=29de11cabc78aab0fee5a0c0a088f63c93492157;hp=d47ad0856c9d23164caa4cdd9fd6dfbd04b07f98;hb=6942e4ab1b5f465caab9ad95ed938f75fa05cd1a;hpb=ce8855055915b91d6a388f9967c0244f8be8921b

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 d47ad0856..29de11cab 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -20,15 +20,29 @@ $Id$
 	local uci = require "luci.model.uci".cursor()
 	local ntm = require "luci.model.network"
 
+	local has_iwinfo = pcall(require, "iwinfo")
+
 	ntm.init(uci)
 
 	function guess_wifi_hw(ifname)
+		local bands = ""
 		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
+			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
+		end
+
 		-- wl.o
 		if name == "wl" then
-			local name = "Broadcom 802.11 Wireless Controller"
+			local name = "Broadcom 802.11%s Wireless Controller" % bands
 			local nm   = 0
 
 			local fd = nixio.open("/proc/bus/pci/devices", "r")
@@ -56,19 +70,19 @@ $Id$
 
 		-- madwifi
 		elseif name == "ath" or name == "wifi" then
-			return "Atheros 802.11 Wireless Controller"
+			return "Atheros 802.11%s Wireless Controller" % bands
 
 		-- ralink
 		elseif name == "ra" then
-			return "RaLink 802.11 Wireless Controller"
+			return "RaLink 802.11%s Wireless Controller" % bands
 
 		-- prism?
 		elseif name == "eth" then
-			return "Prism 802.11 Wireless Controller"
+			return "Prism 802.11%s Wireless Controller" % bands
 
 		-- dunno yet
 		else
-			return "Generic 802.11 Wireless Controller"
+			return "Generic 802.11%s Wireless Controller" % bands
 		end
 	end
 
@@ -91,13 +105,20 @@ $Id$
 
 <%+header%>
 
+<% if not has_iwinfo then %>
+	<div class="errorbox">
+		<strong><%:Package libiwinfo required!%></strong><br />
+		<%_The <em>libiwinfo</em> package is not installed. You must install this component for working wireless configuration!%>
+	</div>
+<% end %>
+
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript"><![CDATA[
+<script type="text/javascript">//<![CDATA[
 	var iwxhr = new XHR();
 	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", "wireless_status", table.concat(netlist, ","))%>', null,
 			function(x, st)
 			{
@@ -146,7 +167,7 @@ $Id$
 						{
 							if (is_assoc)
 								info.innerHTML = String.format(
-									'<strong><%:SSID%>:</strong> %s | ' +
+									'<strong><%:SSID%>:</strong> %h | ' +
 									'<strong><%:Mode%>:</strong> %s<br />' +
 									'<strong><%:BSSID%>:</strong> %s | ' +
 									'<strong><%:Encryption%>:</strong> %s',
@@ -154,7 +175,12 @@ $Id$
 										iw.encryption ? iw.encryption.description : '<%:None%>'
 								);
 							else
-								info.innerHTML = '<em><%:Wireless is disabled or not associated%></em>';
+								info.innerHTML = String.format(
+									'<strong><%:SSID%>:</strong> %h | ' +
+									'<strong><%:Mode%>:</strong> %s<br />' +
+									'<em><%:Wireless is disabled or not associated%></em>',
+										iw.ssid || '?', iw.mode
+								);
 						}
 
 						var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo');
@@ -238,15 +264,17 @@ $Id$
 					{
 						var img = document.getElementById(dev + '-iw-upstate');
 						if (img)
-							img.src = '<%=resource%>/icons/wifi' + (devup[dev] ? '' : '_disabled') + '.png';
+							img.src = '<%=resource%>/icons/wifi_big' + (devup[dev] ? '' : '_disabled') + '.png';
 					}
 				}
+
+				window.setTimeout(update_status, 5000);
 			}
 		)
+	};
 
-		window.setTimeout(arguments.callee, 5000);
-	})();
-]]></script>
+	update_status();
+//]]></script>
 
 <h2><a id="content" name="content"><%:Wireless Overview%></a></h2>
 
@@ -258,7 +286,7 @@ $Id$
 		<table class="cbi-section-table" style="margin:10px; empty-cells:hide">
 			<!-- physical device -->
 			<tr>
-				<td style="width:34px"><img src="<%=resource%>/icons/wifi_disabled.png" style="float:left; margin-right:10px" id="<%=dev:name()%>-iw-upstate" /></td>
+				<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 />
 					<span id="<%=dev:name()%>-iw-devinfo"></span>