mwan3-luci: update to 1.3-5

new naming/wording - more generically mwan than mwan3
renamed cryptic variables/functions/etc everywhere
removed unused and unnecessary variables everywhere
cleaned up ugly and inefficient Lua and Javascript

Signed-off-by: Aedan Renner chipdankly@gmail.com

net/mwan3-luci/files/usr/lib/lua/luci/view/admin_status/index/mwan.htm

@@ -0,0 +1 @@
+<%+mwan/openwrt_overview_status%>

net/mwan3-luci/files/usr/lib/lua/luci/view/admin_status/index/mwan3.htm

@@ -1 +0,0 @@
-<%+mwan3/mwan3_status%>

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_diagnostics.htm

@@ -1,20 +1,20 @@
 <%+header%>
 
 <ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/hotplug")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/mwan3")%>"><%:MWAN3 Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/network")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/diag")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/tshoot")%>"><%:Troubleshooting%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
+	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
 </ul>
 
 <%
 	local uci = require "luci.model.uci"
 
-	str = ""
+	interfaceNames = ""
 	uci.cursor():foreach("mwan3", "interface",
 		function (section)
-			str = str .. section[".name"] .. " "
+			interfaceNames = interfaceNames .. section[".name"] .. " "
 		end
 	)
 %>
@@ -23,16 +23,16 @@
 <script type="text/javascript">//<![CDATA[
 	var stxhr = new XHR();
 
-	function update_status(tool, alt)
+	function update_status(tool, task)
 	{
-		var iface = document.getElementById('mwan3iface').value;
+		var iface = document.getElementById('mwaniface').value;
 		var output = document.getElementById('diag_output');
 
 		if (tool == "service")
 			{
 				output.innerHTML =
 					'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="padding: 20px; vertical-align: middle;" /> ' +
-					"Waiting for MWAN3 to " + alt + "..."
+					"Waiting for MWAN to " + task + "..."
 				;
 			}
 			else
@@ -46,30 +46,27 @@
 		output.parentNode.style.display = 'block';
 		output.style.display = 'inline';
 
-		stxhr.get('<%=luci.dispatcher.build_url("admin", "network", "mwan3", "advanced")%>/diag_display' + '/' + iface + '/' + tool + '/' + alt, null,
-			function(x, st)
+		stxhr.get('<%=luci.dispatcher.build_url("admin", "network", "mwan", "advanced")%>/diagnostics_display' + '/' + iface + '/' + tool + '/' + task, null,
+			function(x, mArray)
 			{
-				if (st.diagres)
+				if (mArray.diagnostics)
 				{
-					output.innerHTML = String.format('<pre id="diag_output_css">%h</pre>', st.diagres[0].diagresult);
+					output.innerHTML = String.format('<pre id="diag_output_css">%h</pre>', mArray.diagnostics[0]);
 				}
 				else
 				{
-					var temp = '';
-					var ncint = 'No diagnostic results returned';
-					temp = String.format('<pre id="diag_output_css"><strong>%s</strong></pre>', ncint);
-					output.innerHTML = temp;
+					output.innerHTML = '<pre id="diag_output_css"><strong>No diagnostic results returned</strong></pre>';
 				}
 			}
 		);
 	}
 //]]></script>
 
-<div id="mwan3_diagnostics" class="cbi-map">
+<div id="mwan_diagnostics" class="cbi-map">
 	<fieldset id="diag_select" class="cbi-section">
-		<legend><%:MWAN3 Interface Diagnostics%></legend>
-		<select id="mwan3iface">
-			<% for z in str:gmatch("[^ ]+") do -%><option value="<%=z%>"><%=z%></option><%- end %>
+		<legend><%:MWAN Interface Diagnostics%></legend>
+		<select id="mwaniface">
+			<% for z in interfaceNames:gmatch("[^ ]+") do -%><option value="<%=z%>"><%=z%></option><%- end %>
 		</select>
 		<div id="buttoncss">
 			<input type="button" value="<%:Ping default gateway%>" class="cbi-button cbi-button-apply" onclick="update_status('ping', 'gateway')" />
@@ -81,11 +78,11 @@
 		</div>
 	</fieldset>
 	<fieldset id="diag_select" class="cbi-section">
-		<legend><%:MWAN3 Service Control%></legend>
+		<legend><%:MWAN Service Control%></legend>
 		<div id="buttoncss">
-			<input type="button" value="<%:Restart MWAN3%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'restart')" />
-			<input type="button" value="<%:Stop MWAN3%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'stop')" />
-			<input type="button" value="<%:Start MWAN3%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'start')" />
+			<input type="button" value="<%:Restart MWAN%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'restart')" />
+			<input type="button" value="<%:Stop MWAN%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'stop')" />
+			<input type="button" value="<%:Start MWAN%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'start')" />
 		</div>
 	</fieldset>
 	<fieldset class="cbi-section" style="display:none">
@@ -95,13 +92,13 @@
 </div>
 
 <style type="text/css">
-  .container {  /*container for entire page. fixes bootstrap theme's ridiculously small page width*/
+  .container {  /* container for entire page. fixes bootstrap theme's ridiculously small page width */
 	max-width: none;
 	margin-left: 30px;
 	padding-right: 30px;
 	width: auto;
   }
-  #mwan3_diagnostics {
+  #mwan_diagnostics {
 	background-color: #FFFFFF;
 	border: 1px dotted #555555;
 	padding: 20px;
@@ -109,7 +106,7 @@
   #diag_select {
 	padding: 12px 20px 20px 20px;
   }
-  #mwan3iface {
+  #mwaniface {
 	float: left;
 	margin: 8px 20px 0px 0px;
   }

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_hotplugscript.htm

