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=312fd08654c900f0ebd7066287ef89182ee96ac5;hp=4ba01a5d1462dcda1a1454f5eb79bd95a73295dd;hb=559bf9126c38992838e240c784ce0d9f4e6714a9;hpb=5be59e6ae7a496a695c5dd533b0b48bb172ec821 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 4ba01a5d1..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 -Copyright 2008-2011 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,8 +9,6 @@ You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -$Id$ - -%> <%- @@ -25,25 +23,31 @@ $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 + 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 -- 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 +57,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 +75,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 +128,14 @@ $Id$ var is_reconnecting = false; + function nowrap(s) { + return s.replace(/ /g, ' '); + } + 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; @@ -180,7 +188,7 @@ $Id$ 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; @@ -204,14 +212,14 @@ $Id$ var sig = document.getElementById(iw.id + '-iw-signal'); if (sig) sig.innerHTML = String.format( - '
' + + '
' + '%d%%', icon, iw.signal, iw.noise, p ); 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%>'; @@ -224,7 +232,7 @@ $Id$ toggle.title = '<%:Activate this network%>'; } - toggle.setAttribute('active', is_assoc); + toggle.setAttribute('active', !iw.disabled); } var info = document.getElementById(iw.id + '-iw-status'); @@ -256,8 +264,8 @@ $Id$ { if (is_assoc) dev.innerHTML = String.format( - '<%:Channel%>: %s (%s GHz) | ' + - '<%:Bitrate%>: %s Mb/s', + '<%:Channel%>: %s (%s <%:GHz%>) | ' + + '<%:Bitrate%>: %s <%:Mbit/s%>', iw.channel ? iw.channel : '?', iw.frequency ? iw.frequency : '?', iw.bitrate ? iw.bitrate : '?' @@ -296,28 +304,28 @@ $Id$ icon = "<%=resource%>/icons/signal-75-100.png"; tr.insertCell(-1).innerHTML = String.format( - '', + '', 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; } @@ -363,7 +371,7 @@ $Id$ - <%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>)
+ <%=guess_wifi_hw(dev)%> (<%=dev:name()%>)
@@ -414,8 +422,8 @@ $Id$ <%:SSID%> - <%:MAC%> - <%:Address%> + <%:MAC-Address%> + <%:IPv4-Address%> <%:Signal%> <%:Noise%> <%:RX Rate%>