From patchwork Thu Mar 2 14:11:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6662 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PSCvJ4v0xz3wk4 for ; Thu, 2 Mar 2023 14:21:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PSCj31fmYz3B; Thu, 2 Mar 2023 14:12:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PSChp22bnz30JZ; Thu, 2 Mar 2023 14:11:54 +0000 (UTC) Received: from mail01.ipfire.org (unknown [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PSChm3x37z30J5 for ; Thu, 2 Mar 2023 14:11:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PSChQ3BhNzRC; Thu, 2 Mar 2023 14:11:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1677766294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=q5wFj5+MbtAh88YCVOL9z8ShasQ4Idt3+PvQX445Bec=; b=/lC09PW1ojNQm+NWcFHJeWA6B4flxET3RJndxF1cbdj510KLPtLp8af49AasNBsBGpOpLN 2csg+H86S+arUfDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1677766294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=q5wFj5+MbtAh88YCVOL9z8ShasQ4Idt3+PvQX445Bec=; b=KOYrh9QDo4Vq5xkg8I2pqLbJCFU2inHEn5UyTKovr32m7+UWRVUtf5r/NHR97RCwa6JlxQ oXkyV/SKyiFG6D9fQOnw2Ux6YVrWRmeIN0Sa5zAeMQ29h3GAmoCNXcdT3Qf3w/SkOu7/Fr Gk0eyC2LXGuFXfWKiJV/ImktnuVbGF7GzRuNSjftRF8QHjw/gJzcSMiacm/cQ/P/IUFmAu PTWJkbLyCiPCt3L1lkCgNYDAv8+pZ3MklvL/tLvYaAsz0lqMDHM4Rh/XhuIKqD05ayqnHx HJzi8pkrzjdmVphibOXkeNs2ZWLmOXvgRr4Nt6FESGYrheKz9OKz3qOqif8tmw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2 1/2] dhcp.cgi: Fix for bug#10629 - update bgcolor to css Date: Thu, 2 Mar 2023 15:11:22 +0100 Message-Id: <20230302141123.3452532-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 anew in every location using the bgcolor or other colour variables. - I will submit patches to follow the same approach in all other WUI cgi pages 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 subnets 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 background-color - Tested on my vm testbed and confirmed to work. The Orange colour for IP's outside of the subnet now shows up. Fixes: Bug#10629 Tested-by: Adolf Belka Signed-off-by: Adolf Belka Reviewed-by: Bernhard Bitsch Tested-by: Bernhard Bitsch --- config/cfgroot/header.pl | 17 +++++++++++++++++ html/cgi-bin/dhcp.cgi | 23 ++++++++++++----------- 2 files changed, 29 insertions(+), 11 deletions(-) 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 = '#990099'; $Header::colourerr = '#FF0000'; $Header::viewsize = 150; $Header::errormessage = ''; +$Header::extraHead = < + .row-color20 { + background-color: $color{'color20'}; + } + .row-color22 { + background-color: $color{'color22'}; + } + .row-colouryellow { + background-color: $Header::colouryellow; + } + .cell-orange { + background-color: orange; + } + +END +; my %menuhash = (); my $menu = \%menuhash; %settings = (); 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 from GUI $dhcpsettings{'ADVOPT_ENABLED'} = 'on'; } -&Header::openpage($Lang::tr{'dhcp configuration'}, 1, ''); +### START PAGE ### +&Header::openpage($Lang::tr{'dhcp configuration'}, 1, $Header::extraHead); &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { @@ -843,11 +844,11 @@ foreach my $line (@current1) { } if ($dhcpsettings{'KEY1'} eq $key) { - print ""; + print ""; } elsif ($key % 2) { - print ""; + print ""; } else { - print ""; + print ""; } print <"; - $col="bgcolor='${Header::colouryellow}'"; + $col="class='row-colouryellow'"; } elsif ($key % 2) { print ""; - $col="bgcolor='$color{'color20'}'"; + $col="class='row-color20'"; } else { print ""; - $col="bgcolor='$color{'color22'}'"; + $col="class='row-color22'"; } my $TAG0 = ''; my $TAG1 = ''; @@ -1091,12 +1092,12 @@ foreach my $line (@current2) { $TAG3 = ''; } if ($ipoutside{$temp[1]} > 0) { - $TAG4 = "bgcolor='orange'" if ($dhcpsettings{'KEY2'} ne $key); + $TAG4 = "class='cell-orange'" if ($dhcpsettings{'KEY2'} ne $key); } print <$TAG2$temp[0]$TAG3 -$TAG0$temp[1]$TAG1 +$TAG0$temp[1]$TAG1 $temp[6]  $temp[3]  $temp[4]  @@ -1153,8 +1154,8 @@ print <   -   - $Lang::tr{'ip address outside subnets'} +   + $Lang::tr{'ip address outside subnets'}     $dup