<%:Diagnostics%>

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 4cdf2df95..9a77f8910 100644 --- 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)%>; @@ -240,7 +250,7 @@ '" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" /> - '" title="<%:Delete this interface%>" value="<%:Delete%>" /> + <% end %> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm index 671d16ed0..3533c6fa4 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm @@ -1,5 +1,5 @@ <%# - Copyright 2009 Jo-Philipp Wich + Copyright 2009-2015 Jo-Philipp Wich Licensed to the public under the Apache License 2.0. -%> @@ -109,7 +109,8 @@ Encryption: <%=format_wifi_encryption(net.encryption)%> - + + @@ -138,7 +139,8 @@ " method="get"> - diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm index 17afe0d6c..f82d06dcd 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -149,7 +149,7 @@ st.innerHTML = '<%:Wireless is restarting...%>'; } - XHR.get('<%=url('admin/network')%>/wireless_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null, + (new XHR()).post('<%=url('admin/network')%>/wireless_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, { token: '<%=token%>' }, function(x) { if (s) @@ -167,6 +167,17 @@ ); } + function wifi_delete(id) { + if (!confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this network.%>')) + return; + + (new XHR()).post('<%=url('admin/network/wireless_delete')%>/' + id, { token: '<%=token%>' }, + function(x) { + location.href = '<%=url('admin/network/wireless')%>'; + } + ); + } + XHR.poll(5, '<%=url('admin/network/wireless_status', table.concat(netlist, ","))%>', null, function(x, st) { @@ -370,8 +381,16 @@ - ?device=<%=dev:name()%>'" title="<%:Find and join network%>" value="<%:Scan%>" /> - ?device=<%=dev:name()%>'" title="<%:Provide new network%>" value="<%:Add%>" /> + + @@ -391,7 +410,7 @@ - '" title="<%:Delete this network%>" value="<%:Remove%>" /> + <% end %> @@ -410,7 +429,7 @@ <% end %> -

<%:Associated Stations%>

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm index 375738869..f49469a59 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm @@ -1,6 +1,6 @@ <%# Copyright 2008-2009 Steven Barth - Copyright 2008-2011 Jo-Philipp Wich + Copyright 2008-2015 Jo-Philipp Wich Licensed to the public under the Apache License 2.0. -%> @@ -37,7 +37,7 @@ local net = wba.iface_get_network(i) if net and i ~= "lo" then return '%s' %{ - luci.dispatcher.build_url("admin", "network", "network", net), i + url("admin/network/network", net), i } end @@ -60,6 +60,7 @@

<%:Firewall Status%>

+
<% if has_ip6tables then %>

@@ -68,82 +69,78 @@ <% end %> - -

<%:Actions%>

-

- - <% for _, tbl in ipairs(tables) do chaincnt = 0 %> -

<%:Table%>: <%=tbl%>

- <% for _, chain in ipairs(ipt:chains(tbl)) do - rowcnt = 0 - chaincnt = chaincnt + 1 - chaininfo = ipt:chain(tbl, chain) - %> - - +

+ + " style="position: absolute; right: 0"> + + + + + + +

+ + <% for _, tbl in ipairs(tables) do chaincnt = 0 %> +

<%:Table%>: <%=tbl%>

- - <%:Chain%> <%=chain%> - (<%- if chaininfo.policy then -%> - <%:Policy%>: <%=chaininfo.policy%>, <%:Packets%>: <%=chaininfo.packets%>, <%:Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%> - <%- else -%> - <%:References%>: <%=chaininfo.references-%> - <%- end -%>) -

+ <% for _, chain in ipairs(ipt:chains(tbl)) do + rowcnt = 0 + chaincnt = chaincnt + 1 + chaininfo = ipt:chain(tbl, chain) + %> + + + + + + + + + + + + + + + + <% for _, rule in ipairs(ipt:find({table=tbl, chain=chain})) do %> + + + + + + + + + + - - - - - - - - - - - - - - - <% for _, rule in ipairs(ipt:find({table=tbl, chain=chain})) do %> - - - - - - - - - - - - - - <% end %> - - <% if rowcnt == 1 then %> - - - - <% end %> <% end %> - <% if chaincnt == 0 then %> + <% if rowcnt == 1 then %> - + <% end %> -

+ + <%:Chain%> <%=chain%> + (<%- if chaininfo.policy then -%> + <%:Policy%>: <%=chaininfo.policy%>, <%:Packets%>: <%=chaininfo.packets%>, <%:Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%> + <%- else -%> + <%:References%>: <%=chaininfo.references-%> + <%- end -%>) +
<%:Pkts.%>	<%:Traffic%>	<%:Target%>	<%:Prot.%>	<%:In%>	<%:Out%>	<%:Source%>	<%:Destination%>	<%:Options%>
<%=rule.packets%>	<%=wba.byte_format(rule.bytes)%>	<%=rule.target and link_target(tbl, rule.target) or "-"%>	<%=rule.protocol%>	<%=link_iface(rule.inputif)%>	<%=link_iface(rule.outputif)%>	<%=rule.source%>	<%=rule.destination%>	<%=#rule.options > 0 and luci.util.pcdata(table.concat(rule.options, " ")) or "-"%>
<%:Rule #%>	<%:Pkts.%>	<%:Traffic%>	<%:Target%>	<%:Prot.%>	<%:Flags%>	<%:In%>	<%:Out%>	<%:Source%>	<%:Destination%>	<%:Options%>
<%=rule.index%>	<%=rule.packets%>	<%=wba.byte_format(rule.bytes)%>	<%=rule.target and link_target(tbl, rule.target) or "-"%>	<%=rule.protocol%>	<%=rule.flags%>	<%=link_iface(rule.inputif)%>	<%=link_iface(rule.outputif)%>	<%=rule.source%>	<%=rule.destination%>	<%=#rule.options > 0 and luci.util.pcdata(table.concat(rule.options, " ")) or "-"%>
<%:No rules in this chain%>
<%:No chains in this table%>											<%:No rules in this chain%>

-

- <% end %> -

<%:Software%>

<%:Actions%>
<%:Configuration%>

- -

<%:Actions%>
<%:Configuration%>

+ + + +

<% if (install and next(install)) or (remove and next(remove)) or update or upgrade then %>

@@ -80,7 +81,7 @@ end <% else %> <%:No package lists available%> <% end %> - +

<% end %> @@ -101,7 +102,7 @@ end <%:Download and install package%>:

- +

@@ -114,83 +115,98 @@ end

	<%:Package name%>	<%:Version%>
<%:Remove%>	<%=luci.util.pcdata(n)%>	<%=luci.util.pcdata(v)%>
	<%:none%>	<%:none%>

<%:Package name%>

<%:Version%>

<%:Remove%>

<%=luci.util.pcdata(n)%>

<%=luci.util.pcdata(v)%>

<%:none%>

	<%:Package name%>	<%:Version%>	<%:Size (.ipk)%>	<%:Description%>
<%:Install%>	<%=luci.util.pcdata(n)%>	<%=luci.util.pcdata(v)%>	<%=luci.util.pcdata(s)%>	<%=luci.util.pcdata(d)%>
	<%:none%>	<%:none%>	<%:none%>	<%:none%>

<%:Package name%>

<%:Version%>

<%:Size (.ipk)%>

<%:Description%>

<%:Install%>

<%=luci.util.pcdata(n)%>

<%=luci.util.pcdata(v)%>

<%=luci.util.pcdata(s)%>

<%=luci.util.pcdata(d)%>

<%:none%>

	<%:Package name%>	<%:Version%>
+ + + + + <%:Remove%> + +	<%=luci.util.pcdata(n)%>	<%=luci.util.pcdata(v)%>
	<%:none%>	<%:none%>

<%:Package name%>

<%:Version%>

+ +

<%=luci.util.pcdata(n)%>

<%=luci.util.pcdata(v)%>

<%:none%>

	<%:Package name%>	<%:Version%>	<%:Size (.ipk)%>	<%:Description%>
+ + + + + <%:Install%> + +	<%=luci.util.pcdata(n)%>	<%=luci.util.pcdata(v)%>	<%=luci.util.pcdata(s)%>	<%=luci.util.pcdata(d)%>
	<%:none%>	<%:none%>	<%:none%>	<%:none%>

<%:Package name%>

<%:Version%>

<%:Size (.ipk)%>

<%:Description%>

+ +

<%=luci.util.pcdata(n)%>

<%=luci.util.pcdata(v)%>

<%=luci.util.pcdata(s)%>

<%=luci.util.pcdata(d)%>

<%:none%>

<%:Diagnostics%>

<%:Associated Stations%>

<%:Associated Stations%>

<%:Firewall Status%>

<%:Actions%>

<%:Table%>: <%=tbl%>

<%:Table%>: <%=tbl%>

<%:Software%>

<%:Status%>

<%:Status%>