X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fview%2Fadmin_network%2Fiface_status.htm;h=8c3b1abcc756eceede506f8ed3b34d69b4fe34c5;hb=e42e5f58651983b9971c2facb08354cc2273dbef;hp=1ebdbfcfb451933c99c64ccbf16c05c0763be6ee;hpb=a19f97f7cacf65fa3f51b668449bcca56db1f53f;p=project%2Fluci.git

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 1ebdbfcfb..8c3b1abcc 100644
--- 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;