Changeset 6949

Timestamp:

03/13/11 12:13:52 (2 years ago)

Author:

jow

Message:

modules/admin-full: use %m format in interface overview

Files:

• luci/trunk/modules/admin-full/luasrc/view/admin_network/iface_overview.htm (modified) (2 diffs)

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

@@ -77 +77 @@
                         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;
@@ -169 +169 @@
                         {
                             t.innerHTML = String.format(
-                                '<strong><%:RX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />' +
-                                '<strong><%:TX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />',
+                                '<strong><%:RX%></strong>: %1024.2mB (%d <%:Pkts.%>)<br />' +
+                                '<strong><%:TX%></strong>: %1024.2mB (%d <%:Pkts.%>)<br />',
                                     rxb, rxp, txb, txp
                             );