From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 27 Sep 2015 13:41:53 +0000 (+0300)
Subject: luci-app-statistics: reorganise menu items
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=da5b25187b245883fa52d569970a6f5810330954;p=oweals%2Fluci.git

luci-app-statistics: reorganise menu items

Reorganise the menu items of the Luci statistics module:

* Re-label "Collectd" to "Setup" and place it after the "Graphs" items.
  - "Graphs" is used much more frequently so it should be first.
  - Change "Collectd" menu item to "Setup" to clarify things.

* Re-label "System plugins" to "General plugins" to change sorting.
  "Network / Output / System" changes to "General / Network / Output"
  that is more logical order for the items.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---

diff --git a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index 49eab5acd..d0415cdfa 100644
--- a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -20,7 +20,7 @@ function index()
 
 	local labels = {
 		s_output	= _("Output plugins"),
-		s_system	= _("System plugins"),
+		s_general	= _("General plugins"),
 		s_network	= _("Network plugins"),
 
 		conntrack	= _("Conntrack"),
@@ -54,7 +54,7 @@ function index()
 	-- our collectd menu
 	local collectd_menu = {
 		output  = { "csv", "network", "rrdtool", "unixsock" },
-		system  = { "cpu", "df", "disk", "email", "entropy", "exec", "irq", "load", "memory", "nut", "processes", "uptime" },
+		general = { "cpu", "df", "disk", "email", "entropy", "exec", "irq", "load", "memory", "nut", "processes", "uptime" },
 		network = { "conntrack", "dns", "interface", "iptables", "netlink", "olsrd", "ping", "splash_leases", "tcpconns", "iwinfo" }
 	}
 
@@ -62,7 +62,7 @@ function index()
 	local st = entry({"admin", "statistics"}, template("admin_statistics/index"), _("Statistics"), 80)
 	st.index = true
 
-	entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Collectd"), 10).subindex = true
+	entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Setup"), 20).subindex = true
 
 
 	-- populate collectd plugin menu
@@ -87,7 +87,7 @@ function index()
 	end
 
 	-- output views
-	local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 80)
+	local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 10)
 	      page.setuser  = "nobody"
 	      page.setgroup = "nogroup"