diff --git a/typo3/sysext/backend/Resources/Private/Layouts/Module.html b/typo3/sysext/backend/Resources/Private/Layouts/Module.html
index f762e66902885370568dbd5d3088ba77840a55c0..4e8c4e0c7fd2a5aa20c4a8fc14b4f7e3ec161a08 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 da8983ec65033cb6f4885e8d3bcbd29494cb82d3..9a13d6b626d224d439b4661220d47a578d1542a7 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 8a9f4b102db15f423dc86cc8cd07be39606b9d68..055d6eb625234e3a02ae225d6f450b7fa4880c4f 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 660ee6fb5333abb3ba3948be6956864e6a9d87dd..33786dba30b5aa8612585dbb014115d30f127ae6 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 129e31378b8819f73ecbd106e3ae681d7df064c8..0ba783accf1091ebb55142344a6872118a827708 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 fdc3bc6a501430a699b2cc5d27f3b99bc0739f95..e71e7ccb9b757e480744835d8cff27c1d9fff1e2 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 7b1fac58e01ce492d6d1531a9abc513f8fbdbcbc..2f09f3fe1cab71b29a8eeb0690c17e3abeffc063 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 7a66192cf97d0c594b179aa441d201f1d9a72ed6..04fe372e662ca839f10cbf3a42388162e6fa33d8 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 5d69c6d44c7fbf68bc7e19246aa17b5559c16046..6ce42cd0b091e0f6f39d7b2c7d3d31a9873c5dff 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 940a6752677aff8514f05de6c3624008524b4a30..a74dcfcf2c4a6d53a6c65e4b2dea8b565a26687f 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 64a78fe45796db368517e11c3a060cda8ba4b4d6..70009e10f739beb1595ef7c5ed520bfb4e32b158 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 da04771f7f47aa22a70642233ac42294c6bee24e..9635c923939e72918598c40445bb40e643e95f92 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 a6089e13e21645b1bea2d9f6e643634115dc1dab..3de62ffbc83b66eff4063e995c727ba334830d16 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 b7ed3ab626d5749c98ac3a70ecf5667e7fc4b4bf..54e799867896725181b5ec372c3e49ce8ecb321b 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 ef8a060f7b41f110655ebc7dd4b2a9749600f395..1f812c5335cf0dbfec03d3aa7c533fe68705a3f7 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 013fd417acdc4660961ae7976f52ba970aa8f45a..2f6108320401f65e94f001c5308915aad4b6f406 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 11654f7afc77205eb8154f6f011678b6e96cfb78..4c822bfb33dfea9c0346a5b62dedd6aeef14c7f8 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 e7209ff9a30e580771fd388223fd2a5a5f11061b..07203e4ae9b630b2a7de143a3aa0fa90c4e1b1df 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 25d21feff9109940f3827a14d71d9c7f70c2a3e2..c866197308642672968f78b67c61d5c82cc7948d 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 bd4cd174ed25dc02376d17f3fe20e5f9b89d7b07..6c3cd81c559b075d650c4088eaa309a28f14f4b2 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 90f660f367b7a6de3bd1504de24e47029dcd5e4d..d4af912467e48d66aef4680200fe0fae6b7faec7 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 238614248963d07b1ea5b555cbc13bbcee9ded90..4ecce826882f94d3557aec1ef8e140d4ba993a84 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 c1f7b62ace0f3db7149219260b08544e46b2d904..2de35153b6e4faadf151d6f9cb30d7b3eba1b18b 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 63534ba97417ef86a0408cb68ca498e5e4f6d35c..a97f3c6cab31ac26074f323de23b0e11ebe336a7 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 89a8cd86a5e27aa47a72710de6eba0826874a2d0..e6fb65ee95e1d28f46427af4eedd557c74137279 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 2edea3fa06778bc4db128c392f42f3938fee8cda..12f32866df888091f5ca1490dd6b8bec31507809 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 6cc43801535491e4ba8a59efd58174f9b4e77ea4..bb60c3dd45bad92cca43b087bb4a8af9066176b4 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 bf90ea6871204af11f6462c773bcb7bf1473bbcc..fe12162a98a6749a7464fc672e0eb67fa7dc3e91 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 7a13c2191a1aa0fc5b1e7324ef235fceb6ce94e6..e1b2d62324ec809e4d4ad96009eb4d8baaf122f1 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 0bb84218fb3cb0d63b0559e4459a0aa819d778d5..33deca784eeb874279fdd814c1114cee8dd47d93 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 60e2ed5a00eda23bd0ac97fa7b698934cd1fd8e6..44f4182ec7e83accc03ed3f5d05d2659001b4918 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 997deb30518ac916d75efb4242780252b8250294..8d8879e94e34abb3dfd7a9ec426f744da2021801 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 10878091b38de1702935760f48c307a07db53161..7525f34317150366e656fd3b2296ec1e5beec060 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 cf96d5f9f30a9a37c665175e4900daa55d17a1ef..2e1a6c82415781cbb40e889aba91aa8dea94367f 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 160faac76e4f0b97e853e4ae63984ccfdec9f201..f82ab66d0464384b0a362021c4f2961fc39878a5 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 f5dbb0cda6b778299aaecc5191d2b54fa6c5a822..4be004d2aeae5b4623527a5acb1e2a77b8a7145f 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 8fc49211298355df5504cc5d7fb64844e7728481..39bd753f5b3f609cc33d2b99da604d0b0932ff4e 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 8fc49211298355df5504cc5d7fb64844e7728481..39bd753f5b3f609cc33d2b99da604d0b0932ff4e 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 770f2f5ee4b55e4de762463eb0998e279d39426d..619191fe2152d6ff5977496a7bf83f208f7a5690 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 7c5eb83ac86020db7f9b36b687bf3d95470303b0..d3a95bf5992953d98d6deefbc5724547b8b95695 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 03d2e2588b7cc71e3ffdd7993018d58f643fb3a8..3dd608ab3c60531f9628551975fdbf50568e7d99 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 8b380fdf76e2541c866e2cfa2a4b15bd54806c00..82f0713671c0cacff8687bf25935253092aba8de 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 41bb13960af8194f61e82ac32133d2db0ab2231b..22f7ffe02d2c5789696379cb27457603b5026244 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 307dd45bd6f8370c0bad8232a53825f68243d107..22fe35a1c21ee78623aa97cafaac9b0b2d5477fd 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 be0041e77fadaabdf2b096db3e2d3d0ea8f0b742..2a281c69b8a19d162ce176fd222eb9d26d05d3e3 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 d72ac75435ceb03901094c7a6628e9edecd370af..78f4b8a1c7d1fcd49faead1f745f88564b2d97a2 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 f80f16f27f6cc1a3381a72a40f03071ebc2001b9..57bbcf451f57667b13e3701419a8458081d92fc9 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 5496d1532efb175da7d387efbb3d9f725bea11b1..1af772743b44e788d2b72c8edf27dd9914051e6f 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 5496d1532efb175da7d387efbb3d9f725bea11b1..1af772743b44e788d2b72c8edf27dd9914051e6f 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 14bda763f2504dcaf61b02b6d7d8ff402007c4aa..97963f923346d6a070eb166c6e1abf6543475de7 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 ec4d373a240e3b471368f0d77c3bc0c449eb52e5..08360418dda5c391c853523ddc03cd951c52c948 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 a2de789e947c68d9b112094dfa299371b4bc65cc..9f2b8a0c554aad40137c4c4f9cc50afb11c26cb4 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 891f29702a9d9819902bfca0e327a676f76dc2e5..dcf6d1c00896326c324c44270fb31e871f74476a 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 14c3050c264e4def51ff94c512e81c6ea7fbe90e..bf3e5a8b2a60eb6205564a8c88b2e704b0976e18 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 46eb0dfcc7c8675db142f7f97148f53085a38b25..205a2dc76f5b1c63fce5a052f43d023cf89ea85b 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 9504adf329bdc5f20dc1c0c1c2bcc79e25c6099c..7ae8dbce41ad7524db11f73d4768be5f1f154abb 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 2e2f23766617c569fa96e4070c42b1e5cadf47fd..b36c220d39974ce318e5e1f54b77acb880f55444 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 208a164fb5d0d34799aa1e0a12a25ad941c45a88..12b88ca23b98aab4078fde112741c0ce8df704a3 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 9daf48dea46ab0bc759438cc8469801f2bfc50fe..92ffc95f21e4280dcb838dfe4ffa131f728518f8 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 e13688d55dc6d01820a50755b378e3bc569dc312..8100e2047814d2c20aa31e5ff5b4f3b89e0feb38 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 c18737d090f3f881025f8782b1852ae6b99f4d26..3e9cf331617ba748d9815fc1c525026c0bb9e163 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 c5d344324dedad4031b6bfc579472f5ce8b97a10..bdd2852406290249b5a8832ff02016737e52b439 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 0b15b8badcb7e1ea218ba09428f3a4f197302d73..15b3edb9c4a0dbb29c5d3ef358b535c7736e83a8 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 a5875e6c8bf580f06fd62c2f0b6a6708686ddff8..d36e88c8059504eaac65c856755cd9ead63929da 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 0cb2b9ff66d36eec80a0c30955e0ea2a775ad902..db24f00a9761a71dd5645320d587695dc50aeb0a 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 970a186fada77e2f6e8273c93e870f5a8b7d760c..c172fc743f3a16e3e32ada0be5b3d207002a24c0 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 b305766c0bb5835221781cd7fd1211e8f09db020..a101763ded7240ca5dce00f76eebe859eeb32764 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 2da38d4092fed248bea21a4ecee838bcad4feca7..6dcbd0e6c5aa39b1953a120bf421feaa1f7adb9a 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 a56d3a15e59a28223c2910c96f637b6fda7bce9a..ecaaa5fb4b182627f8f633e3bfb8145e8e432d9f 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 71c395862cf16ae45e297c2e28bf206bb68dc000..490d830b41408287148f81c83125fd70e09ce5c0 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 811c12d45727fe61e19c2e683b46032fdae5b046..b43e685058857d89f8a4b0bf244b0f3d2d35764a 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 7fbf1d7479cd913a9f34b8da4988a4c76635e403..7cf0780d825f8e5615844e64301505ea4a694ba6 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 044286128454dacdf1235df36832544f4c607b8d..db12d09204710b6f5fb72806ff921b5cf85f1a04 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 249c047978978aa7d6bb2592b0fb095309ecea67..d9d3faa0658f062312bcd2ac930814e1795d5838 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 80fb31246a1e5ce6dbbf9e367fa41f8ce53c5d8e..1960a803294872bf44ef6e8578998ecdc203e1f9 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>