From 31f77a3cfe3ff04d7c20d7ba6d2daacdcc9fbc5d Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Mon, 24 Jul 2017 15:30:01 +0200 Subject: [PATCH] luci-app-travelmate: small bugfixes * speed up wireless scan * emphasize active uplink in Station Overview * mark hidden SSIDs Signed-off-by: Dirk Brenken --- .../luasrc/model/cbi/travelmate/wifi_add.lua | 8 +++++-- .../luasrc/view/travelmate/stations.htm | 6 +++++- .../luasrc/view/travelmate/wifi_scan.htm | 21 +------------------ 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua index 361027f72..979307e00 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua @@ -22,8 +22,12 @@ m.hidden = { wpa_version = http.formvalue("wpa_version") } -wssid = m:field(Value, "ssid", translate("SSID")) -wssid.default = m.hidden.ssid +if m.hidden.ssid ~= "" then + wssid = m:field(Value, "ssid", translate("SSID")) + wssid.default = m.hidden.ssid +else + wssid = m:field(Value, "ssid", translate("SSID (hidden)")) +end if (tonumber(m.hidden.wep) or 0) == 1 then wkey = m:field(Value, "key", translate("WEP passphrase"), diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm index e79fb0c95..ee58f52e1 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm @@ -35,9 +35,13 @@ This is free software, licensed under the Apache License, Version 2.0 local ssid = s.ssid or "" local encryption = s.encryption or "" local disabled = s.disabled or "" + local style = "color:#000000" + if disabled == "0" then + style = "color:#0069d6" + end if iface == trmiface then %> - + <%=device%> <%=mode%> <%=iface%> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm index e1818a06f..44606da60 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm @@ -34,29 +34,12 @@ This is free software, licensed under the Apache License, Version 2.0 return 0 end end - - function scanlist(times) - local i, k, v - local l = { } - local s = { } - - for i = 1, times do - for k, v in ipairs(iw.scanlist or { }) do - if not s[v.bssid] then - l[#l+1] = v - s[v.bssid] = true - end - end - end - return l - end -%> <%+header%>

<%:Wireless Scan%>

-
@@ -64,7 +47,7 @@ This is free software, licensed under the Apache License, Version 2.0 - <% for i, net in ipairs(scanlist(3)) do net.encryption = net.encryption or { } %> + <% for i, net in ipairs(iw.scanlist) do%>
<%:Encryption%> <%:Signal strength%>
<%=net.ssid and utl.pcdata(net.ssid) or "%s" % translate("hidden")%> @@ -84,8 +67,6 @@ This is free software, licensed under the Apache License, Version 2.0 <% if net.encryption.wpa then %> <% for _, v in ipairs(net.encryption.auth_suites) do %> - <% end; for _, v in ipairs(net.encryption.group_ciphers) do %> - <% end; for _, v in ipairs(net.encryption.pair_ciphers) do %> <% end; end %> -- 2.25.1