modules/admin-full: fix some small style quirks

[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 f77ee63..b89d613 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
@@ -25,7 +25,7 @@ $Id$
 -%>
 
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript"><![CDATA[
+<script type="text/javascript">//<![CDATA[
        function iface_shutdown(id, reconnect) {
                if (!reconnect && !confirm(String.format('<%_Really shutdown interface "%s" ?\nYou might loose access to this router if you are connected via this interface.%>', id)))
                        return;
@@ -76,17 +76,25 @@ $Id$
                                        {
                                                var ifc = ifcs[i];
                                                var is_up = (ifc.flags && ifc.flags.up);
-                                               var rxb = ifc.stats ? (ifc.stats["rx_bytes"] / 1024) : 0;
-                                               var txb = ifc.stats ? (ifc.stats["tx_bytes"] / 1024) : 0;
+                                               var rxb = ifc.stats ? ifc.stats["rx_bytes"] : 0;
+                                               var txb = ifc.stats ? ifc.stats["tx_bytes"] : 0;
                                                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)
                                                {
@@ -154,9 +168,9 @@ $Id$
                                                if (t)
                                                {
                                                        t.innerHTML = String.format(
-                                                               '<strong><%:RX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />' +
-                                                               '<strong><%:TX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />',
-                                                                       txb, txp, rxb, rxp
+                                                               '<strong><%:RX%></strong>: %1024.2mB (%d <%:Pkts.%>)<br />' +
+                                                               '<strong><%:TX%></strong>: %1024.2mB (%d <%:Pkts.%>)<br />',
+                                                                       rxb, rxp, txb, txp
                                                        );
                                                }
                                        }
@@ -168,7 +182,7 @@ $Id$
        };
 
        update_status();
-]]></script>
+//]]></script>
 
 <fieldset class="cbi-section" style="display:none">
        <legend><%:Reconnecting interface%></legend>
@@ -182,8 +196,9 @@ $Id$
 
                <table class="cbi-section-table" style="margin:10px; empty-cells:hide">
                        <tr class="cbi-section-table-titles">
-                               <th class="cbi-section-table-cell">&nbsp;</th>
+                               <th class="cbi-section-table-cell">&#160;</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>
@@ -194,10 +209,11 @@ $Id$
                                        <td>
                                                <span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net%></span>
                                        </td>
-                                       <td class="cbi-value-field" style="width:16px; padding:3px; text-align:center" id="<%=net%>-ifc-signal">
+                                       <td class="cbi-value-field" style="min-width:16px; padding:3px; text-align:center" id="<%=net%>-ifc-signal">
                                                <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>