modules/admin-full: add uptime to iface status templates

This commit is contained in:
Jo-Philipp Wich 2010-12-01 21:17:39 +00:00
parent a493e28e91
commit 4e1bf37c43
2 changed files with 26 additions and 1 deletions

View file

@ -81,12 +81,20 @@ $Id$
var rxp = ifc.stats ? ifc.stats["rx_packets"] : 0; var rxp = ifc.stats ? ifc.stats["rx_packets"] : 0;
var txp = ifc.stats ? ifc.stats["tx_packets"] : 0; var txp = ifc.stats ? ifc.stats["tx_packets"] : 0;
var mac = ifc.macaddr ? ifc.macaddr : '00:00:00:00:00:00'; var mac = ifc.macaddr ? ifc.macaddr : '00:00:00:00:00:00';
var upt = '-';
var icon; var icon;
if (is_up) if (is_up)
{
if (ifc.uptime)
upt = String.format('%t', ifc.uptime);
icon = "<%=resource%>/icons/ethernet.png"; icon = "<%=resource%>/icons/ethernet.png";
}
else else
{
icon = "<%=resource%>/icons/ethernet_disabled.png"; icon = "<%=resource%>/icons/ethernet_disabled.png";
}
var s = document.getElementById(ifc.id + '-ifc-signal'); var s = document.getElementById(ifc.id + '-ifc-signal');
if (s) if (s)
@ -98,6 +106,12 @@ $Id$
); );
} }
var u = document.getElementById(ifc.id + '-ifc-uptime');
if (u)
{
u.innerHTML = upt;
}
var m = document.getElementById(ifc.id + '-ifc-mac'); var m = document.getElementById(ifc.id + '-ifc-mac');
if (m) if (m)
{ {
@ -184,6 +198,7 @@ $Id$
<tr class="cbi-section-table-titles"> <tr class="cbi-section-table-titles">
<th class="cbi-section-table-cell">&nbsp;</th> <th class="cbi-section-table-cell">&nbsp;</th>
<th class="cbi-section-table-cell"><%:Interface%></th> <th class="cbi-section-table-cell"><%:Interface%></th>
<th class="cbi-section-table-cell"><%:Uptime%></th>
<th class="cbi-section-table-cell"><%:MAC%></th> <th class="cbi-section-table-cell"><%:MAC%></th>
<th class="cbi-section-table-cell" style="text-align:left"><%:Addresses%></th> <th class="cbi-section-table-cell" style="text-align:left"><%:Addresses%></th>
<th class="cbi-section-table-cell" style="text-align:left"><%:Transfer%></th> <th class="cbi-section-table-cell" style="text-align:left"><%:Transfer%></th>
@ -198,6 +213,7 @@ $Id$
<img src="<%=resource%>/icons/ethernet_disabled.png" style="width:16px; height:16px" /><br /> <img src="<%=resource%>/icons/ethernet_disabled.png" style="width:16px; height:16px" /><br />
<small>?</small> <small>?</small>
</td> </td>
<td class="cbi-value-field" id="<%=net%>-ifc-uptime">?</td>
<td class="cbi-value-field" id="<%=net%>-ifc-mac">?</td> <td class="cbi-value-field" id="<%=net%>-ifc-mac">?</td>
<td class="cbi-value-field" style="text-align:left; padding:3px" id="<%=net%>-ifc-addrs"><em><%:Collecting data...%></em></td> <td class="cbi-value-field" style="text-align:left; padding:3px" id="<%=net%>-ifc-addrs"><em><%:Collecting data...%></em></td>
<td class="cbi-value-field" style="text-align:left; padding:3px" id="<%=net%>-ifc-transfer"> <td class="cbi-value-field" style="text-align:left; padding:3px" id="<%=net%>-ifc-transfer">

View file

@ -14,12 +14,20 @@
var rxp = ifc.stats ? ifc.stats["rx_packets"] : 0; var rxp = ifc.stats ? ifc.stats["rx_packets"] : 0;
var txp = ifc.stats ? ifc.stats["tx_packets"] : 0; var txp = ifc.stats ? ifc.stats["tx_packets"] : 0;
var mac = ifc.macaddr ? ifc.macaddr : '00:00:00:00:00:00'; var mac = ifc.macaddr ? ifc.macaddr : '00:00:00:00:00:00';
var upt = '-';
var icon; var icon;
if (is_up) if (is_up)
{
if (ifc.uptime)
upt = String.format('%t', ifc.uptime);
icon = "<%=resource%>/icons/ethernet.png"; icon = "<%=resource%>/icons/ethernet.png";
}
else else
{
icon = "<%=resource%>/icons/ethernet_disabled.png"; icon = "<%=resource%>/icons/ethernet_disabled.png";
}
var s = document.getElementById('<%=self.option%>-ifc-signal'); var s = document.getElementById('<%=self.option%>-ifc-signal');
if (s) if (s)
@ -32,10 +40,11 @@
if (d && ifc.ifname) if (d && ifc.ifname)
{ {
d.innerHTML = String.format( d.innerHTML = String.format(
'<strong><%:Uptime%>:</strong> %s<br />' +
'<strong><%:MAC Address%>:</strong> %s<br />' + '<strong><%:MAC Address%>:</strong> %s<br />' +
'<strong><%:RX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />' + '<strong><%:RX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />' +
'<strong><%:TX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />', '<strong><%:TX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />',
mac, rxb, rxp, txb, txp upt, mac, rxb, rxp, txb, txp
); );
if (ifc.ipaddrs && ifc.ipaddrs.length) if (ifc.ipaddrs && ifc.ipaddrs.length)