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
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 _, _, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
-
local conn_count = tonumber((
luci.sys.exec("wc -l /proc/net/nf_conntrack") or
luci.sys.exec("wc -l /proc/net/ip_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()
}
td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
}
}
+
+ var ls6 = document.getElementById('lease6_status_table');
+ if (ls6 && info.leases6)
+ {
+ ls6.parentNode.style.display = 'block';
+
+ /* clear all rows */
+ while( ls6.rows.length > 1 )
+ ls6.rows[0].parentNode.deleteRow(1);
+
+ for( var i = 0; i < info.leases6.length; i++ )
+ {
+ var timestr;
+
+ 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 : '?';
+ tr.insertCell(-1).innerHTML = info.leases6[i].ip6addr;
+ tr.insertCell(-1).innerHTML = info.leases6[i].duid;
+ tr.insertCell(-1).innerHTML = timestr;
+ }
+
+ if( ls6.rows.length == 1 )
+ {
+ 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 %>
<% if has_wifi then %>
'</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 Mb/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,
icon = "<%=resource%>/icons/signal-75-100.png";
tr.insertCell(-1).innerHTML = String.format(
- '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />',
+ '<img src="%s" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>" />',
icon, assoclist[i].signal, assoclist[i].noise
);
tr.insertCell(-1).innerHTML = assoclist[i].bssid;
tr.insertCell(-1).innerHTML = String.format(
- '<a href="%s">%h</a>',
+ '<a href="%s">%s</a>',
assoclist[i].link,
- assoclist[i].name
+ '%h'.format(assoclist[i].name).nobr()
);
- tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[i].signal);
- tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[i].noise);
+ 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].rx_mcs > -1)
- ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[i].rx_rate / 1000, assoclist[i].rx_mcs, assoclist[i].rx_40mhz ? 40 : 20)
- : String.format('%.1f Mbit/s', assoclist[i].rx_rate / 1000)
+ ? 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()
;
tr.insertCell(-1).innerHTML = (assoclist[i].tx_mcs > -1)
- ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[i].tx_rate / 1000, assoclist[i].tx_mcs, assoclist[i].tx_40mhz ? 40 : 20)
- : String.format('%.1f Mbit/s', assoclist[i].tx_rate / 1000)
+ ? 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('memtotal'))
e.innerHTML = progressbar(
- (info.memfree + info.membuffers + info.memcached) + " kB",
- info.memtotal + " kB"
+ (info.memfree + info.membuffers + info.memcached) + " <%:kB%>",
+ info.memtotal + " <%:kB%>"
);
if (e = document.getElementById('memfree'))
e.innerHTML = progressbar(
- info.memfree + " kB", info.memtotal + " kB"
+ info.memfree + " <%:kB%>", info.memtotal + " <%:kB%>"
);
if (e = document.getElementById('memcache'))
e.innerHTML = progressbar(
- info.memcached + " kB", info.memtotal + " kB"
+ info.memcached + " <%:kB%>", info.memtotal + " <%:kB%>"
);
if (e = document.getElementById('membuff'))
e.innerHTML = progressbar(
- info.membuffers + " kB", info.memtotal + " kB"
+ 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'))
</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>
</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_wifi then %>
projects / project / luci.git / blobdiff