X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-mwan3%2Fluasrc%2Fcontroller%2Fmwan3.lua;h=09469bc077a51c93a14e57add7f34938727d0881;hp=d3fd150692bc3079bd23ce9b79ea2aaa972ce32b;hb=e7af2148eb4a5966d4ab9f334e724db0d2c34896;hpb=1b42d7a02df97c77ff9653de5e53b115610b3121

diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
index d3fd15069..09469bc07 100644
--- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
+++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
@@ -3,32 +3,44 @@ module("luci.controller.mwan3", package.seeall)
 sys = require "luci.sys"
 ut = require "luci.util"
 
-ip = "/usr/bin/ip -4 "
+ip = "ip -4 "
 
 function index()
 	if not nixio.fs.access("/etc/config/mwan3") then
 		return
 	end
 
-	entry({"admin", "network", "mwan"},
-		alias("admin", "network", "mwan", "overview"),
+	entry({"admin", "status", "mwan"},
+		alias("admin", "status", "mwan", "overview"),
 		_("Load Balancing"), 600)
 
-	entry({"admin", "network", "mwan", "overview"},
-		alias("admin", "network", "mwan", "overview", "overview_interface"),
-		_("Overview"), 10)
-	entry({"admin", "network", "mwan", "overview", "overview_interface"},
+	entry({"admin", "status", "mwan", "overview"},
 		template("mwan/overview_interface"))
-	entry({"admin", "network", "mwan", "overview", "interface_status"},
-		call("interfaceStatus"))
-	entry({"admin", "network", "mwan", "overview", "overview_detailed"},
+	entry({"admin", "status", "mwan", "detail"},
 		template("mwan/overview_detailed"))
-	entry({"admin", "network", "mwan", "overview", "detailed_status"},
+	entry({"admin", "status", "mwan", "diagnostics"},
+		template("mwan/advanced_diagnostics"))
+	entry({"admin", "status", "mwan", "troubleshooting"},
+		template("mwan/advanced_troubleshooting"))
+	entry({"admin", "status", "mwan", "interface_status"},
+		call("interfaceStatus"))
+	entry({"admin", "status", "mwan", "detailed_status"},
 		call("detailedStatus"))
+	entry({"admin", "status", "mwan", "diagnostics_display"},
+		call("diagnosticsData"), nil).leaf = true
+	entry({"admin", "status", "mwan", "troubleshooting_display"},
+		call("troubleshootingData"))
+
+
+	entry({"admin", "network", "mwan"},
+		alias("admin", "network", "mwan", "configuration"),
+		_("Load Balancing"), 600)
 
 	entry({"admin", "network", "mwan", "configuration"},
 		alias("admin", "network", "mwan", "configuration", "interface"),
 		_("Configuration"), 20)
+	entry({"admin", "network", "mwan", "configuration", "globals"},
+		cbi("mwan/globalsconfig"),_("Globals"), 5).leaf = true
 	entry({"admin", "network", "mwan", "configuration", "interface"},
 		arcombine(cbi("mwan/interface"), cbi("mwan/interfaceconfig")),
 		_("Interfaces"), 10).leaf = true
@@ -41,26 +53,19 @@ 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"},
 		form("mwan/advanced_networkconfig"))
 	entry({"admin", "network", "mwan", "advanced", "wirelessconfig"},
 		form("mwan/advanced_wirelessconfig"))
-	entry({"admin", "network", "mwan", "advanced", "diagnostics"},
-		template("mwan/advanced_diagnostics"))
-	entry({"admin", "network", "mwan", "advanced", "diagnostics_display"},
-		call("diagnosticsData"), nil).leaf = true
-	entry({"admin", "network", "mwan", "advanced", "troubleshooting"},
-		template("mwan/advanced_troubleshooting"))
-	entry({"admin", "network", "mwan", "advanced", "troubleshooting_display"},
-		call("troubleshootingData"))
 end
 
 function getInterfaceStatus(ruleNumber, interfaceName)