From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 16/20] ids.cgi: Use new-style table for whitelist entries
Date: Tue, 10 Sep 2024 14:37:29 +0000
Message-ID: <20240910143748.3469271-17-michael.tremer@ipfire.org>
In-Reply-To: <20240910143748.3469271-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7687546132031323173=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/ids.cgi | 52 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 737826580..08db95595 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -1241,11 +1241,11 @@ END
 	&Header::openbox('100%', 'center', $Lang::tr{'ids ignored hosts'});
=20
 	print <<END;
-	<table width=3D'100%'>
+	<table class=3D'tbl'>
 		<tr>
-			<td class=3D'base' bgcolor=3D'$color{'color20'}'><b>$Lang::tr{'ip address=
'}</b></td>
-			<td class=3D'base' bgcolor=3D'$color{'color20'}'><b>$Lang::tr{'remark'}</=
b></td>
-			<td class=3D'base' colspan=3D'3' bgcolor=3D'$color{'color20'}'></td>
+			<th>$Lang::tr{'ip address'}</td>
+			<th>$Lang::tr{'remark'}</td>
+			<th colspan=3D'3'></td>
 		</tr>
 END
 		# Check if some hosts have been added to be ignored.
@@ -1262,10 +1262,6 @@ END
 				# Check if the key (id) number is even or not.
 				if ($cgiparams{'ID'} eq $key) {
 					$col=3D"bgcolor=3D'${Header::colouryellow}'";
-				} elsif ($key % 2) {
-					$col=3D"bgcolor=3D'$color{'color22'}'";
-				} else {
-					$col=3D"bgcolor=3D'$color{'color20'}'";
 				}
=20
 				# Choose icon for the checkbox.
@@ -1283,8 +1279,8 @@ END
=20
 print <<END;
 				<tr>
-					<td width=3D'20%' class=3D'base' $col>$address</td>
-					<td width=3D'65%' class=3D'base' $col>$remark</td>
+					<td width=3D'20%' $col>$address</td>
+					<td width=3D'65%' $col>$remark</td>
=20
 					<td align=3D'center' $col>
 						<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
@@ -1323,12 +1319,10 @@ END
=20
 		# Section to add new elements or edit existing ones.
 print <<END;
-		<br>
-		<hr>
-		<br>
+		<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
+			<input type=3D'hidden' name=3D'ID' value=3D'$cgiparams{'ID'}'>
=20
-		<div align=3D'center'>
-			<table width=3D'100%'>
+			<table class=3D'form'>
 END
=20
 		# Assign correct headline and button text.
@@ -1339,30 +1333,36 @@ END
 		# Check if an ID (key) has been given, in this case an existing entry shou=
ld be edited.
 		if ($cgiparams{'ID'} ne '') {
 			$buttontext =3D $Lang::tr{'update'};
-				print "<tr><td class=3D'boldbase' colspan=3D'3'><b>$Lang::tr{'update'}</=
b></td></tr>\n";
+				print "<tr><td colspan=3D'2'><h6>$Lang::tr{'update'}</h6></td></tr>\n";
=20
 				# Grab address and remark for the given key.
 				$entry_address =3D $ignored{$cgiparams{'ID'}}[0];
 				$entry_remark =3D $ignored{$cgiparams{'ID'}}[1];
 			} else {
 				$buttontext =3D $Lang::tr{'add'};
-				print "<tr><td class=3D'boldbase' colspan=3D'3'><b>$Lang::tr{'dnsforward=
 add a new entry'}</b></td></tr>\n";
+				print "<tr><td colspan=3D'2'><h6>$Lang::tr{'dnsforward add a new entry'}=
</h6></td></tr>\n";
 			}
=20
 print <<END;
-				<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
-				<input type=3D'hidden' name=3D'ID' value=3D'$cgiparams{'ID'}'>
 				<tr>
-					<td width=3D'30%'>$Lang::tr{'ip address'}: </td>
-					<td width=3D'50%'><input type=3D'text' name=3D'IGNORE_ENTRY_ADDRESS' va=
lue=3D'$entry_address' size=3D'24' /></td>
+					<td>$Lang::tr{'ip address'}</td>
+					<td>
+						<input type=3D'text' name=3D'IGNORE_ENTRY_ADDRESS' value=3D'$entry_add=
ress' size=3D'24' />
+					</td>
+				</tr>
+
+				<tr>
+					<td>$Lang::tr{'remark'}</td>
+					<td>
+						<input type=3D'text' name=3DIGNORE_ENTRY_REMARK value=3D'$entry_remark=
' size=3D'24' />
+					</td>
+				</tr>
=20
-					<td width=3D'30%'>$Lang::tr{'remark'}: </td>
-					<td wicth=3D'50%'><input type=3D'text' name=3DIGNORE_ENTRY_REMARK value=
=3D'$entry_remark' size=3D'24' /></td>
-					<td align=3D'center' width=3D'20%'><input type=3D'submit' name=3D'WHITE=
LIST' value=3D'$buttontext' /></td>
+				<tr class=3D'action'>
+					<td colspan=3D'2'><input type=3D'submit' name=3D'WHITELIST' value=3D'$b=
uttontext' /></td>
 				</tr>
-				</form>
 			</table>
-		</div>
+		</form>
 END
=20
 	&Header::closebox();
--=20
2.39.2


--===============7687546132031323173==--