@@ -1,13 +1,13 @@
 <ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/hotplug")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/mwan3")%>"><%:MWAN3 Config%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/network")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/diag")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/tshoot")%>"><%:Troubleshooting%></a></li>
+	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
 </ul>
 
 <style type="text/css">
-  .container {  /*container for entire page. fixes bootstrap theme's ridiculously small page width*/
+  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
 	max-width: none;
 	margin: 0px 0px 0px 30px;
 	padding-right: 30px;

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_mwanconfig.htm

@@ -1,13 +1,13 @@
 <ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/hotplug")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/mwan3")%>"><%:MWAN3 Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/network")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/diag")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/tshoot")%>"><%:Troubleshooting%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
+	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
 </ul>
 
 <style type="text/css">
-  .container {  /*container for entire page. fixes bootstrap theme's ridiculously small page width*/
+  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
 	max-width: none;
 	margin: 0px 0px 0px 30px;
 	padding-right: 30px;

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_networkconfig.htm

@@ -1,13 +1,13 @@
 <ul class="cbi-tabmenu">
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/hotplug")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/mwan3")%>"><%:MWAN3 Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/network")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/diag")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/tshoot")%>"><%:Troubleshooting%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
+	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
 </ul>
 
 <style type="text/css">
-  .container {  /*container for entire page. fixes bootstrap theme's ridiculously small page width*/
+  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
 	max-width: none;
 	margin: 0px 0px 0px 30px;
 	padding-right: 30px;

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_troubleshooting.htm

@@ -0,0 +1,71 @@
+<%+header%>
+
+<ul class="cbi-tabmenu">
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
+	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
+</ul>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "network", "mwan", "advanced", "troubleshooting_display")%>', null,
+		function(x, mArray)
+		{
+			var tshoot = document.getElementById('troubleshoot_text');
+			if (mArray.versions)
+			{
+				var versions = '<span class="description">Software versions : </span><br /><br />';
+				var mwanConfig = '<br /><br /><span class="description">Output of &#34;cat /etc/config/mwan3&#34; : </span><br /><br />';
+				var netConfig = '<br /><br /><span class="description">Output of &#34;cat /etc/config/network&#34; : </span><br /><br />';
+				var ifconfig = '<br /><br /><span class="description">Output of &#34;ifconfig&#34; : </span><br /><br />';
+				var ipRoute = '<br /><br /><span class="description">Output of &#34;route -n&#34; : </span><br /><br />';
+				var ipRuleShow = '<br /><br /><span class="description">Output of &#34;ip rule show&#34; : </span><br /><br />';
+				var routeListTable = '<br /><br /><span class="description">Output of &#34;ip route list table 1-250&#34; : </span><br /><br />';
+				var firewallOut = '<br /><br /><span class="description">Firewall default output policy (must be ACCEPT) : </span><br /><br />';
+				var iptables = '<br /><br /><span class="description">Output of &#34;iptables -L -t mangle -v -n&#34; : </span><br /><br />';
+				tshoot.innerHTML = String.format(
+					'<pre>%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s</pre>',
+					versions, mArray.versions[0], mwanConfig, mArray.mwanconfig[0], netConfig, mArray.netconfig[0],
+					ifconfig, mArray.ifconfig[0], ipRoute, mArray.routeshow[0], ipRuleShow, mArray.iprule[0],
+					routeListTable, mArray.routelist[0], firewallOut, mArray.firewallout[0], iptables, mArray.iptables[0]
+				);
+			}
+			else
+			{
+				tshoot.innerHTML = '<strong>Error collecting troubleshooting information</strong>';
+			}
+		}
+	);
+//]]></script>
+
+<div id="troubleshoot">
+	<fieldset class="cbi-section">
+		<legend><%:Troubleshooting Data%></legend>
+		<div id="troubleshoot_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+	</fieldset>
+</div>
+
+<style type="text/css">
+  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
+	max-width: none;
+	margin-left: 30px;
+	padding-right: 30px;
+	width: auto;
+  }
+  #troubleshoot {
+	background-color: #FFFFFF;
+	border: 1px dotted #555555;
+	padding: 20px;
+  }
+  #troubleshoot_text {
+	padding: 20px;
+	text-align: left;
+  }
+  .description {
+	background-color: rgb(78, 186, 241);
+  }
+</style>
+
+<%+footer%>

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/config_css.htm

