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

luci-app-travelmate: sync with travelmate 0.9.6

Browse source 
* Turris omnia compability fixes
* OpenWrt theme fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2017-12-09 08:23:31 +01:00
parent 2474cdd049
commit c7b39ae08f
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,9 +3,9 @@
module("luci.controller.travelmate", package.seeall) module("luci.controller.travelmate", package.seeall)
local fs = require("nixio.fs") local fs = require("nixio.fs")
local util = require("luci.util") local util = require("luci.util")
local i18n = require("luci.i18n") local i18n = require("luci.i18n")
local templ = require("luci.template") local templ = require("luci.template")
function index() function index()
@ -30,6 +30,12 @@ function index()
end end
function logread() function logread()
local logfile = util.trim(util.exec("logread -e 'travelmate'")) local logfile
if nixio.fs.access("/var/log/messages") then
logfile = util.trim(util.exec("cat /var/log/messages | grep 'travelmate'"))
else
logfile = util.trim(util.exec("logread -e 'travelmate'"))
end
templ.render("travelmate/logread", {title = i18n.translate("Travelmate Logfile"), content = logfile}) templ.render("travelmate/logread", {title = i18n.translate("Travelmate Logfile"), content = logfile})
end end

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

@ -4,8 +4,8 @@ This is free software, licensed under the Apache License, Version 2.0
-%> -%>
<%- <%-
local write = io.write local write = io.write
local uci = require("luci.model.uci").cursor() local uci = require("luci.model.uci").cursor()
local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan" local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan"
-%> -%>
@ -31,10 +31,10 @@ This is free software, licensed under the Apache License, Version 2.0
local iface = s.network or "" local iface = s.network or ""
if iface == trmiface then if iface == trmiface then
local section = s['.name'] or "" local section = s['.name'] or ""
local device = s.device or "" local device = s.device or "-"
local ssid = s.ssid or "" local ssid = s.ssid or "-"
local bssid = s.bssid or "" local bssid = s.bssid or "-"
local encryption = s.encryption or "" local encryption = s.encryption or "-"
local disabled = s.disabled or "" local disabled = s.disabled or ""
local style = "color:#000000" local style = "color:#000000"
if disabled == "0" then if disabled == "0" then