From 0b9c38e59c087cfbc519fffffd4670314d624a9e Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Tue, 21 Dec 2021 18:47:50 +0100
Subject: [PATCH] [TASK] Use EXT: syntax with f:uri.resource
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
To stick to best practice, the patch adapts all
f:uri.resource ViewHelper usages to "EXT:" syntax.
Resolves: #96423
Related: #96414
Releases: main
Change-Id: Icba87d954f939a42ca59fbe78e7c932f0228f11e
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72766
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Simon Gilli <typo3@gilbertsoft.org>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Simon Gilli <typo3@gilbertsoft.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Resources/Private/Partials/About/Logo.html | 2 +-
.../Resources/Private/Layouts/SystemEmail.html | 4 ++--
.../Widget/T3GeneralInformationWidget.html | 2 +-
.../Resources/Private/Templates/Uploads.html | 4 ++--
.../Private/Templates/Environment/Cards.html | 12 ++++++------
.../Private/Templates/Installer/Init.html | 8 ++++----
.../Private/Templates/Installer/MainLayout.html | 2 +-
.../Resources/Private/Templates/Layout/Init.html | 8 ++++----
.../Private/Templates/Layout/MainLayout.html | 2 +-
.../Login/ShowEnableInstallToolFile.html | 2 +-
.../Private/Templates/Login/ShowLogin.html | 2 +-
.../Private/Templates/Maintenance/Cards.html | 16 ++++++++--------
.../Private/Templates/Settings/Cards.html | 12 ++++++------
.../Private/Templates/Upgrade/Cards.html | 14 +++++++-------
.../Resources/Private/Layouts/DocHeader.html | 2 +-
.../Private/Templates/Preview/Index.html | 2 +-
16 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Private/Partials/About/Logo.html b/typo3/sysext/backend/Resources/Private/Partials/About/Logo.html
index 915e15c0f0d6..1b72fd08a47a 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/About/Logo.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/About/Logo.html
@@ -1,4 +1,4 @@
-<img src="{f:uri.resource(path: 'Images/typo3_orange.svg', extensionName: 'core')}" width="150"
+<img src="{f:uri.resource(path: 'EXT:core/Resources/Public/Images/typo3_orange.svg')}" width="150"
alt="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/Modules/about.xlf:typo3_logo')}" />
<br>
<br>
diff --git a/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.html b/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.html
index 3066b2cdfc99..16f5ac582d4d 100644
--- a/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.html
+++ b/typo3/sysext/core/Resources/Private/Layouts/SystemEmail.html
@@ -355,10 +355,10 @@
<img src="{typo3.systemConfiguration.backend.loginLogo -> core:normalizedUrl()}" alt="TYPO3 Logo" height="41" width="150" />
</f:then>
<f:else if="{typo3.systemConfiguration.backend.loginHighlightColor}">
- <img src="{normalizedParams.siteUrl}{f:uri.resource(extensionName: 'core', path: 'Images/typo3_black.svg')}" alt="TYPO3 Logo" height="41" width="150" />
+ <img src="{normalizedParams.siteUrl}{f:uri.resource(path: 'EXT:core/Resources/Public/Images/typo3_black.svg')}" alt="TYPO3 Logo" height="41" width="150" />
</f:else>
<f:else>
- <img src="{normalizedParams.siteUrl}{f:uri.resource(extensionName: 'core', path: 'Images/typo3_orange.svg')}" alt="TYPO3 Logo" height="41" width="150" />
+ <img src="{normalizedParams.siteUrl}{f:uri.resource(path: 'EXT:core/Resources/Public/Images/typo3_orange.svg')}" alt="TYPO3 Logo" height="41" width="150" />
</f:else>
</f:if>
</td>
diff --git a/typo3/sysext/dashboard/Resources/Private/Templates/Widget/T3GeneralInformationWidget.html b/typo3/sysext/dashboard/Resources/Private/Templates/Widget/T3GeneralInformationWidget.html
index 8d85e1cce2f7..f0d483e17b02 100644
--- a/typo3/sysext/dashboard/Resources/Private/Templates/Widget/T3GeneralInformationWidget.html
+++ b/typo3/sysext/dashboard/Resources/Private/Templates/Widget/T3GeneralInformationWidget.html
@@ -17,7 +17,7 @@
</f:if>
</div>
<div class="col-sm-4">
- <img src="{f:uri.resource(path: 'Images/typo3_orange.svg', extensionName: 'core')}"
+ <img src="{f:uri.resource(path: 'EXT:core/Resources/Public/Images/typo3_orange.svg')}"
class="widget-t3information-logo"
alt="{f:translate(key:'widgets.t3information.logo', extensionName: 'dashboard')}"/>
</div>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html
index 00bbd90d9a59..f06872134bd6 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html
@@ -7,7 +7,7 @@
<f:for each="{files}" as="file" iteration="fileIterator">
<li>
<f:if condition="{data.uploads_type} == 1">
- <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
+ <img src="{f:uri.resource(path: 'EXT:frontend/Resources/Public/Icons/FileIcons/{file.extension}.gif')}" alt="">
</f:if>
<f:if condition="{data.uploads_type} == 2">
<f:if condition="{file.type} > 1">
@@ -18,7 +18,7 @@
</a>
</f:then>
<f:else>
- <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
+ <img src="{f:uri.resource(path: 'EXT:frontend/Resources/Public/Icons/FileIcons/{file.extension}.gif')}" alt="">
</f:else>
</f:if>
</f:if>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Environment/Cards.html b/typo3/sysext/install/Resources/Private/Templates/Environment/Cards.html
index f91e22a014f9..9b6ce396a63f 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Environment/Cards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Environment/Cards.html
@@ -4,7 +4,7 @@
<div class="card-container">
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Environment Overview', subtitle: 'Environment', icon: 'Icons/modules/install-show-environment.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Environment Overview', subtitle: 'Environment', icon: 'EXT:install/Resources/Public/Icons/modules/install-show-environment.svg'}" />
<div class="card-body">
<p class="card-text">Gives an overview of your host environment including its web server, PHP version, selected database and the application context.</p>
</div>
@@ -13,7 +13,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Environment Status', subtitle: 'PHP', icon: 'Icons/modules/install-test-environment.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Environment Status', subtitle: 'PHP', icon: 'EXT:install/Resources/Public/Icons/modules/install-test-environment.svg'}" />
<div class="card-body">
<p class="card-text">Analyzes your host environment, identifying any issues that may prevent TYPO3 from running correctly.</p>
</div>
@@ -22,7 +22,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Directory Status', subtitle: 'Permissions', icon: 'Icons/modules/install-check-directory.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Directory Status', subtitle: 'Permissions', icon: 'EXT:install/Resources/Public/Icons/modules/install-check-directory.svg'}" />
<div class="card-body">
<p class="card-text">Analyzes your folder structure, checking files and directories for correct permissions and identifying any files or directories that may be missing from your installation.</p>
</div>
@@ -31,7 +31,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'PHP Info', subtitle: 'PHP', icon: 'Icons/modules/install-php-info.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'PHP Info', subtitle: 'PHP', icon: 'EXT:install/Resources/Public/Icons/modules/install-php-info.svg'}" />
<div class="card-body">
<p class="card-text">Outputs detailed information about your installation of PHP. Including version details and enabled PHP extensions.</p>
</div>
@@ -40,7 +40,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Test Mail Setup', subtitle: 'Mail', icon: 'Icons/modules/install-test-mail.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Test Mail Setup', subtitle: 'Mail', icon: 'EXT:install/Resources/Public/Icons/modules/install-test-mail.svg'}" />
<div class="card-body">
<p class="card-text">Test your mail configuration by sending out a dummy email via TYPO3.</p>
</div>
@@ -49,7 +49,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Image Processing', subtitle: 'Image Processing', icon: 'Icons/modules/install-test-image.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Image Processing', subtitle: 'Image Processing', icon: 'EXT:install/Resources/Public/Icons/modules/install-test-image.svg'}" />
<div class="card-body">
<p class="card-text">Creates test images and compares them against a set of reference images to help ensure that image processing is working correctly within your environment.</p>
</div>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/Init.html b/typo3/sysext/install/Resources/Private/Templates/Installer/Init.html
index c3f74cb5a367..952b1d7137ca 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/Init.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/Init.html
@@ -4,10 +4,10 @@
<title>Installing TYPO3 CMS</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <link rel="stylesheet" href="{f:uri.resource(path: 'Css/backend.css', extensionName: 'backend')}?{bust}" />
- <link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'Icons/favicon.ico')}?{bust}" />
+ <link rel="stylesheet" href="{f:uri.resource(path: 'EXT:backend/Resources/Public/Css/backend.css')}?{bust}" />
+ <link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'EXT:install/Resources/Public/Icons/favicon.ico')}?{bust}" />
</head>
<body class="backend t3js-body install-tool-installer typo3-install" data-package-resource-paths="{packageResourcePaths -> f:format.json()}"></body>
-<script src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}" data-bust="{bust}" data-init="TYPO3/CMS/Install/Installer"></script>
-<script src="{f:uri.resource(path: 'JavaScript/Contrib/require.js', extensionName: 'Core')}?{bust}"></script>
+<script src="{f:uri.resource(path: 'EXT:install/Resources/Public/JavaScript/RequireJSConfig.js')}?{bust}" data-bust="{bust}" data-init="TYPO3/CMS/Install/Installer"></script>
+<script src="{f:uri.resource(path: 'EXT:core/Resources/Public/JavaScript/Contrib/require.js')}?{bust}"></script>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Installer/MainLayout.html b/typo3/sysext/install/Resources/Private/Templates/Installer/MainLayout.html
index d10394412655..b445472bef74 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Installer/MainLayout.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Installer/MainLayout.html
@@ -2,7 +2,7 @@
<div class="typo3-install-container">
<div class="typo3-install-content">
<div class="typo3-install-content-header">
- <img src="{f:uri.resource(path: 'Images/typo3_orange.svg', extensionName: 'core')}" width="130" class="typo3-install-content-header-logo" />
+ <img src="{f:uri.resource(path: 'EXT:core/Resources/Public/Images/typo3_orange.svg')}" width="130" class="typo3-install-content-header-logo" />
<h1>Installing TYPO3 CMS</h1>
</div>
<div class="typo3-install-content-progress">
diff --git a/typo3/sysext/install/Resources/Private/Templates/Layout/Init.html b/typo3/sysext/install/Resources/Private/Templates/Layout/Init.html
index 21ec5b141505..a9c40c12f581 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Layout/Init.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Layout/Init.html
@@ -4,8 +4,8 @@
<title>Install Tool on site {siteName}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <link rel="stylesheet" href="{f:uri.resource(path: 'Css/backend.css', extensionName: 'backend')}?{bust}" />
- <link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'Icons/favicon.ico')}?{bust}" />
+ <link rel="stylesheet" href="{f:uri.resource(path: 'EXT:backend/Resources/Public/Css/backend.css')}?{bust}" />
+ <link rel="icon" type="image/vnd.microsoft.icon" href="{f:uri.resource(path: 'EXT:install/Resources/Public/Icons/favicon.ico')}?{bust}" />
</head>
<body class="backend install-tool-init t3js-body scaffold t3js-scaffold scaffold-modulemenu-expanded" data-controller="{controller}" data-context="{context}" data-package-resource-paths="{packageResourcePaths -> f:format.json()}">
<div>
@@ -14,7 +14,7 @@
<h2 id="t3js-ui-block-detail">Initializing</h2>
</div>
</div>
-<script src="{f:uri.resource(path: 'JavaScript/RequireJSConfig.js')}?{bust}" data-bust="{bust}" data-init="TYPO3/CMS/Install/Install"></script>
-<script src="{f:uri.resource(path: 'JavaScript/Contrib/require.js', extensionName: 'Core')}?{bust}"></script>
+<script src="{f:uri.resource(path: 'EXT:install/Resources/Public/JavaScript/RequireJSConfig.js')}?{bust}" data-bust="{bust}" data-init="TYPO3/CMS/Install/Install"></script>
+<script src="{f:uri.resource(path: 'EXT:core/Resources/Public/JavaScript/Contrib/require.js')}?{bust}"></script>
</body>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Layout/MainLayout.html b/typo3/sysext/install/Resources/Private/Templates/Layout/MainLayout.html
index af368537ce4f..1ce9e7117926 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Layout/MainLayout.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Layout/MainLayout.html
@@ -33,7 +33,7 @@
<div class="topbar-header-site">
<a href="" target="_top" title="TYPO3.CMS">
<span class="topbar-header-site-logo">
- <img src="{f:uri.resource(path: 'Images/typo3_logo_orange.svg')}" width="22" height="22" title="TYPO3 Content Management System" alt="">
+ <img src="{f:uri.resource(path: 'EXT:install/Resources/Public/Images/typo3_logo_orange.svg')}" width="22" height="22" title="TYPO3 Content Management System" alt="">
</span>
<span class="topbar-header-site-title">
<span class="topbar-header-site-name">Admin tool on site: {siteName}</span>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Login/ShowEnableInstallToolFile.html b/typo3/sysext/install/Resources/Private/Templates/Login/ShowEnableInstallToolFile.html
index 5e9e8a695dce..8e97dd6285ae 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Login/ShowEnableInstallToolFile.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Login/ShowEnableInstallToolFile.html
@@ -4,7 +4,7 @@
<div class="row justify-content-center">
<div class="col-md-6">
<div class="page-header">
- <img src="{f:uri.resource(path: 'Images/typo3_orange.svg', extensionName: 'core')}" width="130" class="logo" />
+ <img src="{f:uri.resource(path: 'EXT:core/Resources/Public/Images/typo3_orange.svg')}" width="130" class="logo" />
</div>
<div class="callout callout-warning">
diff --git a/typo3/sysext/install/Resources/Private/Templates/Login/ShowLogin.html b/typo3/sysext/install/Resources/Private/Templates/Login/ShowLogin.html
index 9849ba829bf5..8cf4700c382f 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Login/ShowLogin.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Login/ShowLogin.html
@@ -3,7 +3,7 @@
<div class="container">
<div class="page-header">
<h1 class="logo-pageheader">
- <img src="{f:uri.resource(path: 'Images/typo3_orange.svg', extensionName: 'core')}" width="130" class="logo" /> Site: {siteName} <small>Login to TYPO3 Install Tool</small>
+ <img src="{f:uri.resource(path: 'EXT:core/Resources/Public/Images/typo3_orange.svg')}" width="130" class="logo" /> Site: {siteName} <small>Login to TYPO3 Install Tool</small>
</h1>
</div>
<div class="row justify-content-center">
diff --git a/typo3/sysext/install/Resources/Private/Templates/Maintenance/Cards.html b/typo3/sysext/install/Resources/Private/Templates/Maintenance/Cards.html
index b1380660fabc..3d4c8980f909 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Maintenance/Cards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Maintenance/Cards.html
@@ -4,7 +4,7 @@
<div class="card-container">
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Flush TYPO3 and PHP Cache', subtitle: 'Caching', icon: 'Icons/modules/install-clear-cache.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Flush TYPO3 and PHP Cache', subtitle: 'Caching', icon: 'EXT:install/Resources/Public/Icons/modules/install-clear-cache.svg'}" />
<div class="card-body">
<p class="card-text">This action directly clears all registered caches including opcode and dependency injection cache.</p>
</div>
@@ -13,7 +13,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Analyze Database Structure', subtitle: 'Database', icon: 'Icons/modules/install-database-analyze.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Analyze Database Structure', subtitle: 'Database', icon: 'EXT:install/Resources/Public/Icons/modules/install-database-analyze.svg'}" />
<div class="card-body">
<p class="card-text">Compare and update the database table and field definitions of your installation against the specification defined for every activated extension.</p>
</div>
@@ -22,7 +22,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Remove Temporary Assets', subtitle: 'Caching', icon: 'Icons/modules/install-clear-files.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Remove Temporary Assets', subtitle: 'Caching', icon: 'EXT:install/Resources/Public/Icons/modules/install-clear-files.svg'}" />
<div class="card-body">
<p class="card-text">Clears temporary files including concatenated JS/CSS files and processed images.</p>
</div>
@@ -31,7 +31,7 @@
</div>
</div>
<div class="card card-size-fixed-small {f:if(condition:'{composerMode}', then: 'card-disabled')}">
- <f:render partial="Card/Header" arguments="{ title: 'Rebuild PHP Autoload Information', subtitle: 'Caching', icon: 'Icons/modules/install-clear-autoload.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Rebuild PHP Autoload Information', subtitle: 'Caching', icon: 'EXT:install/Resources/Public/Icons/modules/install-clear-autoload.svg'}" />
<div class="card-body">
<p class="card-text">Resets autoload information for all active third party extensions.</p>
</div>
@@ -50,7 +50,7 @@
</f:if>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Clear Persistent Database Tables', subtitle: 'Database', icon: 'Icons/modules/install-clear-database.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Clear Persistent Database Tables', subtitle: 'Database', icon: 'EXT:install/Resources/Public/Icons/modules/install-clear-database.svg'}" />
<div class="card-body">
<p class="card-text">Truncates persistent database tables, which are not related to caching.</p>
</div>
@@ -59,7 +59,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Create Administrative User', subtitle: 'Backend Users', icon: 'Icons/modules/install-create-admin.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Create Administrative User', subtitle: 'Backend Users', icon: 'EXT:install/Resources/Public/Icons/modules/install-create-admin.svg'}" />
<div class="card-body">
<p class="card-text">Create new administrative users and grant them system maintainer privileges (optional).</p>
</div>
@@ -68,7 +68,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Reset Backend User Preferences', subtitle: 'Backend Users', icon: 'Icons/modules/install-reset-user.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Reset Backend User Preferences', subtitle: 'Backend Users', icon: 'EXT:install/Resources/Public/Icons/modules/install-reset-user.svg'}" />
<div class="card-body">
<p class="card-text">Clears preferences and settings for all backend users. The <code>uc</code> field is then set to an empty string.</p>
</div>
@@ -77,7 +77,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Manage Language Packs', subtitle: 'Language', icon: 'Icons/modules/install-manage-language.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Manage Language Packs', subtitle: 'Language', icon: 'EXT:install/Resources/Public/Icons/modules/install-manage-language.svg'}" />
<div class="card-body">
<p class="card-text">Download and update language packs for installed extensions.</p>
</div>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Settings/Cards.html b/typo3/sysext/install/Resources/Private/Templates/Settings/Cards.html
index fe48b28cfd96..a38a8f130eb6 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Settings/Cards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Settings/Cards.html
@@ -4,7 +4,7 @@
<div class="card-container">
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Extension Configuration', subtitle: 'Global Configuration', icon: 'Icons/modules/install-extension-settings.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Extension Configuration', subtitle: 'Global Configuration', icon: 'EXT:install/Resources/Public/Icons/modules/install-extension-settings.svg'}" />
<div class="card-body">
<p class="card-text">Configure settings for all enabled extensions.</p>
</div>
@@ -13,7 +13,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Change Install Tool Password', subtitle: 'Access', icon: 'Icons/modules/install-password.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Change Install Tool Password', subtitle: 'Access', icon: 'EXT:install/Resources/Public/Icons/modules/install-password.svg'}" />
<div class="card-body">
<p class="card-text">Set a new password for the Install Tool when accessed in Standalone mode.</p>
</div>
@@ -22,7 +22,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Manage System Maintainers', subtitle: 'Access', icon: 'Icons/modules/install-manage-maintainer.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Manage System Maintainers', subtitle: 'Access', icon: 'EXT:install/Resources/Public/Icons/modules/install-manage-maintainer.svg'}" />
<div class="card-body">
<p class="card-text">Specify which backend administrators have access to the Admin Tools module and Install Tool when accessed in Standalone Mode.</p>
</div>
@@ -31,7 +31,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Configuration Presets', subtitle: 'Global Configuration', icon: 'Icons/modules/install-manage-presets.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Configuration Presets', subtitle: 'Global Configuration', icon: 'EXT:install/Resources/Public/Icons/modules/install-manage-presets.svg'}" />
<div class="card-body">
<p class="card-text">Configure image processing, debug/live mode and mail settings.</p>
</div>
@@ -40,7 +40,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Feature Toggles', subtitle: 'Global Configuration', icon: 'Icons/modules/install-manage-features.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Feature Toggles', subtitle: 'Global Configuration', icon: 'EXT:install/Resources/Public/Icons/modules/install-manage-features.svg'}" />
<div class="card-body">
<p class="card-text">Enable and disable core features.</p>
</div>
@@ -49,7 +49,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Configure Installation-Wide Options', subtitle: 'Global Configuration', icon: 'Icons/modules/install-manage-settings.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Configure Installation-Wide Options', subtitle: 'Global Configuration', icon: 'EXT:install/Resources/Public/Icons/modules/install-manage-settings.svg'}" />
<div class="card-body">
<p class="card-text">Modify settings written to LocalConfiguration.php.</p>
</div>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/Cards.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/Cards.html
index f90e40d19e46..210b9962699a 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/Cards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/Cards.html
@@ -4,7 +4,7 @@
<div class="card-container">
<div class="card card-size-fixed-small {f:if(condition:'{composerMode}', then: 'card-disabled')}">
- <f:render partial="Card/Header" arguments="{ title: 'Update TYPO3 Core', subtitle: 'Core Upgrade', icon: 'Icons/modules/install-update.svg'}"/>
+ <f:render partial="Card/Header" arguments="{ title: 'Update TYPO3 Core', subtitle: 'Core Upgrade', icon: 'EXT:install/Resources/Public/Icons/modules/install-update.svg'}"/>
<div class="card-body">
<p class="card-text">Update your TYPO3 installation (support for symbolic links required).</p>
</div>
@@ -23,7 +23,7 @@
</f:if>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Upgrade Wizard', subtitle: 'Core Upgrade', icon: 'Icons/modules/install-wizards.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Upgrade Wizard', subtitle: 'Core Upgrade', icon: 'EXT:install/Resources/Public/Icons/modules/install-wizards.svg'}" />
<div class="card-body">
<p class="card-text">Finalises the upgrade process when moving to a major release.</p>
</div>
@@ -32,7 +32,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'View Upgrade Documentation', subtitle: 'Core Upgrade', icon: 'Icons/modules/install-documentation.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'View Upgrade Documentation', subtitle: 'Core Upgrade', icon: 'EXT:install/Resources/Public/Icons/modules/install-documentation.svg'}" />
<div class="card-body">
<p class="card-text">View and search for important changes that have been made for every major and minor release of TYPO3.</p>
</div>
@@ -41,7 +41,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Check TCA in ext_tables.php', subtitle: 'TCA', icon: 'Icons/modules/install-check-extables.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Check TCA in ext_tables.php', subtitle: 'TCA', icon: 'EXT:install/Resources/Public/Icons/modules/install-check-extables.svg'}" />
<div class="card-body">
<p class="card-text">Identify any extensions that are modifying the Table Control Array (TCA) in ext_tables.php. Changes made to the TCA can result in performance drawbacks.
</p>
@@ -51,7 +51,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Check for Broken Extensions', subtitle: 'Extensions', icon: 'Icons/modules/install-check-brokenextension.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Check for Broken Extensions', subtitle: 'Extensions', icon: 'EXT:install/Resources/Public/Icons/modules/install-check-brokenextension.svg'}" />
<div class="card-body">
<p class="card-text">Checks the compatibility of all active extensions against the current (installed) version of TYPO3.</p>
</div>
@@ -60,7 +60,7 @@
</div>
</div>
<div class="card card-size-fixed-small">
- <f:render partial="Card/Header" arguments="{ title: 'Check TCA Migrations', subtitle: 'TCA', icon: 'Icons/modules/install-check-tca.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Check TCA Migrations', subtitle: 'TCA', icon: 'EXT:install/Resources/Public/Icons/modules/install-check-tca.svg'}" />
<div class="card-body">
<p class="card-text">Identifies any third-party extensions that contain an outdated TCA configuration which should be adapted for the current (installed) version of TYPO3.</p>
</div>
@@ -69,7 +69,7 @@
</div>
</div>
<div class="card card-size-fixed-small {f:if(condition:'!{extensionFoldersInTypo3conf}', then: 'card-disabled')}">
- <f:render partial="Card/Header" arguments="{ title: 'Scan Extension Files', subtitle: 'Extensions', icon: 'Icons/modules/install-scan-extensions.svg'}" />
+ <f:render partial="Card/Header" arguments="{ title: 'Scan Extension Files', subtitle: 'Extensions', icon: 'EXT:install/Resources/Public/Icons/modules/install-scan-extensions.svg'}" />
<div class="card-body">
<p class="card-text">Scan extensions for usage of deprecated or outdated TYPO3 API calls.</p>
</div>
diff --git a/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html b/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
index 5866edab8a54..a08dfc5cf9d7 100644
--- a/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
+++ b/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
@@ -1,6 +1,6 @@
<f:be.pageRenderer
includeCssFiles="{
- 0:'{f:uri.resource(path:\'Css/ui-lightness/jquery-ui-1.10.3.custom.min.css\')}'
+ 0:'{f:uri.resource(path:\'EXT:viewpage/Resources/Public/Css/ui-lightness/jquery-ui-1.10.3.custom.min.css\')}'
}"
includeRequireJsModules="{
0:'TYPO3/CMS/Viewpage/Main'
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html b/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html
index 8ceada23d565..12bc0644a4aa 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/Preview/Index.html
@@ -3,7 +3,7 @@
<div class="typo3-topbar-container" role="navigation" id="typo3-top-container">
<div class="typo3-topbar-site">
<a class="typo3-topbar-site-logo" href="{logoLink}" target="_blank" rel="noreferrer">
- <img src="{f:uri.resource(path: 'Images/typo3_logo_orange.svg', extensionName: 'backend')}" width="22" height="22" title="TYPO3 Content Management System" alt="">
+ <img src="{f:uri.resource(path: 'EXT:backend/Resources/Public/Images/typo3_logo_orange.svg')}" width="22" height="22" title="TYPO3 Content Management System" alt="">
</a>
<span class="typo3-topbar-site-name">{activeWorkspace}</span>
</div>
--
GitLab