diff options
| author | Paul Oranje <p.oranje@xs4all.nl> | 2015-05-02 10:44:17 +0200 |
|---|---|---|
| committer | Paul Oranje <p.oranje@xs4all.nl> | 2015-05-02 10:44:17 +0200 |
| commit | ae8e971eef2be269beab9465139869055918d878 (patch) | |
| tree | 5314a2d5b494884271d8900cba6afc348952279b /themes/luci-theme-freifunk-generic | |
| parent | 4742d1c2112ace9d1299c69fb086c1646bb04911 (diff) | |
| parent | 36879e9e8658601dc3e86ff9251da3fc3666efe0 (diff) | |
Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes
Diffstat (limited to 'themes/luci-theme-freifunk-generic')
| -rw-r--r-- | themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm | 3 | ||||
| -rw-r--r-- | themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm index d74916aea1..20a41be855 100644 --- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm +++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm @@ -10,6 +10,7 @@ local util = require "luci.util" local http = require "luci.http" local disp = require "luci.dispatcher" + local version = require "luci.version" local sysinfo = util.ubus("system", "info") or { } local loadinfo = sysinfo.load or { 0, 0, 0 } @@ -122,7 +123,7 @@ <%end%> </div> <div class="header_right"> - <%=luci.version.distversion%><br /> + <%=version.distversion%><br /> <%:Load%>: <%="%.2f" % (loadinfo[1] / 65535.0)%> <%="%.2f" % (loadinfo[2] / 65535.0)%> <%="%.2f" % (loadinfo[3] / 65535.0)%><br /> <%:Hostname%>: <%=boardinfo.hostname or "?"%><br /> <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()"> diff --git a/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic index 131f54e216..017e7f7bad 100644 --- a/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic +++ b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic @@ -1,4 +1,5 @@ uci batch <<-EOF - set luci.themes.Freifunk_Generic=/luci-static/freifunk-generic + set luci.themes.Freifunk_Generic=/luci-static/freifunk-generic + set luci.main.mediaurlbase=/luci-static/freifunk-generic commit luci EOF |