modules/admin-full:

	- move routes and conntrack info to status menu
	- move static routes to own 2nd level menu point
	- fix i18n in upgrade page

2 files changed, 10 insertions, 22 deletions

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index a14b8fd700..08a5dd0ef6 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -28,12 +28,12 @@ function index()
 	page.target = cbi("admin_network/vlan")
 	page.title  = i18n("a_n_switch")
 	page.order  = 20
-	
+
 	local page = entry({"admin", "network", "wireless"}, arcombine(cbi("admin_network/wireless"), cbi("admin_network/wifi")), i18n("wifi"), 15)
 	page.i18n   = "wifi"
 	page.leaf = true
 	page.subindex = true
-	
+
 	uci:foreach("wireless", "wifi-device",
 		function (section)
 			local ifc = section[".name"]
@@ -42,11 +42,11 @@ function index()
 				 ifc:upper()).i18n = "wifi"
 		end
 	)
-	
+
 	local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("interfaces", "Schnittstellen"), 10)
 	page.leaf   = true
 	page.subindex = true
-	
+
 	uci:foreach("network", "interface",
 		function (section)
 			local ifc = section[".name"]
@@ -77,21 +77,7 @@ function index()
 
 	local page  = node("admin", "network", "routes")
 	page.target = cbi("admin_network/routes")
-	page.title  = i18n("a_n_routes")
+	page.title  = i18n("a_n_routes_static")
 	page.order  = 50
-	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
\ No newline at end of file
+end
diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index feb0802e51..d8fa9e9f60 100644
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -20,8 +20,10 @@ function index()
 	entry({"admin", "status"}, template("admin_status/index"), i18n("status", "Status"), 20).index = true
 	entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("interfaces", "Interfaces"), 1)
 	entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("a_s_ipt", "Firewall"), 2)
-	entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "System Log"), 3)
-	entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("dmesg", "Kernel Log"), 4)
+	entry({"admin", "status", "conntrack"}, form("admin_status/conntrack"), i18n("a_n_conntrack"), 3)
+	entry({"admin", "status", "routes"}, form("admin_status/routes"), i18n("a_n_routes"), 4)
+	entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "System Log"), 5)
+	entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("dmesg", "Kernel Log"), 6)
 
 end