http://www.apache.org/licenses/LICENSE-2.0
-$Id$
-
-%>
<%
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")
if luci.http.formvalue("status") == "1" then
local ntm = require "luci.model.network".init()
- local dr4 = luci.sys.net.defaultroute()
- local dr6 = luci.sys.net.defaultroute6()
- local wan, wan6
-
- if dr4 and dr4.device then
- wan = ntm:get_interface(dr4.device)
- wan = wan and wan:get_network()
- end
-
- if dr6 and dr6.device then
- wan6 = ntm:get_interface(dr6.device)
- wan6 = wan6 and wan6:get_network()
- end
-
- local _, _, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
+ local wan = ntm:get_wannet()
+ local wan6 = ntm:get_wan6net()
local conn_count = tonumber((
luci.sys.exec("wc -l /proc/net/nf_conntrack") or
memcached = memcached,
membuffers = membuffers,
memfree = memfree,
+ swaptotal = swaptotal,
+ swapcached = swapcached,
+ swapfree = swapfree,
connmax = conn_max,
conncount = conn_count,
leases = luci.tools.status.dhcp_leases(),
+ leases6 = luci.tools.status.dhcp6_leases(),
wifinets = luci.tools.status.wifi_networks()
}
}
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()
+ end
+
luci.http.prepare_content("application/json")
luci.http.write_json(rv)
);
}
- var iwxhr = new XHR();
var wifidevs = <%=luci.http.write_json(netdevs)%>;
var arptable = <%=luci.http.write_json(arpcache)%>;
- var update_status = function() {
- iwxhr.get('<%=REQUEST_URI%>', { status: 1 },
- function(x, info)
+ XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 },
+ function(x, info)
+ {
+ var si = document.getElementById('wan4_i');
+ var ss = document.getElementById('wan4_s');
+ var ifc = info.wan;
+
+ if (ifc && ifc.ifname && ifc.proto != 'none')
{
- var si = document.getElementById('wan4_i');
- var ss = document.getElementById('wan4_s');
- var ifc = info.wan;
+ 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++)
+ {
+ s += String.format(
+ '<strong><%:DNS%> %d: </strong>%s<br />',
+ i + 1, ifc.dns[i]
+ );
+ }
- if (ifc && ifc.ifname && ifc.proto != 'none')
+ if (ifc.expires > -1)
{
- 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'
+ s += String.format(
+ '<strong><%:Expires%>: </strong>%t<br />',
+ ifc.expires
);
+ }
- for (var i = 0; i < ifc.dns.length; i++)
- {
- s += String.format(
- '<strong><%:DNS%> %d: </strong>%s<br />',
- i + 1, ifc.dns[i]
- );
- }
+ if (ifc.uptime > 0)
+ {
+ s += String.format(
+ '<strong><%:Connected%>: </strong>%t<br />',
+ ifc.uptime
+ );
+ }
- if (ifc.expires > -1)
- {
- s += String.format(
- '<strong><%:Expires%>: </strong>%t<br />',
- ifc.expires
- );
- }
+ ss.innerHTML = String.format('<small>%s</small>', s);
+ si.innerHTML = String.format(
+ '<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 (ifc.uptime > 0)
- {
- s += String.format(
- '<strong><%:Connected%>: </strong>%t<br />',
- ifc.uptime
- );
- }
+ <% if has_ipv6 then %>
+ var si6 = document.getElementById('wan6_i');
+ var ss6 = document.getElementById('wan6_s');
+ var ifc6 = info.wan6;
- ss.innerHTML = String.format('<small>%s</small>', s);
- si.innerHTML = String.format(
- '<img src="<%=resource%>/icons/ethernet.png" />' +
- '<br /><small><a href="%s">%s</a></small>',
- ifc.link, ifc.ifname
+ if (ifc6 && ifc6.ifname && ifc6.proto != 'none')
+ {
+ var s = String.format(
+ '<strong><%:Address%>: </strong>%s<br />' +
+ '<strong><%:Gateway%>: </strong>%s<br />',
+ (ifc6.ip6addr) ? ifc6.ip6addr : '::',
+ (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]
);
}
- else
+
+ if (ifc6.uptime > 0)
{
- si.innerHTML = '<img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small>';
- ss.innerHTML = '<em>Not connected</em>';
+ s += String.format(
+ '<strong><%:Connected%>: </strong>%t<br />',
+ ifc6.uptime
+ );
}
- <% if has_ipv6 then %>
- var si6 = document.getElementById('wan6_i');
- var ss6 = document.getElementById('wan6_s');
- var ifc6 = info.wan6;
+ 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 %>
+
+ <% if has_dsl then %>
+ var dsl_i = document.getElementById('dsl_i');
+ var dsl_s = document.getElementById('dsl_s');
+
+ 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 />',
+ info.dsl.line_state, info.dsl.line_state_detail,
+ info.dsl.line_state_num,
+ info.dsl.data_rate_down_s, info.dsl.data_rate_up_s,
+ info.dsl.line_attenuation_down, info.dsl.line_attenuation_up,
+ info.dsl.noise_margin_down, info.dsl.noise_margin_up
+ );
+
+ dsl_s.innerHTML = String.format('<small>%s</small>', s);
+ dsl_i.innerHTML = String.format(
+ '<img src="<%=resource%>/icons/ethernet.png" />' +
+ '<br /><small>ADSL</small>'
+ );
+ <% end %>
+
+ <% if has_dhcp then %>
+ var ls = document.getElementById('lease_status_table');
+ if (ls)
+ {
+ /* clear all rows */
+ while( ls.rows.length > 1 )
+ ls.rows[0].parentNode.deleteRow(1);
- if (ifc6 && ifc6.ifname && ifc6.proto != 'none')
+ for( var i = 0; i < info.leases.length; i++ )
{
- var s = String.format(
- '<strong><%:Address%>: </strong>%s<br />' +
- '<strong><%:Gateway%>: </strong>%s<br />',
- (ifc6.ip6addr) ? ifc6.ip6addr : '::',
- (ifc6.gw6addr) ? ifc6.gw6addr : '::'
- );
+ var timestr;
- for (var i = 0; i < ifc6.dns.length; i++)
- {
- s += String.format(
- '<strong><%:DNS%> %d: </strong>%s<br />',
- i + 1, ifc6.dns[i]
- );
- }
+ if (info.leases[i].expires <= 0)
+ timestr = '<em><%:expired%></em>';
+ else
+ timestr = String.format('%t', info.leases[i].expires);
- if (ifc6.uptime > 0)
- {
- s += String.format(
- '<strong><%:Connected%>: </strong>%t<br />',
- ifc6.uptime
- );
- }
+ var tr = ls.rows[0].parentNode.insertRow(-1);
+ tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
- 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>';
+ tr.insertCell(-1).innerHTML = info.leases[i].hostname ? info.leases[i].hostname : '?';
+ tr.insertCell(-1).innerHTML = info.leases[i].ipaddr;
+ tr.insertCell(-1).innerHTML = info.leases[i].macaddr;
+ tr.insertCell(-1).innerHTML = timestr;
}
- <% end %>
- <% if has_dhcp then %>
- var ls = document.getElementById('lease_status_table');
- if (ls)
+ if( ls.rows.length == 1 )
{
- /* clear all rows */
- while( ls.rows.length > 1 )
- ls.rows[0].parentNode.deleteRow(1);
+ var tr = ls.rows[0].parentNode.insertRow(-1);
+ tr.className = 'cbi-section-table-row';
- for( var i = 0; i < info.leases.length; i++ )
- {
- var timestr;
+ var td = tr.insertCell(-1);
+ td.colSpan = 4;
+ td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
+ }
+ }
- if (info.leases[i].expires <= 0)
- timestr = '<em><%:expired%></em>';
- else
- timestr = String.format('%t', info.leases[i].expires);
+ var ls6 = document.getElementById('lease6_status_table');
+ if (ls6 && info.leases6)
+ {
+ ls6.parentNode.style.display = 'block';
- var tr = ls.rows[0].parentNode.insertRow(-1);
- tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+ /* clear all rows */
+ while( ls6.rows.length > 1 )
+ ls6.rows[0].parentNode.deleteRow(1);
- tr.insertCell(-1).innerHTML = info.leases[i].hostname ? info.leases[i].hostname : '?';
- tr.insertCell(-1).innerHTML = info.leases[i].ipaddr;
- tr.insertCell(-1).innerHTML = info.leases[i].macaddr;
- tr.insertCell(-1).innerHTML = timestr;
- }
+ for( var i = 0; i < info.leases6.length; i++ )
+ {
+ var timestr;
- if( ls.rows.length == 1 )
- {
- var tr = ls.rows[0].parentNode.insertRow(-1);
- tr.className = 'cbi-section-table-row';
+ if (info.leases6[i].expires <= 0)
+ timestr = '<em><%:expired%></em>';
+ else
+ timestr = String.format('%t', info.leases6[i].expires);
- var td = tr.insertCell(-1);
- td.colSpan = 4;
- td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
- }
- }
- <% end %>
+ var tr = ls6.rows[0].parentNode.insertRow(-1);
+ tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
- <% if has_wifi then %>
- var assoclist = [ ];
+ tr.insertCell(-1).innerHTML = info.leases6[i].hostname ? 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;
+ }
- var ws = document.getElementById('wifi_status_table');
- if (ws)
+ if( ls6.rows.length == 1 )
{
- var wsbody = ws.rows[0].parentNode;
- while (ws.rows.length > 0)
- wsbody.deleteRow(0);
-
- for (var didx = 0; didx < info.wifinets.length; didx++)
- {
- var dev = info.wifinets[didx];
+ var tr = ls6.rows[0].parentNode.insertRow(-1);
+ tr.className = 'cbi-section-table-row';
- var tr = wsbody.insertRow(-1);
- var td;
-
- td = tr.insertCell(-1);
- td.width = "33%";
- td.innerHTML = dev.name;
- td.style.verticalAlign = "top";
+ var td = tr.insertCell(-1);
+ td.colSpan = 4;
+ td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
+ }
+ }
+ <% end %>
- td = tr.insertCell(-1);
+ <% if has_wifi then %>
+ var assoclist = [ ];
- var s = '';
+ var ws = document.getElementById('wifi_status_table');
+ if (ws)
+ {
+ var wsbody = ws.rows[0].parentNode;
+ while (ws.rows.length > 0)
+ wsbody.deleteRow(0);
- 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 icon;
- if (!is_assoc)
- icon = "<%=resource%>/icons/signal-none.png";
- else if (net.quality == 0)
- icon = "<%=resource%>/icons/signal-0.png";
- else if (net.quality < 25)
- icon = "<%=resource%>/icons/signal-0-25.png";
- else if (net.quality < 50)
- icon = "<%=resource%>/icons/signal-25-50.png";
- else if (net.quality < 75)
- icon = "<%=resource%>/icons/signal-50-75.png";
- else
- icon = "<%=resource%>/icons/signal-75-100.png";
+ for (var didx = 0; didx < info.wifinets.length; didx++)
+ {
+ var dev = info.wifinets[didx];
- s += String.format(
- '<table><tr><td style="text-align:center; width:32px; padding:3px">' +
- '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />' +
- '<br /><small>%d%%</small>' +
- '</td><td style="text-align:left; padding:3px"><small>' +
- '<strong><%:SSID%>:</strong> <a href="%s">%h</a><br />' +
- '<strong><%:Mode%>:</strong> %s<br />' +
- '<strong><%:Channel%>:</strong> %d (%.2f GHz)<br />' +
- '<strong><%:Bitrate%>:</strong> %s Mb/s<br />',
- icon, net.signal, net.noise,
- net.quality,
- net.link, net.ssid,
- net.mode,
- net.channel, net.frequency,
- net.bitrate || '?'
- );
+ var tr = wsbody.insertRow(-1);
+ var td;
- 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)
- {
- assoclist.push({
- bssid: bssid,
- signal: net.assoclist[bssid].signal,
- noise: net.assoclist[bssid].noise,
- link: net.link,
- name: net.name
- });
- }
- }
+ td = tr.insertCell(-1);
+ td.width = "33%";
+ td.innerHTML = dev.name;
+ td.style.verticalAlign = "top";
- if (!s)
- s = '<em><%:No information available%></em>';
+ td = tr.insertCell(-1);
- td.innerHTML = s;
- }
- }
+ var s = '';
- var ac = document.getElementById('wifi_assoc_table');
- if (ac)
- {
- /* clear all rows */
- while( ac.rows.length > 1 )
- ac.rows[0].parentNode.deleteRow(1);
-
- assoclist.sort(function(a, b) {
- return (a.name == b.name)
- ? (a.bssid < b.bssid)
- : (a.name > b.name )
- ;
- });
-
- for( var i = 0; i < assoclist.length; i++ )
+ for (var nidx = 0; nidx < dev.networks.length; nidx++)
{
- var tr = ac.rows[0].parentNode.insertRow(-1);
- tr.className = 'cbi-section-table-row cbi-rowstyle-' + (1 + (i % 2));
+ var net = dev.networks[nidx];
+ var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel);
var icon;
- var q = (-1 * (assoclist[i].noise - assoclist[i].signal)) / 5;
- if (q < 1)
+ if (!is_assoc)
+ icon = "<%=resource%>/icons/signal-none.png";
+ else if (net.quality == 0)
icon = "<%=resource%>/icons/signal-0.png";
- else if (q < 2)
+ else if (net.quality < 25)
icon = "<%=resource%>/icons/signal-0-25.png";
- else if (q < 3)
+ else if (net.quality < 50)
icon = "<%=resource%>/icons/signal-25-50.png";
- else if (q < 4)
+ else if (net.quality < 75)
icon = "<%=resource%>/icons/signal-50-75.png";
else
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
+ s += String.format(
+ '<table><tr><td style="text-align:center; width:32px; padding:3px">' +
+ '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />' +
+ '<br /><small>%d%%</small>' +
+ '</td><td style="text-align:left; padding:3px"><small>' +
+ '<strong><%:SSID%>:</strong> <a href="%s">%h</a><br />' +
+ '<strong><%:Mode%>:</strong> %s<br />' +
+ '<strong><%:Channel%>:</strong> %d (%.3f <%:GHz%>)<br />' +
+ '<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%><br />',
+ icon, net.signal, net.noise,
+ net.quality,
+ net.link, net.ssid,
+ net.mode,
+ net.channel, net.frequency,
+ net.bitrate || '?'
);
- tr.insertCell(-1).innerHTML = assoclist[i].bssid;
+ 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>';
+ }
- tr.insertCell(-1).innerHTML = String.format(
- '<a href="%s">%h</a>',
- assoclist[i].link,
- assoclist[i].name
- );
+ s += '</small></td></tr></table>';
- tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[i].signal);
- tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[i].noise);
+ 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
+ });
+ }
}
- if (ac.rows.length == 1)
- {
- var tr = ac.rows[0].parentNode.insertRow(-1);
- tr.className = 'cbi-section-table-row';
+ if (!s)
+ s = '<em><%:No information available%></em>';
- var td = tr.insertCell(-1);
- td.colSpan = 5;
- td.innerHTML = '<br /><em><%:No information available%></em>';
- }
+ td.innerHTML = s;
}
- <% end %>
-
- var e;
-
- if (e = document.getElementById('localtime'))
- e.innerHTML = info.localtime;
+ }
- if (e = document.getElementById('uptime'))
- e.innerHTML = String.format('%t', info.uptime);
+ var ac = document.getElementById('wifi_assoc_table');
+ if (ac)
+ {
+ /* clear all rows */
+ while( ac.rows.length > 1 )
+ ac.rows[0].parentNode.deleteRow(1);
+
+ assoclist.sort(function(a, b) {
+ return (a.name == b.name)
+ ? (a.bssid < b.bssid)
+ : (a.name > b.name )
+ ;
+ });
+
+ 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 q = (-1 * (assoclist[i].noise - assoclist[i].signal)) / 5;
+ if (q < 1)
+ icon = "<%=resource%>/icons/signal-0.png";
+ else if (q < 2)
+ icon = "<%=resource%>/icons/signal-0-25.png";
+ else if (q < 3)
+ icon = "<%=resource%>/icons/signal-25-50.png";
+ else if (q < 4)
+ icon = "<%=resource%>/icons/signal-50-75.png";
+ else
+ 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
+ );
- if (e = document.getElementById('loadavg'))
- e.innerHTML = String.format('%.02f, %.02f, %.02f',
- info.loadavg[0], info.loadavg[1], info.loadavg[2]);
+ tr.insertCell(-1).innerHTML = assoclist[i].bssid;
- if (e = document.getElementById('memtotal'))
- e.innerHTML = progressbar(
- (info.memfree + info.membuffers + info.memcached) + " kB",
- info.memtotal + " kB"
+ tr.insertCell(-1).innerHTML = String.format(
+ '<a href="%s">%s</a>',
+ assoclist[i].link,
+ '%h'.format(assoclist[i].name).nobr()
);
- if (e = document.getElementById('memfree'))
- e.innerHTML = progressbar(
- info.memfree + " kB", info.memtotal + " kB"
- );
+ tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].signal).nobr();
+ tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].noise).nobr();
- if (e = document.getElementById('memcache'))
- e.innerHTML = progressbar(
- info.memcached + " kB", info.memtotal + " kB"
- );
+ 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()
+ ;
- if (e = document.getElementById('membuff'))
- e.innerHTML = progressbar(
- info.membuffers + " kB", info.memtotal + " kB"
- );
+ 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()
+ ;
+ }
- if (e = document.getElementById('conns'))
- e.innerHTML = progressbar(info.conncount, info.connmax);
+ if (ac.rows.length == 1)
+ {
+ var tr = ac.rows[0].parentNode.insertRow(-1);
+ tr.className = 'cbi-section-table-row';
- window.setTimeout(update_status, 5000);
+ var td = tr.insertCell(-1);
+ td.colSpan = 7;
+ td.innerHTML = '<br /><em><%:No information available%></em>';
+ }
}
- )
- };
+ <% end %>
+
+ var e;
+
+ if (e = document.getElementById('localtime'))
+ e.innerHTML = info.localtime;
- update_status();
+ if (e = document.getElementById('uptime'))
+ 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]);
+
+ if (e = document.getElementById('memtotal'))
+ e.innerHTML = progressbar(
+ (info.memfree + info.membuffers + info.memcached) + " <%:kB%>",
+ info.memtotal + " <%: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%>"
+ );
+
+ 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%>"
+ );
+
+ if (e = document.getElementById('swaptotal'))
+ e.innerHTML = progressbar(
+ (info.swapfree + info.swapcached) + " <%:kB%>",
+ info.swaptotal + " <%:kB%>"
+ );
+
+ if (e = document.getElementById('swapfree'))
+ e.innerHTML = progressbar(
+ info.swapfree + " <%:kB%>", info.swaptotal + " <%:kB%>"
+ );
+
+ if (e = document.getElementById('conns'))
+ e.innerHTML = progressbar(info.conncount, info.connmax);
+
+ }
+ );
//]]></script>
<h2><a id="content" name="content"><%:Status%></a></h2>
<legend><%:System%></legend>
<table width="100%" cellspacing="10">
- <tr><td width="33%"><%:Router Name%></td><td><%=luci.sys.hostname() or "?"%></td></tr>
- <tr><td width="33%"><%:Router Model%></td><td><%=pcdata(model or "?")%></td></tr>
+ <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%"><%:Firmware Version%></td><td>
<%=pcdata(luci.version.distname)%> <%=pcdata(luci.version.distversion)%> /
- <%=pcdata(luci.version.luciname)%> <%=pcdata(luci.version.luciversion)%>
+ <%=pcdata(luci.version.luciname)%> (<%=pcdata(luci.version.luciversion)%>)
</td></tr>
<tr><td width="33%"><%:Kernel Version%></td><td><%=luci.sys.exec("uname -r")%></td></tr>
<tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr>
</table>
</fieldset>
+<% if has_swap 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 %>
+
<fieldset class="cbi-section">
<legend><%:Network%></legend>
</tr></table>
</td></tr>
<% end %>
- <tr><td width="33%"><%:Active IP Connections%></td><td id="conns">-</td></tr>
+ <tr><td width="33%"><%:Active Connections%></td><td id="conns">-</td></tr>
</table>
</fieldset>
</tr>
</table>
</fieldset>
+
+<fieldset class="cbi-section" style="display:none">
+ <legend><%:DHCPv6 Leases%></legend>
+
+ <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"><%:IPv6-Address%></th>
+ <th class="cbi-section-table-cell"><%:DUID%></th>
+ <th class="cbi-section-table-cell"><%:Leasetime remaining%></th>
+ </tr>
+ <tr class="cbi-section-table-row">
+ <td colspan="4"><em><br /><%:Collecting data...%></em></td>
+ </tr>
+ </table>
+</fieldset>
+<% end %>
+
+<% if has_dsl then %>
+<fieldset class="cbi-section">
+ <legend><%:ADSL%></legend>
+ <table width="100%" cellspacing="10">
+ <tr><td width="33%" style="vertical-align:top"><%:ADSL 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>
+ </tr></table>
+ </td></tr>
+ </table>
+</fieldset>
<% end %>
<% if has_wifi then %>
<table class="cbi-section-table" id="wifi_assoc_table">
<tr class="cbi-section-table-titles">
<th class="cbi-section-table-cell"> </th>
- <th class="cbi-section-table-cell"><%:BSSID%></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>
</tr>
<tr class="cbi-section-table-row">
- <td colspan="5"><em><br /><%:Collecting data...%></em></td>
+ <td colspan="7"><em><br /><%:Collecting data...%></em></td>
</tr>
</table>
</fieldset>