X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fwifi_overview.htm;h=d10ea26841f6f0ab3ac5cd9d45d19925c4e55973;hp=218e47bb2c9daf1cb03bcc0691081e5cea6bf057;hb=cee38c117770ba76604778d3940ba7d354abd1a4;hpb=97e27a0bcf5eb9c388a05f73dc13867ef8703e4c 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 218e47bb2..d10ea2684 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 -Copyright 2008-2010 Jo-Philipp Wich +Copyright 2008-2013 Jo-Philipp Wich Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -9,26 +9,44 @@ You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -$Id$ - -%> <%- local sys = require "luci.sys" + local fs = require "luci.fs" local utl = require "luci.util" 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) + 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 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 Wireless Controller" + local name = translatef("Broadcom 802.11%s Wireless Controller", bands) local nm = 0 local fd = nixio.open("/proc/bus/pci/devices", "r") @@ -38,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) ) @@ -56,19 +74,23 @@ $Id$ -- madwifi elseif name == "ath" or name == "wifi" then - return "Atheros 802.11 Wireless Controller" + return translatef("Atheros 802.11%s Wireless Controller", bands) -- ralink elseif name == "ra" then - return "RaLink 802.11 Wireless Controller" + return translatef("RaLink 802.11%s Wireless Controller", bands) - -- prism? + -- hermes elseif name == "eth" then - return "Prism 802.11 Wireless Controller" + return translate("Hermes 802.11b Wireless Controller") + + -- hostap + elseif name == "wlan" and fs.isdirectory("/proc/net/hostap/" .. ifname) then + return translate("Prism2/2.5/3 802.11b Wireless Controller") -- dunno yet else - return "Generic 802.11 Wireless Controller" + return translatef("Generic 802.11%s Wireless Controller", bands) end end @@ -83,174 +105,261 @@ $Id$ for _, dev in ipairs(devices) do local net for _, net in ipairs(dev:get_wifinets()) do - netlist[#netlist+1] = net:ifname() - netdevs[net:ifname()] = dev:name() + netlist[#netlist+1] = net:id() + netdevs[net:id()] = dev:name() end end -%> <%+header%> +<% if not has_iwinfo then %> +
+ <%:Package libiwinfo required!%>
+ <%_The libiwinfo-lua package is not installed. You must install this component for working wireless configuration!%> +
+<% end %> + - + if (assoctable && assoctable.rows.length == 1) + { + var tr = assoctable.insertRow(-1); + tr.className = 'cbi-section-table-row'; + + var td = tr.insertCell(-1); + td.colSpan = 8; + td.innerHTML = '
<%:No information available%>'; + } + + for (var dev in devup) + { + var img = document.getElementById(dev + '-iw-upstate'); + if (img) + img.src = '<%=resource%>/icons/wifi_big' + (devup[dev] ? '' : '_disabled') + '.png'; + } + } + } + ); +//]]>

<%:Wireless Overview%>

+ +
<% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %> @@ -259,14 +368,14 @@ $Id$ - + - @@ -276,16 +385,17 @@ $Id$ <% for i, net in ipairs(nets) do %> - - - <% end %> @@ -293,7 +403,7 @@ $Id$ <% end %> @@ -307,17 +417,19 @@ $Id$

<%:Associated Stations%>

-
- <%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>)
+ <%=guess_wifi_hw(dev)%> (<%=dev:name()%>)
 - Find and join network - Provide new network + + ?device=<%=dev:name()%>'" title="<%:Find and join network%>" value="<%:Scan%>" /> + ?device=<%=dev:name()%>'" title="<%:Provide new network%>" value="<%:Add%>" />
+
0% 		+ <%:Collecting data...%> - Edit this network - ">Delete this network + + + + '" title="<%:Delete this network%>" value="<%:Remove%>" />
- (No network configured on this device) + <%:No network configured on this device%>
+
- - + + + + -
<%:SSID%><%:MAC%><%:Address%><%:MAC-Address%><%:IPv4-Address%> <%:Signal%> <%:Noise%><%:RX Rate%><%:TX Rate%>
+ <%:Collecting data...%>