Changeset 6601

Timestamp:

12/01/10 22:17:39 (2 years ago)

Author:

jow

Message:

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

Location:

luci/trunk/modules/admin-full/luasrc/view/admin_network

Files:

• iface_overview.htm (modified) (4 diffs)
• iface_status.htm (modified) (2 diffs)

luci/trunk/modules/admin-full/luasrc/view/admin_network/iface_overview.htm

@@ -82 +82 @@
                         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');
@@ -97 +105 @@
                                     icon, ifc.ifname ? ifc.ifname : '?'
                             );
+                        }
+
+                        var u = document.getElementById(ifc.id + '-ifc-uptime');
+                        if (u)
+                        {
+                            u.innerHTML = upt;
                         }
 
@@ -185 +199 @@
                 <th class="cbi-section-table-cell">&nbsp;</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>
@@ -199 +214 @@
                         <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>

luci/trunk/modules/admin-full/luasrc/view/admin_network/iface_status.htm

@@ -15 +15 @@
                     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');
@@ -33 +41 @@
                     {
                         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
                         );