@@ -1,28 +1,28 @@
 <style type="text/css">
-  .container {  /*container for entire page. fixes bootstrap theme's ridiculously small page width*/
+  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
 	max-width: none;
 	margin-left: 30px;
 	padding-right: 30px;
 	width: auto;
   }
-  table td {  /*cells showing the configuration values*/
+  table td {	/* cells showing the configuration values */
 	padding: 0px;
 	text-align: center;
 	vertical-align: middle;
   }
-  table th {  /*column for configuration section name*/
+  table th {	/* column for configuration section name */
 	padding: 0px;
 	text-align: center;
 	vertical-align: middle;
   }
-  table tbody th {  /*column for configuration section name*/
+  table tbody th {	/* column for configuration section name */
 	padding: 0px;
 	vertical-align: middle;
   }
-  .cbi-section-node table div {  /*rows*/
+  .cbi-section-node table div {	/* rows */
 	padding-top: 5px;
   }
-  table.cbi-section-table td.cbi-section-table-cell {  /*sort buttons column*/
+  table.cbi-section-table td.cbi-section-table-cell {	/* sort buttons column */
 	text-align: center;
   }
   .cbi-section h3 {

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/openwrt_overview_status.htm

@@ -1,71 +1,62 @@
 <script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "mwan3", "overview", "iface_status")%>', null,
-		function(x, st)
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "mwan", "overview", "interface_status")%>', null,
+		function(x, mArray)
 		{
-			var tx = document.getElementById('mwan3_status_text');
-			if (st.wans)
+			var status = document.getElementById('mwan_status_text');
+			if (mArray.wans)
 			{
 				var temp = '';
-
-				for( var i = 0; i < st.wans.length; i++ )
+				for( var i = 0; i < mArray.wans.length; i++ )
 				{
 					var stat = '';
 					var cssc = '';
-
-					switch (st.wans[i].status)
+					switch (mArray.wans[i].status)
 					{
-						case 'on':
+						case 'online':
 							stat = 'Online (tracking active)';
 							cssc = 'wanon';
 							break;
-
-						case 'nm':
+						case 'notMonitored':
 							stat = 'Online (tracking off)';
 							cssc = 'wanon';
 							break;
-
-						case 'off':
+						case 'offline':
 							stat = 'Offline';
 							cssc = 'wanoff';
 							break;
-
-						case 'ne':
+						case 'notEnabled':
 							stat = 'Disabled';
 							cssc = 'wanoff';
 							break;
 					}
-
 					temp += String.format(
 						'<span class="%s"><strong>%s (<a href="%q">%s</a>)</strong><br />%s</span>',
-						cssc, st.wans[i].name, st.wans[i].link, st.wans[i].ifname, stat
+						cssc, mArray.wans[i].name, mArray.wans[i].link, mArray.wans[i].ifname, stat
 					);
 				}
-				tx.innerHTML = temp;
+				status.innerHTML = temp;
 			}
 			else
 			{
-				var temp = '';
-				var ncint = 'No MWAN3 interfaces found';
-				temp += String.format('<strong>%s</strong>', ncint );
-				tx.innerHTML = temp;
+				status.innerHTML = '<strong>No MWAN interfaces found</strong>';
 			}
 		}
 	);
 //]]></script>
 
 <fieldset id="interface_field" class="cbi-section">
-	<legend><%:MWAN3 Multi-WAN Interface Live Status%></legend>
-	<div id="mwan3_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+	<legend><%:MWAN Interface Live Status%></legend>
+	<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
 </fieldset>
 
 <style type="text/css">
-  .container {  /*container for entire page. fixes bootstrap theme's ridiculously small page width*/
+  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
 	max-width: 1044px;
   }
   #interface_field {
 	padding: 12px 20px 20px 20px;
   }
-  #mwan3_status_text {
+  #mwan_status_text {
 	display: table;
 	font-size: 14px;
 	margin: auto;

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_detailed.htm

@@ -0,0 +1,51 @@
+<%+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>
+</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,
+		function(x, mArray)
+		{
+			var status = document.getElementById('mwan_detail_text');
+			if (mArray.mwandetail)
+			{
+				status.innerHTML = String.format('<pre>%s</pre>', mArray.mwandetail[0]);
+			}
+			else
+			{
+				status.innerHTML = '<strong>No detailed status information available</strong>';
+			}
+		}
+	);
+//]]></script>
+
+<div id="mwan_detail_status">
+	<fieldset class="cbi-section">
+		<legend><%:MWAN Detailed Status%></legend>
+		<div id="mwan_detail_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+	</fieldset>
+</div>
+
+<style type="text/css">
+  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
+	max-width: none;
+	margin-left: 30px;
+	padding-right: 30px;
+	width: auto;
+  }
+  #mwan_detail_status {
+	border: 1px dotted #555555;
+	background-color: #FFFFFF;
+	padding: 20px;
+  }
+  #mwan_detail_text {
+	padding: 20px;
+	text-align: left;
+  }
+</style>
+
+<%+footer%>

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_interface.htm

