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 2/4] zoneconf.cgi: Make output HTML 5 standard compliant
Date: Tue, 17 Nov 2020 07:29:02 +0100
Message-ID: <20201117062904.1547-2-hofmann@leo-andres.de>
In-Reply-To: <20201117062904.1547-1-hofmann@leo-andres.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0426347031093666637=="
List-Id: <development.lists.ipfire.org>

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

This fixes two minor violations of the HTML standard:
- <a> elements may not contain nested <button> elements:
Replace the button with a simple hyperlink, because it was only used as a lin=
k anyway.

- "id" attributes may not contain whitespace:
Remove unneeded attribute, use hyphens instead of spaces.

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

diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index 067410582..2346aa829 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -99,10 +99,6 @@ my $css =3D <<END
 	#submit-container.input {
 		margin-left: auto;
 	}
-
-	button {
-		margin-top: 1em;
-	}
 </style>
 END
 ;
@@ -282,7 +278,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {
 	if ($VALIDATE_error) {
 		&Header::openbox('100%', 'left', $Lang::tr{"error"});
=20
-		print "$VALIDATE_error<br><a href=3D'/cgi-bin/zoneconf.cgi'><button>$Lang:=
:tr{'ok'}</button></a>";
+		print "$VALIDATE_error<br><br><a href=3D'$ENV{'SCRIPT_NAME'}'>$Lang::tr{'b=
ack'}</a>\n";
=20
 		&Header::closebox();
 		&Header::closebigbox();
@@ -388,7 +384,7 @@ foreach (@nics) {
=20
 				print <<END
 		<td class=3D"textcenter $slightlygrey">
-			<input type=3D"radio" id=3D"PPPACCESS $mac" name=3D"PPPACCESS" value=3D"$=
mac" $checked>
+			<input type=3D"radio" name=3D"PPPACCESS" value=3D"$mac" $checked>
 		</td>
 END
 ;
@@ -431,12 +427,12 @@ END
=20
 		print <<END
 		<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)">
+			<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>
+			<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
2.27.0.windows.1


--===============0426347031093666637==--