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=218e47bb2c9daf1cb03bcc0691081e5cea6bf057;hp=20f0e8d6ec16f1a46424369d896bb49e012b469d;hb=97e27a0bcf5eb9c388a05f73dc13867ef8703e4c;hpb=b9c9b7ffeb5e9670590e9dfc1a5a35caf6e11212;ds=sidebyside
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 20f0e8d6e..218e47bb2 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -109,11 +109,14 @@ $Id$
while (assoctable.rows.length > 1)
assoctable.rows[1].parentNode.removeChild(assoctable.rows[1]);
+ var devup = { };
+
for( var i = 0; i < st.length; i++ )
{
var iw = st[i];
+ var is_assoc = (iw.bssid && iw.channel);
var p = (100 / iw.quality_max * iw.quality);
- var q = (iw.bssid && iw.channel) ? p : -1;
+ var q = is_assoc ? p : -1;
var icon;
if (q < 0)
@@ -129,6 +132,9 @@ $Id$
else
icon = "<%=resource%>/icons/signal-75-100.png";
+ if (!devup[wifidevs[iw.id]])
+ devup[wifidevs[iw.id]] = is_assoc;
+
var sig = document.getElementById(iw.id + '-iw-signal');
if (sig)
sig.innerHTML = String.format(
@@ -138,24 +144,34 @@ $Id$
var info = document.getElementById(iw.id + '-iw-status');
if (info)
- info.innerHTML = String.format(
- '<%:SSID%>: %s | ' +
- '<%:Mode%>: %s
' +
- '<%:BSSID%>: %s | ' +
- '<%:Encryption%>: %s',
- iw.ssid, iw.mode, iw.bssid,
- iw.encryption ? iw.encryption.description : '<%:None%>'
- );
+ {
+ if (is_assoc)
+ info.innerHTML = String.format(
+ '<%:SSID%>: %s | ' +
+ '<%:Mode%>: %s
' +
+ '<%:BSSID%>: %s | ' +
+ '<%:Encryption%>: %s',
+ iw.ssid, iw.mode, iw.bssid,
+ iw.encryption ? iw.encryption.description : '<%:None%>'
+ );
+ else
+ info.innerHTML = '<%:Wireless is disabled or not associated%>';
+ }
var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo');
if (dev)
- dev.innerHTML = String.format(
- '<%:Channel%>: %s (%s GHz) | ' +
- '<%:Bitrate%>: %s Mb/s',
- iw.channel ? iw.channel : '?',
- iw.frequency ? iw.frequency / 1000 : '?',
- iw.bitrate ? iw.bitrate / 1000 : '?'
- );
+ {
+ if (is_assoc)
+ dev.innerHTML = String.format(
+ '<%:Channel%>: %s (%s GHz) | ' +
+ '<%:Bitrate%>: %s Mb/s',
+ iw.channel ? iw.channel : '?',
+ iw.frequency ? iw.frequency / 1000 : '?',
+ iw.bitrate ? iw.bitrate / 1000 : '?'
+ );
+ else
+ dev.innerHTML = '';
+ }
if (assoctable)
{
@@ -218,6 +234,13 @@ $Id$
assoctable.rows[0].parentNode.appendChild(tr);
}
+
+ for (var dev in devup)
+ {
+ var img = document.getElementById(dev + '-iw-upstate');
+ if (img)
+ img.src = '<%=resource%>/icons/wifi' + (devup[dev] ? '' : '_disabled') + '.png';
+ }
}
}
)
@@ -236,7 +259,7 @@ $Id$
.png" style="float:left; margin-right:10px" /> | +
<%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>) |