luci-mod-admin-full: allow empty mac in interface status

Also adjust for changed IP address format emitted by iface_status call.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
index 2967647fd295d1796cb049bf52fba789d74f272e..01f9fb01e9046d129be031056093034ea7a1de0e 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
@@ -135,7 +135,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);
                                                }
@@ -153,10 +153,9 @@
 
                                                        for (var i = 0; i < ifc.ipaddrs.length; i++)
                                                                html += String.format(
-                                                                       '%s%s/%d',
+                                                                       '%s%s',
                                                                        i ? ', ' : '',
-                                                                       ifc.ipaddrs[i].addr,
-                                                                       ifc.ipaddrs[i].prefix
+                                                                       ifc.ipaddrs[i]
                                                                );
 
                                                        html += '<br />';
@@ -168,10 +167,9 @@
 
                                                        for (var i = 0; i < ifc.ip6addrs.length; i++)
                                                                html += String.format(
-                                                                       '%s%s/%d',
+                                                                       '%s%s',
                                                                        i ? ', ' : '',
-                                                                       ifc.ip6addrs[i].addr.toUpperCase(),
-                                                                       ifc.ip6addrs[i].prefix
+                                                                       ifc.ip6addrs[i].toUpperCase()
                                                                );
 
                                                        html += '<br />';
@@ -250,7 +248,7 @@
                                                <input type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', true)" title="<%:Reconnect this interface%>" value="<%:Connect%>" />
                                                <input type="button" class="cbi-button cbi-button-reset" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', false)" title="<%:Shutdown this interface%>" value="<%:Stop%>" />
                                                <input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" />
-                                               <input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="iface_delete('<%=net[1]%>')" value="<%:Delete%>" />
+                                               <input type="submit" class="cbi-button cbi-button-remove" style="width:100px" onclick="iface_delete('<%=net[1]%>')" value="<%:Delete%>" />
                                        </td>
                                </tr>
                        <% end %>

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 1ebdbfcfb451933c99c64ccbf16c05c0763be6ee..adf6dccd5688e3bc49e9b507202f0863e5e92868 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);
                                        }
@@ -43,10 +43,9 @@
 
                                                for (var i = 0; i < ifc.ipaddrs.length; i++)
                                                        html += String.format(
-                                                               '%s%s/%d',
+                                                               '%s%s',
                                                                i ? ', ' : '',
-                                                               ifc.ipaddrs[i].addr,
-                                                               ifc.ipaddrs[i].prefix
+                                                               ifc.ipaddrs[i]
                                                        );
 
                                                html += '<br />';