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 4cdf2df..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
@@ -49,7 +49,7 @@
                        s.innerHTML = '<%:Waiting for changes to be applied...%>';
                }
 
-               XHR.get('<%=url('admin/network')%>/iface_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null,
+               (new XHR()).post('<%=url('admin/network')%>/iface_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, { token: '<%=token%>' },
                        function(x)
                        {
                                if (s)
@@ -66,6 +66,16 @@
                );
        }
 
+       function iface_delete(id) {
+               if (!confirm('<%:Really delete this interface? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this interface.%>'))
+                       return;
+
+               (new XHR()).post('<%=url('admin/network/iface_delete')%>/' + id, { token: '<%=token%>' },
+                       function(x) {
+                               location.href = '<%=url('admin/network/network')%>';
+                       }
+               );
+       }
 
        var iwxhr = new XHR();
        var wifidevs = <%=luci.http.write_json(netdevs)%>;
@@ -125,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);
                                                }
@@ -139,32 +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/%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 />';
+                                               }
+                                               
+                                               if (ifc.ip6prefix)
+                                               {
+                                                       html += String.format('<strong><%:IPv6-PD%>:</strong> %s<br />', ifc.ip6prefix);
                                                }
 
                                                d.innerHTML = html;
@@ -240,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="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this interface? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this interface.%>')) location.href='<%=url("admin/network/iface_delete", net[1])%>'" title="<%:Delete this interface%>" value="<%:Delete%>" />
+                                               <input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="iface_delete('<%=net[1]%>')" value="<%:Delete%>" />
                                        </td>
                                </tr>
                        <% end %>