From bfbc7f4bdf6b60edf9d52d995c14d156d8349757 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 15 Jan 2015 14:26:27 +0100 Subject: [PATCH] themes: eliminate uses of luci.sys.loadavg() Signed-off-by: Jo-Philipp Wich --- .../luasrc/view/themes/bootstrap/header.htm | 7 ++++--- .../luasrc/view/themes/freifunk-bno/header.htm | 8 +++++--- .../luasrc/view/themes/freifunk-generic/header.htm | 12 +++++++----- .../luasrc/view/themes/openwrt.org/header.htm | 12 +++++++----- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm index 12818cbc5f..2df3386b52 100644 --- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm +++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm @@ -13,10 +13,11 @@ You may obtain a copy of the License at -%> <% local sys = require "luci.sys" + local util = require "luci.util" local http = require "luci.http" local disp = require "luci.dispatcher" - local hostname = sys.hostname() + local boardinfo = util.ubus("system", "board") local request = disp.context.path local request2 = disp.context.request @@ -100,7 +101,7 @@ You may obtain a copy of the License at - <%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI + <%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI @@ -119,7 +120,7 @@ You may obtain a copy of the License at
- <%=hostname%> + <%=boardinfo.hostname or "?"%>
    <%- local function submenu(prefix, node) diff --git a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm index 5099d186fe..790dbb00b5 100644 --- a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm +++ b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm @@ -14,13 +14,15 @@ $Id$ -%> <% require("luci.sys") -local load1, load5, load15 = luci.sys.loadavg() +require("luci.util") + +local boardinfo = luci.util.ubus("system", "board") + local request = require("luci.dispatcher").context.path local category = request[1] local tree = luci.dispatcher.node() local cattree = category and luci.dispatcher.node(category) local node = luci.dispatcher.context.dispatched -local hostname = luci.sys.hostname() local c = tree for i,r in ipairs(request) do @@ -48,7 +50,7 @@ require("luci.http").prepare_content("text/html") - <%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI + <%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI