From bb4f769ac110a10780799746944e509ba6c4472b Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Thu, 11 Jan 2018 09:18:50 +0100
Subject: [PATCH] luci-app-mwan3: move status information to status menu entry

move status information to status menu entry

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
 .../luasrc/controller/mwan3.lua               | 22 ++++++++++---------
 .../view/mwan/openwrt_overview_status.htm     |  2 +-
 .../luasrc/view/mwan/overview_detailed.htm    |  6 ++---
 .../luasrc/view/mwan/overview_interface.htm   |  6 ++---
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
index 4877f611ec..4bb0d492e2 100644
--- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
+++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
@@ -10,22 +10,24 @@ 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", "interface_status"},
+		call("interfaceStatus"))
+	entry({"admin", "status", "mwan", "detailed_status"},
 		call("detailedStatus"))
 
+	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)
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm b/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
index 7cef0630ee..335c95c8fd 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
@@ -1,5 +1,5 @@
 <script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "mwan", "overview", "interface_status")%>', null,
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null,
 		function(x, mArray)
 		{
 			var status = document.getElementById('mwan_status_text');
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
index 6a800c3f98..1403de1922 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
@@ -1,13 +1,13 @@
 <%+header%>
 
 <ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/overview")%>"><%:Interface Status%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/overview/overview_detailed")%>"><%:Detailed Status%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview_interface")%>"><%:Interface Status%></a></li>
+	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview_detailed")%>"><%:Detailed Status%></a></li>
 </ul>
 
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 <script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "mwan", "overview", "detailed_status")%>', null,
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null,
 		function(x, mArray)
 		{
 			var status = document.getElementById('mwan_detail_text');
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
index 2929a6df60..eabdf293af 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
@@ -1,13 +1,13 @@
 <%+header%>
 
 <ul class="cbi-tabmenu">
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/overview")%>"><%:Interface Status%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/overview/overview_detailed")%>"><%:Detailed Status%></a></li>
+	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview_interface")%>"><%:Interface Status%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/overview_detailed")%>"><%:Detailed Status%></a></li>
 </ul>
 
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 <script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "mwan", "overview", "interface_status")%>', null,
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null,
 		function(x, mArray)
 		{
 			var statusDiv = document.getElementById('mwan_status_text');
-- 
2.30.2