@@ -0,0 +1,122 @@
+<%+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>
+</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,
+		function(x, mArray)
+		{
+			var statusDiv = document.getElementById('mwan_status_text');
+			if (mArray.wans)
+			{
+				var interfaceStatus = '';
+				for( var i = 0; i < mArray.wans.length; i++ )
+				{
+					var status = '';
+					var css = '';
+					switch (mArray.wans[i].status)
+					{
+						case 'online':
+							status = 'Online (tracking active)';
+							css = 'wanon';
+							break;
+						case 'notMonitored':
+							status = 'Online (tracking off)';
+							css = 'wanon';
+							break;
+						case 'offline':
+							status = 'Offline';
+							css = 'wanoff';
+							break;
+						case 'notEnabled':
+							status = 'Disabled';
+							css = 'wanoff';
+							break;
+					}
+					interfaceStatus += String.format(
+						'<span class="%s"><strong>%s (<a href="%q">%s</a>)</strong><br />%s</span>',
+						css, mArray.wans[i].name, mArray.wans[i].link, mArray.wans[i].ifname, status
+					);
+				}
+				statusDiv.innerHTML = interfaceStatus;
+			}
+			else
+			{
+				statusDiv.innerHTML = '<strong>No MWAN interfaces found</strong>';
+			}
+
+			var logs = document.getElementById('mwan_statuslog_text');
+			if (mArray.mwanlog)
+			{
+				var mwanLog = 'Last 50 MWAN systemlog entries. Newest entries sorted at the top :';
+				logs.innerHTML = String.format('<pre>%s<br /><br />%s</pre>', mwanLog, mArray.mwanlog[0]);
+			}
+			else
+			{
+				logs.innerHTML = '<strong>No MWAN systemlog history found</strong>';
+			}
+		}
+	);
+//]]></script>
+
+<div id="mwan_interface_status">
+	<fieldset id="interface_field" class="cbi-section">
+		<legend><%:MWAN Interface Live Status%></legend>
+		<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+	</fieldset>
+	<fieldset class="cbi-section">
+		<legend><%:MWAN Interface Systemlog%></legend>
+		<div id="mwan_statuslog_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+	</fieldset>
+</div>
+
+<style type="text/css">
+  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
+	max-width: none;
+	margin-left: 30px;
+	padding-right: 30px;
+	width: auto;
+  }
+  #mwan_interface_status {
+	background-color: #FFFFFF;
+	border: 1px dotted #555555;
+	padding: 20px;
+  }
+  #interface_field {
+	padding: 12px 20px 20px 20px;
+  }
+  #mwan_status_text {
+	display: table;
+	font-size: 14px;
+	margin: auto;
+	max-width: 1044px;
+	min-width: 246px;
+	width: 100%;
+  }
+  .wanon {
+	background-color: rgb(144, 240, 144);
+  }
+  .wanoff {
+	background-color: rgb(240, 144, 144);
+  }
+  .wanon, .wanoff {
+	border-radius: 60px;
+	box-shadow: 0px 2px 5px -3px;
+	float: left;
+	margin: 8px 3px 0px 3px;
+	min-height: 30px;
+	min-width: 235px;
+	padding: 5px 10px 8px 10px;
+	text-align: center;
+  }
+  #mwan_statuslog_text {
+	padding: 20px;
+	text-align: left;
+  }
+</style>
+
+<%+footer%>

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan3/mwan3_adv_troubleshoot.htm

