Optical improvements

[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 1d44bda..f95b832 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -15,48 +15,76 @@ module("luci.controller.admin.network", package.seeall)
 
 function index()
        require("luci.i18n")
-       require("luci.model.uci")
+       local uci = require("luci.model.uci").cursor()
        local i18n = luci.i18n.translate
 
        local page  = node("admin", "network")
-       page.target = template("admin_network/index")
-       page.title  = i18n("network", "Netzwerk")  
+       page.target = alias("admin", "network", "network")
+       page.title  = i18n("network")  
        page.order  = 50
        
        local page  = node("admin", "network", "vlan")
        page.target = cbi("admin_network/vlan")
-       page.title  = i18n("a_n_switch", "Switch")
-       page.order  = 10
-       
-       local page  = node("admin", "network", "ifaces")
-       page.target = cbi("admin_network/ifaces")
-       page.title  = i18n("interfaces", "Schnittstellen")
+       page.title  = i18n("a_n_switch")
        page.order  = 20
+       
+       local page  = node("admin", "network", "wireless")
+       page.target = form("admin_network/wireless")
+       page.title  = i18n("wifi")
+       page.order  = 15
+       uci:foreach("wireless", "wifi-device",
+               function (section)
+                       local ifc = section[".name"]
+                               entry({"admin", "network", "wireless", ifc},
+                                alias("admin", "network", "wifi", ifc),
+                                ifc:upper())
+               end
+       )
+       
+       local page  = node("admin", "network", "wifi")
+       page.target = cbi("admin_network/wifi")
        page.leaf   = true
-
-       luci.model.uci.foreach("network", "interface",
+       
+       local page  = node("admin", "network", "network")
+       page.target = cbi("admin_network/network")
+       page.title  = i18n("interfaces", "Schnittstellen")
+       page.order  = 10
+       uci:foreach("network", "interface",
                function (section)
                        local ifc = section[".name"]
                        if ifc ~= "loopback" then
-                               entry({"admin", "network", "ifaces", ifc},
-                                page.target, ifc:upper())
+                               entry({"admin", "network", "network", ifc},
+                                alias("admin", "network", "ifaces", ifc),
+                                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"
        page.order  = 30
        
-       local page  = node("admin", "network", "ptp")
-       page.target = cbi("admin_network/ptp")
-       page.title  = "PPPoE / PPTP"
-       page.order  = 40
+       entry(
+        {"admin", "network", "dhcp", "leases"},
+        cbi("admin_network/dhcpleases"),
+        i18n("dhcp_leases")
+       ) 
        
        local page  = node("admin", "network", "routes")
        page.target = cbi("admin_network/routes")
-       page.title  = i18n("a_n_routes", "Routen")
-       page.order  = 50
+       page.title  = i18n("a_n_routes")
+       page.order  = 40
+       page.leaf   = true
+       
+       entry(
+        {"admin", "network", "routes", "static"},
+        function() end,
+        i18n("a_n_routes_static")
+       )
+
 end
\ No newline at end of file