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

Merge pull request #1626 from TDT-AG/pr/20180105-luci-app-mwan3-add-service

Browse source 
luci-app-mwan3: add service hint
This commit is contained in:
Hannu Nyman 2018-02-05 17:43:44 +02:00 committed by GitHub
commit 90369e78d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm
View file

@ -1 +1,3 @@
<%if require("luci.sys").init.enabled("mwan3") then%>
<%+mwan/overview_status_interface%> <%+mwan/overview_status_interface%>
<%end%>

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

@ -28,6 +28,9 @@
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:MWAN Status - Detail%></h2> <h2 name="content"><%:MWAN Status - Detail%></h2>
<%if not require("luci.sys").init.enabled("mwan3") then%>
<div><strong><%:INFO: MWAN not running%></strong></div>
<%end%>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend id="diag-rc-legend"><%:Collecting data...%></legend> <legend id="diag-rc-legend"><%:Collecting data...%></legend>
<span id="diag-rc-output"> <span id="diag-rc-output">

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

@ -55,7 +55,9 @@
<form method="post" action="<%=url('admin/network/diagnostics')%>"> <form method="post" action="<%=url('admin/network/diagnostics')%>">
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:MWAN Status - Diagnostics%></h2> <h2 name="content"><%:MWAN Status - Diagnostics%></h2>
<%if not require("luci.sys").init.enabled("mwan3") then%>
<div><strong><%:INFO: MWAN not running%></strong></div>
<%end%>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<br /> <br />

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

@ -18,7 +18,9 @@
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null, XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null,
function(x, status) function(x, status)
{ {
var statusDiv = document.getElementById('mwan_status_text'); var legend = document.getElementById('diag-rc-legend');
var statusDiv = document.getElementById('diag-rc-output');
legend.style.display = 'none';
if (status.interfaces) if (status.interfaces)
{ {
var statusview = ''; var statusview = '';
@ -62,10 +64,16 @@
); );
//]]></script> //]]></script>
<div id="mwan_interface_status"> <div class="cbi-map">
<fieldset id="interface_field" class="cbi-section"> <h2 name="content"><%:MWAN Status - Interface%></h2>
<legend><%:MWAN status - Interface Live Status%></legend> <%if not require("luci.sys").init.enabled("mwan3") then%>
<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div> <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;" />
</span>
</fieldset> </fieldset>
</div> </div>

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

@ -28,6 +28,9 @@
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:MWAN Status - Troubleshooting%></h2> <h2 name="content"><%:MWAN Status - Troubleshooting%></h2>
<%if not require("luci.sys").init.enabled("mwan3") then%>
<div><strong><%:INFO: MWAN not running%></strong></div>
<%end%>
<fieldset class="cbi-section"> <fieldset class="cbi-section">
<legend id="diag-rc-legend"><%:Collecting data...%></legend> <legend id="diag-rc-legend"><%:Collecting data...%></legend>
<span id="diag-rc-output"> <span id="diag-rc-output">

2
applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3
View file

@ -4,7 +4,7 @@
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
del ucitrack.@mwan3[-1] del ucitrack.@mwan3[-1]
add ucitrack mwan3 add ucitrack mwan3
set ucitrack.@mwan3[-1].exec="/usr/sbin/mwan3 restart" set ucitrack.@mwan3[-1].exec="/etc/init.d/mwan3 reload"
commit ucitrack commit ucitrack
EOF EOF