From 7561bd05a74b3cfa2624e9d3b03f9c3ea7b9f245 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <ben@bnf.dev>
Date: Tue, 5 Mar 2024 15:35:07 +0100
Subject: [PATCH] [TASK] Revert "[TASK] Format fluid format tags consistently"
This reverts commit 4fda3505b07bdfd912b20dfe8158856d7a27dce3.
Reason for revert: The patch has been merged with too few votes.
Change-Id: I50e4b27adad119fdd9634276a60f1d6200838f8a
Releases: main, 12.4
Resolves: #103287
Reverts: #103240
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83233
Tested-by: Andreas Kienast <a.fernandez@scripting-base.de>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Benjamin Franzke <ben@bnf.dev>
Tested-by: Benjamin Franzke <ben@bnf.dev>
Reviewed-by: Andreas Kienast <a.fernandez@scripting-base.de>
Tested-by: Simon Praetorius <simon@praetorius.me>
Reviewed-by: Simon Praetorius <simon@praetorius.me>
---
.../Resources/Private/Layouts/Module.html | 3 +-
.../Private/Partials/About/CoreTeam.html | 5 ---
.../Private/Partials/About/Credits.html | 5 ---
.../Private/Partials/About/Donation.html | 5 ---
.../Private/Partials/About/Extensions.html | 5 ---
.../Resources/Private/Partials/DocHeader.html | 5 ---
.../Email/PasswordReset/ClosingParagraph.html | 5 ---
.../Partials/Menus/SelectBoxJumpMenu.html | 15 ++-----
.../Partials/Mfa/SetupInstructions.html | 5 ---
.../MultiRecordSelection/Actions.html | 5 ++-
.../Private/Partials/PageLayout/Grid.html | 5 ---
.../Partials/PageLayout/Grid/Column.html | 5 ---
.../PageLayout/Grid/ColumnHeader.html | 6 ---
.../Partials/PageLayout/LanguageColumns.html | 7 ----
.../Private/Partials/PageLayout/Record.html | 6 ---
.../PageLayout/RecordDefault/Footer.html | 5 ---
.../ContentElement/ElementInformation.html | 4 ++
.../Templates/ElementBrowser/Page.html | 1 +
.../Private/Templates/Form/EditDocument.html | 5 +++
.../Templates/Form/OuterWrapContainer.html | 2 +
.../Resources/Private/Templates/Mfa/Edit.html | 3 ++
.../Private/Templates/Page/SortSubPages.html | 9 ++++
.../Templates/PageLayout/PageLayout.html | 6 +--
.../Templates/PageLayout/PageModule.html | 8 ++++
.../Templates/PageTsConfig/Active.html | 4 ++
.../PageTsConfig/RecordsOverview.html | 2 +
.../Private/Templates/RecordList.html | 1 +
.../ShortcutToolbarItemDropDown.html | 6 ---
.../SystemInformationDropDown.html | 6 +--
.../Private/Templates/Permission/Index.html | 4 +-
.../Private/Partials/List/Distribution.html | 8 +---
.../Partials/List/TerShowVersionsTable.html | 9 +---
.../Private/Partials/List/TerTable.html | 8 +---
.../Private/Templates/Distribution/Show.html | 20 +++++----
.../ExtensionComposerStatus/List.html | 5 +++
.../Templates/List/ShowAllVersions.html | 5 +++
.../ElementBrowser/CreateFolder.html | 1 +
.../Templates/ElementBrowser/Files.html | 1 +
.../Templates/ElementBrowser/Folder.html | 3 ++
.../Private/Templates/File/CreateFile.html | 3 ++
.../Private/Templates/File/EditFile.html | 3 ++
.../Private/Templates/LinkHandler/File.html | 2 +-
.../Private/Templates/LinkHandler/Folder.html | 2 +-
.../Resources/Private/Templates/Html.html | 4 +-
.../Private/Templates/MenuAbstract.html | 3 +-
.../Resources/Private/Templates/Shortcut.html | 4 +-
.../Resources/Private/Templates/Text.html | 3 +-
.../Private/Templates/Textmedia.html | 8 +++-
.../Resources/Private/Templates/Textpic.html | 8 +++-
.../Rendering/Fixtures/FluidTemplate.html | 2 -
.../Templates/Finishers/Email/Default.html | 8 ----
.../Partials/AdvancedPassword.html | 12 +++---
.../Partials/Field/Field.html | 5 +--
.../Partials/MultiCheckbox.html | 2 +
.../Templates/Backend/FormEditor/Index.html | 1 +
.../Partials/Export/Configuration.html | 16 +++++++
.../Private/Partials/Import/MetaData.html | 4 ++
.../Resources/Private/Partials/Preview.html | 2 +
.../Administration/ExternalDocuments.html | 1 +
.../Templates/Administration/Pages.html | 1 +
.../Templates/Administration/Statistic.html | 3 +-
.../Administration/StatisticDetails.html | 2 +
.../Private/Templates/Search/Search.html | 1 +
.../Resources/Private/Layouts/Module.html | 5 ++-
.../Private/Templates/PageInformation.html | 9 +++-
.../Private/Templates/TranslationStatus.html | 3 ++
.../Upgrade/UpgradeDocs/PanelItem.html | 4 +-
.../Private/Templates/Configuration.html | 7 ++++
.../Private/Templates/CustomSearch.html | 9 ++--
.../Private/Templates/RecordStatistics.html | 4 ++
.../Private/Templates/Relations.html | 3 ++
.../Resources/Private/Partials/TaskList.html | 42 +++++++++----------
.../Resources/Private/Templates/Main.html | 8 +++-
.../Private/Partials/ActiveTree.html | 3 ++
.../Email/StageChangeNotification.html | 12 ++----
75 files changed, 224 insertions(+), 198 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Private/Layouts/Module.html b/typo3/sysext/backend/Resources/Private/Layouts/Module.html
index f762e6690288..4e8c4e0c7fd2 100644
--- a/typo3/sysext/backend/Resources/Private/Layouts/Module.html
+++ b/typo3/sysext/backend/Resources/Private/Layouts/Module.html
@@ -1,8 +1,8 @@
<html
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:render section="Before" arguments="{_all}" optional="true" />
<div class="module {moduleClass}" data-module-id="{moduleId}" data-module-name="{moduleName}">
@@ -23,6 +23,7 @@
<f:flashMessages queueIdentifier="{flashMessageQueueIdentifier}" />
<f:render section="Content" arguments="{_all}" optional="true" />
+
</div>
<f:if condition="{formTag}">
<f:then>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/About/CoreTeam.html b/typo3/sysext/backend/Resources/Private/Partials/About/CoreTeam.html
index da8983ec6503..9a13d6b626d2 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/About/CoreTeam.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/About/CoreTeam.html
@@ -1,7 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<div class="card">
<div class="card-body">
<h2 class="h4 card-title">
@@ -12,4 +8,3 @@
</p>
</div>
</div>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/About/Credits.html b/typo3/sysext/backend/Resources/Private/Partials/About/Credits.html
index 8a9f4b102db1..055d6eb62523 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/About/Credits.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/About/Credits.html
@@ -1,7 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<div class="card">
<div class="card-body">
<h2 class="h4 card-title">
@@ -12,4 +8,3 @@
</p>
</div>
</div>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/About/Donation.html b/typo3/sysext/backend/Resources/Private/Partials/About/Donation.html
index 660ee6fb5333..33786dba30b5 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/About/Donation.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/About/Donation.html
@@ -1,7 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<div class="card">
<div class="card-body">
<h2 class="h4 card-title">
@@ -15,4 +11,3 @@
</a>
</div>
</div>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/About/Extensions.html b/typo3/sysext/backend/Resources/Private/Partials/About/Extensions.html
index 129e31378b88..0ba783accf10 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/About/Extensions.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/About/Extensions.html
@@ -1,7 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<f:if condition="{loadedExtensions}">
<div class="card">
<div class="card-body">
@@ -52,4 +48,3 @@
</div>
</div>
</f:if>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html b/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
index fdc3bc6a5014..e71e7ccb9b75 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/DocHeader.html
@@ -1,7 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<div class="module-loading-indicator"></div>
<div class="module-docheader t3js-module-docheader">
<div class="module-docheader-bar module-docheader-bar-navigation t3js-module-docheader-bar t3js-module-docheader-bar-navigation">
@@ -47,4 +43,3 @@
</div>
</div>
</div>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Email/PasswordReset/ClosingParagraph.html b/typo3/sysext/backend/Resources/Private/Partials/Email/PasswordReset/ClosingParagraph.html
index 7b1fac58e01c..2f09f3fe1cab 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Email/PasswordReset/ClosingParagraph.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Email/PasswordReset/ClosingParagraph.html
@@ -1,11 +1,6 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<p>
<f:if condition="{normalizedParams.remoteAddress}">
This password reset request originated from the IP address <strong>{normalizedParams.remoteAddress}</strong>.
</f:if>
If you have not requested a password reset and have concerns about this email, please let your administrator know.
</p>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Menus/SelectBoxJumpMenu.html b/typo3/sysext/backend/Resources/Private/Partials/Menus/SelectBoxJumpMenu.html
index 7a66192cf97d..04fe372e662c 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Menus/SelectBoxJumpMenu.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Menus/SelectBoxJumpMenu.html
@@ -1,17 +1,10 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<f:if condition="{menu.menuItems -> f:count()} > 1">
- {menu.label}
- <select class="form-select form-select-sm t3-js-jumpMenuBox"
- name="{menu.identifier}"
- data-menu-identifier="{menu.dataIdentifier}"
- data-global-event="change" data-action-navigate="$value"
- >
+ {menu.label} <select class="form-select form-select-sm t3-js-jumpMenuBox"
+ name="{menu.identifier}"
+ data-menu-identifier="{menu.dataIdentifier}"
+ data-global-event="change" data-action-navigate="$value">
<f:for each="{menu.menuItems}" as="menuItem">
<option value="{menuItem.href}" {f:if(condition: '{menuItem.active}', then: ' selected="selected"')}>{menuItem.title}</option>
</f:for>
</select>
</f:if>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/Mfa/SetupInstructions.html b/typo3/sysext/backend/Resources/Private/Partials/Mfa/SetupInstructions.html
index 5d69c6d44c7f..6ce42cd0b091 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/Mfa/SetupInstructions.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/Mfa/SetupInstructions.html
@@ -1,7 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<div class="alert alert-info alert-dismissible">
<div class="alert-heading">
<h4><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_mfa.xlf:setup.instructions"/></h4>
@@ -11,4 +7,3 @@
<f:format.nl2br>{provider.setupInstructions -> f:translate(key: provider.setupInstructions, default: provider.setupInstructions)}</f:format.nl2br>
</div>
</div>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/MultiRecordSelection/Actions.html b/typo3/sysext/backend/Resources/Private/Partials/MultiRecordSelection/Actions.html
index 940a6752677a..a74dcfcf2c4a 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/MultiRecordSelection/Actions.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/MultiRecordSelection/Actions.html
@@ -1,5 +1,6 @@
<html
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+ xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
@@ -11,8 +12,8 @@
<div class="col">
<f:for each="{actions}" as="action">
<button class="btn btn-default btn-sm"
- data-multi-record-selection-action="{action.name}"
- data-multi-record-selection-action-config='{action.configuration -> f:format.raw()}'
+ data-multi-record-selection-action="{action.name}"
+ data-multi-record-selection-action-config='{action.configuration -> f:format.raw()}'
>
{action.icon -> f:format.raw()}
<span class="text">{action.label}</span>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid.html b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid.html
index 64a78fe45796..70009e10f739 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid.html
@@ -1,7 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<div class="t3-grid-container" data-default-language-binding="{f:if(condition: context.drawingConfiguration.defaultLanguageBinding, then: '1', else: '0')}">
<div class="t3-grid-container-inner">
<table class="t3-page-columns t3-grid-table t3js-page-columns">
@@ -22,4 +18,3 @@
</table>
</div>
</div>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/Column.html b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/Column.html
index da04771f7f47..9635c923939e 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/Column.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/Column.html
@@ -1,7 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<f:comment>
Styling requires the colpos to be set to the string 'unused'. To preserve type safety in the
controller, the string is only used in the template by setting the below "colpos" variable.
@@ -28,4 +24,3 @@
</f:if>
<f:format.raw>{column.afterSectionMarkup}</f:format.raw>
</td>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
index a6089e13e216..3de62ffbc83b 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
@@ -1,8 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<div class="t3-page-column-header">
<f:if condition="{column.active}">
<f:then>
@@ -38,4 +33,3 @@
<div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available"></div>
</div>
</f:if>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/LanguageColumns.html b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/LanguageColumns.html
index b7ed3ab626d5..54e799867896 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/LanguageColumns.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/LanguageColumns.html
@@ -1,9 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<f:if condition="{context.newLanguageOptions}">
<div class="form-row">
<div class="form-group">
@@ -144,4 +138,3 @@
</table>
</div>
</div>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record.html b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record.html
index ef8a060f7b41..1f812c5335cf 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record.html
@@ -1,8 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
{f:if(condition: '{item.disabled} && {item.context.drawingConfiguration.showHidden} == 0', then: 'height: 0; position: absolute;') -> f:variable(name: 'style')}
<div class="t3-page-ce {item.wrapperClassName} t3js-page-ce t3js-page-ce-sortable" id="element-tt_content-{item.record.uid}" data-table="tt_content" data-uid="{item.record.uid}" data-language-uid="{item.record.sys_language_uid}" style="{style}">
<div class="t3-page-ce-element t3-page-ce-dragitem" id="{item.uniqueId}">
@@ -33,4 +28,3 @@
</f:if>
<div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available"></div>
</div>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/RecordDefault/Footer.html b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/RecordDefault/Footer.html
index 013fd417acdc..2f6108320401 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/RecordDefault/Footer.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/RecordDefault/Footer.html
@@ -1,7 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<f:if condition="{item.footerInfo}">
<div class="t3-page-ce-footer">
<div class="t3-page-ce-info">
@@ -9,4 +5,3 @@
</div>
</div>
</f:if>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ContentElement/ElementInformation.html b/typo3/sysext/backend/Resources/Private/Templates/ContentElement/ElementInformation.html
index 11654f7afc77..4c822bfb33df 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ContentElement/ElementInformation.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ContentElement/ElementInformation.html
@@ -4,9 +4,11 @@
xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<f:if condition="{accessAllowed}">
<f:then>
<f:if condition="{hookContent}">
@@ -22,8 +24,10 @@
<f:be.infobox state="2">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.noEditPermission')}</f:be.infobox>
</f:else>
</f:if>
+
</f:section>
+
<f:section name="nativeContent">
<div class="card-container">
<div class="card card-size-medium">
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ElementBrowser/Page.html b/typo3/sysext/backend/Resources/Private/Templates/ElementBrowser/Page.html
index e7209ff9a30e..07203e4ae9b6 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ElementBrowser/Page.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ElementBrowser/Page.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="{f:if(condition: treeEnabled, then: 'ElementBrowserWithNavigation', else: 'ElementBrowser')}" />
<f:section name="Navigation">
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Form/EditDocument.html b/typo3/sysext/backend/Resources/Private/Templates/Form/EditDocument.html
index 25d21feff910..c86619730864 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Form/EditDocument.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Form/EditDocument.html
@@ -2,14 +2,19 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<f:be.pageRenderer
includeJavaScriptModules="{
0: '@typo3/backend/context-menu.js'
}"
/>
+
<f:format.raw>{bodyHtml}</f:format.raw>
+
</f:section>
+
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Form/OuterWrapContainer.html b/typo3/sysext/backend/Resources/Private/Templates/Form/OuterWrapContainer.html
index bd4cd174ed25..6c3cd81c559b 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Form/OuterWrapContainer.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Form/OuterWrapContainer.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<h1><f:format.raw>{pageTitle}</f:format.raw></h1>
<f:if condition="{recordDescription}">
@@ -27,4 +28,5 @@
</f:if>
</div>
</div>
+
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Mfa/Edit.html b/typo3/sysext/backend/Resources/Private/Templates/Mfa/Edit.html
index 90f660f367b7..d4af912467e4 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Mfa/Edit.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Mfa/Edit.html
@@ -3,9 +3,11 @@
xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<f:variable name="providerTitle" value="{provider.title -> f:translate(key: provider.title, default: provider.title)}"/>
<h1><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_mfa.xlf:edit.title" arguments="{0: providerTitle}"/></h1>
@@ -48,6 +50,7 @@
</div>
</div>
</form>
+
</f:section>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Page/SortSubPages.html b/typo3/sysext/backend/Resources/Private/Templates/Page/SortSubPages.html
index 238614248963..4ecce826882f 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Page/SortSubPages.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Page/SortSubPages.html
@@ -4,18 +4,22 @@
xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<f:be.pageRenderer
includeJavaScriptModules="{
0:'@typo3/backend/context-menu.js',
1:'@typo3/backend/modal.js'
}"
/>
+
<h1>
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_sort.xlf:title" />
</h1>
+
<f:if condition="{isInWorkspace}">
<f:then>
<f:be.infobox
@@ -34,9 +38,11 @@
state="-1"
/>
</f:if>
+
<h2>
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_sort.xlf:currentPageOrder" />
</h2>
+
<div class="table-fit">
<table class="table table-striped table-hover">
<thead>
@@ -58,6 +64,7 @@
</th>
</tr>
</thead>
+
<f:for each="{subPages}" as="page">
<tr>
<td class="text-nowrap">
@@ -85,6 +92,7 @@
</f:for>
</table>
</div>
+
<h2>
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_sort.xlf:changeOrder"/>
</h2>
@@ -153,6 +161,7 @@
</f:if>
</f:else>
</f:if>
+
</f:section>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageLayout.html b/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageLayout.html
index c1f7b62ace0f..2de35153b6e4 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageLayout.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageLayout.html
@@ -1,7 +1,4 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
+{namespace be=TYPO3\CMS\Backend\ViewHelpers}
<f:if condition="{context.drawingConfiguration.languageMode}">
<f:then>
<f:render partial="PageLayout/LanguageColumns" arguments="{_all}" />
@@ -10,4 +7,3 @@
<f:render partial="PageLayout/Grid" arguments="{_all}" />
</f:else>
</f:if>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageModule.html b/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageModule.html
index 63534ba97417..a97f3c6cab31 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageModule.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/PageLayout/PageModule.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Before">
@@ -30,6 +31,7 @@
</f:section>
<f:section name="Content">
+
<typo3-backend-editable-page-title
pageTitle="{localizedPageTitle}"
pageId="{pageId}"
@@ -38,15 +40,19 @@
>
{localizedPageTitle}
</typo3-backend-editable-page-title>
+
<f:for each="{infoBoxes}" as="infoBox">
<f:be.infobox state="{infoBox.state}">
<f:format.raw>{infoBox.message}</f:format.raw>
</f:be.infobox>
</f:for>
+
<f:format.raw>{eventContentHtmlTop}</f:format.raw>
+
<form action="{f:be.uri(route:'web_layout', parameters:'{id: pageId}')}" id="PageLayoutController" method="post">
<f:format.raw>{mainContentHtml}</f:format.raw>
</form>
+
<f:if condition="{hiddenElementsShowToggle}">
<div class="form-check form-switch">
<input
@@ -62,7 +68,9 @@
</label>
</div>
</f:if>
+
<f:format.raw>{eventContentHtmlBottom}</f:format.raw>
+
</f:section>
</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/Active.html b/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/Active.html
index 89a8cd86a5e2..e6fb65ee95e1 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/Active.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/Active.html
@@ -4,6 +4,7 @@
xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module"/>
<f:section name="Before">
@@ -36,7 +37,9 @@
/>
</h1>
<p><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pagetsconfig.xlf:module.pagetsconfig_active.description" /></p>
+
<f:render section="Options" arguments="{_all}" />
+
<f:comment><!-- Constants from Site settings --></f:comment>
<f:if condition="{siteSettingsAst}">
<h2><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pagetsconfig.xlf:module.pagetsconfig_active.siteSettings" /></h2>
@@ -52,6 +55,7 @@
/>
</div>
</f:if>
+
<h2><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pagetsconfig.xlf:module.pagetsconfig_active.activePageTsConfig" /></h2>
<f:if condition="!{pageTsConfigAst.children}">
<f:then>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/RecordsOverview.html b/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/RecordsOverview.html
index 2edea3fa0677..12f32866df88 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/RecordsOverview.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/RecordsOverview.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module"/>
<f:section name="Before">
@@ -19,6 +20,7 @@
</f:section>
<f:section name="Content">
+
<h1>
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pagetsconfig.xlf:module.pagetsconfig_pages.headline" />
</h1>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/RecordList.html b/typo3/sysext/backend/Resources/Private/Templates/RecordList.html
index 6cc438015354..bb60c3dd45ba 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/RecordList.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/RecordList.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Before">
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ShortcutToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ShortcutToolbarItemDropDown.html
index bf90ea687120..fe12162a98a6 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ShortcutToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ShortcutToolbarItemDropDown.html
@@ -1,8 +1,3 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<h3 class="dropdown-headline">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks')}</h3>
<f:if condition="{f:count(subject: '{shortcutMenu}')} == 0">
<f:then>
@@ -54,4 +49,3 @@
</f:for>
</f:else>
</f:if>
-</html>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
index 7a13c2191a1a..e1b2d62324ec 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
@@ -1,8 +1,4 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
+<html xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" data-namespace-typo3-fluid="true">
<span data-systeminformation-data
data-systeminformation-data-count="{count}"
data-systeminformation-data-severitybadgeclass="{severityBadgeClass}"
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html
index 0bb84218fb3c..33deca784eeb 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html
@@ -5,9 +5,10 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
-<f:layout name="Module" />
+<f:layout name="Module" />
<f:section name="Content">
+
<f:be.pageRenderer
includeJavaScriptModules="{
0: '@typo3/beuser/permissions.js'
@@ -191,6 +192,7 @@
<core:icon identifier="status-status-permission-granted" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Granted" /><br>
<core:icon identifier="status-status-permission-denied" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Denied" />
</p>
+
</f:section>
</html>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html
index 60e2ed5a00ed..44f4182ec7e8 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html
@@ -1,9 +1,4 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:em="http://typo3.org/ns/TYPO3/CMS/Extensionmanager/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
+{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
<div class="card card-size-fixed-small">
<div class="card-image">
<f:link.action action="show" controller="Distribution" arguments="{extension:distribution}" class="distribution-image">
@@ -52,4 +47,3 @@
</f:link.action>
</div>
</div>
-</html>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsTable.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsTable.html
index 997deb30518a..8d8879e94e34 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsTable.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsTable.html
@@ -1,8 +1,4 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:em="http://typo3.org/ns/TYPO3/CMS/Extensionmanager/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
+{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
<div class="table-fit">
<table id="{tableId}" class="table table-striped table-hover extension-list">
<thead>
@@ -19,7 +15,7 @@
<f:for each="{extensions}" as="extension">
<tr>
<td><em:downloadExtension class="download" extension="{extension}" /></td>
- <td>{extension.title}</td>
+ <td>{extension.title}</th>
<td>{extension.version}</td>
<td><f:format.nl2br>{extension.updateComment}</f:format.nl2br></td>
<td data-sort="{f:format.date(date: extension.lastUpdated, format: 'U')}"><f:format.date>{extension.lastUpdated}</f:format.date></td>
@@ -29,4 +25,3 @@
</tbody>
</table>
</div>
-</html>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerTable.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerTable.html
index 10878091b38d..7525f3431715 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerTable.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerTable.html
@@ -1,9 +1,4 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:em="http://typo3.org/ns/TYPO3/CMS/Extensionmanager/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
+{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
<div class="table-fit">
<table id="{tableId}" class="table table-striped table-hover extension-list">
<thead>
@@ -54,4 +49,3 @@
</tbody>
</table>
</div>
-</html>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
index cf96d5f9f30a..2e1a6c824157 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
@@ -1,18 +1,21 @@
<html
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
xmlns:em="http://typo3.org/ns/TYPO3/CMS/Extensionmanager/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<f:be.pageRenderer
includeJavaScriptModules="{
0: '@typo3/extensionmanager/main.js'
}"
/>
+
<em:be.trigger triggers="{triggers}" />
+
<div class="distribution-detail">
<div class="distribution-detail-previewpane">
<typo3-extensionmanager-distribution-image
@@ -27,6 +30,7 @@
<h1>{extension.title}</h1>
<p>{extension.description}</p>
</div>
+
<ul class="distribution-detail-actions">
<f:if condition="{distributionActive}">
<f:else>
@@ -39,23 +43,22 @@
<f:then>
<li>
<button class="btn btn-default distribution-openViewModule"
- data-dispatch-action="TYPO3.ModuleMenu.showModule"
- data-dispatch-args-list="page_preview"
- >
+ data-dispatch-action="TYPO3.ModuleMenu.showModule"
+ data-dispatch-args-list="page_preview">
<core:icon identifier="actions-document-view" /> <f:translate key="distribution.welcome.openViewModule" />
</button>
</li>
<li>
<button class="btn btn-default distribution-openPageModule"
- data-dispatch-action="TYPO3.ModuleMenu.showModule"
- data-dispatch-args-list="web_layout"
- >
+ data-dispatch-action="TYPO3.ModuleMenu.showModule"
+ data-dispatch-args-list="web_layout">
<core:icon identifier="actions-open" /> <f:translate key="distribution.welcome.openPageModule" />
</button>
</li>
</f:then>
</f:if>
</ul>
+
<dl class="row mt-4 mb-4">
<dt class="col-sm-2"><f:translate key="extensionList.distribution.title" /></dt>
<dd class="col-sm-10">{extension.title}</dd>
@@ -68,6 +71,7 @@
<dt class="col-sm-2"><f:translate key="extensionList.distribution.downloads" /></dt>
<dd class="col-sm-10">{extension.alldownloadcounter}</dd>
</dl>
+
<f:if condition="{extension.dependencies}">
<h2><f:translate key="distribution.dependency.headline" /></h2>
<div class="table-fit">
@@ -93,8 +97,10 @@
</table>
</div>
</f:if>
+
</div>
</div>
+
</f:section>
</html>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/ExtensionComposerStatus/List.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/ExtensionComposerStatus/List.html
index 160faac76e4f..f82ab66d0464 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/ExtensionComposerStatus/List.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/ExtensionComposerStatus/List.html
@@ -4,16 +4,21 @@
xmlns:em="http://typo3.org/ns/TYPO3/CMS/Extensionmanager/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<f:be.pageRenderer
includeJavaScriptModules="{
0: '@typo3/extensionmanager/main.js'
}"
/>
+
<em:be.trigger triggers="{triggers}" />
+
<h1><f:translate key="extensionComposerStatus" /></h1>
+
<f:if condition="{extensions}">
<f:then>
<f:be.infobox title="Invalid composer.json files in extensions" state="-1">
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
index f5dbb0cda6b7..4be004d2aeae 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
@@ -3,15 +3,19 @@
xmlns:em="http://typo3.org/ns/TYPO3/CMS/Extensionmanager/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<f:be.pageRenderer
includeJavaScriptModules="{
0: '@typo3/extensionmanager/main.js'
}"
/>
+
<em:be.trigger triggers="{triggers}" />
+
<h1><f:translate key="showAllVersions" /> {extensionKey}</h1>
<f:if condition="{currentVersion}">
<p><f:format.nl2br>{currentVersion.description}</f:format.nl2br></p>
@@ -65,6 +69,7 @@
</table>
</f:if>
<f:render partial="List/TerShowVersionsTable" arguments="{tableId: 'terVersionTable', extensions: extensions}" />
+
</f:section>
</html>
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/CreateFolder.html b/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/CreateFolder.html
index 8fc492112983..39bd753f5b3f 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/CreateFolder.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/CreateFolder.html
@@ -3,6 +3,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="ElementBrowserWithNavigation" />
<f:section name="Navigation">
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/Files.html b/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/Files.html
index 8fc492112983..39bd753f5b3f 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/Files.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/Files.html
@@ -3,6 +3,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="ElementBrowserWithNavigation" />
<f:section name="Navigation">
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/Folder.html b/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/Folder.html
index 770f2f5ee4b5..619191fe2152 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/Folder.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/ElementBrowser/Folder.html
@@ -3,6 +3,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="ElementBrowserWithNavigation" />
<f:section name="Navigation">
@@ -21,6 +22,7 @@
</h4>
</f:if>
<f:flashMessages queueIdentifier="core.template.flashMessages"/>
+
<div
data-filelist-element="true"
data-filelist-type="folder"
@@ -32,6 +34,7 @@
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_browse_links.xlf:linkTo" arguments="{0: '/{folderLabel}'}">{selectedFolder.storage.name}: {selectedFolder.identifier}</f:translate>
</button>
</div>
+
<f:format.raw>{content}</f:format.raw>
</f:section>
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/File/CreateFile.html b/typo3/sysext/filelist/Resources/Private/Templates/File/CreateFile.html
index 7c5eb83ac860..d3a95bf59929 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/File/CreateFile.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/File/CreateFile.html
@@ -2,9 +2,11 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<h1><f:translate key="LLL:EXT:filelist/Resources/Private/Language/locallang.xlf:actions.create_file" /></h1>
<f:if condition="{hasPermission}">
<f:if condition="{fileExtList -> f:count()} > 0">
@@ -62,6 +64,7 @@
</form>
</f:if>
</f:if>
+
</f:section>
</html>
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/File/EditFile.html b/typo3/sysext/filelist/Resources/Private/Templates/File/EditFile.html
index 03d2e2588b7c..3dd608ab3c60 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/File/EditFile.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/File/EditFile.html
@@ -2,14 +2,17 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<form action="{moduleUrlTceFile}" method="post" id="EditFileController" name="editform">
<h1><f:translate key="LLL:EXT:filelist/Resources/Private/Language/locallang.xlf:file_edit.php.pagetitle" /> {fileName}</h1>
<f:format.raw>{hookContent}</f:format.raw>
<f:format.raw>{form}</f:format.raw>
</form>
+
</f:section>
</html>
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/LinkHandler/File.html b/typo3/sysext/filelist/Resources/Private/Templates/LinkHandler/File.html
index 8b380fdf76e2..82f0713671c0 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/LinkHandler/File.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/LinkHandler/File.html
@@ -1,8 +1,8 @@
<html
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="LinkBrowser" />
<f:section name="Navigation">
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/LinkHandler/Folder.html b/typo3/sysext/filelist/Resources/Private/Templates/LinkHandler/Folder.html
index 41bb13960af8..22f7ffe02d2c 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/LinkHandler/Folder.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/LinkHandler/Folder.html
@@ -1,8 +1,8 @@
<html
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="LinkBrowser" />
<f:section name="Navigation">
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html
index 307dd45bd6f8..22fe35a1c21e 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html
@@ -1,9 +1,9 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:layout name="Default" />
-
<f:section name="Header" />
-
<f:section name="Main">
+
<f:format.raw>{data.bodytext}</f:format.raw>
+
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuAbstract.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuAbstract.html
index be0041e77fad..2a281c69b8a1 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuAbstract.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/MenuAbstract.html
@@ -1,7 +1,7 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:layout name="Default" />
-
<f:section name="Main">
+
<f:if condition="{menu}">
<ul>
<f:for each="{menu}" as="page">
@@ -16,5 +16,6 @@
</f:for>
</ul>
</f:if>
+
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html
index d72ac75435ce..78f4b8a1c7d1 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html
@@ -1,9 +1,9 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:layout name="Default" />
-
<f:section name="Header" />
-
<f:section name="Main">
+
<f:format.raw>{shortcuts}</f:format.raw>
+
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Text.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Text.html
index f80f16f27f6c..57bbcf451f57 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Text.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Text.html
@@ -1,7 +1,8 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:layout name="Default" />
-
<f:section name="Main">
+
<f:format.html>{data.bodytext}</f:format.html>
+
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html
index 5496d1532efb..1af772743b44 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html
@@ -1,17 +1,19 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:layout name="Default" />
-
<f:section name="Header">
+
<f:if condition="{gallery.position.noWrap} != 1">
<f:render partial="Header/All" arguments="{_all}" />
</f:if>
-</f:section>
+</f:section>
<f:section name="Main">
+
<div class="ce-textpic ce-{gallery.position.horizontal} ce-{gallery.position.vertical}{f:if(condition: gallery.position.noWrap, then: ' ce-nowrap')}">
<f:if condition="{gallery.position.vertical} != 'below'">
<f:render partial="Media/Gallery" arguments="{_all}" />
</f:if>
+
<f:if condition="{data.bodytext}">
<f:then>
<div class="ce-bodytext">
@@ -31,9 +33,11 @@
</f:if>
</f:else>
</f:if>
+
<f:if condition="{gallery.position.vertical} == 'below'">
<f:render partial="Media/Gallery" arguments="{_all}" />
</f:if>
</div>
+
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textpic.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textpic.html
index 5496d1532efb..1af772743b44 100644
--- a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textpic.html
+++ b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textpic.html
@@ -1,17 +1,19 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:layout name="Default" />
-
<f:section name="Header">
+
<f:if condition="{gallery.position.noWrap} != 1">
<f:render partial="Header/All" arguments="{_all}" />
</f:if>
-</f:section>
+</f:section>
<f:section name="Main">
+
<div class="ce-textpic ce-{gallery.position.horizontal} ce-{gallery.position.vertical}{f:if(condition: gallery.position.noWrap, then: ' ce-nowrap')}">
<f:if condition="{gallery.position.vertical} != 'below'">
<f:render partial="Media/Gallery" arguments="{_all}" />
</f:if>
+
<f:if condition="{data.bodytext}">
<f:then>
<div class="ce-bodytext">
@@ -31,9 +33,11 @@
</f:if>
</f:else>
</f:if>
+
<f:if condition="{gallery.position.vertical} == 'below'">
<f:render partial="Media/Gallery" arguments="{_all}" />
</f:if>
</div>
+
</f:section>
</html>
diff --git a/typo3/sysext/fluid_styled_content/Tests/Functional/Rendering/Fixtures/FluidTemplate.html b/typo3/sysext/fluid_styled_content/Tests/Functional/Rendering/Fixtures/FluidTemplate.html
index 14bda763f250..97963f923346 100644
--- a/typo3/sysext/fluid_styled_content/Tests/Functional/Rendering/Fixtures/FluidTemplate.html
+++ b/typo3/sysext/fluid_styled_content/Tests/Functional/Rendering/Fixtures/FluidTemplate.html
@@ -1,4 +1,3 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:spaceless>
<f:switch expression="{type}">
<f:defaultCase>
@@ -6,4 +5,3 @@
</f:defaultCase>
</f:switch>
</f:spaceless>
-</html>
diff --git a/typo3/sysext/form/Resources/Private/Frontend/Templates/Finishers/Email/Default.html b/typo3/sysext/form/Resources/Private/Frontend/Templates/Finishers/Email/Default.html
index ec4d373a240e..08360418dda5 100644
--- a/typo3/sysext/form/Resources/Private/Frontend/Templates/Finishers/Email/Default.html
+++ b/typo3/sysext/form/Resources/Private/Frontend/Templates/Finishers/Email/Default.html
@@ -1,12 +1,5 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<f:layout name="SystemEmail" />
-
<f:section name="Title">{title}</f:section>
-
<f:section name="Main">
<table>
<formvh:renderAllFormValues renderable="{form.formDefinition}" as="formValue">
@@ -50,4 +43,3 @@
</formvh:renderAllFormValues>
</table>
</f:section>
-</html>
diff --git a/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/AdvancedPassword.html b/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/AdvancedPassword.html
index a2de789e947c..9f2b8a0c554a 100644
--- a/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/AdvancedPassword.html
+++ b/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/AdvancedPassword.html
@@ -44,12 +44,12 @@
/>
</div>
<f:if condition="{validationResults.errors} && {element.properties.renderFieldset} == '1'">
- <span id="{element.uniqueIdentifier}-errors" class="{element.rootForm.renderingOptions.fieldProperties.errorMsgClassAttribute}" role="alert">
- <f:for each="{validationResults.errors}" as="error">
- <f:format.htmlspecialchars>{formvh:translateElementError(element: element, error: error)}</f:format.htmlspecialchars>
- <br/>
- </f:for>
- </span>
+ <span id="{element.uniqueIdentifier}-errors" class="{element.rootForm.renderingOptions.fieldProperties.errorMsgClassAttribute}" role="alert">
+ <f:for each="{validationResults.errors}" as="error">
+ <f:format.htmlspecialchars>{formvh:translateElementError(element: element, error: error)}</f:format.htmlspecialchars>
+ <br/>
+ </f:for>
+ </span>
</f:if>
</f:render>
</f:form.validationResults>
diff --git a/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/Field/Field.html b/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/Field/Field.html
index 891f29702a9d..dcf6d1c00896 100644
--- a/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/Field/Field.html
+++ b/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/Field/Field.html
@@ -1,7 +1,4 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<f:form.validationResults for="{element.rootForm.identifier}.{element.identifier}">
<f:if condition="{renderFieldset} == 1">
<f:then>
diff --git a/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/MultiCheckbox.html b/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/MultiCheckbox.html
index 14c3050c264e..bf3e5a8b2a60 100644
--- a/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/MultiCheckbox.html
+++ b/typo3/sysext/form/Resources/Private/FrontendVersion2/Partials/MultiCheckbox.html
@@ -3,6 +3,7 @@
<f:render partial="Field/Field" arguments="{element: element, renderFieldset: '{element.properties.renderFieldset}', doNotShowLabel: '{element.properties.legendVisuallyHidden}'}" contentAs="elementContent">
<f:form.validationResults for="{element.rootForm.identifier}.{element.identifier}">
<f:variable name="errorClass">{f:if(condition: '{validationResults.errors}', then: '{element.rootForm.renderingOptions.fieldProperties.errorClassAttribute}')}</f:variable>
+
<div id="{element.uniqueIdentifier}" class="{errorClass}" role="radiogroup" aria-label="{element.label}">
<f:for each="{element.properties.options}" as="label" key="value" iteration="idIterator">
<f:if condition="{element.properties.elementDescription}">
@@ -11,6 +12,7 @@
<f:if condition="{validationResults.errors} && {idIterator.isFirst}">
<f:variable name="aria" value="{invalid: 'true', describedby: '{element.uniqueIdentifier}-errors'}" />
</f:if>
+
<div class="{element.properties.containerClassAttribute}">
<label class="{element.properties.labelClassAttribute}" for="{element.uniqueIdentifier}-{idIterator.index}">
<f:form.checkbox
diff --git a/typo3/sysext/form/Resources/Private/Templates/Backend/FormEditor/Index.html b/typo3/sysext/form/Resources/Private/Templates/Backend/FormEditor/Index.html
index 46eb0dfcc7c8..205a2dc76f5b 100644
--- a/typo3/sysext/form/Resources/Private/Templates/Backend/FormEditor/Index.html
+++ b/typo3/sysext/form/Resources/Private/Templates/Backend/FormEditor/Index.html
@@ -4,6 +4,7 @@
xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html b/typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html
index 9504adf329bd..7ae8dbce41ad 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html
@@ -4,10 +4,13 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<div class="form-section">
+
<h3 class="form-section-headline">
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeconfig_exportPagetreeConfiguration" />
</h3>
+
<div class="row">
<div class="col-sm-2">
<label class="form-label">
@@ -19,6 +22,7 @@
<input type="hidden" name="tx_impexp[pagetree][id]" value="{inData.pagetree.id}" />
</div>
</div>
+
<div class="row">
<div class="col-sm-2">
<label class="form-label">
@@ -36,6 +40,7 @@
</f:if>
</div>
</div>
+
<div class="form-group">
<label class="form-label" for="pagetreeLevels">
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeconfig_levels" />
@@ -50,6 +55,7 @@
</f:for>
</select>
</div>
+
<div class="form-group">
<label class="form-label" for="pagetreeTables">
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeconfig_includeTables"/>
@@ -66,6 +72,7 @@
</f:for>
</select>
</div>
+
<f:if condition="{records -> f:count()} > 0">
<h4>
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeconfig_exportSingleRecord"/>
@@ -86,6 +93,7 @@
</div>
</div>
</f:if>
+
<f:if condition="{tableList -> f:count()} > 0">
<h4>
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeconfig_exportTablesFromPages"/>
@@ -105,9 +113,11 @@
</div>
</div>
</f:if>
+
<h4>
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeconfig_relationsAndExclusions"/>
</h4>
+
<div class="form-group">
<label class="form-label" for="externalRefTables">
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeconfig_includeRelationsToTables"/>
@@ -124,6 +134,7 @@
</f:for>
</select>
</div>
+
<div class="form-group">
<label class="form-label" for="externalStaticTables">
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeconfig_useStaticRelationsFor"/>
@@ -140,6 +151,7 @@
</f:for>
</select>
</div>
+
<div class="form-group">
<div class="form-check">
<input type="hidden" name="tx_impexp[showStaticRelations]" value="" />
@@ -156,6 +168,7 @@
</label>
</div>
</div>
+
<div class="form-group">
<label class="form-label">
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeconfig_excludeElements"/>
@@ -199,6 +212,7 @@
</label>
</div>
</div>
+
<div class="form-group">
<button
type="submit"
@@ -208,5 +222,7 @@
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:makeadvanc_update" />
</button>
</div>
+
</div>
+
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Import/MetaData.html b/typo3/sysext/impexp/Resources/Private/Partials/Import/MetaData.html
index 2e2f23766617..b36c220d3997 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Import/MetaData.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Import/MetaData.html
@@ -2,7 +2,9 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<div class="form-section">
+
<h3 class="form-section-headline">
<f:translate key="LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:importdata_metaData" />
</h3>
@@ -47,5 +49,7 @@
</tbody>
</table>
</div>
+
</div>
+
</html>
diff --git a/typo3/sysext/impexp/Resources/Private/Partials/Preview.html b/typo3/sysext/impexp/Resources/Private/Partials/Preview.html
index 208a164fb5d0..12b88ca23b98 100644
--- a/typo3/sysext/impexp/Resources/Private/Partials/Preview.html
+++ b/typo3/sysext/impexp/Resources/Private/Partials/Preview.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:if condition="{import.mode} == 'import'">
<f:then>
<h2>
@@ -159,4 +160,5 @@
</table>
</div>
</f:if>
+
</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html
index 9daf48dea46a..92ffc95f21e4 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html
@@ -3,6 +3,7 @@
xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html
index e13688d55dc6..8100e2047814 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html
@@ -3,6 +3,7 @@
xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
index c18737d090f3..3e9cf331617b 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
@@ -4,6 +4,7 @@
xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
@@ -137,7 +138,7 @@
</f:else>
</f:if>
</f:for>
- </tbody>
+ </tbody>
</table>
</div>
</f:then>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
index c5d344324ded..bdd285240629 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
@@ -3,6 +3,7 @@
xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
@@ -28,6 +29,7 @@
<f:render section="wordlisting" arguments="{words:words,phash:phash,page:page,keywords:keywords,title:'words'}" />
<f:render section="wordlisting" arguments="{words:topCount,phash:phash,title:'topCount'}" />
<f:render section="wordlisting" arguments="{words:topFrequency,phash:phash,title:'topFrequency'}" />
+
<f:if condition="{debug}">
<h3>
<f:translate key="administration.statistics.debug" />
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html
index 0b15b8badcb7..15b3edb9c4a0 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:asset.script identifier="indexed_search_pagination" src="EXT:indexed_search/Resources/Public/JavaScript/pagination.js" />
<f:alias map="{sword: searchParams.sword}">
diff --git a/typo3/sysext/info/Resources/Private/Layouts/Module.html b/typo3/sysext/info/Resources/Private/Layouts/Module.html
index a5875e6c8bf5..d36e88c80595 100644
--- a/typo3/sysext/info/Resources/Private/Layouts/Module.html
+++ b/typo3/sysext/info/Resources/Private/Layouts/Module.html
@@ -1,9 +1,10 @@
<html
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:render section="Before" arguments="{_all}" optional="true" />
+
<div class="module {moduleClass}" data-module-id="{moduleId}" data-module-name="{moduleName}">
<f:if condition="{docHeader.enabled}">
<f:render partial="DocHeader" arguments="{docHeader:docHeader}" />
@@ -20,5 +21,7 @@
<f:format.raw>{footerContent}</f:format.raw>
</div>
</div>
+
<f:render section="After" arguments="{_all}" optional="true" />
+
</html>
diff --git a/typo3/sysext/info/Resources/Private/Templates/PageInformation.html b/typo3/sysext/info/Resources/Private/Templates/PageInformation.html
index 0cb2b9ff66d3..db24f00a9761 100644
--- a/typo3/sysext/info/Resources/Private/Templates/PageInformation.html
+++ b/typo3/sysext/info/Resources/Private/Templates/PageInformation.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module"/>
<f:section name="Before">
@@ -21,10 +22,14 @@
</f:section>
<f:section name="Content">
+
<f:if condition="{accessContent}">
<f:then>
- <h1><f:translate key="LLL:EXT:info/Resources/Private/Language/locallang_webinfo.xlf:page_title"/></h1>
+ <h1>
+ <f:translate key="LLL:EXT:info/Resources/Private/Language/locallang_webinfo.xlf:page_title"/>
+ </h1>
<f:if condition="{content}">
+
<form action="{f:be.uri(route: 'web_info_overview', parameters: '{id: pageUid}')}" method="post">
<div class="form-row">
<div class="form-group">
@@ -41,6 +46,7 @@
</div>
</div>
</form>
+
<f:format.raw>{content}</f:format.raw>
</f:if>
</f:then>
@@ -50,6 +56,7 @@
</f:be.infobox>
</f:else>
</f:if>
+
</f:section>
</html>
diff --git a/typo3/sysext/info/Resources/Private/Templates/TranslationStatus.html b/typo3/sysext/info/Resources/Private/Templates/TranslationStatus.html
index 970a186fada7..c172fc743f3a 100644
--- a/typo3/sysext/info/Resources/Private/Templates/TranslationStatus.html
+++ b/typo3/sysext/info/Resources/Private/Templates/TranslationStatus.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module"/>
<f:section name="Before">
@@ -22,6 +23,7 @@
</f:section>
<f:section name="Content">
+
<f:if condition="{accessContent}">
<f:then>
<h1><f:translate key="LLL:EXT:info/Resources/Private/Language/locallang_webinfo.xlf:lang_title" /></h1>
@@ -53,6 +55,7 @@
</f:be.infobox>
</f:else>
</f:if>
+
</f:section>
</html>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Upgrade/UpgradeDocs/PanelItem.html b/typo3/sysext/install/Resources/Private/Partials/Upgrade/UpgradeDocs/PanelItem.html
index b305766c0bb5..a101763ded72 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Upgrade/UpgradeDocs/PanelItem.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Upgrade/UpgradeDocs/PanelItem.html
@@ -1,8 +1,8 @@
<html
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
+ data-namespace-typo3-fluid="true">
+
<div class="t3js-upgrade-doc panel panel-rst panel-{fileArray.class} risk-medium" data-item-tags="{fileArray.tagList}" data-item-version="{fileArray.version}" data-item-state="{state}" id="heading{id}">
<div class="panel-heading" role="tab">
<h3 class="panel-title">
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Configuration.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Configuration.html
index 2da38d4092fe..6dcbd0e6c5aa 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Configuration.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Configuration.html
@@ -3,9 +3,11 @@
xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<f:be.pageRenderer
includeJavaScriptModules="{
0: '@typo3/backend/tree/tree-node-toggle.js',
@@ -16,9 +18,12 @@
'collapse-state-search.numberOfSearchMatches': 'LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:module.configuration.numberOfSearchMatches'
}"
/>
+
<form action="" id="ConfigurationView" method="post">
<h1><f:translate key="LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:module.configuration.title" /></h1>
+
<h2>{treeName}</h2>
+
<div id="lowlevel-config" class="form-row">
<div class="form-group">
<form action="#">
@@ -43,10 +48,12 @@
<span class="badge badge-success hidden t3js-collapse-states-search-numberOfSearchMatches"></span>
</div>
</div>
+
<div class="t3js-collapse-states-search-tree">
<f:format.raw>{tree}</f:format.raw>
</div>
</form>
+
</f:section>
</html>
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/CustomSearch.html b/typo3/sysext/lowlevel/Resources/Private/Templates/CustomSearch.html
index a56d3a15e59a..ecaaa5fb4b18 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/CustomSearch.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/CustomSearch.html
@@ -1,19 +1,20 @@
<html
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Before">
<f:be.pageRenderer
includeJavaScriptModules="{
- 0: '@typo3/lowlevel/query-generator.js'
- }"
+ 0: '@typo3/lowlevel/query-generator.js'
+ }"
/>
</f:section>
<f:section name="Content">
+
<h1>{f:translate(key:'LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:search_whole_database')}</h1>
<f:format.raw>{submenu}</f:format.raw>
@@ -24,6 +25,7 @@
</f:then>
<f:else>
<h2 id="search-options">{f:translate(key:'LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:searchOptions')}</h2>
+
<div class="form-group">
<div class="input-group">
<input aria-labelledby="search-options" placeholder="{f:translate(key: 'LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:search.placeholder')}" class="form-control" type="search" id="searchField" name="SET[sword]" value="{sword}">
@@ -48,6 +50,7 @@
</f:else>
</f:if>
</form>
+
</f:section>
</html>
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/RecordStatistics.html b/typo3/sysext/lowlevel/Resources/Private/Templates/RecordStatistics.html
index 71c395862cf1..490d830b4140 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/RecordStatistics.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/RecordStatistics.html
@@ -2,10 +2,13 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<h1>{f:translate(key:'LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:records')}</h1>
+
<h2>{f:translate(key:'LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:pages')}</h2>
<div class="table-fit">
<table class="table table-striped table-hover">
@@ -89,6 +92,7 @@
</tbody>
</table>
</div>
+
</f:section>
</html>
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Relations.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Relations.html
index 811c12d45727..b43e68505885 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Relations.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Relations.html
@@ -2,9 +2,11 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Content">
+
<h1>{f:translate(key:'LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:relations')}</h1>
<p class="lead"><f:translate key="LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:relations_description" /></p>
@@ -44,6 +46,7 @@
</div>
</div>
</div>
+
</f:section>
</html>
diff --git a/typo3/sysext/scheduler/Resources/Private/Partials/TaskList.html b/typo3/sysext/scheduler/Resources/Private/Partials/TaskList.html
index 7fbf1d7479cd..7cf0780d825f 100644
--- a/typo3/sysext/scheduler/Resources/Private/Partials/TaskList.html
+++ b/typo3/sysext/scheduler/Resources/Private/Partials/TaskList.html
@@ -308,12 +308,12 @@
<span class="badge badge-success"><f:translate key="LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.running" /></span>
</f:if>
<f:if condition="{task.nextExecution} && {task.nextExecution} < {now} && !{group.hidden} && !{task.disabled}">
- <span
- class="badge badge-warning"
- title="{f:translate(key:'LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.legend.scheduled')}"
- >
- <f:translate key="LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.late" />
- </span>
+ <span
+ class="badge badge-warning"
+ title="{f:translate(key:'LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.legend.scheduled')}"
+ >
+ <f:translate key="LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.late" />
+ </span>
</f:if>
<f:if condition="{task.disabled} && !{task.isRunning}">
<span class="badge badge-secondary"><f:translate key="LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.disabled" /></span>
@@ -324,23 +324,23 @@
<f:if condition="{task.lastExecutionFailure}">
<f:if condition="{task.lastExecutionFailureMessage}">
<f:then>
- <span
- class="badge badge-danger"
- title="{f:translate(
- key:'LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:msg.executionFailureReport',
- arguments:{0: task.lastExecutionFailureCode, 1: task.lastExecutionFailureMessage}
- )}"
- >
- <f:translate key="LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.failure" />
- </span>
+ <span
+ class="badge badge-danger"
+ title="{f:translate(
+ key:'LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:msg.executionFailureReport',
+ arguments:{0: task.lastExecutionFailureCode, 1: task.lastExecutionFailureMessage}
+ )}"
+ >
+ <f:translate key="LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.failure" />
+ </span>
</f:then>
<f:else>
- <span
- class="badge badge-danger"
- title="{f:translate(key:'LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:msg.executionFailureDefault')}"
- >
- <f:translate key="LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.failure" />
- </span>
+ <span
+ class="badge badge-danger"
+ title="{f:translate(key:'LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:msg.executionFailureDefault')}"
+ >
+ <f:translate key="LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:status.failure" />
+ </span>
</f:else>
</f:if>
</f:if>
diff --git a/typo3/sysext/setup/Resources/Private/Templates/Main.html b/typo3/sysext/setup/Resources/Private/Templates/Main.html
index 044286128454..db12d0920471 100644
--- a/typo3/sysext/setup/Resources/Private/Templates/Main.html
+++ b/typo3/sysext/setup/Resources/Private/Templates/Main.html
@@ -2,6 +2,7 @@
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:layout name="Module" />
<f:section name="Before">
@@ -17,7 +18,11 @@
</f:section>
<f:section name="Content">
- <h1><f:translate key="LLL:EXT:setup/Resources/Private/Language/locallang.xlf:UserSettings" /></h1>
+
+ <h1>
+ <f:translate key="LLL:EXT:setup/Resources/Private/Language/locallang.xlf:UserSettings" />
+ </h1>
+
<form
action="{f:be.uri(route: 'user_setup')}"
method="post"
@@ -48,6 +53,7 @@
</f:for>
</div>
</div>
+
<div>
<input type="hidden" name="formToken" value="{formToken}" />
<input type="hidden" value="1" name="data[save]" />
diff --git a/typo3/sysext/tstemplate/Resources/Private/Partials/ActiveTree.html b/typo3/sysext/tstemplate/Resources/Private/Partials/ActiveTree.html
index 249c04797897..d9d3faa0658f 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Partials/ActiveTree.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Partials/ActiveTree.html
@@ -3,6 +3,7 @@
xmlns:backend="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
data-namespace-typo3-fluid="true"
>
+
<f:for each="{tree.nextChild}" as="child">
<f:if condition="{displayComments} && {child.comments}">
<li class="loose">
@@ -38,9 +39,11 @@
</typo3-backend-tree-node-toggle>
</f:if>
<span class="treelist-group treelist-group-monospace">
+
<span class="treelist-label">
<a href="{editUri}&nodeIdentifier={child.identifier}">{child.name}</a>
</span>
+
<f:if condition="!{child.valueNull}">
<span class="treelist-operator">=</span>
<span class="treelist-value">{child.value}</span>
diff --git a/typo3/sysext/workspaces/Resources/Private/Templates/Email/StageChangeNotification.html b/typo3/sysext/workspaces/Resources/Private/Templates/Email/StageChangeNotification.html
index 80fb31246a1e..1960a8032948 100644
--- a/typo3/sysext/workspaces/Resources/Private/Templates/Email/StageChangeNotification.html
+++ b/typo3/sysext/workspaces/Resources/Private/Templates/Email/StageChangeNotification.html
@@ -1,13 +1,6 @@
-<html
- xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true"
->
<f:layout name="SystemEmail" />
-
<f:section name="Subject">There are new changes in workspace "{workspace.title}"</f:section>
-
<f:section name="Title">{affectedElements -> f:count()} items sent to stage "{nextStage}" in workspace "{workspace.title}"</f:section>
-
<f:section name="Main">
<p>
At the TYPO3 site "{typo3.sitename}" in workspace "{workspace.title}" ({workspace.uid})
@@ -18,19 +11,22 @@
<li>{element.0}:{element.1}</li>
</f:for>
</ul>
+
<p>
The first entry was "{recordTitle}" at location <code>"{rootLine}"</code> in the page tree.
</p>
+
<f:if condition="{previewLink}">
<p><a href="{previewLink}" rel="noopener">See a preview of the changed page.</a></p>
</f:if>
+
<p>
The stage was changed by <strong>{currentUser.realName}</strong> ({currentUser.username}).
</p>
+
<f:if condition="{additionalMessage}">
<p> </p>
<h3>Additional comment</h3>
<p><f:format.nl2br>{additionalMessage}</f:format.nl2br></p>
</f:if>
</f:section>
-</html>
--
GitLab