summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-travelmate/luasrc/view
diff options
context:
space:
mode:
authorDirk Brenken <dev@brenken.org>2017-07-25 07:24:59 +0200
committerDirk Brenken <dev@brenken.org>2017-07-25 07:24:59 +0200
commit5dd6be451372f44363bd0428c2e44cf912540e50 (patch)
treedda76b3059ed2358ce9eb8b0e6bf29a669eee791 /applications/luci-app-travelmate/luasrc/view
parent31f77a3cfe3ff04d7c20d7ba6d2daacdcc9fbc5d (diff)
luci-app-travelmate: enhancements & fixes
* add re-ordering buttons in Station Overview * fix possible nil error during wifi scan Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'applications/luci-app-travelmate/luasrc/view')
-rw-r--r--applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm14
-rw-r--r--applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm2
2 files changed, 11 insertions, 5 deletions
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index ee58f52e1..bdb265f19 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@ -24,10 +24,12 @@ This is free software, licensed under the Apache License, Version 2.0
<th class="cbi-section-table-cell" style="text-align:left"><%:Uplink Interface%></th>
<th class="cbi-section-table-cell" style="text-align:left"><%:SSID%></th>
<th class="cbi-section-table-cell" style="text-align:left"><%:Encryption%></th>
- <th class="cbi-section-table-cell" style="text-align:left" colspan="2"><%:Disabled%></th>
+ <th class="cbi-section-table-cell" style="text-align:left" colspan="3"><%:Disabled%></th>
</tr>
<%
- uci:foreach("wireless", "wifi-iface", function(s)
+ local pos = 1
+ uci:foreach("wireless", "wifi-iface", function(s)
+ pos = pos + 1
local section = s['.name']
local device = s.device or ""
local mode = s.mode or ""
@@ -41,14 +43,18 @@ This is free software, licensed under the Apache License, Version 2.0
end
if iface == trmiface then
%>
- <tr class="cbi-section-table-row cbi-rowstyle-6" style="<%=style%>">
+ <tr class="cbi-section-table-row cbi-rowstyle-7" style="<%=style%>">
<td style="text-align:left"><%=device%></td>
<td style="text-align:left"><%=mode%></td>
<td style="text-align:left"><%=iface%></td>
<td style="text-align:left"><%=ssid%></td>
<td style="text-align:left"><%=encryption%></td>
<td style="text-align:left"><%=disabled%></td>
- <td class="cbi-value-field" style="width:200px;text-align:right">
+ <td class="cbi-value-field" style="width:100px;text-align:right">
+ <input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&pos=<%=pos%>&dir=up'" alt="<%:Move up%>" title="<%:Move up%>" />
+ <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&pos=<%=pos%>&dir=down'" alt="<%:Move down%>" title="<%:Move down%>" />
+ </td>
+ <td class="cbi-value-field" style="width:180px;text-align:right">
<input type="button" class="cbi-button cbi-button-edit" style="width:85px" onclick="location.href='<%=url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>" />
<input type="button" class="cbi-button cbi-button-remove" style="width:85px" onclick="location.href='<%=url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/>
</td>
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 44606da60..2ce45c63c 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
@@ -47,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(iw.scanlist) do%>
+ <% for i, net in ipairs(iw.scanlist or { }) 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>