Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-admin-full: differentiate between disabled and not associated wireless

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-07-13 14:08:17 +02:00
parent 4115f8cc56
commit aef1c2fca0
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
View file

@ -8,7 +8,7 @@
{ {
var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && !iw.disabled); var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && !iw.disabled);
var p = iw.quality; var p = iw.quality;
var q = is_assoc ? p : -1; var q = iw.disabled ? -1 : p;
var icon; var icon;
if (q < 0) if (q < 0)
@ -55,8 +55,10 @@
info.innerHTML = String.format( info.innerHTML = String.format(
'<strong><%:SSID%>:</strong> %h | ' + '<strong><%:SSID%>:</strong> %h | ' +
'<strong><%:Mode%>:</strong> %s<br />' + '<strong><%:Mode%>:</strong> %s<br />' +
'<em><%:Wireless is disabled or not associated%></em>', '<em>%s</em>',
iw.ssid || '?', iw.mode iw.ssid || '?', iw.mode,
iw.disabled ? '<em><%:Wireless is disabled%></em>'
: '<em><%:Wireless is not associated%></em>'
); );
} }
} }

6
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
View file

@ -299,9 +299,9 @@
var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled); var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled);
var icon; var icon;
if (!is_assoc) if (net.disabled)
icon = "<%=resource%>/icons/signal-none.png"; icon = "<%=resource%>/icons/signal-none.png";
else if (net.quality == 0) else if (net.quality <= 0)
icon = "<%=resource%>/icons/signal-0.png"; icon = "<%=resource%>/icons/signal-0.png";
else if (net.quality < 25) else if (net.quality < 25)
icon = "<%=resource%>/icons/signal-0-25.png"; icon = "<%=resource%>/icons/signal-0-25.png";
@ -320,7 +320,7 @@
'<%:BSSID%>', is_assoc ? (net.bssid || '-') : null, '<%:BSSID%>', is_assoc ? (net.bssid || '-') : null,
'<%:Encryption%>', is_assoc ? net.encryption : null, '<%:Encryption%>', is_assoc ? net.encryption : null,
'<%:Associations%>', is_assoc ? (net.num_assoc || '-') : null, '<%:Associations%>', is_assoc ? (net.num_assoc || '-') : null,
null, is_assoc ? null : E('em', '<%:Wireless is disabled or not associated%>'))); null, is_assoc ? null : E('em', net.disabled ? '<%:Wireless is disabled%>' : '<%:Wireless is not associated%>')));
} }
ws.appendChild(renderBox( ws.appendChild(renderBox(