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

Merge pull request #1267 from dibdot/travelmate

Browse source 
luci-app-travelmate: bugfixes
This commit is contained in:
Hannu Nyman 2017-07-31 12:40:43 +03:00 committed by GitHub
commit 0b11fdebf8
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
View file

@ -90,7 +90,7 @@ end
o3 = s:option(Value, "trm_iface", translate("Uplink / Trigger interface"), o3 = s:option(Value, "trm_iface", translate("Uplink / Trigger interface"),
translate("Name of the uplink interface that triggers travelmate processing in 'manual' mode.")) translate("Name of the uplink interface that triggers travelmate processing in 'manual' mode."))
o3.datatype = "and(uciname,rangelength(3,15))" o3.datatype = "and(uciname,rangelength(3,15))"
o3.default = "trm_wwan" o3.default = trmiface
o3.rmempty = false o3.rmempty = false
o4 = s:option(Value, "trm_triggerdelay", translate("Trigger delay"), o4 = s:option(Value, "trm_triggerdelay", translate("Trigger delay"),

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

@ -14,7 +14,7 @@ This is free software, licensed under the Apache License, Version 2.0
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:Wireless Stations%></h2> <h2 name="content"><%:Wireless Stations%></h2>
<div class="cbi-map-descr"> <div class="cbi-map-descr">
<%:Provides an overview of all configured uplinks for the travelmate interface (%><%=trmiface%><%:). You can edit, delete or re-order existing uplinks or scan for a new one. The currently used uplink is emphasized in blue.%> <%=translatef("Provides an overview of all configured uplinks for the travelmate interface (%s). You can edit, delete or re-order existing uplinks or scan for a new one. The currently used uplink is emphasized in blue.", trmiface)%>
</div> </div>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
@ -26,8 +26,11 @@ This is free software, licensed under the Apache License, Version 2.0
<th class="cbi-section-table-cell" style="text-align:center" colspan="2"><%:Actions%></th> <th class="cbi-section-table-cell" style="text-align:center" colspan="2"><%:Actions%></th>
</tr> </tr>
<% <%
local pos = 1 local pos = -1
uci:foreach("wireless", "wifi-iface", function(s) uci:foreach("wireless", "wifi-device", function(s)
pos = pos + 1
end)
uci:foreach("wireless", "wifi-iface", function(s)
pos = pos + 1 pos = pos + 1
local section = s['.name'] local section = s['.name']
local device = s.device or "" local device = s.device or ""