modules/admin-full: Detect hostap Prism2/2.5/3 hardware

[project/luci.git] / modules / admin-full / luasrc / view / admin_network / iface_overview.htm

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 5932a90..8df2de0 100644 (file)
--- 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)
                                                {
@@ -156,7 +170,7 @@ $Id$
                                                        t.innerHTML = String.format(
                                                                '<strong><%:RX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />' +
                                                                '<strong><%:TX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />',
-                                                                       txb, txp, rxb, rxp
+                                                                       rxb, rxp, txb, txp
                                                        );
                                                }
                                        }
@@ -184,6 +198,7 @@ $Id$
                        <tr class="cbi-section-table-titles">
                                <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>
                                <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">
@@ -216,8 +232,6 @@ $Id$
                        <% end %>
                </table>
 
-               <form action="<%=luci.dispatcher.build_url("admin/network/iface_add")%>" method="post">
-                       <input type="submit" class="cbi-button cbi-button-add" value="<%:Add new interface...%>" />
-               </form>
+               <input type="button" class="cbi-button cbi-button-add" value="<%:Add new interface...%>" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/iface_add")%>'" />
        </fieldset>
 </div>