OXYGEN #1: Added index-marks

13 files changed, 42 insertions, 15 deletions

diff --git a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
index 6f0a89e00..ac1f5f93a 100644
--- a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
+++ b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
@@ -18,7 +18,10 @@ function index()
 	require("luci.i18n")
 	local i18n = luci.i18n.translate
 
-	entry( { "admin", "services", "coovachilli" },            cbi("coovachilli"),         i18n("coovachilli",         "CoovaChilli"),                90).i18n = "coovachilli"
+	local cc = entry( { "admin", "services", "coovachilli" },            cbi("coovachilli"),         i18n("coovachilli",         "CoovaChilli"),                90)
+	cc.i18n = "coovachilli"
+	cc.subindex = true
+	
 	entry( { "admin", "services", "coovachilli", "network" }, cbi("coovachilli_network"), i18n("coovachilli_network", "Network Configuration"),      10)
 	entry( { "admin", "services", "coovachilli", "radius"  }, cbi("coovachilli_radius"),  i18n("coovachilli_radius",  "Radius Configuration"),       20)
 	entry( { "admin", "services", "coovachilli", "auth"    }, cbi("coovachilli_auth"),    i18n("coovachilli_auth",    "UAM and MAC Authentication"), 30)
diff --git a/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua b/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
index 4d8c13840..d952b6043 100644
--- a/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
+++ b/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
@@ -7,14 +7,16 @@ function index()
 	local nodes = {}
 
 	table.insert(nodes, entry({"admin", "network", "firewall"}, alias("admin", "network", "firewall", "zones"), i18n("fw_fw"), 60))
