X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fdiagnostics.htm;h=d1bef2a8b7936d12b747921b1d97b6c5c73402b2;hb=03ed541b7613206010ddfbfc5a8fb6af5cbbf106;hp=64666880da180889fbbdab69dbf4e5da5e4211ab;hpb=13224b696d0ea71fb2f8e2b4b0e8eca6caa9ae90;p=project%2Fluci.git

diff --git a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
index 64666880d..d1bef2a8b 100644
--- a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -24,23 +24,15 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 <script type="text/javascript">//<![CDATA[
 	var stxhr = new XHR();
 
-	function update_status(field,proto)
+	function update_status(field, proto)
 	{
 		var tool = field.name;
 		var addr = field.value;
-		var protocol = ""
+		var protocol = proto ? "6" : "";
 
 		var legend = document.getElementById('diag-rc-legend');
 		var output = document.getElementById('diag-rc-output');
 
-		if (typeof proto != 'undefined') {
-			for(var i = 0; i < proto.length; i++) {
-				if(proto[i].checked) {
-					protocol = proto[i].value;
-				}
-			}
-		}
-
 		if (legend && output)
 		{
 			output.innerHTML =
@@ -80,29 +72,37 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 			<br />
 
 			<div style="width:30%; float:left">
-				<input style="width: 50%" type="text" value="openwrt.org" name="ping" />
-				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping,this.form.proto)" />
+				<input style="margin: 5px 0" type="text" value="openwrt.org" name="ping" /><br />
 				<% if has_ping6 then %>
-				<div style="width:100%; margin-top: 10px;">
-					<input type="radio" name="proto" value="" checked="checked" /> <%:IPv4%>
-					<input type="radio" name="proto" value="6" /> <%:IPv6%>
-				</div>
-				<%end%>
+				<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 style="width:33%; float:left">
-				<input style="width: 50%" type="text" value="openwrt.org" name="traceroute" />
-				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute,this.form.trproto)" />
+				<input style="margin: 5px 0" type="text" value="openwrt.org" name="traceroute" /><br />
 				<% if has_traceroute6 then %>
-				<div style="width:100%; margin-top: 10px;">
-					<input type="radio" name="trproto" value="" checked="checked" /> <%:IPv4%>
-					<input type="radio" name="trproto" value="6" /> <%:IPv6%>
-				</div>
-				<%end%>
+				<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="width: 50%" type="text" value="openwrt.org" name="nslookup" />
+				<input style="margin: 5px 0" type="text" value="openwrt.org" name="nslookup" /><br />
 				<input type="button" value="<%:Nslookup%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.nslookup)" />
 			</div>