header.pl: Add reference to colors.txt into header.pl

Message ID 20230316103403.3761-1-adolf.belka@ipfire.org
State Accepted
Commit a84b9ed2feb926681ad94273d8c2efc5d7b71b4f
Headers
Series header.pl: Add reference to colors.txt into header.pl |

Commit Message

Adolf Belka March 16, 2023, 10:34 a.m. UTC
  - With change of common css entries into header.pl with commit
   https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=b52a84ddc77f9db7e4ad7b129f21fbf528c6f990
   I had missed that color20 and color22 etc, that come from colors.txt, are not known in
   header.pl so that the alternate colours in tables were missing. Even though I tested the
   previous commit I obviously did not look well enough because I missed that the tables
   had no alternate colours. I just found it now when looking at Core Update 174 Testing.
- Confirmed by copying this version of header.pl into my CU174 Testing system and the
   alternate colour rows came back again as they should be. I am sure now that they are
   correct.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/cfgroot/header.pl | 3 +++
 1 file changed, 3 insertions(+)
  

Comments

Bernhard Bitsch March 17, 2023, 4:11 p.m. UTC | #1
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch@ipfire.org>

Am 16.03.2023 um 11:34 schrieb Adolf Belka:
> - With change of common css entries into header.pl with commit
>     https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=b52a84ddc77f9db7e4ad7b129f21fbf528c6f990
>     I had missed that color20 and color22 etc, that come from colors.txt, are not known in
>     header.pl so that the alternate colours in tables were missing. Even though I tested the
>     previous commit I obviously did not look well enough because I missed that the tables
>     had no alternate colours. I just found it now when looking at Core Update 174 Testing.
> - Confirmed by copying this version of header.pl into my CU174 Testing system and the
>     alternate colour rows came back again as they should be. I am sure now that they are
>     correct.
> 
> Tested-by: Adolf Belka <adolf.belka@ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>   config/cfgroot/header.pl | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
> index 955ed2646..3f80ce9b4 100644
> --- a/config/cfgroot/header.pl
> +++ b/config/cfgroot/header.pl
> @@ -17,6 +17,9 @@ use HTML::Entities();
>   use Socket;
>   use Time::Local;
>   
> +our %color = ();
> +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
> +
>   $|=1; # line buffering
>   
>   $Header::revision = 'final';
  

Patch

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 955ed2646..3f80ce9b4 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -17,6 +17,9 @@  use HTML::Entities();
 use Socket;
 use Time::Local;
 
+our %color = ();
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
+
 $|=1; # line buffering
 
 $Header::revision = 'final';