OXYGEN #1: Added index-marks

4 files changed, 22 insertions, 9 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(