From 23fc4cd913392603139fdafa382aeca361efdbf9 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Tue, 3 Jul 2018 16:09:06 +0200
Subject: [PATCH] Fix index

---
 .../view/admin_network/diagnostics.htm.rej    | 61 -------------------
 .../luasrc/view/admin_status/index.htm        |  4 +-
 2 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm.rej

diff --git a/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm.rej b/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm.rej
deleted file mode 100644
index 9c1d86837..000000000
--- a/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm.rej
+++ /dev/null
@@ -1,61 +0,0 @@
---- luasrc/view/admin_network/diagnostics.htm	2018-07-03 15:17:57.633203371 +0200
-+++ luasrc/view/admin_network/diagnostics.htm	2018-06-08 10:45:56.107723557 +0200
-@@ -72,7 +78,7 @@
- 
- 			<br />
- 
--			<div style="width:30%; float:left">
-+			<div style="width:23%; float:left">
- 				<input style="margin: 5px 0" type="text" value="<%=ping_host%>" name="ping" /><br />
- 				<% if has_ping6 then %>
- 				<select name="ping_proto" style="width:auto">
-@@ -85,7 +91,7 @@
- 				<% end %>
- 			</div>
- 
--			<div style="width:33%; float:left">
-+			<div style="width:23%; float:left">
- 				<input style="margin: 5px 0" type="text" value="<%=route_host%>" name="traceroute" /><br />
- 				<% if has_traceroute6 then %>
- 				<select name="traceroute_proto" style="width:auto">
-@@ -102,11 +108,39 @@
- 				<% end %>
- 			</div>
- 
--			<div style="width:33%; float:left;">
-+			<div style="width:23%; float:left;">
- 				<input style="margin: 5px 0" type="text" value="<%=dns_host%>" name="nslookup" /><br />
- 				<input type="button" value="<%:Nslookup%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.nslookup)" />
- 			</div>
- 
-+			<% if has_speedtest and false then %>
-+			<div style="width:23%; float:left;">
-+				<input style="margin: 5px 0" type="text" value="" name="speedtest" placeholder="alternate server" /><br />
-+				<input type="button" value="<%:Speedtest%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.speedtest)" />
-+			</div>
-+			<% end %>
-+
-+			<% if has_iperf3 then %>
-+			<div style="width:23%; float:left;">
-+				<input style="margin: 5px 0" type="text" value="<%=iperf3_host%>" name="iperf3" /><br />
-+				<input type="button" value="<%:Iperf3%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.iperf3)" />
-+			</div>
-+			<% end %>
-+
-+			<% if has_curl then %>
-+			<div style="width:23%; float:left;">
-+				<input style="margin: 5px 0" type="hidden" value="<%=getip_host%>" name="getip" /><br />
-+				<input type="button" value="<%:Get public IP%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.getip)" />
-+			</div>
-+			<% end %>
-+
-+			<% if has_netstat then %>
-+			<div style="width:23%; float:left;">
-+				<input style="margin: 5px 0" type="hidden" value="" name="netstat" /><br />
-+				<input type="button" value="<%:Netstat%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.netstat)" />
-+			</div>
-+			<% end %>
-+
- 			<br style="clear:both" /><br />
- 
- 		</fieldset>
diff --git a/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index 9d282f58b..900732fee 100644
--- a/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -436,11 +436,11 @@
 
 <div class="cbi-section">
 	<h3><%:Network%></h3>
-
+	<% if has_mptcp == 0 then %>
 	<div id="upstream_status_table" class="network-status-table">
 		<em><%:Collecting data...%></em>
 	</div>
-
+	<% end %>
 	<div class="table" width="100%">
 		<div class="tr"><div class="td left" width="33%"><%:Active Connections%></div><div class="td left" id="conns">-</div></div>
 	</div>