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=2261815221c1fa3562ce93d64477e7ffcb3b9b11;hp=ca39c9bf30346e1b0f1d48a3233fa307c51a82ae;hb=5c42bba054da46e09d0facbedf50a0d2a21734bd;hpb=2dc60d2b440564b1e8ed4497fe841706354ca539 diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index ca39c9bf3..226181522 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -10,25 +10,38 @@ function index() return end - entry({"admin", "network", "mwan"}, - alias("admin", "network", "mwan", "overview"), + + entry({"admin", "status", "mwan"}, + alias("admin", "status", "mwan", "overview_interface"), _("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_interface"}, template("mwan/overview_interface")) - entry({"admin", "network", "mwan", "overview", "interface_status"}, - call("interfaceStatus")) - entry({"admin", "network", "mwan", "overview", "overview_detailed"}, + entry({"admin", "status", "mwan", "overview_detailed"}, 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 +54,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)