modules/admin-core, modules/admin-full: implement display support for dnsmasq dhcpv6...

[project/luci.git] / modules / admin-full / luasrc / view / admin_status / index.htm

diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm
index 1ef90ad..003ec31 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/admin-full/luasrc/view/admin_status/index.htm
@@ -50,6 +50,7 @@ $Id$
                        connmax    = conn_max,
                        conncount  = conn_count,
                        leases     = luci.tools.status.dhcp_leases(),
+                       leases6    = luci.tools.status.dhcp6_leases(),
                        wifinets   = luci.tools.status.wifi_networks()
                }
 
@@ -248,6 +249,44 @@ $Id$
                                                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 %>
@@ -302,8 +341,8 @@ $Id$
                                                        '</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 />',
+                                                               '<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,
@@ -386,7 +425,7 @@ $Id$
                                                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
                                        );
 
@@ -398,17 +437,17 @@ $Id$
                                                        assoclist[i].name
                                        );
 
-                                       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);
+                                       tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].noise);
 
                                        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)
+                                               : String.format('%.1f <%:Mbit/s%>', assoclist[i].rx_rate / 1000)
                                        ;
 
                                        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)
+                                               : String.format('%.1f <%:Mbit/s%>', assoclist[i].tx_rate / 1000)
                                        ;
                                }
 
@@ -438,23 +477,23 @@ $Id$
 
                        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('conns'))
@@ -532,6 +571,22 @@ $Id$
                </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 %>