diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-01-03 10:59:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 10:59:40 +0200 |
| commit | b121f958621efd5d81451e2de3e7d35a828645bc (patch) | |
| tree | 07dfbc66be4063036f66582fa1bca780c8011c46 /applications | |
| parent | dbb694c699f80f387c61d531cb3e8de2608edbec (diff) | |
| parent | a4e05483b1c4cb9973d78e3a8312023ee0be5262 (diff) | |
Merge pull request #1495 from dibdot/travelmate
luci-app-travelmate: sync with 1.0.1
Diffstat (limited to 'applications')
3 files changed, 14 insertions, 5 deletions
diff --git a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua index efbe619a4..ef79c7406 100644 --- a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua +++ b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua @@ -1,4 +1,4 @@ --- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- Copyright 2017-2018 Dirk Brenken (dev@brenken.org) -- This is free software, licensed under the Apache License, Version 2.0 module("luci.controller.travelmate", package.seeall) @@ -33,9 +33,9 @@ function logread() local logfile if nixio.fs.access("/var/log/messages") then - logfile = util.trim(util.exec("cat /var/log/messages | grep 'travelmate'")) + logfile = util.trim(util.exec("cat /var/log/messages | grep 'travelmate-'")) else - logfile = util.trim(util.exec("logread -e 'travelmate'")) + logfile = util.trim(util.exec("logread -e 'travelmate-'")) end templ.render("travelmate/logread", {title = i18n.translate("Travelmate Logfile"), content = logfile}) end 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 a3dd0a2b9..1e8bd7ec6 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 @@ -1,4 +1,4 @@ --- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- Copyright 2017-2018 Dirk Brenken (dev@brenken.org) -- This is free software, licensed under the Apache License, Version 2.0 local fs = require("nixio.fs") @@ -34,7 +34,11 @@ else wssid = m:field(Value, "ssid", translate("SSID (hidden)")) end +nobssid = m:field(Flag, "no_bssid", translate("Ignore BSSID")) +nobssid.default = nobssid.enabled + bssid = m:field(Value, "bssid", translate("BSSID")) +bssid:depends("no_bssid", 0) bssid.datatype = "macaddr" bssid.default = m.hidden.bssid or "" diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm index 7f6ff7776..6cbeaffde 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm @@ -1,5 +1,5 @@ <%# -Copyright 2017 Dirk Brenken (dev@brenken.org) +Copyright 2017-2018 Dirk Brenken (dev@brenken.org) This is free software, licensed under the Apache License, Version 2.0 -%> @@ -12,4 +12,9 @@ This is free software, licensed under the Apache License, Version 2.0 </fieldset> </div> +<script type="text/javascript"> + var textarea = document.getElementById('logread_id'); + textarea.scrollTop = textarea.scrollHeight; +</script> + <%+footer%> |