update new luci style for x86/x64

This commit is contained in:
coolsnowwolf 2018-06-14 22:33:08 +08:00
parent cbfbeaf8fa
commit a7d3c46b79
2 changed files with 270 additions and 360 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=autocore PKG_NAME:=autocore
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=10 PKG_RELEASE:=12
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

View File

@ -6,6 +6,7 @@
<% <%
local fs = require "nixio.fs" local fs = require "nixio.fs"
local ipc = require "luci.ip"
local util = require "luci.util" local util = require "luci.util"
local stat = require "luci.tools.status" local stat = require "luci.tools.status"
local ver = require "luci.version" local ver = require "luci.version"
@ -58,6 +59,8 @@
} }
if wan then if wan then
local dev = wan:get_interface()
local link = dev and ipc.link(dev:name())
rv.wan = { rv.wan = {
ipaddr = wan:ipaddr(), ipaddr = wan:ipaddr(),
gwaddr = wan:gwaddr(), gwaddr = wan:gwaddr(),
@ -66,12 +69,19 @@
expires = wan:expires(), expires = wan:expires(),
uptime = wan:uptime(), uptime = wan:uptime(),
proto = wan:proto(), proto = wan:proto(),
i18n = wan:get_i18n(),
ifname = wan:ifname(), ifname = wan:ifname(),
link = wan:adminlink() link = wan:adminlink(),
mac = dev and dev:mac(),
type = dev and dev:type(),
name = dev and dev:get_i18n(),
ether = link and link.type == 1
} }
end end
if wan6 then if wan6 then
local dev = wan6:get_interface()
local link = dev and ipc.link(dev:name())
rv.wan6 = { rv.wan6 = {
ip6addr = wan6:ip6addr(), ip6addr = wan6:ip6addr(),
gw6addr = wan6:gw6addr(), gw6addr = wan6:gw6addr(),
@ -79,8 +89,13 @@
ip6prefix = wan6:ip6prefix(), ip6prefix = wan6:ip6prefix(),
uptime = wan6:uptime(), uptime = wan6:uptime(),
proto = wan6:proto(), proto = wan6:proto(),
i18n = wan6:get_i18n(),
ifname = wan6:ifname(), ifname = wan6:ifname(),
link = wan6:adminlink() link = wan6:adminlink(),
mac = dev and dev:mac(),
type = dev and dev:type(),
name = dev and dev:get_i18n(),
ether = link and link.type == 1
} }
end end
@ -106,7 +121,7 @@
<%+header%> <%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js?v=git-18.143.28733-7acacf2"></script> <script type="text/javascript" src="<%=resource%>/cbi.js?v=git-18.163.61042-b5a43cf"></script>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
function progressbar(v, m) function progressbar(v, m)
{ {
@ -164,133 +179,95 @@
}); });
} }
function labelList(items, offset) {
var rv = [ ];
for (var i = offset || 0; i < items.length; i += 2) {
var label = items[i],
value = items[i+1];
if (value === undefined || value === null)
continue;
if (label)
rv.push(E('strong', [label, ': ']));
rv.push(value, E('br'));
}
return rv;
}
function renderBox(title, active, childs) {
childs = childs || [];
childs.unshift(E('span', labelList(arguments, 3)));
return E('div', { class: 'ifacebox' }, [
E('div', { class: 'ifacebox-head center ' + (active ? 'active' : '') },
E('strong', title)),
E('div', { class: 'ifacebox-body' }, childs)
]);
}
function renderBadge(icon, title) {
return E('span', { class: 'ifacebadge' }, [
E('img', { src: icon, title: title || '' }),
E('span', labelList(arguments, 2))
]);
}
XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 }, XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 },
function(x, info) function(x, info)
{ {
if (!(npoll++ % 5)) if (!(npoll++ % 5))
updateHosts(); updateHosts();
var si = document.getElementById('wan4_i'); var us = document.getElementById('upstream_status_table');
var ss = document.getElementById('wan4_s');
var ifc = info.wan;
if (ifc && ifc.ifname && ifc.proto != 'none') while (us.lastElementChild)
{ us.removeChild(us.lastElementChild);
var s = String.format(
'<strong><%:Type%>: </strong>%s<br />' +
'<strong><%:Address%>: </strong>%s<br />' +
'<strong><%:Netmask%>: </strong>%s<br />' +
'<strong><%:Gateway%>: </strong>%s<br />',
ifc.proto,
(ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0',
(ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255',
(ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0'
);
for (var i = 0; i < ifc.dns.length; i++) var ifc = info.wan || {};
{
s += String.format(
'<strong><%:DNS%> %d: </strong>%s<br />',
i + 1, ifc.dns[i]
);
}
if (ifc.expires > -1) us.appendChild(renderBox(
{ '<%:IPv4 Upstream%>',
s += String.format( (ifc.ifname && ifc.proto != 'none'),
'<strong><%:Expires%>: </strong>%t<br />', [ E('div', {}, renderBadge(
ifc.expires '<%=resource%>/icons/%s.png'.format((ifc && ifc.type) ? ifc.type : 'ethernet_disabled'), null,
); '<%:Device%>', ifc ? (ifc.name || ifc.ifname || '-') : '-',
} '<%:MAC-Address%>', (ifc && ifc.ether) ? ifc.mac : null)) ],
'<%:Protocol%>', ifc.i18n || E('em', '<%:Not connected%>'),
if (ifc.uptime > 0) '<%:Address%>', (ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0',
{ '<%:Netmask%>', (ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255',
s += String.format( '<%:Gateway%>', (ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0',
'<strong><%:Connected%>: </strong>%t<br />', '<%:DNS%> 1', (ifc.dns) ? ifc.dns[0] : null,
ifc.uptime '<%:DNS%> 2', (ifc.dns) ? ifc.dns[1] : null,
); '<%:DNS%> 3', (ifc.dns) ? ifc.dns[2] : null,
} '<%:DNS%> 4', (ifc.dns) ? ifc.dns[3] : null,
'<%:DNS%> 5', (ifc.dns) ? ifc.dns[4] : null,
ss.innerHTML = String.format('<small>%s</small>', s); '<%:Expires%>', (ifc.expires > -1) ? '%t'.format(ifc.expires) : null,
si.innerHTML = String.format( '<%:Connected%>', (ifc.uptime > 0) ? '%t'.format(ifc.uptime) : null));
'<img src="<%=resource%>/icons/ethernet.png" />' +
'<br /><small><a href="%s">%s</a></small>',
ifc.link, ifc.ifname
);
}
else
{
si.innerHTML = '<img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small>';
ss.innerHTML = '<em><%:Not connected%></em>';
}
<% if has_ipv6 then %> <% if has_ipv6 then %>
var si6 = document.getElementById('wan6_i'); var ifc6 = info.wan6 || {};
var ss6 = document.getElementById('wan6_s');
var ifc6 = info.wan6;
if (ifc6 && ifc6.ifname && ifc6.proto != 'none') us.appendChild(renderBox(
{ '<%:IPv6 Upstream%>',
var s = String.format( (ifc6.ifname && ifc6.proto != 'none'),
'<strong><%:Type%>: </strong>%s%s<br />', [ E('div', {}, renderBadge(
ifc6.proto, (ifc6.ip6prefix) ? '-pd' : '' '<%=resource%>/icons/%s.png'.format(ifc6.type || 'ethernet_disabled'), null,
); '<%:Device%>', ifc6 ? (ifc6.name || ifc6.ifname || '-') : '-',
'<%:MAC-Address%>', (ifc6 && ifc6.ether) ? ifc6.mac : null)) ],
if (!ifc6.ip6prefix) '<%:Protocol%>', ifc6.i18n ? (ifc6.i18n + (ifc6.proto === 'dhcp' && ifc6.ip6prefix ? '-PD' : '')) : E('em', '<%:Not connected%>'),
{ '<%:Prefix Delegated%>', ifc6.ip6prefix,
s += String.format( '<%:Address%>', (ifc6.ip6prefix) ? (ifc6.ip6addr || null) : (ifc6.ipaddr || '::'),
'<strong><%:Address%>: </strong>%s<br />', '<%:Gateway%>', (ifc6.gw6addr) ? ifc6.gw6addr : '::',
(ifc6.ip6addr) ? ifc6.ip6addr : '::' '<%:DNS%> 1', (ifc6.dns) ? ifc6.dns[0] : null,
); '<%:DNS%> 2', (ifc6.dns) ? ifc6.dns[1] : null,
} '<%:DNS%> 3', (ifc6.dns) ? ifc6.dns[2] : null,
else '<%:DNS%> 4', (ifc6.dns) ? ifc6.dns[3] : null,
{ '<%:DNS%> 5', (ifc6.dns) ? ifc6.dns[4] : null,
s += String.format( '<%:Connected%>', (ifc6.uptime > 0) ? '%t'.format(ifc6.uptime) : null));
'<strong><%:Prefix Delegated%>: </strong>%s<br />',
ifc6.ip6prefix
);
if (ifc6.ip6addr)
{
s += String.format(
'<strong><%:Address%>: </strong>%s<br />',
ifc6.ip6addr
);
}
}
s += String.format(
'<strong><%:Gateway%>: </strong>%s<br />',
(ifc6.gw6addr) ? ifc6.gw6addr : '::'
);
for (var i = 0; i < ifc6.dns.length; i++)
{
s += String.format(
'<strong><%:DNS%> %d: </strong>%s<br />',
i + 1, ifc6.dns[i]
);
}
if (ifc6.uptime > 0)
{
s += String.format(
'<strong><%:Connected%>: </strong>%t<br />',
ifc6.uptime
);
}
ss6.innerHTML = String.format('<small>%s</small>', s);
si6.innerHTML = String.format(
'<img src="<%=resource%>/icons/ethernet.png" />' +
'<br /><small><a href="%s">%s</a></small>',
ifc6.link, ifc6.ifname
);
}
else
{
si6.innerHTML = '<img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small>';
ss6.innerHTML = '<em><%:Not connected%></em>';
}
<% end %> <% end %>
<% if has_dsl then %> <% if has_dsl then %>
@ -358,10 +335,10 @@
if (ls) if (ls)
{ {
/* clear all rows */ /* clear all rows */
while( ls.rows.length > 1 ) while (ls.firstElementChild !== ls.lastElementChild)
ls.rows[0].parentNode.deleteRow(1); ls.removeChild(ls.lastElementChild);
for( var i = 0; i < info.leases.length; i++ ) for (var i = 0; i < info.leases.length; i++)
{ {
var timestr; var timestr;
@ -372,24 +349,16 @@
else else
timestr = String.format('%t', info.leases[i].expires); timestr = String.format('%t', info.leases[i].expires);
var tr = ls.rows[0].parentNode.insertRow(-1); ls.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format((i % 2) + 1), [
tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1); E('<div class="td">', info.leases[i].hostname ? info.leases[i].hostname : '?'),
E('<div class="td">', info.leases[i].ipaddr),
tr.insertCell(-1).innerHTML = info.leases[i].hostname ? info.leases[i].hostname : '?'; E('<div class="td">', info.leases[i].macaddr),
tr.insertCell(-1).innerHTML = info.leases[i].ipaddr; E('<div class="td">', timestr)
tr.insertCell(-1).innerHTML = info.leases[i].macaddr; ]));
tr.insertCell(-1).innerHTML = timestr;
} }
if( ls.rows.length == 1 ) if (ls.firstElementChild === ls.lastElementChild)
{ ls.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:There are no active leases.%></em></div></div>'));
var tr = ls.rows[0].parentNode.insertRow(-1);
tr.className = 'cbi-section-table-row';
var td = tr.insertCell(-1);
td.colSpan = 4;
td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
}
} }
var ls6 = document.getElementById('lease6_status_table'); var ls6 = document.getElementById('lease6_status_table');
@ -398,10 +367,10 @@
ls6.parentNode.style.display = 'block'; ls6.parentNode.style.display = 'block';
/* clear all rows */ /* clear all rows */
while( ls6.rows.length > 1 ) while (ls6.firstElementChild !== ls6.lastElementChild)
ls6.rows[0].parentNode.deleteRow(1); ls6.removeChild(ls6.lastElementChild);
for( var i = 0; i < info.leases6.length; i++ ) for (var i = 0; i < info.leases6.length; i++)
{ {
var timestr; var timestr;
@ -412,35 +381,29 @@
else else
timestr = String.format('%t', info.leases6[i].expires); timestr = String.format('%t', info.leases6[i].expires);
var tr = ls6.rows[0].parentNode.insertRow(-1); var host = hosts[duid2mac(info.leases6[i].duid)],
tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1); name = info.leases6[i].hostname,
hint = null;
var host = hosts[duid2mac(info.leases6[i].duid)]; if (!name) {
if (!info.leases6[i].hostname) if (host)
tr.insertCell(-1).innerHTML = hint = host.name || host.ipv4 || host.ipv6;
(host && (host.name || host.ipv4 || host.ipv6)) }
? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">? (%h)</div>'.format(host.name || host.ipv4 || host.ipv6) else {
: '?'; if (host && host.name && info.leases6[i].hostname != host.name)
else hint = host.name;
tr.insertCell(-1).innerHTML = }
(host && host.name && info.leases6[i].hostname != host.name)
? '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap">%h (%h)</div>'.format(info.leases6[i].hostname, host.name)
: info.leases6[i].hostname;
tr.insertCell(-1).innerHTML = info.leases6[i].ip6addr; ls6.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format((i % 2) + 1), [
tr.insertCell(-1).innerHTML = info.leases6[i].duid; E('<div class="td nowrap">', hint ? '<div>%h (%h)</div>'.format(name || '?', hint) : (name || '?')),
tr.insertCell(-1).innerHTML = timestr; E('<div class="td nowrap">', info.leases6[i].ip6addr),
E('<div class="td nowrap">', info.leases6[i].duid),
E('<div class="td nowrap">', timestr)
]));
} }
if( ls6.rows.length == 1 ) if (ls6.firstElementChild === ls6.lastElementChild)
{ ls6.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:There are no active leases.%></em></div></div>'));
var tr = ls6.rows[0].parentNode.insertRow(-1);
tr.className = 'cbi-section-table-row';
var td = tr.insertCell(-1);
td.colSpan = 4;
td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
}
} }
<% end %> <% end %>
@ -450,30 +413,34 @@
var ws = document.getElementById('wifi_status_table'); var ws = document.getElementById('wifi_status_table');
if (ws) if (ws)
{ {
var wsbody = ws.rows[0].parentNode; while (ws.lastElementChild)
while (ws.rows.length > 0) ws.removeChild(ws.lastElementChild);
wsbody.deleteRow(0);
for (var didx = 0; didx < info.wifinets.length; didx++) for (var didx = 0; didx < info.wifinets.length; didx++)
{ {
var dev = info.wifinets[didx]; var dev = info.wifinets[didx];
var net0 = (dev.networks && dev.networks[0]) ? dev.networks[0] : {};
var tr = wsbody.insertRow(-1); var vifs = [];
var td;
td = tr.insertCell(-1);
td.width = "33%";
td.innerHTML = dev.name;
td.style.verticalAlign = "top";
td = tr.insertCell(-1);
var s = '';
for (var nidx = 0; nidx < dev.networks.length; nidx++) for (var nidx = 0; nidx < dev.networks.length; nidx++)
{ {
var net = dev.networks[nidx]; var net = dev.networks[nidx];
var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled); var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled);
var num_assoc = 0;
for (var bssid in net.assoclist)
{
var bss = net.assoclist[bssid];
bss.bssid = bssid;
bss.link = net.link;
bss.name = net.name;
bss.ifname = net.ifname;
bss.radio = dev.name;
assoclist.push(bss);
num_assoc++;
}
var icon; var icon;
if (!is_assoc) if (!is_assoc)
@ -489,66 +456,35 @@
else else
icon = "<%=resource%>/icons/signal-75-100.png"; icon = "<%=resource%>/icons/signal-75-100.png";
s += String.format( vifs.push(renderBadge(
'<table><tr><td style="text-align:center; width:32px; padding:3px">' + icon,
'<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />' + '<%:Signal%>: %d dBm / <%:Quality%>: %d%%'.format(net.signal, net.quality),
'<br /><small>%d%%</small>' + '<%:SSID%>', E('a', { href: net.link }, [ net.ssid || '?' ]),
'</td><td style="text-align:left; padding:3px"><small>' + '<%:Mode%>', net.mode,
'<strong><%:SSID%>:</strong> <a href="%s">%h</a><br />' + '<%:BSSID%>', is_assoc ? (net.bssid || '-') : null,
'<strong><%:Mode%>:</strong> %s<br />' + '<%:Encryption%>', is_assoc ? net.encryption : null,
'<strong><%:Channel%>:</strong> %d (%.3f <%:GHz%>)<br />' + '<%:Associations%>', is_assoc ? (num_assoc || '-') : null,
'<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%><br />', null, is_assoc ? null : E('em', '<%:Wireless is disabled or not associated%>')));
icon, net.signal, net.noise,
net.quality,
net.link, net.ssid || '?',
net.mode,
net.channel, net.frequency,
net.bitrate || '?'
);
if (is_assoc)
{
s += String.format(
'<strong><%:BSSID%>:</strong> %s<br />' +
'<strong><%:Encryption%>:</strong> %s',
net.bssid || '?',
net.encryption
);
}
else
{
s += '<em><%:Wireless is disabled or not associated%></em>';
}
s += '</small></td></tr></table>';
for (var bssid in net.assoclist)
{
var bss = net.assoclist[bssid];
bss.bssid = bssid;
bss.link = net.link;
bss.name = net.name;
bss.ifname = net.ifname;
bss.radio = dev.name;
assoclist.push(bss);
}
} }
if (!s) ws.appendChild(renderBox(
s = '<em><%:No information available%></em>'; dev.device, dev.up || net0.up,
[ E('div', vifs) ],
td.innerHTML = s; '<%:Type%>', dev.name.replace(/^Generic | Wireless Controller .+$/g, ''),
'<%:Channel%>', net0.channel ? '%d (%.3f <%:GHz%>)'.format(net0.channel, net0.frequency) : '-',
'<%:Bitrate%>', net0.bitrate ? '%d <%:Mbit/s%>'.format(net0.bitrate) : '-'));
} }
if (!ws.lastElementChild)
ws.appendChild(E('<em><%:No information available%></em>'));
} }
var ac = document.getElementById('wifi_assoc_table'); var ac = document.getElementById('wifi_assoc_table');
if (ac) if (ac)
{ {
/* clear all rows */ /* clear all rows */
while( ac.rows.length > 1 ) while (ac.firstElementChild !== ac.lastElementChild)
ac.rows[0].parentNode.deleteRow(1); ac.removeChild(ac.lastElementChild);
assoclist.sort(function(a, b) { assoclist.sort(function(a, b) {
return (a.name == b.name) return (a.name == b.name)
@ -557,11 +493,8 @@
; ;
}); });
for( var i = 0; i < assoclist.length; i++ ) for (var i = 0; i < assoclist.length; i++)
{ {
var tr = ac.rows[0].parentNode.insertRow(-1);
tr.className = 'cbi-section-table-row cbi-rowstyle-' + (1 + (i % 2));
var icon; var icon;
var q = (-1 * (assoclist[i].noise - assoclist[i].signal)) / 5; var q = (-1 * (assoclist[i].noise - assoclist[i].signal)) / 5;
if (q < 1) if (q < 1)
@ -575,49 +508,31 @@
else else
icon = "<%=resource%>/icons/signal-75-100.png"; icon = "<%=resource%>/icons/signal-75-100.png";
tr.insertCell(-1).innerHTML = String.format( var host = hosts[assoclist[i].bssid],
'<span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span>', name = host ? (host.name || host.ipv4 || host.ipv6) : null,
assoclist[i].radio, assoclist[i].ifname hint = (host && host.name && (host.ipv4 || host.ipv6)) ? (host.ipv4 || host.ipv6) : null;
);
tr.insertCell(-1).innerHTML = String.format( ac.appendChild(E('<div class="tr cbi-section-table-row cbi-rowstyle-%d">'.format(1 + (i % 2)), [
'<a href="%s">%s</a>', E('<div class="td"><span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span></div>'
assoclist[i].link, .format(assoclist[i].radio, assoclist[i].ifname)),
'%h'.format(assoclist[i].name).nobr() E('<div class="td"><a href="%s" style="white-space:nowrap">%h</a></div>'
); .format(assoclist[i].link, assoclist[i].name)),
E('<div class="td">',
tr.insertCell(-1).innerHTML = assoclist[i].bssid; assoclist[i].bssid),
E('<div class="td nowrap">',
var host = hosts[assoclist[i].bssid]; hint ? '<div>%h (%h)</div>'.format(name || '?', hint) : (name || '?')),
if (host) E('<div class="td"><span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%> / <%:SNR%>: %d"><img src="%s" /> %d / %d <%:dBm%></span></div>'
tr.insertCell(-1).innerHTML = String.format( .format(assoclist[i].signal, assoclist[i].noise, assoclist[i].signal - assoclist[i].noise, icon, assoclist[i].signal, assoclist[i].noise)),
'<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis">%s</div>', E('<div class="td nowrap">', [
((host.name && (host.ipv4 || host.ipv6)) E('<span style="white-space:nowrap">', wifirate(assoclist[i], true)),
? '%h (%s)'.format(host.name, host.ipv4 || host.ipv6) E('<br />'),
: '%h'.format(host.name || host.ipv4 || host.ipv6)).nobr() E('<span style="white-space:nowrap">', wifirate(assoclist[i], false))
); ])
else ]));
tr.insertCell(-1).innerHTML = '?';
tr.insertCell(-1).innerHTML = String.format(
'<span class="ifacebadge" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%> / <%:SNR%>: %d"><img src="%s" /> %d / %d <%:dBm%></span>',
assoclist[i].signal, assoclist[i].noise, assoclist[i].signal - assoclist[i].noise,
icon,
assoclist[i].signal, assoclist[i].noise
);
tr.insertCell(-1).innerHTML = wifirate(assoclist[i], true).nobr() + '<br />' + wifirate(assoclist[i], false).nobr();
} }
if (ac.rows.length == 1) if (ac.firstElementChild === ac.lastElementChild)
{ ac.appendChild(E('<div class="tr cbi-section-table-row"><div class="td"><em><br /><%:No information available%></em></div></div>'));
var tr = ac.rows[0].parentNode.insertRow(-1);
tr.className = 'cbi-section-table-row';
var td = tr.insertCell(-1);
td.colSpan = 7;
td.innerHTML = '<br /><em><%:No information available%></em>';
}
} }
<% end %> <% end %>
@ -679,109 +594,104 @@
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:System%></legend> <legend><%:System%></legend>
<table width="100%" cellspacing="10"> <div class="table" width="100%">
<tr><td width="33%"><%:Hostname%></td><td><%=luci.sys.hostname() or "?"%></td></tr> <div class="tr"><div class="td left" width="33%"><%:Hostname%></div><div class="td left"><%=luci.sys.hostname() or "?"%></div></div>
<tr><td width="33%"><%:Model%></td><td><%=pcdata(boardinfo.model or boardinfo.system or "?")%></td></tr> <div class="tr"><div class="td left" width="33%"><%:Model%></div><div class="td left"><%=pcdata(boardinfo.model or "?")%></div></div>
<tr><td width="33%"><%:CPU Temperature%></td><td><%=luci.sys.exec("sensors | grep 'Core 0' | cut -c10-24")%> @ <%=luci.sys.exec("grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'")%> MHz</td></tr> <div class="tr"><div class="td left" width="33%"><%:CPU Temperature%></div><div class="td left"><%=luci.sys.exec("sensors | grep 'Core 0' | cut -c10-24")%> @ <%=luci.sys.exec("grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'")%> MHz</div></div>
<tr><td width="33%"><%:Firmware Version%></td><td> <div class="tr"><div class="td left" width="33%"><%:Firmware Version%></div><div class="td left">
<%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> / <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> /
<%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>) <%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>)
</td></tr> </div></div>
<tr><td width="33%"><%:Kernel Version%></td><td><%=unameinfo.release or "?"%></td></tr> <div class="tr"><div class="td left" width="33%"><%:Kernel Version%></div><div class="td left"><%=unameinfo.release or "?"%></div></div>
<tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr> <div class="tr"><div class="td left" width="33%"><%:Local Time%></div><div class="td left" id="localtime">-</div></div>
<tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr> <div class="tr"><div class="td left" width="33%"><%:Uptime%></div><div class="td left" id="uptime">-</div></div>
<tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr> <div class="tr"><div class="td left" width="33%"><%:Load Average%></div><div class="td left" id="loadavg">-</div></div>
</table> </div>
</fieldset> </fieldset>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Memory%></legend> <legend><%:Memory%></legend>
<table width="100%" cellspacing="10"> <div class="table" width="100%">
<tr><td width="33%"><%:Total Available%></td><td id="memtotal">-</td></tr> <div class="tr"><div class="td left" width="33%"><%:Total Available%></div><div class="td left" id="memtotal">-</div></div>
<tr><td width="33%"><%:Free%></td><td id="memfree">-</td></tr> <div class="tr"><div class="td left" width="33%"><%:Free%></div><div class="td left" id="memfree">-</div></div>
<tr><td width="33%"><%:Buffered%></td><td id="membuff">-</td></tr> <div class="tr"><div class="td left" width="33%"><%:Buffered%></div><div class="td left" id="membuff">-</div></div>
</table> </div>
</fieldset> </fieldset>
<% if swapinfo.total > 0 then %> <% if swapinfo.total > 0 then %>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Swap%></legend> <legend><%:Swap%></legend>
<table width="100%" cellspacing="10"> <div class="table" width="100%">
<tr><td width="33%"><%:Total Available%></td><td id="swaptotal">-</td></tr> <div class="tr"><div class="td left" width="33%"><%:Total Available%></div><div class="td left" id="swaptotal">-</div></div>
<tr><td width="33%"><%:Free%></td><td id="swapfree">-</td></tr> <div class="tr"><div class="td left" width="33%"><%:Free%></div><div class="td left" id="swapfree">-</div></div>
</table> </div>
</fieldset> </fieldset>
<% end %> <% end %>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Network%></legend> <legend><%:Network%></legend>
<table width="100%" cellspacing="10"> <div id="upstream_status_table" class="network-status-table">
<tr><td width="33%" style="vertical-align:top"><%:IPv4 WAN Status%></td><td> <em><%:Collecting data...%></em>
<table><tr> </div>
<td id="wan4_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td>
<td id="wan4_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td> <div class="table" width="100%">
</tr></table> <div class="tr"><div class="td left" width="33%"><%:Active Connections%></div><div class="td left" id="conns">-</div></div>
</td></tr> </div>
<% if has_ipv6 then %>
<tr><td width="33%" style="vertical-align:top"><%:IPv6 WAN Status%></td><td>
<table><tr>
<td id="wan6_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td>
<td id="wan6_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td>
</tr></table>
</td></tr>
<% end %>
<tr><td width="33%"><%:Active Connections%></td><td id="conns">-</td></tr>
</table>
</fieldset> </fieldset>
<% if has_dhcp then %> <% if has_dhcp then %>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:DHCP Leases%></legend> <legend><%:DHCP Leases%></legend>
<table class="cbi-section-table" id="lease_status_table"> <div class="table cbi-section-table" id="lease_status_table">
<tr class="cbi-section-table-titles"> <div class="tr cbi-section-table-titles">
<th class="cbi-section-table-cell"><%:Hostname%></th> <div class="th"><%:Hostname%></div>
<th class="cbi-section-table-cell"><%:IPv4-Address%></th> <div class="th"><%:IPv4-Address%></div>
<th class="cbi-section-table-cell"><%:MAC-Address%></th> <div class="th"><%:MAC-Address%></div>
<th class="cbi-section-table-cell"><%:Leasetime remaining%></th> <div class="th"><%:Leasetime remaining%></div>
</tr> </div>
<tr class="cbi-section-table-row"> <div class="tr cbi-section-table-row">
<td colspan="4"><em><br /><%:Collecting data...%></em></td> <div class="td" colspan="4"><em><br /><%:Collecting data...%></em></div>
</tr> </div>
</table> </div>
</fieldset> </fieldset>
<fieldset class="cbi-section" style="display:none"> <fieldset class="cbi-section" style="display:none">
<legend><%:DHCPv6 Leases%></legend> <legend><%:DHCPv6 Leases%></legend>
<table class="cbi-section-table" id="lease6_status_table"> <div class="table cbi-section-table" id="lease6_status_table">
<tr class="cbi-section-table-titles"> <div class="tr cbi-section-table-titles">
<th class="cbi-section-table-cell"><%:Host%></th> <div class="th"><%:Host%></div>
<th class="cbi-section-table-cell"><%:IPv6-Address%></th> <div class="th"><%:IPv6-Address%></div>
<th class="cbi-section-table-cell"><%:DUID%></th> <div class="th"><%:DUID%></div>
<th class="cbi-section-table-cell"><%:Leasetime remaining%></th> <div class="th"><%:Leasetime remaining%></div>
</tr> </div>
<tr class="cbi-section-table-row"> <div class="tr cbi-section-table-row">
<td colspan="4"><em><br /><%:Collecting data...%></em></td> <div class="td" colspan="4"><em><br /><%:Collecting data...%></em></div>
</tr> </div>
</table> </div>
</fieldset> </fieldset>
<% end %> <% end %>
<% if has_dsl then %> <% if has_dsl then %>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:DSL%></legend> <legend><%:DSL%></legend>
<table width="100%" cellspacing="10"> <div class="table" width="100%">
<tr><td width="33%" style="vertical-align:top"><%:DSL Status%></td><td> <div class="tr">
<table><tr> <div class="td left" width="33%" style="vertical-align:top"><%:DSL Status%></div>
<td id="dsl_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td> <div class="td">
<td id="dsl_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td> <div class="table">
</tr></table> <div class="tr">
</td></tr> <div class="td" id="dsl_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></div>
</table> <div class="td left" id="dsl_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></div>
</div>
</div>
</div>
</div>
</div>
</fieldset> </fieldset>
<% end %> <% end %>
@ -789,27 +699,27 @@
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Wireless%></legend> <legend><%:Wireless%></legend>
<table id="wifi_status_table" width="100%" cellspacing="10"> <div id="wifi_status_table" class="network-status-table">
<tr><td><em><%:Collecting data...%></em></td></tr> <em><%:Collecting data...%></em>
</table> </div>
</fieldset> </fieldset>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend><%:Associated Stations%></legend> <legend><%:Associated Stations%></legend>
<table class="cbi-section-table valign-middle" id="wifi_assoc_table"> <div class="table cbi-section-table valign-middle" id="wifi_assoc_table">
<tr class="cbi-section-table-titles"> <div class="tr cbi-section-table-titles">
<th class="cbi-section-table-cell">&#160;</th> <div class="th">&#160;</div>
<th class="cbi-section-table-cell"><%:Network%></th> <div class="th"><%:Network%></div>
<th class="cbi-section-table-cell"><%:MAC-Address%></th> <div class="th"><%:MAC-Address%></div>
<th class="cbi-section-table-cell"><%:Host%></th> <div class="th"><%:Host%></div>
<th class="cbi-section-table-cell"><%:Signal%> / <%:Noise%></th> <div class="th"><%:Signal%> / <%:Noise%></div>
<th class="cbi-section-table-cell"><%:RX Rate%> / <%:TX Rate%></th> <div class="th"><%:RX Rate%> / <%:TX Rate%></div>
</tr> </div>
<tr class="cbi-section-table-row"> <div class="tr cbi-section-table-row">
<td colspan="6"><em><br /><%:Collecting data...%></em></td> <div class="td" colspan="6"><em><br /><%:Collecting data...%></em></div>
</tr> </div>
</table> </div>
</fieldset> </fieldset>
<% end %> <% end %>