@@ -1,75 +0,0 @@
-<%+header%>
-
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/hotplug")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/mwan3")%>"><%:MWAN3 Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/network")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/diag")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/advanced/tshoot")%>"><%:Troubleshooting%></a></li>
-</ul>
-
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-	XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "network", "mwan3", "advanced", "tshoot_display")%>', null,
-		function(x, st)
-		{
-			var tx = document.getElementById('mwan3_tshoot_text');
-			if (st.mw3ver)
-			{
-				var temp = '';
-				var mwanvers = 'Software versions : <br /><br />';
-				var mwan3cnfg = '<br /><br />Output of &#34;cat /etc/config/mwan3&#34; : <br /><br />';
-				var netcnfg = '<br /><br />Output of &#34;cat /etc/config/network&#34; : <br /><br />';
-				var ifcnfg = '<br /><br />Output of &#34;ifconfig&#34; : <br /><br />';
-				var iproute = '<br /><br />Output of &#34;route -n&#34; : <br /><br />';
-				var iprulesh = '<br /><br />Output of &#34;ip rule show&#34; : <br /><br />';
-				var routelisttbl = '<br /><br />Output of &#34;ip route list table 1-250&#34; : <br /><br />';
-				var firewalldef = '<br /><br />Firewall default output policy (must be ACCEPT) : <br /><br />';
-				var iptable = '<br /><br />Output of &#34;iptables -L -t mangle -v -n&#34; : <br /><br />';
-
-				temp = String.format(
-					'<pre><span class="tsht">%s</span>%s<span class="tsht">%s</span>%s<span class="tsht">%s</span>%s<span class="tsht">%s</span>%s<span class="tsht">%s</span>%s<span class="tsht">%s</span>%s<span class="tsht">%s</span>%s<span class="tsht">%s</span>%s<span class="tsht">%s</span>%s</pre>',
-					mwanvers, st.mw3ver[0].mwan3v, mwan3cnfg, st.mwan3config[0].mwn3cfg, netcnfg, st.netconfig[0].netcfg, ifcnfg, st.ifconfig[0].ifcfg, iproute, st.rtshow[0].iprtshow, iprulesh, st.iprule[0].rule, routelisttbl, st.routelist[0].iprtlist, firewalldef, st.fidef[0].firedef, iptable, st.iptables[0].iptbls
-				);
-				tx.innerHTML = temp;
-			}
-			else
-			{
-				var temp = '';
-				var terror = 'Error collecting troubleshooting information';
-				temp = String.format('<strong>%s</strong>', terror);
-				tx.innerHTML = temp;
-			}
-		}
-	);
-//]]></script>
-
-<div id="tshoot_div">
-	<fieldset class="cbi-section">
-		<legend><%:Troubleshooting Data%></legend>
-		<div id="mwan3_tshoot_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
-	</fieldset>
-</div>
-
-<style type="text/css">
-  .container {  /*container for entire page. fixes bootstrap theme's ridiculously small page width*/
-	max-width: none;
-	margin-left: 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  #tshoot_div {
-	background-color: #FFFFFF;
-	border: 1px dotted #555555;
-	padding: 20px;
-  }
-  #mwan3_tshoot_text {
-	padding: 20px;
-	text-align: left;
-  }
-  .tsht {
-	background-color: rgb(78, 186, 241);
-  }
-</style>
-
-<%+footer%>

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan3/mwan3_over_detail.htm

