Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-mwan3: remove diag-rc-legend field id

Browse source 
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>
This commit is contained in:
Florian Eckert 2018-04-03 13:16:44 +02:00
parent c390464590
commit cd1a979593
5 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
View file

@ -69,6 +69,7 @@ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_
<fieldset id="interface_field" class="cbi-section"> <fieldset id="interface_field" class="cbi-section">
<legend><%:MWAN Interfaces%></legend> <legend><%:MWAN Interfaces%></legend>
<div id="mwan_status_text"> <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> </div>
</fieldset> </fieldset>

4
applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm
View file

@ -18,9 +18,7 @@
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null, XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null,
function(x) function(x)
{ {
var legend = document.getElementById('diag-rc-legend');
var output = document.getElementById('diag-rc-output'); var output = document.getElementById('diag-rc-output');
legend.style.display = 'none';
output.innerHTML = String.format('<pre>%h</pre>', x.responseText); output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
} }
); );
@ -32,9 +30,9 @@
<div><strong><%:INFO: MWAN not running%></strong></div> <div><strong><%:INFO: MWAN not running%></strong></div>
<%end%> <%end%>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend id="diag-rc-legend"><%:Collecting data...%></legend>
<span id="diag-rc-output"> <span id="diag-rc-output">
<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" /> <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" />
<%:Collecting data...%>
</span> </span>
</fieldset> </fieldset>
</div> </div>

3
applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm
View file

@ -31,7 +31,6 @@
function update_status(iface, task) function update_status(iface, task)
{ {
var legend = document.getElementById('diag-rc-legend');
var output = document.getElementById('diag-rc-output'); var output = document.getElementById('diag-rc-output');
output.innerHTML = output.innerHTML =
@ -45,7 +44,6 @@
stxhr.post('<%=url('admin/status/mwan')%>/diagnostics_display' + '/' + iface + '/' + task, { token: '<%=token%>' }, stxhr.post('<%=url('admin/status/mwan')%>/diagnostics_display' + '/' + iface + '/' + task, { token: '<%=token%>' },
function(x) function(x)
{ {
legend.style.display = 'none';
output.innerHTML = String.format('<pre>%h</pre>', x.responseText); output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
} }
); );
@ -86,7 +84,6 @@
</fieldset> </fieldset>
</div> </div>
<fieldset class="cbi-section" style="display:none"> <fieldset class="cbi-section" style="display:none">
<legend id="diag-rc-legend"><%:Collecting data...%></legend>
<span id="diag-rc-output"></span> <span id="diag-rc-output"></span>
</fieldset> </fieldset>
</form> </form>

3
applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm
View file

@ -15,6 +15,7 @@
<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<div class="cbi-map">
<%+mwan/overview_status_interface%> <%+mwan/overview_status_interface%>
</div>
<%+footer%> <%+footer%>

4
applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm
View file

@ -18,9 +18,7 @@
XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "troubleshooting_display")%>', null, XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "troubleshooting_display")%>', null,
function(x) function(x)
{ {
var legend = document.getElementById('diag-rc-legend');
var output = document.getElementById('diag-rc-output'); var output = document.getElementById('diag-rc-output');
legend.style.display = 'none';
output.innerHTML = String.format('<pre>%h</pre>', x.responseText); output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
} }
); );
@ -32,9 +30,9 @@
<div><strong><%:INFO: MWAN not running%></strong></div> <div><strong><%:INFO: MWAN not running%></strong></div>
<%end%> <%end%>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend id="diag-rc-legend"><%:Collecting data...%></legend>
<span id="diag-rc-output"> <span id="diag-rc-output">
<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" /> <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" />
<%:Collecting data...%>
</span> </span>
</fieldset> </fieldset>
</div> </div>