diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-01 21:17:39 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-01 21:17:39 +0000 |
| commit | 4e1bf37c4345bffa149f144a0c435df9b7fc4e1a (patch) | |
| tree | aa21d3711773d7d5410cf2bd0379f42f6b76c3d9 /modules/admin-full | |
| parent | a493e28e91248d6c4e9dbf4682d882a22647d914 (diff) | |
modules/admin-full: add uptime to iface status templates
Diffstat (limited to 'modules/admin-full')
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_network/iface_overview.htm | 16 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_network/iface_status.htm | 11 |
2 files changed, 26 insertions, 1 deletions
diff --git a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm index 957d91749d..f914c404ec 100644 --- a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm @@ -81,12 +81,20 @@ $Id$ var rxp = ifc.stats ? ifc.stats["rx_packets"] : 0; var txp = ifc.stats ? ifc.stats["tx_packets"] : 0; var mac = ifc.macaddr ? ifc.macaddr : '00:00:00:00:00:00'; + var upt = '-'; var icon; if (is_up) + { + if (ifc.uptime) + upt = String.format('%t', ifc.uptime); + icon = "<%=resource%>/icons/ethernet.png"; + } else + { icon = "<%=resource%>/icons/ethernet_disabled.png"; + } var s = document.getElementById(ifc.id + '-ifc-signal'); 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'); if (m) { @@ -184,6 +198,7 @@ $Id$ <tr class="cbi-section-table-titles"> <th class="cbi-section-table-cell"> </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" style="text-align:left"><%:Addresses%></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 /> <small>?</small> </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" 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"> diff --git a/modules/admin-full/luasrc/view/admin_network/iface_status.htm b/modules/admin-full/luasrc/view/admin_network/iface_status.htm index 7c03769657..ed5002bc6c 100644 --- a/modules/admin-full/luasrc/view/admin_network/iface_status.htm +++ b/modules/admin-full/luasrc/view/admin_network/iface_status.htm @@ -14,12 +14,20 @@ var rxp = ifc.stats ? ifc.stats["rx_packets"] : 0; var txp = ifc.stats ? ifc.stats["tx_packets"] : 0; var mac = ifc.macaddr ? ifc.macaddr : '00:00:00:00:00:00'; + var upt = '-'; var icon; if (is_up) + { + if (ifc.uptime) + upt = String.format('%t', ifc.uptime); + icon = "<%=resource%>/icons/ethernet.png"; + } else + { icon = "<%=resource%>/icons/ethernet_disabled.png"; + } var s = document.getElementById('<%=self.option%>-ifc-signal'); if (s) @@ -32,10 +40,11 @@ if (d && ifc.ifname) { d.innerHTML = String.format( + '<strong><%:Uptime%>:</strong> %s<br />' + '<strong><%:MAC Address%>:</strong> %s<br />' + '<strong><%:RX%></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) |