@@ -1,56 +0,0 @@
-<%+header%>
-
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/overview")%>"><%:Interface Status%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/overview/over_detail")%>"><%: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", "mwan3", "overview", "detail_status")%>', null,
-		function(x, st)
-		{
-			var tx = document.getElementById('mwan3_detail_text');
-			if (st.mwan3dst)
-			{
-				var temp = '';
-				temp = String.format('<pre>%s</pre>', st.mwan3dst[0].detailstat);
-				tx.innerHTML = temp;
-			}
-			else
-			{
-				var temp = '';
-				var nslg = 'No detailed status information available';
-				temp = String.format('<strong>%s</strong>', nslg);
-				tx.innerHTML = temp;
-			}
-		}
-	);
-//]]></script>
-
-<div id="mwan3_detail_status">
-	<fieldset class="cbi-section">
-		<legend><%:MWAN3 Multi-WAN Detailed Status%></legend>
-		<div id="mwan3_detail_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
-	</fieldset>
-</div>
-
-<style type="text/css">
-  .container {  /*container for entire page. fixes bootstrap theme's ridiculously small page width*/
-	max-width: none;
-	margin-left: 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  #mwan3_detail_status {
-	border: 1px dotted #555555;
-	background-color: #FFFFFF;
-	padding: 20px;
-  }
-  #mwan3_detail_text {
-	padding: 20px;
-	text-align: left;
-  }
-</style>
-
-<%+footer%>

