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

3 files changed, 81 insertions, 73 deletions

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
index 4767e07d5..7962d4da1 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
@@ -11,73 +11,13 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 require("luci.tools.webadmin")
 m = Map("network", translate("a_n_routes"), translate("a_n_routes1"))
 
 local routes6 = luci.sys.net.routes6()
 local bit = require "bit"
 
-if not arg or not arg[1] then
-	local routes = luci.sys.net.routes()
-
-	v = m:section(Table, routes, translate("a_n_routes_kernel4"))
-
-	net = v:option(DummyValue, "iface", translate("network"))
-	function net.cfgvalue(self, section)
-		return luci.tools.webadmin.iface_get_network(routes[section].device)
-		 or routes[section].device
-	end
-
-	target  = v:option(DummyValue, "target", translate("target"))
-	function target.cfgvalue(self, section)
-		return routes[section].dest:network():string()
-	end
-
-	netmask = v:option(DummyValue, "netmask", translate("netmask"))
-	function netmask.cfgvalue(self, section)
-		return routes[section].dest:mask():string()
-	end
-
-	gateway = v:option(DummyValue, "gateway", translate("gateway"))
-	function gateway.cfgvalue(self, section)
-		return routes[section].gateway:string()
-	end
-
-	metric = v:option(DummyValue, "metric", translate("metric"))
-	function metric.cfgvalue(self, section)
-		return routes[section].metric
-	end
-
-	if routes6 then
-		v = m:section(Table, routes6, translate("a_n_routes_kernel6"))
-
-		net = v:option(DummyValue, "iface", translate("network"))
-		function net.cfgvalue(self, section)
-			return luci.tools.webadmin.iface_get_network(routes6[section].device)
-			 or routes6[section].device
-		end
-
-		target  = v:option(DummyValue, "target", translate("target"))
-		function target.cfgvalue(self, section)
-			return routes6[section].dest:string()
-		end
-
-		gateway = v:option(DummyValue, "gateway", translate("gateway6"))
-		function gateway.cfgvalue(self, section)
-			return routes6[section].source:string()
-		end
-
-		metric = v:option(DummyValue, "metric", translate("metric"))
-		function metric.cfgvalue(self, section)
-			local metr = routes6[section].metric
-			local lower = bit.band(metr, 0xffff)
-			local higher = bit.rshift(bit.band(metr, 0xffff0000), 16)
-			return "%04X%04X" % {higher, lower}
-		end
-	end
-end
-
-
 s = m:section(TypedSection, "route", translate("a_n_routes_static4"))
 s.addremove = true
 s.anonymous = true
@@ -87,14 +27,8 @@ s.template  = "cbi/tblsection"
 iface = s:option(ListValue, "interface", translate("interface"))
 luci.tools.webadmin.cbi_add_networks(iface)
 
-if not arg or not arg[1] then
-	net.titleref = iface.titleref
-end
-
 s:option(Value, "target", translate("target"), translate("a_n_r_target1"))
-
 s:option(Value, "netmask", translate("netmask"), translate("a_n_r_netmask1")).rmemepty = true
-
 s:option(Value, "gateway", translate("gateway"))
 
 if routes6 then
@@ -107,12 +41,7 @@ if routes6 then
 	iface = s:option(ListValue, "interface", translate("interface"))
 	luci.tools.webadmin.cbi_add_networks(iface)
 
-	if not arg or not arg[1] then
-		net.titleref = iface.titleref
-	end
-
 	s:option(Value, "target", translate("target"), translate("a_n_r_target6"))
-
 	s:option(Value, "gateway", translate("gateway6")).rmempty = true
 end
 
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua b/modules/admin-full/luasrc/model/cbi/admin_status/conntrack.lua
index f1c90d695..d970bdf3d 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_status/conntrack.lua
@@ -46,4 +46,4 @@ function d.cfgvalue(self, section)
 					 self.map:get(section, "dport") or "*" }
 end
 
-return f
\ No newline at end of file
+return f
diff --git a/modules/admin-full/luasrc/model/cbi/admin_status/routes.lua b/modules/admin-full/luasrc/model/cbi/admin_status/routes.lua
new file mode 100644
index 000000000..5b147eff7
--- /dev/null
+++ b/modules/admin-full/luasrc/model/cbi/admin_status/routes.lua
@@ -0,0 +1,79 @@
+--[[
+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$
+]]--
+
+require("luci.tools.webadmin")
+m = Map("network", translate("a_n_routes"), translate("a_n_routes1"))
+
+local routes = luci.sys.net.routes()
+local routes6 = luci.sys.net.routes6()
+local bit = require "bit"
+
+v = m:section(Table, routes, translate("a_n_routes_kernel4"))
+
+net = v:option(DummyValue, "iface", translate("network"))
+function net.cfgvalue(self, section)
+	return luci.tools.webadmin.iface_get_network(routes[section].device)
+	 or routes[section].device
+end
+
+target  = v:option(DummyValue, "target", translate("target"))
+function target.cfgvalue(self, section)
+	return routes[section].dest:network():string()
+end
+
+netmask = v:option(DummyValue, "netmask", translate("netmask"))
+function netmask.cfgvalue(self, section)
+	return routes[section].dest:mask():string()
+end
+
+gateway = v:option(DummyValue, "gateway", translate("gateway"))
+function gateway.cfgvalue(self, section)
+	return routes[section].gateway:string()
+end
+
+metric = v:option(DummyValue, "metric", translate("metric"))
+function metric.cfgvalue(self, section)
+	return routes[section].metric
+end
+
+if routes6 then
+	v = m:section(Table, routes6, translate("a_n_routes_kernel6"))
+
+	net = v:option(DummyValue, "iface", translate("network"))
+	function net.cfgvalue(self, section)
+		return luci.tools.webadmin.iface_get_network(routes6[section].device)
+		 or routes6[section].device
+	end
+
+	target  = v:option(DummyValue, "target", translate("target"))
+	function target.cfgvalue(self, section)
+		return routes6[section].dest:string()
+	end
+
+	gateway = v:option(DummyValue, "gateway", translate("gateway6"))
+	function gateway.cfgvalue(self, section)
+		return routes6[section].source:string()
+	end
+
+	metric = v:option(DummyValue, "metric", translate("metric"))
+	function metric.cfgvalue(self, section)
+		local metr = routes6[section].metric
+		local lower = bit.band(metr, 0xffff)
+		local higher = bit.rshift(bit.band(metr, 0xffff0000), 16)
+		return "%04X%04X" % {higher, lower}
+	end
+end
+
+
+return m