2 files changed, 17 insertions, 34 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 3952fb868..23a575852 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -28,6 +28,23 @@ function index()
 	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
+	luci.model.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
+	
 	local page  = node("admin", "network", "network")
 	page.target = cbi("admin_network/network")
 	page.title  = i18n("interfaces", "Schnittstellen")
diff --git a/modules/admin-full/luasrc/controller/admin/wifi.lua b/modules/admin-full/luasrc/controller/admin/wifi.lua
deleted file mode 100644
index 4bef0b7a5..000000000
--- a/modules/admin-full/luasrc/controller/admin/wifi.lua
+++ /dev/null
@@ -1,34 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-module("luci.controller.admin.wifi", package.seeall)
-
-function index()
-	luci.i18n.loadc("admin-core")
-	local i18n = luci.i18n.translate
-
-	local page  = node("admin", "wifi")
-	page.target = template("admin_wifi/index")
-	page.title  = i18n("wifi", "Drahtlos")  
-	page.order  = 60
-	
-	local page  = node("admin", "wifi", "devices")
-	page.target = cbi("admin_wifi/devices")
-	page.title  = i18n("devices", "Geräte")
-	page.order  = 10
-	
-	local page  = node("admin", "wifi", "networks")
-	page.target = cbi("admin_wifi/networks")
-	page.title  = i18n("networks", "Netze")
-	page.order  = 20
-end
-\ No newline at end of file