From 6ac76568e770082ade633370b4e287cc9a0f4f1b Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 10 Jan 2018 15:17:19 +0100 Subject: [PATCH 1/1] luci-app-mwan3: move/rename hotplugscript tab - move hotplugscript tab to Configuration - rename hotplugscript tab to notify Signed-off-by: Florian Eckert --- applications/luci-app-mwan3/luasrc/controller/mwan3.lua | 7 ++++--- .../cbi/mwan/{advanced_hotplugscript.lua => notify.lua} | 1 - .../luasrc/view/mwan/advanced_diagnostics.htm | 1 - .../luasrc/view/mwan/advanced_hotplugscript.htm | 14 -------------- .../luasrc/view/mwan/advanced_mwanconfig.htm | 1 - .../luasrc/view/mwan/advanced_networkconfig.htm | 1 - .../luasrc/view/mwan/advanced_troubleshooting.htm | 1 - .../luasrc/view/mwan/advanced_wirelessconfig.htm | 1 - 8 files changed, 4 insertions(+), 23 deletions(-) rename applications/luci-app-mwan3/luasrc/model/cbi/mwan/{advanced_hotplugscript.lua => notify.lua} (94%) delete mode 100644 applications/luci-app-mwan3/luasrc/view/mwan/advanced_hotplugscript.htm diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index c24beda28..4877f611e 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -43,12 +43,13 @@ function index() entry({"admin", "network", "mwan", "configuration", "rule"}, arcombine(cbi("mwan/rule"), cbi("mwan/ruleconfig")), _("Rules"), 40).leaf = true + entry({"admin", "network", "mwan", "configuration", "notify"}, + cbi("mwan/notify"), + _("Notification"), 50).leaf = true entry({"admin", "network", "mwan", "advanced"}, - alias("admin", "network", "mwan", "advanced", "hotplugscript"), + alias("admin", "network", "mwan", "advanced", "mwanconfig"), _("Advanced"), 100) - entry({"admin", "network", "mwan", "advanced", "hotplugscript"}, - form("mwan/advanced_hotplugscript")) entry({"admin", "network", "mwan", "advanced", "mwanconfig"}, form("mwan/advanced_mwanconfig")) entry({"admin", "network", "mwan", "advanced", "networkconfig"}, diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_hotplugscript.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua similarity index 94% rename from applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_hotplugscript.lua rename to applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua index 1b9708021..8746072eb 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_hotplugscript.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua @@ -6,7 +6,6 @@ ut = require "luci.util" script = "/etc/mwan3.user" m5 = SimpleForm("luci", nil) - m5:append(Template("mwan/advanced_hotplugscript")) -- highlight current tab f = m5:section(SimpleSection, nil, translate("This section allows you to modify the content of \"/etc/mwan3.user\".
" .. diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm index 448348594..d29009595 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm @@ -1,7 +1,6 @@ <%+header%>