net/mwan3-luci/files/usr/lib/lua/luci/view/mwan3/mwan3_over_interface.htm

@@ -1,136 +0,0 @@
-<%+header%>
-
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/overview")%>"><%:Interface Status%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan3/overview/over_detail")%>"><%: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", "mwan3", "overview", "iface_status")%>', null,
-		function(x, st)
-		{
-			var tx = document.getElementById('mwan3_status_text');
-			if (st.wans)
-			{
-				var temp = '';
-
-				for( var i = 0; i < st.wans.length; i++ )
-				{
-					var stat = '';
-					var cssc = '';
-
-					switch (st.wans[i].status)
-					{
-						case 'on':
-							stat = 'Online (tracking active)';
-							cssc = 'wanon';
-							break;
-
-						case 'nm':
-							stat = 'Online (tracking off)';
-							cssc = 'wanon';
-							break;
-
-						case 'off':
-							stat = 'Offline';
-							cssc = 'wanoff';
-							break;
-
-						case 'ne':
-							stat = 'Disabled';
-							cssc = 'wanoff';
-							break;
-					}
-
-					temp += String.format(
-						'<span class="%s"><strong>%s (<a href="%q">%s</a>)</strong><br />%s</span>',
-						cssc, st.wans[i].name, st.wans[i].link, st.wans[i].ifname, stat
-					);
-				}
-				tx.innerHTML = temp;
-			}
-			else
-			{
-				var temp = '';
-				var ncint = 'No MWAN3 interfaces found';
-				temp = String.format('<strong>%s</strong>', ncint);
-				tx.innerHTML = temp;
-			}
-
-			var tx = document.getElementById('mwan3_statuslog_text');
-			if (st.mwan3log)
-			{
-				var temp = '';
-				var mwan3lg = 'Last 50 MWAN3 systemlog entries. Newest entries sorted at the top :';
-				temp = String.format('<pre>%s<br /><br />%s</pre>', mwan3lg, st.mwan3log[0].mwanlog);
-				tx.innerHTML = temp;
-			}
-			else
-			{
-				var temp = '';
-				var nslg = 'No MWAN3 systemlog history found';
-				temp = String.format('<strong>%s</strong>', nslg);
-				tx.innerHTML = temp;
-			}
-		}
-	);
-//]]></script>
-
-<div id="mwan3_interface_status">
-	<fieldset id="interface_field" class="cbi-section">
-		<legend><%:MWAN3 Multi-WAN Interface Live Status%></legend>
-		<div id="mwan3_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
-	</fieldset>
-	<fieldset class="cbi-section">
-		<legend><%:MWAN3 Multi-WAN Interface Systemlog%></legend>
-		<div id="mwan3_statuslog_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
-	</fieldset>
-</div>
-
-<style type="text/css">
-  .container {  /*container for entire page. fixes bootstrap theme's ridiculously small page width*/
-	max-width: none;
-	margin-left: 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  #mwan3_interface_status {
-	background-color: #FFFFFF;
-	border: 1px dotted #555555;
-	padding: 20px;
-  }
-  #interface_field {
-	padding: 12px 20px 20px 20px;
-  }
-  #mwan3_status_text {
-	display: table;
-	font-size: 14px;
-	margin: auto;
-	max-width: 1044px;
-	min-width: 246px;
-	width: 100%;
-  }
-  .wanon {
-	background-color: rgb(144, 240, 144);
-  }
-  .wanoff {
-	background-color: rgb(240, 144, 144);
-  }
-  .wanon, .wanoff {
-	border-radius: 60px;
-	box-shadow: 0px 2px 5px -3px;
-	float: left;
-	margin: 8px 3px 0px 3px;
-	min-height: 30px;
-	min-width: 235px;
-	padding: 5px 10px 8px 10px;
-	text-align: center;
-  }
-  #mwan3_statuslog_text {
-	padding: 20px;
-	text-align: left;
-  }
-</style>
-
-<%+footer%>