From 574906606103c735050bfee86e1be9b7b7411575 Mon Sep 17 00:00:00 2001
From: Tom Mortensen <tomm@lime-technology.com>
Date: Wed, 22 Jul 2026 13:19:25 -0700
Subject: [PATCH 1/2] Revert "Merge pull request #2689 from
 unraid/feat/consolidated-header"

This reverts commit 8dd7b347302deef5dd14b66c6c7f0f0f178e0603, reversing
changes made to 369f0b2994584a6b6c8e6e570f5f86401d289234.
---
 emhttp/plugins/dynamix/DisplaySettings.page   |  6 ---
 emhttp/plugins/dynamix/default.cfg            |  1 -
 .../include/DefaultPageLayout/Header.php      | 50 +------------------
 .../plugins/dynamix/styles/default-base.css   | 38 +-------------
 4 files changed, 2 insertions(+), 93 deletions(-)

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 30117fb823..741f173212 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -260,12 +260,6 @@ _(Dynamix color theme)_:
   <?endforeach; // $themeHelper set in DefaultPageLayout.php ?>
   </select>
 
-_(Header logo style)_:
-: <select name="headerLogo">
-  <?=mk_option($display['headerLogo'] ?? "", "", _('Gradient'))?>
-  <?=mk_option($display['headerLogo'] ?? "", "theme", _('Theme adaptive'))?>
-  </select>
-
 _(Used / Free columns)_:
 : <select name="text">
   <?=mk_option($display['text'], "0", _('Text'))?>
diff --git a/emhttp/plugins/dynamix/default.cfg b/emhttp/plugins/dynamix/default.cfg
index d862d7fcde..d10aee010e 100644
--- a/emhttp/plugins/dynamix/default.cfg
+++ b/emhttp/plugins/dynamix/default.cfg
@@ -29,7 +29,6 @@ hotssd="60"
 maxssd="70"
 power=""
 theme="white"
-headerLogo=""
 locale=""
 raw=""
 rtl=""
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index f557e2ca30..579dd637df 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -1,55 +1,7 @@
-<?php
-// Unraid 7.3+ ships a single consolidated header web component (<unraid-header>)
-// that owns the whole header and its responsive layout. Older releases keep the
-// legacy multi-component header (logo/version + user profile) as a fallback.
-$headerOsVersion = @parse_ini_file('/etc/unraid-version')['version'] ?? '0';
-$headerUseConsolidated = version_compare($headerOsVersion, '7.3', '>=');
-$headerClass = trim($display['banner'] . ($headerUseConsolidated ? ' unraid-consolidated-header' : ''));
-?>
-<div id="header" class="<?=$headerClass?>">
-<?php if ($headerUseConsolidated): ?>
-    <?php
-        require_once "$docroot/plugins/dynamix.my.servers/include/state.php";
-        $headerServerState = new ServerState();
-    ?>
-    <script>
-    window.LOCALE = <?= json_encode($_SESSION['locale'] ?? 'en_US', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP) ?>;
-    </script>
-    <?php
-        // The consolidated header owns the array-usage bar for sidebar themes,
-        // where the legacy #array-usage-sidenav widget used to be injected.
-        $headerShowArrayUsage = ($display['usage'] && $themeHelper->isSidebarTheme()) ? 'true' : 'false';
-        $headerLogoStyle = (($display['headerLogo'] ?? '') === 'theme') ? 'theme' : '';
-    ?>
-    <style>
-        /* Light-DOM fallback: paint the logo before <unraid-header> mounts so the
-           header does not pop in on page load. #header is already
-           display:flex; align-items:center, so the logo lands left + vertically
-           centered where the mounted logo sits. The mount engine calls
-           replaceChildren(), so this markup is discarded when the component
-           upgrades. */
-        #header.unraid-consolidated-header .unraid-header-boot-logo {
-            display: inline-flex;
-            align-items: center;
-        }
-        #header.unraid-consolidated-header .unraid-header-boot-logo img {
-            width: 14rem;
-            max-width: 100%;
-            max-height: 3rem;
-            height: auto;
-            object-fit: contain;
-        }
-    </style>
-    <unraid-header
-        server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"
-        show-array-usage="<?= $headerShowArrayUsage ?>"
-        header-logo-style="<?= $headerLogoStyle ?>"
-    ><a class="unraid-header-boot-logo" href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><img src="/webGui/images/UN-logotype-gradient.svg" alt="Unraid" /></a></unraid-header>
-<?php else: ?>
+<div id="header" class="<?=$display['banner']?>">
     <unraid-header-os-version></unraid-header-os-version>
     <? if ($display['usage'] && $themeHelper->isSidebarTheme()): ?>
         <span id='array-usage-sidenav'></span>
     <? endif; ?>
     <?include "$docroot/plugins/dynamix.my.servers/include/myservers2.php"?>
-<?php endif; ?>
 </div>
diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index be0b8dba8a..6dfa65cea8 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -476,33 +476,6 @@ textarea:where(:not(.unapi *)) {
     align-self: stretch;
 }
 
-#header.unraid-consolidated-header {
-    align-items: stretch;
-    gap: 0;
-    min-height: 86px;
-    padding-left: 0;
-    background-size: 100% 86px;
-}
-
-#header.unraid-consolidated-header unraid-header {
-    align-self: stretch;
-    display: block;
-    width: 100%;
-}
-
-#header.unraid-consolidated-header #UnraidHeader {
-    min-height: inherit;
-    padding: .5rem 1rem;
-}
-
-#header.unraid-consolidated-header .block {
-    background-color: transparent;
-    float: none;
-    margin: 0;
-    padding: 0;
-    text-align: inherit;
-}
-
 /**
  * Tools page, rotate the Downgrade icon to prevent needing to add a new icon to the icon font.
  * The pseudo element is targeted here otherwise the rotation of the span would mess up spacing with the text.
@@ -2434,15 +2407,6 @@ div#title.ud {
         padding-left: 80px;
     }
 
-    #header.unraid-consolidated-header {
-        padding-left: 0;
-    }
-
-    #header.unraid-consolidated-header #UnraidHeader {
-        padding-left: calc(64px + 1rem);
-        padding-right: 1rem;
-    }
-
     #header .logo {
         margin-left: 0;
         color: var(--brand-red);
@@ -2850,4 +2814,4 @@ div#title.ud {
     label.checkbox input:checked ~ .checkmark {
         background-color: var(--brand-orange);
     }
-}
+}
\ No newline at end of file

From ff8f6e8db99854e6c1a6f758f8f7ef975543dca6 Mon Sep 17 00:00:00 2001
From: chodeus <dhoges90@icloud.com>
Date: Tue, 14 Jul 2026 15:59:59 +0800
Subject: [PATCH 2/2] fix: don't delete the shared default docker icon when
 removing an icon-less container

Containers with no template icon get /plugins/dynamix.docker.manager/images/question.png
recorded as their icon in the webui-info registry (DockerClient.php L346). removeContainer()
then unlinks that recorded path when cache flags are set, deleting the shared fallback from
the docroot for the whole system until the next reboot. CA Docker Auto-Update triggers this
whenever it updates an icon-less container.

Also quote and guard the container-list onerror fallback (this.onerror=null) so a missing
fallback degrades to one failed request per image instead of an endless 404 retry loop.

Fixes #2691

(cherry picked from commit 6f28eb66e4dc3002c1cc9cb2a656967c35cae333)
---
 emhttp/plugins/dynamix.docker.manager/include/DockerClient.php | 3 ++-
 .../dynamix.docker.manager/include/DockerContainers.php        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
index fc51e1ae2a..28b20c0248 100755
--- a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -898,7 +898,8 @@ public function removeContainer($name, $id=false, $cache=false) {
 		// Attempt to remove container
 		$this->getDockerJSON("/containers/$id?force=1", 'DELETE', $code);
 		if (isset($info[$name])) {
-			if (isset($info[$name]['icon'])) {
+			// never unlink the shared default icon recorded for icon-less containers
+			if (isset($info[$name]['icon']) && $info[$name]['icon'] != '/plugins/dynamix.docker.manager/images/question.png') {
 				$iconRAM = $docroot.$info[$name]['icon'];
 				$iconUSB = str_replace($dockerManPaths['images-ram'], $dockerManPaths['images'], $iconRAM);
 				if ($cache>=1 && is_file($iconRAM)) unlink($iconRAM);
diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
index ca2d0918dc..c6768f5c50 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
@@ -97,7 +97,7 @@ function my_lang_log($text) {
   $color = $status=='started' ? 'green-text' : ($status=='paused' ? 'orange-text' : 'red-text');
   $update = $updateStatus==1 && !empty($compose) ? 'blue-text' : '';
   $icon = $info['icon'] ?: '/plugins/dynamix.docker.manager/images/question.png';
-  $image = substr($icon,-4)=='.png' ? "<img src='$icon?".filemtime("$docroot{$info['icon']}")."' class='img' onerror=this.src='/plugins/dynamix.docker.manager/images/question.png';>" : (substr($icon,0,5)=='icon-' ? "<i class='$icon img'></i>" : "<i class='fa fa-$icon img'></i>");
+  $image = substr($icon,-4)=='.png' ? "<img src='$icon?".filemtime("$docroot{$info['icon']}")."' class='img' onerror=\"this.onerror=null;this.src='/plugins/dynamix.docker.manager/images/question.png';\">" : (substr($icon,0,5)=='icon-' ? "<i class='$icon img'></i>" : "<i class='fa fa-$icon img'></i>");
   $wait = var_split($autostart[array_search($name,$names)]??'',1);
   $networks = [];
   $network_ips = [];