From cd1a979593ab90753cda98ac5fa69e23037758d7 Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Tue, 3 Apr 2018 13:16:44 +0200
Subject: [PATCH] luci-app-mwan3: remove diag-rc-legend field id

On the material theme the "Collecting data" hint in the status pages
was still present on the page even though the command was sucessfull executed.

Remove the legend tag and move the info "Collecting data" to the
"diag-rc-output" tag will solve this issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
 .../luasrc/view/mwan/overview_status_interface.htm           | 3 ++-
 .../luci-app-mwan3/luasrc/view/mwan/status_detail.htm        | 4 +---
 .../luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm   | 3 ---
 .../luci-app-mwan3/luasrc/view/mwan/status_interface.htm     | 5 +++--
 .../luasrc/view/mwan/status_troubleshooting.htm              | 4 +---
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
index 4ec0edf04..fcc1bcf69 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
@@ -69,6 +69,7 @@ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_
 <fieldset id="interface_field" class="cbi-section">
 	<legend><%:MWAN Interfaces%></legend>
 	<div id="mwan_status_text">
-		<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%>
+		<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+		<%:Collecting data...%>
 	</div>
 </fieldset>
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm
index 70eac7252..bcc23beb3 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm
@@ -18,9 +18,7 @@
 	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null,
 		function(x)
 		{
-			var legend = document.getElementById('diag-rc-legend');
 			var output = document.getElementById('diag-rc-output');
-			legend.style.display = 'none';
 			output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
 		}
 	);
@@ -32,9 +30,9 @@
 	<div><strong><%:INFO: MWAN not running%></strong></div>
 	<%end%>
 	<fieldset class="cbi-section">
-		<legend id="diag-rc-legend"><%:Collecting data...%></legend>
 		<span id="diag-rc-output">
 			<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" />
+			<%:Collecting data...%>
 		</span>
 	</fieldset>
 </div>
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm
index f1c5d8fd9..22f4734dd 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm
@@ -31,7 +31,6 @@
 
 	function update_status(iface, task)
 	{
-		var legend = document.getElementById('diag-rc-legend');
 		var output = document.getElementById('diag-rc-output');
 
 		output.innerHTML =
@@ -45,7 +44,6 @@
 		stxhr.post('<%=url('admin/status/mwan')%>/diagnostics_display' + '/' + iface + '/' + task, { token: '<%=token%>' },
 			function(x)
 			{
-				legend.style.display = 'none';
 				output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
 			}
 		);
@@ -86,7 +84,6 @@
 		</fieldset>
 	</div>
 	<fieldset class="cbi-section" style="display:none">
-		<legend id="diag-rc-legend"><%:Collecting data...%></legend>
 		<span id="diag-rc-output"></span>
 	</fieldset>
 </form>
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm
index cb476967f..4518bd658 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm
@@ -15,6 +15,7 @@
 
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 
-<%+mwan/overview_status_interface%>
-
+<div class="cbi-map">
+	<%+mwan/overview_status_interface%>
+</div>
 <%+footer%>
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm
index 77d009231..f60e0da0a 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm
@@ -18,9 +18,7 @@
 	XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "troubleshooting_display")%>', null,
 		function(x)
 		{
-			var legend = document.getElementById('diag-rc-legend');
 			var output = document.getElementById('diag-rc-output');
-			legend.style.display = 'none';
 			output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
 		}
 	);
@@ -32,9 +30,9 @@
 	<div><strong><%:INFO: MWAN not running%></strong></div>
 	<%end%>
 	<fieldset class="cbi-section">
-		<legend id="diag-rc-legend"><%:Collecting data...%></legend>
 		<span id="diag-rc-output">
 			<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" />
+			<%:Collecting data...%>
 		</span>
 	</fieldset>
 </div>
-- 
2.25.1