Completed rewrite of network interface configuration page

[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 8712633..cc79e57 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -15,6 +15,7 @@ module("luci.controller.admin.network", package.seeall)
 
 function index()
        require("luci.i18n")
 
 function index()
        require("luci.i18n")

+       require("luci.model.uci")

        local i18n = luci.i18n.translate
 
        local page  = node("admin", "network")
        local i18n = luci.i18n.translate
 
        local page  = node("admin", "network")


@@ -25,25 +26,34 @@ function index()
        local page  = node("admin", "network", "vlan")
        page.target = cbi("admin_network/vlan")
        page.title  = i18n("a_n_switch", "Switch")
        local page  = node("admin", "network", "vlan")
        page.target = cbi("admin_network/vlan")
        page.title  = i18n("a_n_switch", "Switch")

+       page.order  = 20
+       
+       local page  = node("admin", "network", "network")
+       page.target = cbi("admin_network/network")
+       page.title  = i18n("interfaces", "Schnittstellen")

        page.order  = 10
        page.order  = 10

+       luci.model.uci.foreach("network", "interface",
+               function (section)
+                       local ifc = section[".name"]
+                       if ifc ~= "loopback" then
+                               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")
        
        local page  = node("admin", "network", "ifaces")
        page.target = cbi("admin_network/ifaces")

-       page.title  = i18n("interfaces", "Schnittstellen")
-       page.order  = 20
-       
+       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", "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
-       

        local page  = node("admin", "network", "routes")
        page.target = cbi("admin_network/routes")
        page.title  = i18n("a_n_routes", "Routen")
        local page  = node("admin", "network", "routes")
        page.target = cbi("admin_network/routes")
        page.title  = i18n("a_n_routes", "Routen")

-       page.order  = 50
+       page.order  = 40

 end
\ No newline at end of file
 end
\ No newline at end of file