luci-mod-admin-full: don't replace DHCPv6 hostname

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

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 01f9fb0..2512a35 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
@@ -149,30 +149,25 @@
 
                                                if (ifc.ipaddrs && ifc.ipaddrs.length)
                                                {
-                                                       html += '<strong><%:IPv4%>: </strong>';
-
                                                        for (var i = 0; i < ifc.ipaddrs.length; i++)
                                                                html += String.format(
-                                                                       '%s%s',
-                                                                       i ? ', ' : '',
+                                                                       '<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',
-                                                                       i ? ', ' : '',
-                                                                       ifc.ip6addrs[i].toUpperCase()
+                                                                       '<strong><%:IPv6%>:</strong> %s<br />',
+                                                                       ifc.ip6addrs[i]
                                                                );
-
-                                                       html += '<br />';
+                                               }
+                                               
+                                               if (ifc.ip6prefix)
+                                               {
+                                                       html += String.format('<strong><%:IPv6-PD%>:</strong> %s<br />', ifc.ip6prefix);
                                                }
 
                                                d.innerHTML = html;
@@ -248,7 +243,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="submit" class="cbi-button cbi-button-remove" style="width:100px" onclick="iface_delete('<%=net[1]%>')" value="<%:Delete%>" />
+                                               <input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="iface_delete('<%=net[1]%>')" value="<%:Delete%>" />
                                        </td>
                                </tr>
                        <% end %>