From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo-Andres Hofmann <hofmann@leo-andres.de>
To: development@lists.ipfire.org
Subject: [PATCH 1/4] zoneconf.cgi: Clean up HTML output
Date: Tue, 17 Nov 2020 07:29:01 +0100
Message-ID: <20201117062904.1547-1-hofmann@leo-andres.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3489114161715844978=="
List-Id: <development.lists.ipfire.org>

--===============3489114161715844978==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This adds missing brackets, cleans up the indentation and removes unnecessary=
 CSS.

Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
---
 html/cgi-bin/zoneconf.cgi | 46 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index d99a3e611..067410582 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -38,10 +38,6 @@ my $css =3D <<END
 		height: 4em;
 	}
=20
-	tr.thin {
-		height: 3em;
-	}
-
 	td.narrow {
 		width: 11em;
 	}
@@ -85,10 +81,6 @@ my $css =3D <<END
 		border-left-style: none;
 	}
=20
-	td.disabled {
-		background-color: #cccccc;
-	}
-
 	td.textcenter {
 		text-align: center;
 	}
@@ -312,8 +304,8 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {
 print <<END
 <form method=3D'post' enctype=3D'multipart/form-data'>
 	<table>
-		<tr>
-		<td class=3D"h narrow topleft" /td>
+	<tr>
+		<td class=3D"h narrow topleft"></td>
 END
 ;
=20
@@ -332,7 +324,7 @@ foreach (@zones) {
 		my $red_restricted =3D ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_t=
ype eq "DHCP"));
=20
 		if ($red_restricted) {
-			print "<td class=3D'h textcenter $_'>$uc ($red_type)</td>";
+			print "\t\t<td class=3D'h textcenter $_'>$uc ($red_type)</td>\n";
=20
 			next; # We're done here
 		}
@@ -350,7 +342,7 @@ foreach (@zones) {
 	}
=20
 	print <<END
-		<td class=3D'h textcenter $_'>$uc</br>
+		<td class=3D'h textcenter $_'>$uc<br>
 			<select name=3D"MODE $uc">
 				<option value=3D"DEFAULT" $mode_selected{"DEFAULT"}>$Lang::tr{"zoneconf =
nicmode default"}</option>
 				<option value=3D"BRIDGE" $mode_selected{"BRIDGE"}>$Lang::tr{"zoneconf ni=
cmode bridge"}</option>
@@ -361,7 +353,7 @@ END
 ;
 }
=20
-print "</tr>";
+print "\t</tr>\n";
=20
 my $slightlygrey =3D "";
=20
@@ -370,7 +362,8 @@ foreach (@nics) {
 	my $nic =3D $_->[1];
 	my $wlan =3D $_->[2];
=20
-	print "<tr><td class=3D'h narrow textcenter'>$nic<br>$mac</td>";
+	print "\t<tr>\n";
+	print "\t\t<td class=3D'h narrow textcenter'>$nic<br>$mac</td>\n";
=20
 	# Iterate through all zones and check if the current NIC is assigned to it
 	foreach (@zones) {
@@ -393,7 +386,12 @@ foreach (@nics) {
 					$checked =3D "checked";
 				}
=20
-				print "<td class=3D'textcenter $slightlygrey'><input type=3D'radio' id=
=3D'PPPACCESS $mac' name=3D'PPPACCESS' value=3D'$mac' $checked></td>";
+				print <<END
+		<td class=3D"textcenter $slightlygrey">
+			<input type=3D"radio" id=3D"PPPACCESS $mac" name=3D"PPPACCESS" value=3D"$=
mac" $checked>
+		</td>
+END
+;
 				next; # We're done here
 			}
 		}
@@ -432,19 +430,19 @@ foreach (@nics) {
 		my $vlan_disabled =3D ($wlan) ? "disabled" : "";
=20
 		print <<END
-			<td class=3D"textcenter $slightlygrey">
-				<select name=3D"ACCESS $uc $mac" onchange=3D"document.getElementById('TA=
G $uc $mac').disabled =3D (this.value =3D=3D=3D 'VLAN' ? false : true)">
-					<option value=3D"NONE" $access_selected{"NONE"}>- $Lang::tr{"zoneconf a=
ccess none"} -</option>
-					<option value=3D"NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf=
 access native"}</option>
-					<option value=3D"VLAN" $access_selected{"VLAN"} $vlan_disabled>$Lang::t=
r{"zoneconf access vlan"}</option>
-				</select>
-				<input type=3D"number" class=3D"vlanid" id=3D"TAG $uc $mac" name=3D"TAG =
$uc $mac" min=3D"1" max=3D"4095" value=3D"$zone_vlan_id" $field_disabled>
-			</td>
+		<td class=3D"textcenter $slightlygrey">
+			<select name=3D"ACCESS $uc $mac" onchange=3D"document.getElementById('TAG=
 $uc $mac').disabled =3D (this.value =3D=3D=3D 'VLAN' ? false : true)">
+				<option value=3D"NONE" $access_selected{"NONE"}>- $Lang::tr{"zoneconf ac=
cess none"} -</option>
+				<option value=3D"NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf =
access native"}</option>
+				<option value=3D"VLAN" $access_selected{"VLAN"} $vlan_disabled>$Lang::tr=
{"zoneconf access vlan"}</option>
+			</select>
+			<input type=3D"number" class=3D"vlanid" id=3D"TAG $uc $mac" name=3D"TAG $=
uc $mac" min=3D"1" max=3D"4095" value=3D"$zone_vlan_id" $field_disabled>
+		</td>
 END
 ;
 	}
=20
-	print "</tr>";
+	print "\t</tr>\n";
=20
 	if ($slightlygrey) {
 		$slightlygrey =3D "";
--=20
2.27.0.windows.1


--===============3489114161715844978==--