From f2a6844761c5e6bdf696a97f045bd21c3388eaef Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Fri, 4 Apr 2025 20:34:46 -0700
Subject: [PATCH] refactor: header background image support in
 DefaultPageLayout.php and default-base.css with CSS var

---
 emhttp/plugins/dynamix/include/DefaultPageLayout.php | 8 +++-----
 emhttp/plugins/dynamix/styles/default-base.css       | 5 +++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 623e4e207..7ccdd18b8 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -21,7 +21,7 @@ $themeHelper->updateDockerLogColor($docroot);
 
 $display['font'] = filter_var($_COOKIE['fontSize'] ?? $display['font'] ?? '',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 
-$header  = $display['header'];
+$header  = $display['header']; // keep $header, $backgnd vars for plugin backwards compatibility for the time being
 $backgnd = $display['background'];
 
 $config  = "/boot/config";
@@ -32,6 +32,7 @@ $wlan0   = file_exists('/sys/class/net/wlan0');
 $nchan = ['webGui/nchan/notify_poller','webGui/nchan/session_check'];
 if ($wlan0) $nchan[] = 'webGui/nchan/wlan0';
 $safemode = _var($var,'safeMode')=='yes';
+$banner = "$config/plugins/dynamix/banner.png";
 
 function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text\n",str_repeat("#",strlen($text)),"\n-->\n";}
 ?>
@@ -71,15 +72,12 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
   <?if ($display['font']):?>
     --custom-font-size: <?=$display['font']?>%;
   <?endif;?>
+  --customer-header-background-image: url(<?= file_exists($banner) ? autov($banner) : autov('/webGui/images/banner.png') ?>);
 }
 
 <?
 $tasks = find_pages('Tasks');
 $buttons = find_pages('Buttons');
-$banner = "$config/plugins/dynamix/banner.png";
-echo "#header.image{background-image:url(";
-echo file_exists($banner) ? autov($banner) : '/webGui/images/banner.png';
-echo ")}\n";
 if ($themeHelper->isSidebarTheme()) {
   foreach ($tasks as $button) if (isset($button['Code'])) echo ".nav-item a[href='/{$button['name']}']:before{content:'\\{$button['Code']}'}\n";
   echo ".nav-item.LockButton a:before{content:'\\e955'}\n";
diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index db0ba390f..9e476467e 100644
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -370,6 +370,11 @@ textarea {
     background-size: 100% 90px;
     background-repeat: no-repeat;
 }
+
+#header.image { /* .image is conditionally added by DefaultPageLayout.php */
+    background-image: var(--customer-header-background-image);
+}
+
 #header .logo {
     float: left;
     margin-left: 10px;