luci-mod-admin-full: interface status page / clarify address display

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

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
index 1ebdbfc..8c3b1ab 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
@@ -25,7 +25,7 @@
                                                html += String.format('<strong><%:Uptime%>:</strong> %t<br />', ifc.uptime);
                                        }
 
-                                       if (ifc.type != 'tunnel')
+                                       if (ifc.macaddr)
                                        {
                                                html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr);
                                        }
@@ -39,32 +39,20 @@
 
                                        if (ifc.ipaddrs && ifc.ipaddrs.length)
                                        {
-                                               html += '<strong><%:IPv4%>: </strong>';
-
                                                for (var i = 0; i < ifc.ipaddrs.length; i++)
                                                        html += String.format(
-                                                               '%s%s/%d',
-                                                               i ? ', ' : '',
-                                                               ifc.ipaddrs[i].addr,
-                                                               ifc.ipaddrs[i].prefix
+                                                               '<strong><%:IPv4%>:</strong> %s<br />',
+                                                               ifc.ipaddrs[i]
                                                        );
-
-                                               html += '<br />';
                                        }
 
                                        if (ifc.ip6addrs && ifc.ip6addrs.length)
                                        {
-                                               html += '<strong><%:IPv6%>: </strong>';
-
                                                for (var i = 0; i < ifc.ip6addrs.length; i++)
                                                        html += String.format(
-                                                               '%s%s/%d',
-                                                               i ? ', ' : '',
-                                                               ifc.ip6addrs[i].addr.toUpperCase(),
-                                                               ifc.ip6addrs[i].prefix
+                                                               '<strong><%:IPv6%>:</strong> %s<br />',
+                                                               ifc.ip6addrs[i]
                                                        );
-
-                                               html += '<br />';
                                        }
 
                                        d.innerHTML = html;