+	nodes[#nodes].index = true
+	
 	table.insert(nodes, entry({"admin", "network", "firewall", "zones"}, cbi("luci_fw/zones"), i18n("fw_zones"), 10))
 	table.insert(nodes, entry({"admin", "network", "firewall", "redirection"}, cbi("luci_fw/redirect"), i18n("fw_redirect"), 30))	
 	table.insert(nodes, entry({"admin", "network", "firewall", "traffic"}, cbi("luci_fw/traffic"), i18n("fw_traffic"), 20))
 		
 	table.insert(nodes, entry({"admin", "network", "firewall", "rule"}, cbi("luci_fw/trule")))
-	nodes[#nodes].leaf = true		
+	nodes[#nodes].leaf = true
 	table.insert(nodes, entry({"admin", "network", "firewall", "redirect"}, cbi("luci_fw/rrule")))
-	nodes[#nodes].leaf = true	
+	nodes[#nodes].leaf = true
 	
 	table.insert(nodes, entry({"mini", "network", "portfw"}, cbi("luci_fw/miniportfw"), i18n("fw_portfw", "Portweiterleitung"), 70))
 	
diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index c80a75cc1..97e5061b9 100644
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -12,6 +12,7 @@ function index()
 	page.target = call("action_index")
 	page.title  = "OLSR"
 	page.i18n   = "olsr"
+	page.subindex = true
 
 	local page  = node("admin", "status", "olsr", "routes")
 	page.target = call("action_routes")
@@ -33,15 +34,17 @@ function index()
 	page.title  = "MID"
 	page.order  = 50
 
-	entry(
+	local ol = entry(
 		{"admin", "services", "olsrd"},
 		cbi("olsr/olsrd"), "OLSR"
-	).i18n = "olsr"
+	)
+	ol.i18n = "olsr"
+	ol.subindex = true
 
 	entry(
 		{"admin", "services", "olsrd", "hna"},
 		cbi("olsr/olsrdhna"), "HNA Announcements"
-	).i18n = "olsr"
+	)
 
 	oplg = entry(
 		{"admin", "services", "olsrd", "plugins"},
@@ -49,6 +52,7 @@ function index()
 	)
 	oplg.i18n = "olsr"
 	oplg.leaf = true
+	oplg.subindex = true
 
 	local uci = require("luci.model.uci").cursor()
 	uci:foreach("olsrd", "LoadPlugin",
diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index 7ca8a5aa3..0aa66362b 100644
--- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -50,8 +50,12 @@ function index()
 	}
 
 	-- create toplevel menu nodes
-	entry({"admin", "statistics"},             call("statistics_index"),        _i18n("statistics"), 80).i18n = "statistics"
-	entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _i18n("collectd"),   10)
+	local st = entry({"admin", "statistics"},             call("statistics_index"),        _i18n("statistics"), 80)
+	st.i18n = "statistics"
+	st.index = true
+	
+	entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _i18n("collectd"),   10).subindex = true
+	
 
 	-- populate collectd plugin menu
 	local index = 1
@@ -61,7 +65,7 @@ function index()
 			call( "statistics_" .. section .. "plugins" ),
 			_i18n( section .. "plugins" ),
 			index * 10
-		)
+		).index = true
 
 		for j, plugin in luci.util.vspairs( plugins ) do
 			_entry(
diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index cab9441d0..071dd595d 100644
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
@@ -20,6 +20,7 @@ function index()
 	local root = node()
 	if not root.target then
 		root.target = alias("admin")
+		root.index = true
 	end
 	
 	entry({"about"}, template("about")).i18n = "admin-core"
@@ -32,11 +33,13 @@ function index()
 	page.sysauth = "root"
 	page.sysauth_authenticator = "htmlauth"
 	page.ucidata = true
+	page.index = true
 	
 	local page  = node("admin", "index")
 	page.target = template("admin_index/index")
 	page.title  = i18n("overview", "Übersicht")
 	page.order  = 10
+	page.index = true
 	
 	local page  = node("admin", "index", "luci")
 	page.target = cbi("admin_index/luci")
diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index e3f80a1b1..778a70fb9 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -22,6 +22,7 @@ function index()
 	page.target = alias("admin", "network", "network")
 	page.title  = i18n("network")
 	page.order  = 50
+	page.index  = true
 
 	local page  = node("admin", "network", "vlan")
 	page.target = cbi("admin_network/vlan")
@@ -33,6 +34,7 @@ function index()
 	page.title  = i18n("wifi")
 	page.i18n   = "wifi"
 	page.order  = 15
+	page.subindex = true
 	uci:foreach("wireless", "wifi-device",
 		function (section)
 			local ifc = section[".name"]
@@ -51,6 +53,7 @@ function index()
 	page.target = cbi("admin_network/network")
 	page.title  = i18n("interfaces", "Schnittstellen")
 	page.order  = 10
+	page.subindex = true
 	uci:foreach("network", "interface",
 		function (section)
 			local ifc = section[".name"]
@@ -70,6 +73,7 @@ function index()
 	page.target = cbi("admin_network/dhcp")
 	page.title  = "DHCP"
 	page.order  = 30
+	page.subindex = true
 
 	entry(
 	 {"admin", "network", "dhcp", "leases"},
diff --git a/modules/admin-full/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua
index ea8758544..f7bdb02d5 100644
--- a/modules/admin-full/luasrc/controller/admin/services.lua
+++ b/modules/admin-full/luasrc/controller/admin/services.lua
@@ -26,6 +26,7 @@ function index()
 	page.target = template("admin_services/index")
 	page.title  = i18n("services", "Dienste")  
 	page.order  = 40
+	page.index  = true
 	
 	local page  = node("admin", "services", "httpd")
 	page.target = cbi("admin_services/httpd")
diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index 0eb3c1964..addc3ca74 100644
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -17,7 +17,7 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 
-	entry({"admin", "status"}, template("admin_status/index"), i18n("status", "Status"), 20)
+	entry({"admin", "status"}, template("admin_status/index"), i18n("status", "Status"), 20).index = true
 	entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "Systemprotokoll"))
 end
 
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 5d6037151..1afdfc55e 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -17,7 +17,7 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 	
-	entry({"admin", "system"}, alias("admin", "system", "system"), i18n("system"), 30)
+	entry({"admin", "system"}, alias("admin", "system", "system"), i18n("system"), 30).index = true
 	entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 1)
 	entry({"admin", "system", "packages"}, call("action_packages"), i18n("a_s_packages"), 10)
 	entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"), i18n("a_s_p_ipkg"))
diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua
index 77847dccc..4813b838e 100644
--- a/modules/admin-mini/luasrc/controller/mini/index.lua
+++ b/modules/admin-mini/luasrc/controller/mini/index.lua
@@ -22,6 +22,7 @@ function index()
 	local root = node()
 	if not root.lock then
 		root.target = alias("mini")
+		root.index = true
 	end
 	
 	entry({"about"}, template("about")).i18n = "admin-core"
@@ -31,9 +32,10 @@ function index()
 	page.sysauth = "root"
 	page.sysauth_authenticator = "htmlauth"
 	page.ucidata = true
+	page.index = true
 	
-	entry({"mini", "index"}, alias("mini", "index", "index"), i18n("overview"), 10)
-	entry({"mini", "index", "index"}, form("mini/index"), i18n("general"), 1)
+	entry({"mini", "index"}, alias("mini", "index", "index"), i18n("overview"), 10).index = true
+	entry({"mini", "index", "index"}, form("mini/index"), i18n("general"), 1).ignoreindex = true
 	entry({"mini", "index", "luci"}, cbi("mini/luci"), i18n("settings"), 10)
 	entry({"mini", "index", "logout"}, call("action_logout"), i18n("logout"))
 end
diff --git a/modules/admin-mini/luasrc/controller/mini/network.lua b/modules/admin-mini/luasrc/controller/mini/network.lua
index e1a82e6c5..56ffc30f2 100644
--- a/modules/admin-mini/luasrc/controller/mini/network.lua
+++ b/modules/admin-mini/luasrc/controller/mini/network.lua
@@ -19,7 +19,7 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 
-	entry({"mini", "network"}, alias("mini", "network", "index"), i18n("network"), 20)
+	entry({"mini", "network"}, alias("mini", "network", "index"), i18n("network"), 20).index = true
 	entry({"mini", "network", "index"}, cbi("mini/network"), i18n("general"), 1)
 	entry({"mini", "network", "wifi"}, cbi("mini/wifi"), i18n("wifi"), 10).i18n="wifi"
 	entry({"mini", "network", "dhcp"}, cbi("mini/dhcp"), "DHCP", 20)
diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index ac6d64b32..9d0ef0c63 100644
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -19,7 +19,7 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 
-	entry({"mini", "system"}, alias("mini", "system", "index"), i18n("system"), 40)
+	entry({"mini", "system"}, alias("mini", "system", "index"), i18n("system"), 40).index = true
 	entry({"mini", "system", "index"}, cbi("mini/system"), i18n("general"), 1)
 	entry({"mini", "system", "passwd"}, form("mini/passwd"), i18n("a_s_changepw"), 10)
 	entry({"mini", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 80)
diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
index 3d4bf1cb7..9399d5093 100644
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -19,6 +19,8 @@ function index()
 	local page  = node()
 	page.lock   = true
 	page.target = alias("freifunk")
+	page.subindex = true
+	page.index = false
 
 	local page    = node("freifunk")
 	page.title    = "Freifunk"
@@ -27,11 +29,13 @@ function index()
 	page.setuser  = "nobody"
 	page.setgroup = "nogroup"
 	page.i18n     = "freifunk"
+	page.index    = true
 	
 	local page  = node("freifunk", "index")
 	page.target = template("freifunk/index")
 	page.title  = "Übersicht"
 	page.order  = 10
+	page.indexignore = true
 	
 	local page  = node("freifunk", "index", "contact")
 	page.target = template("freifunk/contact")