From b1e87c61a8505540e6f755420f5815ad9c6f7cf2 Mon Sep 17 00:00:00 2001
From: Nikita Hovratov <nikita.h@live.de>
Date: Thu, 29 Feb 2024 12:03:11 +0100
Subject: [PATCH] [BUGFIX] Use f:uri.resource over image ViewHelper for static
 assets

Fixes: #622
---
 Resources/Private/Partials/List/Footer.html        | 4 ++--
 Resources/Private/Partials/List/Header.html        | 2 +-
 Resources/Private/Templates/Wizard/Main.html       | 2 +-
 Resources/Private/Templates/Wizard/MainLegacy.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Private/Partials/List/Footer.html b/Resources/Private/Partials/List/Footer.html
index 49f11e62..de6fa69f 100644
--- a/Resources/Private/Partials/List/Footer.html
+++ b/Resources/Private/Partials/List/Footer.html
@@ -2,7 +2,7 @@
     <div class="mask-footer__column mask-footer__column--left">
         <div class="mask-footer__item mask-footer__item--first">
             <div class="mask-footer__version">
-                <img src="{f:uri.image(src: 'EXT:mask/Resources/Public/Images/legacy-icon.gif')}" alt="Mask legacy icon" title="&#128489; Have fun with Mask!"/>v{{ version }}
+                <img src="{f:uri.resource(path: 'EXT:mask/Resources/Public/Images/legacy-icon.gif')}" alt="Mask legacy icon" title="&#128489; Have fun with Mask!"/>v{{ version }}
             </div>
         </div>
         <div class="mask-footer__separator"></div>
@@ -27,7 +27,7 @@
         <div class="mask-footer__item">
             <a href="https://tvconverter.webprofil.at/" target="_blank" class="templa" title="Go to https://tvconverter.webprofil.at/">
                 <div class="templa__wrap">
-                    <img src="{f:uri.image(src: 'EXT:mask/Resources/Public/Images/Logo_TVconverter.png')}" width="120" alt="TemplaVoila to Mask" class="templa__image img-fluid"/>
+                    <img src="{f:uri.resource(path: 'EXT:mask/Resources/Public/Images/Logo_TVconverter.png')}" width="120" alt="TemplaVoila to Mask" class="templa__image img-fluid"/>
                     <div>
                         <div class="templa__header">TemplaVoila to Mask</div>
                         <p class="templa__text">Convert the entire content of your old project to Mask.</p>
diff --git a/Resources/Private/Partials/List/Header.html b/Resources/Private/Partials/List/Header.html
index 6a5f4465..f4f32092 100644
--- a/Resources/Private/Partials/List/Header.html
+++ b/Resources/Private/Partials/List/Header.html
@@ -1,6 +1,6 @@
 <div class="mask-list__header">
     <div class="mask-list__logo-wrap">
-        <f:image src="EXT:mask/Resources/Public/Icons/Extension.svg" class="mask-list__logo"/> <span class="mask-list__label">Mask</span>
+        <img src="{f:uri.resource(path: 'EXT:mask/Resources/Public/Icons/Extension.svg')}" width="156" height="156" class="mask-list__logo" alt="Mask Logo"> <span class="mask-list__label">Mask</span>
     </div>
     <div class="mask-list__docs">
         <a href="https://docs.typo3.org/p/mask/mask/main/en-us/" target="_blank">Documentation <i class="fa fa-book"></i></a>
diff --git a/Resources/Private/Templates/Wizard/Main.html b/Resources/Private/Templates/Wizard/Main.html
index 15cc2ab5..aa4e48f3 100644
--- a/Resources/Private/Templates/Wizard/Main.html
+++ b/Resources/Private/Templates/Wizard/Main.html
@@ -6,6 +6,6 @@
             <f:render partial="Edit" arguments="{_all}"/>
         </div>
         <f:render partial="List" arguments="{_all}"/>
-        <splashscreen :loaded="loaded" logo-path="{f:uri.image(src: 'EXT:mask/Resources/Public/Icons/MaskUkraine.svg')}"></splashscreen>
+        <splashscreen :loaded="loaded" logo-path="{f:uri.resource(path: 'EXT:mask/Resources/Public/Icons/MaskUkraine.svg')}"></splashscreen>
     </div>
 </f:section>
diff --git a/Resources/Private/Templates/Wizard/MainLegacy.html b/Resources/Private/Templates/Wizard/MainLegacy.html
index d1c2b6c1..d10cce07 100644
--- a/Resources/Private/Templates/Wizard/MainLegacy.html
+++ b/Resources/Private/Templates/Wizard/MainLegacy.html
@@ -3,5 +3,5 @@
         <f:render partial="Edit" arguments="{_all}"/>
     </div>
     <f:render partial="List" arguments="{_all}"/>
-    <splashscreen :loaded="loaded" logo-path="{f:uri.image(src: 'EXT:mask/Resources/Public/Icons/MaskUkraine.svg')}"></splashscreen>
+    <splashscreen :loaded="loaded" logo-path="{f:uri.resource(path: 'EXT:mask/Resources/Public/Icons/MaskUkraine.svg')}"></splashscreen>
 </div>