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: Modify CSS to allow additional rows
Date: Tue, 22 Dec 2020 21:06:44 +0100
Message-ID: <20201222200646.1609-2-hofmann@leo-andres.de>
In-Reply-To: <20201222200646.1609-1-hofmann@leo-andres.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6755058855363667024=="
List-Id: <development.lists.ipfire.org>

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

Simplify borders, load more colors from header and add dividers

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

diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index bf46ab0c7..13543d244 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -32,39 +32,59 @@ my $extraHead =3D <<END
 	table#zoneconf {
 		width: 100%;
 		border-collapse: collapse;
+		border-style: hidden;
 		table-layout: fixed;
 	}
=20
+	/* row height */
 	#zoneconf tr {
 		height: 4em;
 	}
+	/* section separators */
+	#zoneconf tr.divider-top {
+			border-top: 2px solid $Header::bordercolour;
+	}
+	#zoneconf tr.divider-bottom {
+			border-bottom: 2px solid $Header::bordercolour;
+	}
=20
+	/* table cells */
 	#zoneconf td {
 		padding: 5px 10px;
-		border: 0.5px solid black;
+		border-left: 0.5px solid $Header::bordercolour;
 		text-align: center;
 	}
=20
-	/* dark grey header cells */
+	/* grey header cells */
 	#zoneconf td.heading {
-		background-color: grey;
+		background-color: lightgrey;
 		color: white;
 	}=09
-	#zoneconf td.heading::first-line {
+	#zoneconf td.heading.bold::first-line {
 		font-weight: bold;
 		line-height: 1.6;
 	}
=20
-	/* narrow left column */
+	/* narrow left column with background color */
 	#zoneconf tr > td:first-child {
 		width: 11em;
 	}
+	#zoneconf tr.nic-row > td:first-child {
+			background-color: darkgray;
+	}
+	#zoneconf tr.nic-row {
+		border-bottom: 0.5px solid $Header::bordercolour;
+	}
=20
 	/* alternating row background color */
+	#zoneconf tr {
+		background-color: $Header::table2colour;
+	}
 	#zoneconf tr:nth-child(2n+3) {
-		background-color: #F0F0F0;
+		background-color: $Header::table1colour;
 	}
=20
+	/* special cell colors */
 	#zoneconf td.green {
 		background-color: $Header::colourgreen;
 	}
@@ -83,8 +103,6 @@ my $extraHead =3D <<END
=20
 	#zoneconf td.topleft {
 		background-color: $Header::pagecolour;
-		border-top-style: none;
-		border-left-style: none;
 	}
=20
 	input.vlanid {
@@ -324,7 +342,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {
 print <<END
 <form method=3D'post' enctype=3D'multipart/form-data'>
 	<table id=3D"zoneconf">
-	<tr>
+	<tr class=3D"divider-bottom">
 		<td class=3D"topleft"></td>
 END
 ;
@@ -359,7 +377,7 @@ foreach (@zones) {
 	}
=20
 	print <<END
-		<td class=3D'heading $_'>$uc<br>
+		<td class=3D'heading bold $_'>$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>
@@ -378,8 +396,8 @@ foreach (@nics) {
 	my $nic =3D $_->[1];
 	my $wlan =3D $_->[2];
=20
-	print "\t<tr>\n";
-	print "\t\t<td class=3D'heading'>$nic<br>$mac</td>\n";
+	print "\t<tr class=3D'nic-row'>\n";
+	print "\t\t<td class=3D'heading bold'>$nic<br>$mac</td>\n";
=20
 	# Iterate through all zones and check if the current NIC is assigned to it
 	foreach (@zones) {
--=20
2.27.0.windows.1


--===============6755058855363667024==--