modules/admin-full: Rewrote route 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 3fb45f8..7614529 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -26,36 +26,42 @@ 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  = 10
+       page.order  = 20

        
        

-       local page  = node("admin", "network", "ifaces")
-       page.target = cbi("admin_network/ifaces")
+       local page  = node("admin", "network", "network")
+       page.target = cbi("admin_network/network")

        page.title  = i18n("interfaces", "Schnittstellen")
        page.title  = i18n("interfaces", "Schnittstellen")

-       page.order  = 20
-       page.leaf   = true
-
+       page.order  = 10

        luci.model.uci.foreach("network", "interface",
                function (section)
                        local ifc = section[".name"]
                        if ifc ~= "loopback" then
        luci.model.uci.foreach("network", "interface",
                function (section)
                        local ifc = section[".name"]
                        if ifc ~= "loopback" then

-                               entry({"admin", "network", "ifaces", ifc}, page.target, ifc)
+                               entry({"admin", "network", "network", ifc},
+                                alias("admin", "network", "ifaces", ifc),
+                                ifc:upper())

                        end
                end
        )
                        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", "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")
        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
 end
\ No newline at end of file