X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fnetwork.lua;h=e3f80a1b1e0c1c976a6a3d22005415b73d46898f;hp=3fb45f804d04cb4315d4969263c0234071d94173;hb=e317c7545e1cfd95e6df99f6f92a9b0f79b895ca;hpb=e72a526984982f6fa2b6f2ed5ce01523094bfe43

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 3fb45f804..e3f80a1b1 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -15,47 +15,90 @@ 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.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()).i18n = "wifi"
+		end
+	)
+
+	local page  = node("admin", "network", "wifi")
+	page.target = cbi("admin_network/wifi")
 	page.leaf   = true
+	page.i18n = "wifi"
 
-	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)
+				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"
+
+	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.order  = 40
-	
+
 	local page  = node("admin", "network", "routes")
 	page.target = cbi("admin_network/routes")
-	page.title  = i18n("a_n_routes", "Routen")
+	page.title  = i18n("a_n_routes")
 	page.order  = 50
-end
\ No newline at end of file
+	page.leaf   = true
+
+	entry(
+	 {"admin", "network", "routes", "static"},
+	 function() end,
+	 i18n("a_n_routes_static")
+	)
+
+	entry(
+		{"admin", "network", "conntrack"},
+		form("admin_network/conntrack"),
+		i18n("a_n_conntrack"),
+		60
+	)
+
+end