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

Merge pull request #1250 from dibdot/luci-app-travelmate

Browse source 
luci-app-travelmate: small bugfixes
This commit is contained in:
Hannu Nyman 2017-07-24 19:54:31 +03:00 committed by GitHub
commit 6c8a9f104c
3 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
View file

@ -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"),

6
applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
View file

@ -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
%>
<tr class="cbi-section-table-row cbi-rowstyle-6">
<tr class="cbi-section-table-row cbi-rowstyle-6" style="<%=style%>">
<td style="text-align:left"><%=device%></td>
<td style="text-align:left"><%=mode%></td>
<td style="text-align:left"><%=iface%></td>

21
applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
View file

@ -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%>
<div class="cbi-map">
<h2 name="content"><%:Wireless Scan%></h2>
<fieldset class="cbi-section">
<table class="cbi-section-table" style="empty-cells:hide">
<tr class="cbi-section-table-titles">
@ -64,7 +47,7 @@ This is free software, licensed under the Apache License, Version 2.0
<th class="cbi-section-table-cell" style="text-align:left"><%:Encryption%></th>
<th class="cbi-section-table-cell" style="text-align:left" colspan="2"><%:Signal strength%></th>
</tr>
<% for i, net in ipairs(scanlist(3)) do net.encryption = net.encryption or { } %>
<% for i, net in ipairs(iw.scanlist) do%>
<tr class="cbi-section-table-row cbi-rowstyle-4">
<td class="cbi-value-field" style="text-align:left">
<strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong>
@ -84,8 +67,6 @@ This is free software, licensed under the Apache License, Version 2.0
<% if net.encryption.wpa then %>
<input type="hidden" name="wpa_version" value="<%=net.encryption.wpa%>" />
<% for _, v in ipairs(net.encryption.auth_suites) do %><input type="hidden" name="wpa_suites" value="<%=v%>" />
<% end; for _, v in ipairs(net.encryption.group_ciphers) do %><input type="hidden" name="wpa_group" value="<%=v%>" />
<% end; for _, v in ipairs(net.encryption.pair_ciphers) do %><input type="hidden" name="wpa_pairwise" value="<%=v%>" />
<% end; end %>
<input class="cbi-button cbi-button-apply" style="width:110px" type="submit" value="<%:Add Uplink%>" />
</form>