From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH v2 1/2] dhcp.cgi: Fix for bug#10629 - update bgcolor to css
Date: Fri, 03 Mar 2023 19:11:57 +0100
Message-ID: <65e02a2d-65b8-be8c-b365-f916186d0880@ipfire.org>
In-Reply-To: <20230302141123.3452532-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0795963825481899729=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 02.03.2023 um 15:11 schrieb Adolf Belka:
> - This v2 version moves the extraHead variable to header.pl as many of the =
css values
>     will be used in many other WUI cgi pages so makes sense to not define a=
new in every
>     location using the bgcolor or other colour variables.
> - I will submit patches to follow the same approach in all other WUI cgi pa=
ges once this
>     has been submitted into next
> - bgcolor was deprecated in HTML 4.01 and is not supported by HTML 5
> - The orange colour for IP's that are outside the IPFire green and blue sub=
nets does not
>     work on any browser I am using.
> - I used the CSS approach that @Leo used in the Zone Configuration cgi page
> - This patch changes all existing bgcolor entries to the css based backgrou=
nd-color
> - Tested on my vm testbed and confirmed to work. The Orange colour for IP's=
 outside of
>     the subnet now shows up.
>=20
> Fixes: Bug#10629
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   config/cfgroot/header.pl | 17 +++++++++++++++++
>   html/cgi-bin/dhcp.cgi    | 23 ++++++++++++-----------
>   2 files changed, 29 insertions(+), 11 deletions(-)
>=20
> diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
> index 3956d80a1..b25f83e26 100644
> --- a/config/cfgroot/header.pl
> +++ b/config/cfgroot/header.pl
> @@ -41,6 +41,23 @@ $Header::colourvpn =3D '#990099';
>   $Header::colourerr =3D '#FF0000';
>   $Header::viewsize =3D 150;
>   $Header::errormessage =3D '';
> +$Header::extraHead =3D <<END
> +<style>
> +	.row-color20 {
> +		background-color: $color{'color20'};
> +	}
> +	.row-color22 {
> +		background-color: $color{'color22'};
> +	}
> +	.row-colouryellow {
> +		background-color: $Header::colouryellow;
> +	}
> +	.cell-orange {
> +		background-color: orange;
> +	}		=09
> +</style>
> +END
> +;
>   my %menuhash =3D ();
>   my $menu =3D \%menuhash;
>   %settings =3D ();
> diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
> index 125713285..4d4c21a7f 100644
> --- a/html/cgi-bin/dhcp.cgi
> +++ b/html/cgi-bin/dhcp.cgi
> @@ -547,7 +547,8 @@ if ($dhcpsettings{'ACTION'} eq '' ) { # First launch fr=
om GUI
>       $dhcpsettings{'ADVOPT_ENABLED'} =3D 'on';
>       }
>  =20
> -&Header::openpage($Lang::tr{'dhcp configuration'}, 1, '');
> +### START PAGE ###
> +&Header::openpage($Lang::tr{'dhcp configuration'}, 1, $Header::extraHead);
>   &Header::openbigbox('100%', 'left', '', $errormessage);
>  =20
>   if ($errormessage) {
> @@ -843,11 +844,11 @@ foreach my $line (@current1) {
>       }
>  =20
>       if ($dhcpsettings{'KEY1'} eq $key) {
> -	print "<tr bgcolor=3D'${Header::colouryellow}'>";
> +	print "<tr class=3D'row-colouryellow'>";
>       } elsif ($key % 2) {
> -	print "<tr bgcolor=3D'$color{'color22'}'>";
> +	print "<tr class=3D'row-color22'>";
>       } else {
> -	print "<tr bgcolor=3D'$color{'color20'}'>";
> +	print "<tr class=3D'row-color20'>";
>       }
>  =20
>       print <<END
> @@ -1069,13 +1070,13 @@ foreach my $line (@current2) {
>  =20
>       if ($dhcpsettings{'KEY2'} eq $key) {
>   	print "<tr>";
> -	$col=3D"bgcolor=3D'${Header::colouryellow}'";
> +	$col=3D"class=3D'row-colouryellow'";
>       } elsif ($key % 2) {
>   	print "<tr>";
> -	$col=3D"bgcolor=3D'$color{'color20'}'";
> +	$col=3D"class=3D'row-color20'";
>       } else {
>   	print "<tr>";
> -	$col=3D"bgcolor=3D'$color{'color22'}'";
> +	$col=3D"class=3D'row-color22'";
>       }
>       my $TAG0 =3D '';
>       my $TAG1 =3D '';
> @@ -1091,12 +1092,12 @@ foreach my $line (@current2) {
>   	$TAG3 =3D '</b>';
>       }
>       if ($ipoutside{$temp[1]} > 0) {
> -	$TAG4 =3D "bgcolor=3D'orange'" if ($dhcpsettings{'KEY2'} ne $key);
> +	$TAG4 =3D "class=3D'cell-orange'" if ($dhcpsettings{'KEY2'} ne $key);
>       }
>  =20
>       print <<END
>   <td align=3D'center' $col>$TAG2$temp[0]$TAG3</td>
> -<td align=3D'center' $col $TAG4>$TAG0$temp[1]$TAG1</td>
> +<td align=3D'center' $TAG4 $col>$TAG0$temp[1]$TAG1</td>
>   <td align=3D'center' $col>$temp[6]&nbsp;</td>
>   <td align=3D'center' $col>$temp[3]&nbsp;</td>
>   <td align=3D'center' $col>$temp[4]&nbsp;</td>
> @@ -1153,8 +1154,8 @@ print <<END
>   </tr>
>   <tr>
>   	<td>&nbsp;</td>
> -	<td bgcolor=3D'orange'>&nbsp;</td>
> -	<td class=3D'base'>$Lang::tr{'ip address outside subnets'}</td>
> +	<td>&nbsp;</td>
> +	<td class=3D'base cell-orange'>$Lang::tr{'ip address outside subnets'}</t=
d>
>   	<td>&nbsp;</td>
>   	<td>&nbsp;</td>
>   	$dup

--===============0795963825481899729==--