<%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+ Copyright 2008 Steven Barth <steven@midlink.org>
+ Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
+ Licensed to the public under the Apache License 2.0.
-%>
<%
- require "luci.fs"
- require "luci.tools.status"
-
- local has_ipv6 = luci.fs.access("/proc/net/ipv6_route")
- local has_dhcp = luci.fs.access("/etc/config/dhcp")
- local has_wifi = luci.fs.stat("/etc/config/wireless")
- has_wifi = has_wifi and has_wifi.size > 0
- local _, _, memtotal, memcached, membuffers, memfree, _, swaptotal, swapcached, swapfree = luci.sys.sysinfo()
- local has_swap
- if swaptotal > 0 then
- has_swap = 1
- end
- local has_dsl = luci.fs.stat("/etc/init.d/dsl_control")
+ local fs = require "nixio.fs"
+ local util = require "luci.util"
+ local stat = require "luci.tools.status"
+ local ver = require "luci.version"
+
+ local has_ipv6 = fs.access("/proc/net/ipv6_route")
+ local has_dhcp = fs.access("/etc/config/dhcp")
+ local has_wifi = ((fs.stat("/etc/config/wireless", "size") or 0) > 0)
+
+ local sysinfo = luci.util.ubus("system", "info") or { }
+ local boardinfo = luci.util.ubus("system", "board") or { }
+ local unameinfo = nixio.uname() or { }
+
+ local meminfo = sysinfo.memory or {
+ total = 0,
+ free = 0,
+ buffered = 0,
+ shared = 0
+ }
+
+ local swapinfo = sysinfo.swap or {
+ total = 0,
+ free = 0
+ }
+
+ local has_dsl = fs.access("/etc/init.d/dsl_control")
if luci.http.formvalue("status") == "1" then
local ntm = require "luci.model.network".init()
local wan = ntm:get_wannet()
local wan6 = ntm:get_wan6net()
- local conn_count = tonumber((
- luci.sys.exec("wc -l /proc/net/nf_conntrack") or
- luci.sys.exec("wc -l /proc/net/ip_conntrack") or
- ""):match("%d+")) or 0
+ local conn_count = tonumber(
+ fs.readfile("/proc/sys/net/netfilter/nf_conntrack_count") or "") or 0
local conn_max = tonumber((
luci.sys.exec("sysctl net.nf_conntrack_max") or
""):match("%d+")) or 4096
local rv = {
- uptime = luci.sys.uptime(),
+ uptime = sysinfo.uptime or 0,
localtime = os.date(),
- loadavg = { luci.sys.loadavg() },
- memtotal = memtotal,
- memcached = memcached,
- membuffers = membuffers,
- memfree = memfree,
- swaptotal = swaptotal,
- swapcached = swapcached,
- swapfree = swapfree,
+ loadavg = sysinfo.load or { 0, 0, 0 },
+ memory = meminfo,
+ swap = swapinfo,
connmax = conn_max,
conncount = conn_count,
- leases = luci.tools.status.dhcp_leases(),
- leases6 = luci.tools.status.dhcp6_leases(),
- wifinets = luci.tools.status.wifi_networks()
+ leases = stat.dhcp_leases(),
+ leases6 = stat.dhcp6_leases(),
+ wifinets = stat.wifi_networks()
}
if wan then
if wan6 then
rv.wan6 = {
- ip6addr = wan6:ip6addr(),
- gw6addr = wan6:gw6addr(),
- dns = wan6:dns6addrs(),
- uptime = wan6:uptime(),
- ifname = wan6:ifname(),
- link = wan6:adminlink()
+ ip6addr = wan6:ip6addr(),
+ gw6addr = wan6:gw6addr(),
+ dns = wan6:dns6addrs(),
+ ip6prefix = wan6:ip6prefix(),
+ uptime = wan6:uptime(),
+ proto = wan6:proto(),
+ ifname = wan6:ifname(),
+ link = wan6:adminlink()
}
end
if has_dsl then
local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat")
local dsl_func = loadstring(dsl_stat)
- rv.dsl = dsl_func()
+ if dsl_func then
+ rv.dsl = dsl_func()
+ end
end
luci.http.prepare_content("application/json")
luci.http.write_json(rv)
return
- end
+ elseif luci.http.formvalue("hosts") == "1" then
+ luci.http.prepare_content("application/json")
+ luci.http.write_json(luci.sys.net.host_hints())
- local system, model = luci.sys.sysinfo()
+ return
+ end
-%>
<%+header%>
);
}
- var wifidevs = <%=luci.http.write_json(netdevs)%>;
- var arptable = <%=luci.http.write_json(arpcache)%>;
+ function wifirate(bss, rx) {
+ var p = rx ? 'rx_' : 'tx_',
+ s = '%.1f <%:Mbit/s%>, %d<%:MHz%>'
+ .format(bss[p+'rate'] / 1000, bss[p+'mhz']),
+ ht = bss[p+'ht'], vht = bss[p+'vht'],
+ mhz = bss[p+'mhz'], nss = bss[p+'nss'],
+ mcs = bss[p+'mcs'], sgi = bss[p+'short_gi'];
+
+ if (ht || vht) {
+ if (vht) s += ', VHT-MCS %d'.format(mcs);
+ if (nss) s += ', VHT-NSS %d'.format(nss);
+ if (ht) s += ', MCS %s'.format(mcs);
+ if (sgi) s += ', <%:Short GI%>';
+ }
+
+ return s;
+ }
+
+ function duid2mac(duid) {
+ // DUID-LLT / Ethernet
+ if (duid.length === 28 && duid.substr(0, 8) === '00010001')
+ return duid.substr(16).replace(/(..)(?=..)/g, '$1:').toUpperCase();
+
+ // DUID-LL / Ethernet
+ if (duid.length === 24 && duid.substr(0, 8) === '00030001')
+ return duid.substr(8).replace(/(..)(?=..)/g, '$1:').toUpperCase();
+
+ return null;
+ }
+
+ var npoll = 1;
+ var hosts = <%=luci.http.write_json(luci.sys.net.host_hints())%>;
+
+ function updateHosts() {
+ XHR.get('<%=REQUEST_URI%>', { hosts: 1 }, function(x, data) {
+ hosts = data;
+ });
+ }
XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 },
function(x, info)
{
+ if (!(npoll++ % 5))
+ updateHosts();
+
var si = document.getElementById('wan4_i');
var ss = document.getElementById('wan4_s');
var ifc = info.wan;
if (ifc6 && ifc6.ifname && ifc6.proto != 'none')
{
var s = String.format(
- '<strong><%:Address%>: </strong>%s<br />' +
+ '<strong><%:Type%>: </strong>%s%s<br />',
+ ifc6.proto, (ifc6.ip6prefix) ? '-pd' : ''
+ );
+
+ if (!ifc6.ip6prefix)
+ {
+ s += String.format(
+ '<strong><%:Address%>: </strong>%s<br />',
+ (ifc6.ip6addr) ? ifc6.ip6addr : '::'
+ );
+ }
+ else
+ {
+ s += String.format(
+ '<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.ip6addr) ? ifc6.ip6addr : '::',
(ifc6.gw6addr) ? ifc6.gw6addr : '::'
);
var s = String.format(
'<strong><%:Status%>: </strong>%s<br />' +
'<strong><%:Line State%>: </strong>%s [0x%x]<br />' +
- '<strong><%:Line Speed%>: </strong>%s/s / %s/s<br />' +
- '<strong><%:Line Attenuation%>: </strong>%s dB / %s dB<br />' +
- '<strong><%:Noise Margin%>: </strong>%s dB / %s dB<br />',
+ '<strong><%:Line Mode%>: </strong>%s<br />' +
+ '<strong><%:Annex%>: </strong>%s<br />' +
+ '<strong><%:Profile%>: </strong>%s<br />' +
+ '<strong><%:Data Rate%>: </strong>%s/s / %s/s<br />' +
+ '<strong><%:Max. Attainable Data Rate (ATTNDR)%>: </strong>%s/s / %s/s<br />' +
+ '<strong><%:Latency%>: </strong>%s / %s<br />' +
+ '<strong><%:Line Attenuation (LATN)%>: </strong>%s dB / %s dB<br />' +
+ '<strong><%:Signal Attenuation (SATN)%>: </strong>%s dB / %s dB<br />' +
+ '<strong><%:Noise Margin (SNR)%>: </strong>%s dB / %s dB<br />' +
+ '<strong><%:Aggregate Transmit Power(ACTATP)%>: </strong>%s dB / %s dB<br />' +
+ '<strong><%:Forward Error Correction Seconds (FECS)%>: </strong>%s / %s<br />' +
+ '<strong><%:Errored seconds (ES)%>: </strong>%s / %s<br />' +
+ '<strong><%:Severely Errored Seconds (SES)%>: </strong>%s / %s<br />' +
+ '<strong><%:Loss of Signal Seconds (LOSS)%>: </strong>%s / %s<br />' +
+ '<strong><%:Unavailable Seconds (UAS)%>: </strong>%s / %s<br />' +
+ '<strong><%:Header Error Code Errors (HEC)%>: </strong>%s / %s<br />' +
+ '<strong><%:Non Pre-emtive CRC errors (CRC_P)%>: </strong>%s / %s<br />' +
+ '<strong><%:Pre-emtive CRC errors (CRCP_P)%>: </strong>%s / %s<br />' +
+ '<strong><%:Line Uptime%>: </strong>%s<br />' +
+ '<strong><%:ATU-C System Vendor ID%>: </strong>%s<br />' +
+ '<strong><%:Power Management Mode%>: </strong>%s<br />',
info.dsl.line_state, info.dsl.line_state_detail,
info.dsl.line_state_num,
+ info.dsl.line_mode_s,
+ info.dsl.annex_s,
+ info.dsl.profile_s,
info.dsl.data_rate_down_s, info.dsl.data_rate_up_s,
+ info.dsl.max_data_rate_down_s, info.dsl.max_data_rate_up_s,
+ info.dsl.latency_num_down, info.dsl.latency_num_up,
info.dsl.line_attenuation_down, info.dsl.line_attenuation_up,
- info.dsl.noise_margin_down, info.dsl.noise_margin_up
+ info.dsl.signal_attenuation_down, info.dsl.signal_attenuation_up,
+ info.dsl.noise_margin_down, info.dsl.noise_margin_up,
+ info.dsl.actatp_down, info.dsl.actatp_up,
+ info.dsl.errors_fec_near, info.dsl.errors_fec_far,
+ info.dsl.errors_es_near, info.dsl.errors_es_far,
+ info.dsl.errors_ses_near, info.dsl.errors_ses_far,
+ info.dsl.errors_loss_near, info.dsl.errors_loss_far,
+ info.dsl.errors_uas_near, info.dsl.errors_uas_far,
+ info.dsl.errors_hec_near, info.dsl.errors_hec_far,
+ info.dsl.errors_crc_p_near, info.dsl.errors_crc_p_far,
+ info.dsl.errors_crcp_p_near, info.dsl.errors_crcp_p_far,
+ info.dsl.line_uptime_s,
+ info.dsl.atuc_vendor_id,
+ info.dsl.power_mode_s
);
dsl_s.innerHTML = String.format('<small>%s</small>', s);
dsl_i.innerHTML = String.format(
'<img src="<%=resource%>/icons/ethernet.png" />' +
- '<br /><small>ADSL</small>'
+ '<br /><small>DSL</small>'
);
<% end %>
{
var timestr;
- if (info.leases[i].expires <= 0)
+ if (info.leases[i].expires === false)
+ timestr = '<em><%:unlimited%></em>';
+ else if (info.leases[i].expires <= 0)
timestr = '<em><%:expired%></em>';
else
timestr = String.format('%t', info.leases[i].expires);
{
var timestr;
- if (info.leases6[i].expires <= 0)
+ if (info.leases6[i].expires === false)
+ timestr = '<em><%:unlimited%></em>';
+ else if (info.leases6[i].expires <= 0)
timestr = '<em><%:expired%></em>';
else
timestr = String.format('%t', info.leases6[i].expires);
var tr = ls6.rows[0].parentNode.insertRow(-1);
tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
- tr.insertCell(-1).innerHTML = info.leases6[i].hostname ? info.leases6[i].hostname : '?';
+ var host = hosts[duid2mac(info.leases6[i].duid)];
+ if (!info.leases6[i].hostname)
+ tr.insertCell(-1).innerHTML =
+ (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
+ 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;
tr.insertCell(-1).innerHTML = info.leases6[i].duid;
tr.insertCell(-1).innerHTML = timestr;
for (var nidx = 0; nidx < dev.networks.length; nidx++)
{
var net = dev.networks[nidx];
- var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel);
+ var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled);
var icon;
if (!is_assoc)
'<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%><br />',
icon, net.signal, net.noise,
net.quality,
- net.link, net.ssid,
+ net.link, net.ssid || '?',
net.mode,
net.channel, net.frequency,
net.bitrate || '?'
s += String.format(
'<strong><%:BSSID%>:</strong> %s<br />' +
'<strong><%:Encryption%>:</strong> %s',
- net.bssid,
+ net.bssid || '?',
net.encryption
);
}
for (var bssid in net.assoclist)
{
- assoclist.push({
- bssid: bssid,
- signal: net.assoclist[bssid].signal,
- noise: net.assoclist[bssid].noise,
- rx_rate: net.assoclist[bssid].rx_rate,
- rx_mcs: net.assoclist[bssid].rx_mcs,
- rx_40mhz: net.assoclist[bssid].rx_40mhz,
- tx_rate: net.assoclist[bssid].tx_rate,
- tx_mcs: net.assoclist[bssid].tx_mcs,
- tx_40mhz: net.assoclist[bssid].tx_40mhz,
- link: net.link,
- name: net.name
- });
+ 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);
}
}
icon = "<%=resource%>/icons/signal-75-100.png";
tr.insertCell(-1).innerHTML = String.format(
- '<img src="%s" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>" />',
- icon, assoclist[i].signal, assoclist[i].noise
+ '<span class="ifacebadge" title="%q"><img src="<%=resource%>/icons/wifi.png" /> %h</span>',
+ assoclist[i].radio, assoclist[i].ifname
);
- tr.insertCell(-1).innerHTML = assoclist[i].bssid;
-
tr.insertCell(-1).innerHTML = String.format(
'<a href="%s">%s</a>',
assoclist[i].link,
'%h'.format(assoclist[i].name).nobr()
);
- tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].signal).nobr();
- tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].noise).nobr();
+ tr.insertCell(-1).innerHTML = assoclist[i].bssid;
- tr.insertCell(-1).innerHTML = (assoclist[i].rx_mcs > -1)
- ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].rx_rate / 1000, assoclist[i].rx_mcs, assoclist[i].rx_40mhz ? 40 : 20).nobr()
- : String.format('%.1f <%:Mbit/s%>', assoclist[i].rx_rate / 1000).nobr()
- ;
+ var host = hosts[assoclist[i].bssid];
+ if (host)
+ tr.insertCell(-1).innerHTML = String.format(
+ '<div style="max-width:200px;overflow:hidden;text-overflow:ellipsis">%s</div>',
+ ((host.name && (host.ipv4 || host.ipv6))
+ ? '%h (%s)'.format(host.name, host.ipv4 || host.ipv6)
+ : '%h'.format(host.name || host.ipv4 || host.ipv6)).nobr()
+ );
+ else
+ tr.insertCell(-1).innerHTML = '?';
- tr.insertCell(-1).innerHTML = (assoclist[i].tx_mcs > -1)
- ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].tx_rate / 1000, assoclist[i].tx_mcs, assoclist[i].tx_40mhz ? 40 : 20).nobr()
- : String.format('%.1f <%:Mbit/s%>', assoclist[i].tx_rate / 1000).nobr()
- ;
+ 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)
e.innerHTML = String.format('%t', info.uptime);
if (e = document.getElementById('loadavg'))
- e.innerHTML = String.format('%.02f, %.02f, %.02f',
- info.loadavg[0], info.loadavg[1], info.loadavg[2]);
+ e.innerHTML = String.format(
+ '%.02f, %.02f, %.02f',
+ info.loadavg[0] / 65535.0,
+ info.loadavg[1] / 65535.0,
+ info.loadavg[2] / 65535.0
+ );
if (e = document.getElementById('memtotal'))
e.innerHTML = progressbar(
- (info.memfree + info.membuffers + info.memcached) + " <%:kB%>",
- info.memtotal + " <%:kB%>"
+ ((info.memory.free + info.memory.buffered) / 1024) + " <%:kB%>",
+ (info.memory.total / 1024) + " <%:kB%>"
);
if (e = document.getElementById('memfree'))
e.innerHTML = progressbar(
- info.memfree + " <%:kB%>", info.memtotal + " <%:kB%>"
- );
-
- if (e = document.getElementById('memcache'))
- e.innerHTML = progressbar(
- info.memcached + " <%:kB%>", info.memtotal + " <%:kB%>"
+ (info.memory.free / 1024) + " <%:kB%>",
+ (info.memory.total / 1024) + " <%:kB%>"
);
if (e = document.getElementById('membuff'))
e.innerHTML = progressbar(
- info.membuffers + " <%:kB%>", info.memtotal + " <%:kB%>"
- );
-
- if (e = document.getElementById('swapcache'))
- e.innerHTML = progressbar(
- info.swapcached + " <%:kB%>", info.swaptotal + " <%:kB%>"
+ (info.memory.buffered / 1024) + " <%:kB%>",
+ (info.memory.total / 1024) + " <%:kB%>"
);
if (e = document.getElementById('swaptotal'))
e.innerHTML = progressbar(
- (info.swapfree + info.swapcached) + " <%:kB%>",
- info.swaptotal + " <%:kB%>"
+ (info.swap.free / 1024) + " <%:kB%>",
+ (info.swap.total / 1024) + " <%:kB%>"
);
if (e = document.getElementById('swapfree'))
e.innerHTML = progressbar(
- info.swapfree + " <%:kB%>", info.swaptotal + " <%:kB%>"
+ (info.swap.free / 1024) + " <%:kB%>",
+ (info.swap.total / 1024) + " <%:kB%>"
);
if (e = document.getElementById('conns'))
);
//]]></script>
-<h2><a id="content" name="content"><%:Status%></a></h2>
+<h2 name="content"><%:Status%></h2>
<fieldset class="cbi-section">
<legend><%:System%></legend>
<table width="100%" cellspacing="10">
<tr><td width="33%"><%:Hostname%></td><td><%=luci.sys.hostname() or "?"%></td></tr>
- <tr><td width="33%"><%:Model%></td><td><%=pcdata(model or "?")%></td></tr>
+ <tr><td width="33%"><%:Model%></td><td><%=pcdata(boardinfo.model or boardinfo.system or "?")%></td></tr>
<tr><td width="33%"><%:Firmware Version%></td><td>
- <%=pcdata(luci.version.distname)%> <%=pcdata(luci.version.distversion)%> /
- <%=pcdata(luci.version.luciname)%> (<%=pcdata(luci.version.luciversion)%>)
+ <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> /
+ <%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>)
</td></tr>
- <tr><td width="33%"><%:Kernel Version%></td><td><%=luci.sys.exec("uname -r")%></td></tr>
+ <tr><td width="33%"><%:Kernel Version%></td><td><%=unameinfo.release or "?"%></td></tr>
<tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr>
<tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr>
<tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr>
<table width="100%" cellspacing="10">
<tr><td width="33%"><%:Total Available%></td><td id="memtotal">-</td></tr>
<tr><td width="33%"><%:Free%></td><td id="memfree">-</td></tr>
- <tr><td width="33%"><%:Cached%></td><td id="memcache">-</td></tr>
<tr><td width="33%"><%:Buffered%></td><td id="membuff">-</td></tr>
</table>
</fieldset>
-<% if has_swap then %>
+<% if swapinfo.total > 0 then %>
<fieldset class="cbi-section">
<legend><%:Swap%></legend>
<table width="100%" cellspacing="10">
<tr><td width="33%"><%:Total Available%></td><td id="swaptotal">-</td></tr>
<tr><td width="33%"><%:Free%></td><td id="swapfree">-</td></tr>
- <tr><td width="33%"><%:Cached%></td><td id="swapcache">-</td></tr>
</table>
</fieldset>
<% end %>
<table class="cbi-section-table" id="lease6_status_table">
<tr class="cbi-section-table-titles">
- <th class="cbi-section-table-cell"><%:Hostname%></th>
+ <th class="cbi-section-table-cell"><%:Host%></th>
<th class="cbi-section-table-cell"><%:IPv6-Address%></th>
<th class="cbi-section-table-cell"><%:DUID%></th>
<th class="cbi-section-table-cell"><%:Leasetime remaining%></th>
<% if has_dsl then %>
<fieldset class="cbi-section">
- <legend><%:ADSL%></legend>
+ <legend><%:DSL%></legend>
<table width="100%" cellspacing="10">
- <tr><td width="33%" style="vertical-align:top"><%:ADSL Status%></td><td>
+ <tr><td width="33%" style="vertical-align:top"><%:DSL Status%></td><td>
<table><tr>
<td id="dsl_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td>
<td id="dsl_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td>
<fieldset class="cbi-section">
<legend><%:Associated Stations%></legend>
- <table class="cbi-section-table" id="wifi_assoc_table">
+ <table class="cbi-section-table valign-middle" id="wifi_assoc_table">
<tr class="cbi-section-table-titles">
<th class="cbi-section-table-cell"> </th>
- <th class="cbi-section-table-cell"><%:MAC-Address%></th>
<th class="cbi-section-table-cell"><%:Network%></th>
- <th class="cbi-section-table-cell"><%:Signal%></th>
- <th class="cbi-section-table-cell"><%:Noise%></th>
- <th class="cbi-section-table-cell"><%:RX Rate%></th>
- <th class="cbi-section-table-cell"><%:TX Rate%></th>
+ <th class="cbi-section-table-cell"><%:MAC-Address%></th>
+ <th class="cbi-section-table-cell"><%:Host%></th>
+ <th class="cbi-section-table-cell"><%:Signal%> / <%:Noise%></th>
+ <th class="cbi-section-table-cell"><%:RX Rate%> / <%:TX Rate%></th>
</tr>
<tr class="cbi-section-table-row">
- <td colspan="7"><em><br /><%:Collecting data...%></em></td>
+ <td colspan="6"><em><br /><%:Collecting data...%></em></td>
</tr>
</table>
</fieldset>
<% end %>
<%-
- require "luci.util"
- require "nixio.fs"
-
- local plugins = nixio.fs.dir(luci.util.libpath() .. "/view/admin_status/index")
- if plugins then
+ local incdir = util.libpath() .. "/view/admin_status/index/"
+ if fs.access(incdir) then
local inc
- for inc in plugins do
+ for inc in fs.dir(incdir) do
if inc:match("%.htm$") then
include("admin_status/index/" .. inc:gsub("%.htm$", ""))
end