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

Merge pull request #1495 from dibdot/travelmate

Browse source 
luci-app-travelmate: sync with 1.0.1
This commit is contained in:
Hannu Nyman 2018-01-03 10:59:40 +02:00 committed by GitHub
commit b121f95862
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
applications/luci-app-travelmate/luasrc/controller/travelmate.lua
View file

@ -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

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

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

7
applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm
View file

@ -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%>