diff options
author | Dirk Brenken <dev@brenken.org> | 2018-10-05 10:21:34 +0200 |
---|---|---|
committer | Dirk Brenken <dev@brenken.org> | 2018-10-05 10:27:36 +0200 |
commit | 8a1fe2ad6d05c4b9c6943198ac475ab29e22a0a7 (patch) | |
tree | ac05abb1d79b18bfdd6247c79c62c53037612a2e /applications/luci-app-travelmate/luasrc/model | |
parent | 24cf28b5ec148bc29d2d150e94f8928d96c1d1e6 (diff) |
luci-app-travelmate: sync with update 1.2.4
* with the config option 'trm_radio' you can now restrict travelmate
to a single radio (e.g. 'radio1') or change the overall
scanning order (e.g. 'radio1 radio2 radio0')
* LuCI: show QR codes now inline on the overview page
(collapsed by default)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'applications/luci-app-travelmate/luasrc/model')
-rw-r--r-- | applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index a1a7ed72c3..9ba4cf3bf2 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -56,7 +56,7 @@ end s = m:section(NamedSection, "global", "travelmate") -o1 = s:option(Flag, "trm_enabled", translate("Enable travelmate")) +o1 = s:option(Flag, "trm_enabled", translate("Enable Travelmate")) o1.default = o1.disabled o1.rmempty = false @@ -78,18 +78,6 @@ end o3.default = trmiface o3.rmempty = false -if fs.access("/usr/bin/qrencode") then - btn = s:option(Button, "btn", translate("View AP QR-Codes"), - translate("Connect your Android or iOS devices to your router's WiFi using the shown QR code.")) - btn.inputtitle = translate("QR-Codes") - btn.inputstyle = "apply" - btn.disabled = false - - function btn.write() - luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate", "apqr")) - end -end - -- Runtime information ds = s:option(DummyValue, "_dummy") @@ -97,16 +85,15 @@ ds.template = "travelmate/runtime" -- Extra options -e = m:section(NamedSection, "global", "travelmate", translate("Extra options"), +e = m:section(NamedSection, "global", "travelmate", translate("Extra Options"), translate("Options for further tweaking in case the defaults are not suitable for you.")) -e1 = e:option(Flag, "trm_debug", translate("Enable verbose debug logging")) +e1 = e:option(Flag, "trm_debug", translate("Enable Verbose Debug Logging")) e1.default = e1.disabled e1.rmempty = false -e2 = e:option(Value, "trm_radio", translate("Radio selection"), - translate("Restrict travelmate to a dedicated radio, e.g. 'radio0'.")) -e2.datatype = "and(uciname,rangelength(6,6))" +e2 = e:option(Value, "trm_radio", translate("Radio Selection / Order"), + translate("Restrict travelmate to a single radio (e.g. 'radio1') or change the overall scanning order (e.g. 'radio1 radio2 radio0').")) e2.rmempty = true e3 = e:option(Value, "trm_triggerdelay", translate("Trigger Delay"), |