From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 14/20] suricata: Fix broken spacing in the settings section
Date: Tue, 10 Sep 2024 14:37:27 +0000
Message-ID: <20240910143748.3469271-15-michael.tremer@ipfire.org>
In-Reply-To: <20240910143748.3469271-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3968487932458133198=="
List-Id: <development.lists.ipfire.org>

--===============3968487932458133198==
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 | 45 +++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 00cc502f1..deebb3ad3 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -1017,30 +1017,29 @@ sub show_mainpage() {
=20
 	# Only show this area, if at least one ruleset provider is configured.
 	if (%used_providers) {
+		my $num_zones =3D scalar @network_zones;
=20
 print <<END
-
-		<br><br><h2>$Lang::tr{'settings'}</h2>
+		<br>
=20
 		<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
 			<table width=3D'100%' border=3D'0'>
 				<tr>
-					<td class=3D'base' colspan=3D'2'>
+					<td colspan=3D'$num_zones'>
 						<input type=3D'checkbox' name=3D'ENABLE_IDS' $checked{'ENABLE_IDS'}{'o=
n'}>&nbsp;$Lang::tr{'ids enable'}
 					</td>
-
-				</td>
 				</tr>
=20
-				<tr>
-					<td><br><br></td>
-					<td><br><br></td>
-					<td><br><br></td>
-					<td><br><br></td>
+				<tr> <!-- empty row for spacing -->
+					<td colspan=3D'$num_zones'>
+						&nbsp;
+					</td>
 				</tr>
=20
 				<tr>
-					<td colspan=3D'4'><b>$Lang::tr{'ids monitored interfaces'}</b><br></td>
+					<td colspan=3D'$num_zones'>
+						<b>$Lang::tr{'ids monitored interfaces'}</b>
+					</td>
 				</tr>
=20
 				<tr>
@@ -1068,21 +1067,29 @@ END
 				$checked_input =3D "checked =3D 'checked'";
 			}
=20
-			print "<td class=3D'base' width=3D'20%'>\n";
-			print "<input type=3D'checkbox' name=3D'ENABLE_IDS_$zone_upper' $checked_=
input>\n";
-			print "&nbsp;$Lang::tr{'enabled on'}<font color=3D'$colourhash{$zone}'> $=
Lang::tr{$zone_name}</font>\n";
-			print "</td>\n";
+			print <<END;
+				<td>
+					<label>
+						<input type=3D'checkbox' name=3D'ENABLE_IDS_$zone_upper' $checked_inpu=
t>
+						&nbsp; $Lang::tr{'enabled on'}<font color=3D'$colourhash{$zone}'> $Lan=
g::tr{$zone_name}</font>
+					</label>
+				</td>
+END
 		}
=20
 print <<END
 				</tr>
-			</table>
=20
-			<br><br>
+				<tr> <!-- empty row for spacing -->
+					<td colspan=3D'$num_zones'>
+						&nbsp;
+					</td>
+				</tr>
=20
-			<table width=3D'100%'>
 				<tr>
-					<td align=3D'right'><input type=3D'submit' name=3D'IDS' value=3D'$Lang:=
:tr{'save'}' /></td>
+					<td colspan=3D'$num_zones' align=3D'right'>
+						<input type=3D'submit' name=3D'IDS' value=3D'$Lang::tr{'save'}' />
+					</td>
 				</tr>
 			</table>
 		</form>
--=20
2.39.2


--===============3968487932458133198==--