fix: DefaultPageLayout patch rollback omits legacy header logo

pujitm · pujitm · commit 474bca3f7c32 · 2025-07-09T13:02:59.000-04:00
diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/DefaultPageLayout.php.modified.snapshot.php b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/DefaultPageLayout.php.modified.snapshot.php
@@ -711,7 +711,7 @@ function flashReport() {
   <div class="upgrade_notice" style="display:none"></div>
   <div id="header" class="<?=$display['banner']?>">
     <div class="logo">
-      <a href="https://unraid.net" target="_blank"><?readfile("$docroot/webGui/images/UN-logotype-gradient.svg")?></a>
+      
       <unraid-i18n-host><unraid-header-os-version></unraid-header-os-version></unraid-i18n-host>
     </div>
     <?include "$docroot/plugins/dynamix.my.servers/include/myservers2.php"?>
diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/default-page-layout.modification.ts b/api/src/unraid-api/unraid-file-modifier/modifications/default-page-layout.modification.ts
@@ -68,13 +68,22 @@ if (is_localhost() && !is_good_session()) {
     private addModalsWebComponent(source: string): string {
         return source.replace('<body>', '<body>\n<unraid-modals></unraid-modals>');
     }
+
+    private hideHeaderLogo(source: string): string {
+        return source.replace(
+            '<a href="https://unraid.net" target="_blank"><?readfile("$docroot/webGui/images/UN-logotype-gradient.svg")?></a>',
+            ''
+        );
+    }
+
     private applyToSource(fileContent: string): string {
         const transformers = [
             this.removeNotificationBell.bind(this),
             this.replaceToasts.bind(this),
             this.addToaster.bind(this),
             this.patchGuiBootAuth.bind(this),
             this.addModalsWebComponent.bind(this),
+            this.hideHeaderLogo.bind(this),
         ];
 
         return transformers.reduce((content, transformer) => transformer(content), fileContent);
diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-page-layout.patch b/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-page-layout.patch
@@ -53,7 +53,7 @@ Index: /usr/local/emhttp/plugins/dynamix/include/DefaultPageLayout.php
  }
  
  function closeNotifier() {
-@@ -695,10 +704,11 @@
+@@ -695,15 +704,16 @@
  });
  </script>
  <?include "$docroot/plugins/dynamix.my.servers/include/myservers1.php"?>
@@ -64,7 +64,13 @@ Index: /usr/local/emhttp/plugins/dynamix/include/DefaultPageLayout.php
    <div class="upgrade_notice" style="display:none"></div>
    <div id="header" class="<?=$display['banner']?>">
      <div class="logo">
-       <a href="https://unraid.net" target="_blank"><?readfile("$docroot/webGui/images/UN-logotype-gradient.svg")?></a>
+-      <a href="https://unraid.net" target="_blank"><?readfile("$docroot/webGui/images/UN-logotype-gradient.svg")?></a>
++      
+       <unraid-i18n-host><unraid-header-os-version></unraid-header-os-version></unraid-i18n-host>
+     </div>
+     <?include "$docroot/plugins/dynamix.my.servers/include/myservers2.php"?>
+   </div>
+   <a href="#" class="move_to_end" title="<?=_('Move To End')?>"><i class="fa fa-arrow-circle-down"></i></a>
 @@ -748,12 +758,12 @@
    }
    // create list of nchan scripts to be started
