modules/admin-full: remove dhcp network page and move leases there

[project/luci.git] / modules / admin-full / luasrc / controller / admin / network.lua

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 778a70f..df2a4c4 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -20,89 +20,101 @@ function index()
 
        local page  = node("admin", "network")
        page.target = alias("admin", "network", "network")
-       page.title  = i18n("network")
+       page.title  = i18n("Network")
        page.order  = 50
        page.index  = true
 
        local page  = node("admin", "network", "vlan")
        page.target = cbi("admin_network/vlan")
-       page.title  = i18n("a_n_switch")
+       page.title  = i18n("Switch")
        page.order  = 20
 
-       local page  = node("admin", "network", "wireless")
-       page.target = form("admin_network/wireless")
-       page.title  = i18n("wifi")
-       page.i18n   = "wifi"
-       page.order  = 15
+       local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15)
+       page.leaf = true
        page.subindex = true
-       uci:foreach("wireless", "wifi-device",
-               function (section)
-                       local ifc = section[".name"]
-                               entry({"admin", "network", "wireless", ifc},
-                                alias("admin", "network", "wifi", ifc),
-                                ifc:upper()).i18n = "wifi"
-               end
-       )
 
-       local page  = node("admin", "network", "wifi")
-       page.target = cbi("admin_network/wifi")
-       page.leaf   = true
-       page.i18n = "wifi"
+       local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
+       page.leaf = true
+
+       local page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16)
+       page.leaf = true
 
-       local page  = node("admin", "network", "network")
-       page.target = cbi("admin_network/network")
-       page.title  = i18n("interfaces", "Schnittstellen")
-       page.order  = 10
+       local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
+       page.leaf   = true
        page.subindex = true
+
+       local page = entry({"admin", "network", "add"}, cbi("admin_network/iface_add"), nil)
+       page.leaf = true
+
        uci:foreach("network", "interface",
                function (section)
                        local ifc = section[".name"]
                        if ifc ~= "loopback" then
                                entry({"admin", "network", "network", ifc},
-                                alias("admin", "network", "ifaces", ifc),
+                                true,
                                 ifc:upper())
                        end
                end
        )
 
-       local page  = node("admin", "network", "ifaces")
-       page.target = cbi("admin_network/ifaces")
-       page.leaf   = true
-
-       local page  = node("admin", "network", "dhcp")
-       page.target = cbi("admin_network/dhcp")
-       page.title  = "DHCP"
+       local page  = node("admin", "network", "dhcpleases")
+       page.target = cbi("admin_network/dhcpleases")
+       page.title  = i18n("DHCP Leases")
        page.order  = 30
-       page.subindex = true
-
-       entry(
-        {"admin", "network", "dhcp", "leases"},
-        cbi("admin_network/dhcpleases"),
-        i18n("dhcp_leases")
-       )
 
        local page  = node("admin", "network", "hosts")
        page.target = cbi("admin_network/hosts")
-       page.title  = i18n("hostnames", "Hostnames")
+       page.title  = i18n("Hostnames")
        page.order  = 40
 
        local page  = node("admin", "network", "routes")
        page.target = cbi("admin_network/routes")
-       page.title  = i18n("a_n_routes")
+       page.title  = i18n("Static Routes")
        page.order  = 50
-       page.leaf   = true
 
-       entry(
-        {"admin", "network", "routes", "static"},
-        function() end,
-        i18n("a_n_routes_static")
-       )
+end
 
-       entry(
-               {"admin", "network", "conntrack"},
-               form("admin_network/conntrack"),
-               i18n("a_n_conntrack"),
-               60
-       )
+function wifi_join()
+       local function param(x)
+               return luci.http.formvalue(x)
+       end
+
+       local function ptable(x)
+               x = param(x)
+               return x and (type(x) ~= "table" and { x } or x) or {}
+       end
+
+       local dev  = param("device")
+       local ssid = param("join")
+
+       if dev and ssid then
+               local cancel  = (param("cancel") or param("cbi.cancel")) and true or false
+
+               if cancel then
+                       luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless_join?device=" .. dev))
+               else
+                       local cbi = require "luci.cbi"
+                       local tpl = require "luci.template"
+                       local map = luci.cbi.load("admin_network/wifi_add")[1]
+
+                       if map:parse() ~= cbi.FORM_DONE then
+                               tpl.render("header")
+                               map:render()
+                               tpl.render("footer")
+                       end
+               end
+       else
+               luci.template.render("admin_network/wifi_join")
+       end
+end
+
+function wifi_delete(network)
+       local uci = require "luci.model.uci".cursor()
+       local wlm = require "luci.model.wireless"
+
+       wlm.init(uci)
+       wlm:del_network(network)
 
+       uci:save("wireless")
+       luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
 end