From 0fa66693eb17a1719e600c59313d84cfe68f6e8f Mon Sep 17 00:00:00 2001 From: Ycarus Date: Wed, 28 Mar 2018 10:59:15 +0200 Subject: [PATCH] Some menu changes --- luci-app-mptcp/Makefile | 1 - luci-app-mptcp/luasrc/controller/mptcp.lua | 4 ++-- luci-app-mptcp/luasrc/view/{ => mptcp}/multipath.htm | 0 luci-app-nginx-ha/luasrc/controller/nginx-ha.lua | 4 +--- luci-app-omr-quota/luasrc/controller/quota.lua | 2 -- luci-app-omr-tracker/luasrc/controller/omr-tracker.lua | 5 ++--- .../luasrc/controller/openmptcprouter.lua | 2 +- 7 files changed, 6 insertions(+), 12 deletions(-) rename luci-app-mptcp/luasrc/view/{ => mptcp}/multipath.htm (100%) diff --git a/luci-app-mptcp/Makefile b/luci-app-mptcp/Makefile index 77306e5aa..07598e027 100644 --- a/luci-app-mptcp/Makefile +++ b/luci-app-mptcp/Makefile @@ -6,7 +6,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for MPTCP - PKG_LICENSE:=Apache-2.0 include ../luci/luci.mk diff --git a/luci-app-mptcp/luasrc/controller/mptcp.lua b/luci-app-mptcp/luasrc/controller/mptcp.lua index 7bd8ae388..af5a65633 100644 --- a/luci-app-mptcp/luasrc/controller/mptcp.lua +++ b/luci-app-mptcp/luasrc/controller/mptcp.lua @@ -7,8 +7,8 @@ module("luci.controller.mptcp", package.seeall) function index() entry({"admin", "network", "mptcp"}, alias("admin", "network", "mptcp", "settings"), _("MPTCP")) - entry({"admin", "network", "mptcp", "settings"}, cbi("mptcp"), _("Settings"),2) - entry({"admin", "network", "mptcp", "bandwidth"}, template("multipath"), _("Bandwidth"), 3).leaf = true + entry({"admin", "network", "mptcp", "settings"}, cbi("mptcp"), _("Settings"),2).leaf = true + entry({"admin", "network", "mptcp", "bandwidth"}, template("mptcp/multipath"), _("Bandwidth"), 3).leaf = true entry({"admin", "network", "mptcp", "multipath_bandwidth"}, call("multipath_bandwidth")).leaf = true entry({"admin", "network", "mptcp", "interface_bandwidth"}, call("interface_bandwidth")).leaf = true end diff --git a/luci-app-mptcp/luasrc/view/multipath.htm b/luci-app-mptcp/luasrc/view/mptcp/multipath.htm similarity index 100% rename from luci-app-mptcp/luasrc/view/multipath.htm rename to luci-app-mptcp/luasrc/view/mptcp/multipath.htm diff --git a/luci-app-nginx-ha/luasrc/controller/nginx-ha.lua b/luci-app-nginx-ha/luasrc/controller/nginx-ha.lua index 587c42769..7dad86da0 100644 --- a/luci-app-nginx-ha/luasrc/controller/nginx-ha.lua +++ b/luci-app-nginx-ha/luasrc/controller/nginx-ha.lua @@ -1,7 +1,5 @@ module("luci.controller.nginx-ha", package.seeall) function index() - entry( - {"admin", "services", "nginx-ha"}, - cbi("nginx-ha"), _("Nginx High Availability"), 55) + entry({"admin", "services", "nginx-ha"}, cbi("nginx-ha"), _("Nginx High Availability")) end diff --git a/luci-app-omr-quota/luasrc/controller/quota.lua b/luci-app-omr-quota/luasrc/controller/quota.lua index 48ab51630..072b32d14 100644 --- a/luci-app-omr-quota/luasrc/controller/quota.lua +++ b/luci-app-omr-quota/luasrc/controller/quota.lua @@ -7,9 +7,7 @@ function index() if not nixio.fs.access("/etc/config/omr-quota") then return end - local page - page = entry({"admin", "network", "quota"}, cbi("quota/quota"), _("Quota")) page.dependent = true end diff --git a/luci-app-omr-tracker/luasrc/controller/omr-tracker.lua b/luci-app-omr-tracker/luasrc/controller/omr-tracker.lua index 35fc122db..a4fcb23e7 100644 --- a/luci-app-omr-tracker/luasrc/controller/omr-tracker.lua +++ b/luci-app-omr-tracker/luasrc/controller/omr-tracker.lua @@ -1,7 +1,6 @@ module("luci.controller.omr-tracker", package.seeall) function index() - entry( - {"admin", "services", "omr-tracker"}, - cbi("omr-tracker"), _("OMR-Tracker"), 55) + --entry({"admin", "openmptcprouter", "omr-tracker"}, cbi("omr-tracker"), _("OMR-Tracker")) + entry({"admin", "services", "omr-tracker"}, cbi("omr-tracker"), _("OMR-Tracker")) end diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index 1d589bc82..ba07c9355 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -8,7 +8,7 @@ function index() -- entry({"admin", "openmptcprouter"}, firstchild(), _("OpenMPTCProuter"), 19).index = true -- entry({"admin", "openmptcprouter", "wizard"}, template("openmptcprouter/wizard"), _("Wizard"), 1).leaf = true -- entry({"admin", "openmptcprouter", "wizard_add"}, post("wizard_add")).leaf = true - entry({"admin", "system", "openmptcprouter"}, alias("admin", "system", "openmptcprouter", "wizard"), _("OpenMPTCProuter")) + entry({"admin", "system", "openmptcprouter"}, alias("admin", "system", "openmptcprouter", "wizard"), _("OpenMPTCProuter"), 1) entry({"admin", "system", "openmptcprouter", "wizard"}, template("openmptcprouter/wizard"), _("Settings Wizard"), 1) entry({"admin", "system", "openmptcprouter", "wizard_add"}, post("wizard_add")) entry({"admin", "system", "openmptcprouter", "status"}, template("openmptcprouter/wanstatus"), _("Status"), 2).leaf = true