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

modules/freifunk: do some minor code cleanups and html fixes in public status page

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-01-03 00:16:45 +00:00
parent c4f70ce38a
commit ea7a4bee18
1 changed files with 48 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
modules/freifunk/luasrc/view/freifunk/public_status.htm
View file

@ -1,6 +1,8 @@
<% <%
local sys = require "luci.sys" local sys = require "luci.sys"
local twa = require "luci.tools.webadmin" local twa = require "luci.tools.webadmin"
-- System -- System
local system, model, memtotal, memcached, membuffers, memfree, bogomips = sys.sysinfo() local system, model, memtotal, memcached, membuffers, memfree, bogomips = sys.sysinfo()
local uptime = twa.date_format(tonumber(sys.uptime())) local uptime = twa.date_format(tonumber(sys.uptime()))
@ -8,16 +10,17 @@ local_time = os.date("%c")
local load1, load5, load15 = sys.loadavg() local load1, load5, load15 = sys.loadavg()
local load = string.format("%.2f, %.2f, %.2f", load1, load5, load15) local load = string.format("%.2f, %.2f, %.2f", load1, load5, load15)
local mem = string.format("%.2f MB (%.2f %s, %.2f %s, %.2f %s, %.2f %s)", local mem = string.format(
tonumber(memtotal) / 1024, "%.2f MB (%.2f %s, %.2f %s, %.2f %s, %.2f %s)",
tonumber(memtotal - memfree) / 1024, tonumber(memtotal) / 1024,
tostring(i18n.translate("used")), tonumber(memtotal - memfree) / 1024,
memfree / 1024, tostring(i18n.translate("used")),
tostring(i18n.translate("free")), memfree / 1024,
memcached / 1024, tostring(i18n.translate("free")),
tostring(i18n.translate("cached")), memcached / 1024,
membuffers / 1024, tostring(i18n.translate("cached")),
tostring(i18n.translate("buffered")) membuffers / 1024,
tostring(i18n.translate("buffered"))
) )
-- update interval -- update interval
@ -46,8 +49,9 @@ local has_iwinfo = pcall(require, "iwinfo")
-- Routes -- Routes
local defroutev4 = sys.net.defaultroute() local defroutev4 = sys.net.defaultroute()
local defroutev6 = sys.net.defaultroute6 () local defroutev6 = sys.net.defaultroute6()
%>
-%>
<%+header%> <%+header%>
@ -91,7 +95,9 @@ local defroutev6 = sys.net.defaultroute6 ()
var signal = document.getElementById(iw.id + '-signal'); var signal = document.getElementById(iw.id + '-signal');
if (signal) if (signal)
signal.innerHTML = String.format( signal.innerHTML = String.format(
'<img src="%s" title="Signal: %s db / Noise: %s db" alt="Signal Quality"</img>', icon, iw.signal, iw.noise); '<img src="%s" title="Signal: %s db / Noise: %s db" alt="Signal Quality" />',
icon, iw.signal, iw.noise
);
var bitrate = document.getElementById(iw.id + '-bitrate'); var bitrate = document.getElementById(iw.id + '-bitrate');
if (bitrate) if (bitrate)
@ -115,90 +121,57 @@ local defroutev6 = sys.net.defaultroute6 ()
} }
i = st.length - 1 i = st.length - 1
var u = document.getElementById('dynuptime'); var u
if (u)
{ if (u = document.getElementById('dynuptime'))
u.innerHTML = st[i].uptime; u.innerHTML = st[i].uptime;
}
var u = document.getElementById('dynload'); if (u = document.getElementById('dynload'))
if (u) u.innerHTML = st[i].load;
{
u.innerHTML = st[i].load;
}
var u = document.getElementById('dynmem'); if (u = document.getElementById('dynmem'))
if (u) u.innerHTML = st[i].mem;
{
u.innerHTML = st[i].mem;
}
var u = document.getElementById('dyntime'); if (u = document.getElementById('dyntime'))
if (u) u.innerHTML = st[i].time;
{
u.innerHTML = st[i].time;
}
if (st[i].defroutev4) if (st[i].defroutev4)
{ {
var u = document.getElementById('v4dst'); if (u = document.getElementById('v4dst'))
if (u) u.innerHTML = st[i].defroutev4.dest;
{
u.innerHTML = st[i].defroutev4.dest;
}
var u = document.getElementById('v4gw'); if (u = document.getElementById('v4gw'))
if (u) u.innerHTML = st[i].defroutev4.gateway;
{
u.innerHTML = st[i].defroutev4.gateway;
}
var u = document.getElementById('v4dev'); if (u = document.getElementById('v4dev'))
if (u) u.innerHTML = st[i].defroutev4.dev;
{
u.innerHTML = st[i].defroutev4.dev;
}
var u = document.getElementById('v4metr'); if (u = document.getElementById('v4metr'))
if (u) u.innerHTML = st[i].defroutev4.metr;
{
u.innerHTML = st[i].defroutev4.metr;
}
} }
if (st[i].defroutev6) if (st[i].defroutev6)
{ {
var u = document.getElementById('v6dst'); if (u = document.getElementById('v6dst'))
if (u) u.innerHTML = st[i].defroutev6.dest;
{
u.innerHTML = st[i].defroutev6.dest;
}
var u = document.getElementById('v6gw'); if (u = document.getElementById('v6gw'))
if (u) u.innerHTML = st[i].defroutev6.gateway);
{
u.innerHTML = st[i].defroutev6.gateway;
}
var u = document.getElementById('v6dev'); if (u = document.getElementById('v6dev'))
if (u) u.innerHTML = st[i].defroutev6.dev);
{
u.innerHTML = st[i].defroutev6.dev;
}
var u = document.getElementById('v6metr'); if (u = document.getElementById('v6metr'))
if (u) u.innerHTML = st[i].defroutev6.metr);
{
u.innerHTML = st[i].defroutev6.metr;
}
} }
} }
window.setTimeout(update_wifi_status, <%=interval%>); window.setTimeout(update_wifi_status, <%=interval%>);
} }
) )
}; };
update_wifi_status();
update_wifi_status();
//]]></script> //]]></script>
<div class="cbi-map"> <div class="cbi-map">