* Rewritten menu builder

* Moved menu definitions from controllers to model/menu

5 files changed, 4 insertions, 51 deletions

diff --git a/src/ffluci/controller/admin/index.lua b/src/ffluci/controller/admin/index.lua
index 43e680a236..b4a7720f8b 100644
--- a/src/ffluci/controller/admin/index.lua
+++ b/src/ffluci/controller/admin/index.lua
@@ -1,10 +1 @@
-module("ffluci.controller.admin.index", package.seeall)
-
-menu = {
-	descr   = "Übersicht",
-	order   = 10,
-	entries = {
-		{action = "luci", descr = "FFLuCI"},
-		{action = "contact", descr = "Kontakt"}
-	}
-}
\ No newline at end of file
+module("ffluci.controller.admin.index", package.seeall)
\ No newline at end of file
diff --git a/src/ffluci/controller/admin/mesh.lua b/src/ffluci/controller/admin/mesh.lua
index fcdcdabb04..3dbe98cbb6 100644
--- a/src/ffluci/controller/admin/mesh.lua
+++ b/src/ffluci/controller/admin/mesh.lua
@@ -1,9 +1 @@
-module("ffluci.controller.admin.mesh", package.seeall)
-
-menu = {
-	descr   = "Mesh",
-	order   = 50,
-	entries = {
-		{action = "olsrd", descr = "OLSR"},
-	}
-}
\ No newline at end of file
+module("ffluci.controller.admin.mesh", package.seeall)
\ No newline at end of file
diff --git a/src/ffluci/controller/admin/network.lua b/src/ffluci/controller/admin/network.lua
index 5ffe641755..4f8160a4c9 100644
--- a/src/ffluci/controller/admin/network.lua
+++ b/src/ffluci/controller/admin/network.lua
@@ -1,12 +1 @@
-module(..., package.seeall)
-
-menu = {
-	descr   = "Netzwerk",
-	order   = 30,
-	entries = {
-		{action = "vlan", descr = "Switch"},
-		{action = "ifaces", descr = "Schnittstellen"},
-		{action = "ptp", descr = "PPPoE / PPTP"},
-		{action = "routes", descr = "Statische Routen"},
-	}
-}
\ No newline at end of file
+module(..., package.seeall)
\ No newline at end of file
diff --git a/src/ffluci/controller/admin/system.lua b/src/ffluci/controller/admin/system.lua
index 455424eb8a..c4ba027cbc 100644
--- a/src/ffluci/controller/admin/system.lua
+++ b/src/ffluci/controller/admin/system.lua
@@ -5,16 +5,6 @@ require("ffluci.http")
 require("ffluci.util")
 require("ffluci.fs")
 
-menu = {
-	descr   = "System",
-	order   = 20,
-	entries = {
-		{action = "passwd", descr = "Passwort ändern"},
-		{action = "sshkeys", descr = "SSH-Schlüssel"},
-		{action = "reboot", descr = "Neu starten"},
-	}
-}
-
 function action_editor()
 	local file = ffluci.http.formvalue("file", "")
 	local data = ffluci.http.formvalue("data")
diff --git a/src/ffluci/controller/admin/wifi.lua b/src/ffluci/controller/admin/wifi.lua
index 54b6bfb203..bc1040c715 100644
--- a/src/ffluci/controller/admin/wifi.lua
+++ b/src/ffluci/controller/admin/wifi.lua
@@ -1,10 +1 @@
-module("ffluci.controller.admin.wifi", package.seeall)
-
-menu = {
-	descr   = "Drahtlos",
-	order   = 40,
-	entries = {
-		{action = "devices", descr = "Geräte"},
-		{action = "networks", descr = "Netze"},
-	}
-}
\ No newline at end of file
+module("ffluci.controller.admin.wifi", package.seeall)
\ No newline at end of file