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

Copy the changes made by f8d0ba00b2ff27dc9e2f10712bc343ae655fbdf9
also to the interface details pages in order to clarify display of
multiple addresses.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

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 94d9e88..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
@@ -39,30 +39,20 @@
 
                                        if (ifc.ipaddrs && ifc.ipaddrs.length)
                                        {
 
                                        if (ifc.ipaddrs && ifc.ipaddrs.length)
                                        {

-                                               html += '<strong><%:IPv4%>: </strong>';
-

                                                for (var i = 0; i < ifc.ipaddrs.length; i++)
                                                        html += String.format(
                                                for (var i = 0; i < ifc.ipaddrs.length; i++)
                                                        html += String.format(

-                                                               '%s%s',
-                                                               i ? ', ' : '',
+                                                               '<strong><%:IPv4%>:</strong> %s<br />',

                                                                ifc.ipaddrs[i]
                                                        );
                                                                ifc.ipaddrs[i]
                                                        );

-
-                                               html += '<br />';

                                        }
 
                                        if (ifc.ip6addrs && ifc.ip6addrs.length)
                                        {
                                        }
 
                                        if (ifc.ip6addrs && ifc.ip6addrs.length)
                                        {

-                                               html += '<strong><%:IPv6%>: </strong>';
-

                                                for (var i = 0; i < ifc.ip6addrs.length; i++)
                                                        html += String.format(
                                                for (var i = 0; i < ifc.ip6addrs.length; i++)
                                                        html += String.format(

-                                                               '%s%s',
-                                                               i ? ', ' : '',
-                                                               ifc.ip6addrs[i].toUpperCase()
+                                                               '<strong><%:IPv6%>:</strong> %s<br />',
+                                                               ifc.ip6addrs[i]

                                                        );
                                                        );

-
-                                               html += '<br />';

                                        }
 
                                        d.innerHTML = html;
                                        }
 
                                        d.innerHTML = html;