From bbf096c79eca2e8407d15fe2acfde70c8d08e9c4 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 19 Jun 2018 17:17:04 +0200
Subject: luci-mod-admin-full: cleanup markup

Globally cleanup template markup to support responsive design changes in
OpenWrt theme.

Rework handling of dynamic status tables, consolidate hand-written markup,
fix small render bugs in various places and annotate tables where needed.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 .../luasrc/view/admin_network/diagnostics.htm      | 85 +++++++++++-----------
 1 file changed, 42 insertions(+), 43 deletions(-)

(limited to 'modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm')

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
index f4adb26069..5607e59dfb 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -61,55 +61,54 @@ local route_host = luci.config.diag and luci.config.diag.route or "dev.openwrt.o
 	<div class="cbi-map">
 		<h2 name="content"><%:Diagnostics%></h2>
 
-		<fieldset class="cbi-section">
+		<div class="cbi-section">
 			<legend><%:Network Utilities%></legend>
 
-			<br />
-
-			<div style="width:30%; 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">
-					<option value="" selected="selected"><%:IPv4%></option>
-					<option value="6"><%:IPv6%></option>
-				</select>
-				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping, this.form.ping_proto.selectedIndex)" />
-				<% else %>
-				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping)" />
-				<% end %>
+			<div class="table">
+				<div class="tr">
+					<div class="td 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">
+							<option value="" selected="selected"><%:IPv4%></option>
+							<option value="6"><%:IPv6%></option>
+						</select>
+						<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping, this.form.ping_proto.selectedIndex)" />
+						<% else %>
+						<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping)" />
+						<% end %>
+					</div>
+
+					<div class="td 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">
+							<option value="" selected="selected"><%:IPv4%></option>
+							<option value="6"><%:IPv6%></option>
+						</select>
+						<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute, this.form.traceroute_proto.selectedIndex)" />
+						<% else %>
+						<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute)" />
+						<% end %>
+						<% if not has_traceroute6 then %>
+							<p>&#160;</p>
+							<p><%:Install iputils-traceroute6 for IPv6 traceroute%></p>
+						<% end %>
+					</div>
+
+					<div class="td 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>
+				</div>
 			</div>
-
-			<div style="width:33%; 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">
-					<option value="" selected="selected"><%:IPv4%></option>
-					<option value="6"><%:IPv6%></option>
-				</select>
-				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute, this.form.traceroute_proto.selectedIndex)" />
-				<% else %>
-				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute)" />
-				<% end %>
-				<% if not has_traceroute6 then %>
-					<p>&#160;</p>
-					<p><%:Install iputils-traceroute6 for IPv6 traceroute%></p>
-				<% end %>
-			</div>
-
-			<div style="width:33%; 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>
-
-			<br style="clear:both" /><br />
-
-		</fieldset>
+		</div>
 	</div>
 
-	<fieldset class="cbi-section" style="display:none">
-		<legend id="diag-rc-legend"><%:Collecting data...%></legend>
+	<div class="cbi-section" style="display:none">
+		<strong id="diag-rc-legend"></strong>
 		<span id="diag-rc-output"></span>
-	</fieldset>
+	</div>
 </form>
 
 <%+footer%>
-- 
cgit v1.2.3