X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fnetwork.lua;h=778a70fb96b22b703c8f13103e67ca76d30e127e;hb=8815b6a7dd24a481606db03c5980bc310709a103;hp=23a575852b66e77c491a6534b5e4a05372cd27db;hpb=0c3fc70ddbf3f0fc0dcbb5d7c05285b0b2d12ccb;p=project%2Fluci.git

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 23a575852..778a70fb9 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -15,41 +15,46 @@ 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 = 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.order  = 20
-	
+
 	local page  = node("admin", "network", "wireless")
 	page.target = form("admin_network/wireless")
 	page.title  = i18n("wifi")
+	page.i18n   = "wifi"
 	page.order  = 15
-	luci.model.uci.foreach("wireless", "wifi-device",
+	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())
+				 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  = node("admin", "network", "network")
 	page.target = cbi("admin_network/network")
 	page.title  = i18n("interfaces", "Schnittstellen")
 	page.order  = 10
-	luci.model.uci.foreach("network", "interface",
+	page.subindex = true
+	uci:foreach("network", "interface",
 		function (section)
 			local ifc = section[".name"]
 			if ifc ~= "loopback" then
@@ -59,7 +64,7 @@ function index()
 			end
 		end
 	)
-	
+
 	local page  = node("admin", "network", "ifaces")
 	page.target = cbi("admin_network/ifaces")
 	page.leaf   = true
@@ -68,23 +73,36 @@ function index()
 	page.target = cbi("admin_network/dhcp")
 	page.title  = "DHCP"
 	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.order  = 40
+
 	local page  = node("admin", "network", "routes")
 	page.target = cbi("admin_network/routes")
 	page.title  = i18n("a_n_routes")
-	page.order  = 40
+	page.order  = 50
 	page.leaf   = true
-	
+
 	entry(
 	 {"admin", "network", "routes", "static"},
 	 function() end,
 	 i18n("a_n_routes_static")
 	)
 
-end
\ No newline at end of file
+	entry(
+		{"admin", "network", "conntrack"},
+		form("admin_network/conntrack"),
+		i18n("a_n_conntrack"),
+		60
+	)
+
+end