diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/BackendLayout.php b/typo3/sysext/backend/Classes/View/BackendLayout/BackendLayout.php index 11ff0b6cd1f2e64d59da9ecff62c04f6b5ff795a..4bffb76b62f63e42c9547409a87857e8ca224588 100644 --- a/typo3/sysext/backend/Classes/View/BackendLayout/BackendLayout.php +++ b/typo3/sysext/backend/Classes/View/BackendLayout/BackendLayout.php @@ -308,7 +308,8 @@ class BackendLayout } $grid->addRow($rowObject); } - $allowInconsistentLanguageHandling = (bool)(BackendUtility::getPagesTSconfig($this->id)['mod.']['web_layout.']['allowInconsistentLanguageHandling'] ?? false); + $pageId = $this->drawingConfiguration->getPageId(); + $allowInconsistentLanguageHandling = (bool)(BackendUtility::getPagesTSconfig($pageId)['mod.']['web_layout.']['allowInconsistentLanguageHandling'] ?? false); if (!$allowInconsistentLanguageHandling && $this->getLanguageModeIdentifier() === 'connected') { $grid->setAllowNewContent(false); } diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumnItem.php b/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumnItem.php index 2358f21441efad10b2296460fc0423efdc2bcae9..9dc2ad9d568f507960811c07a2aba5c2d8a188b9 100644 --- a/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumnItem.php +++ b/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumnItem.php @@ -195,7 +195,7 @@ class GridColumnItem extends AbstractGridObject public function isDelible(): bool { $backendUser = $this->getBackendUser(); - if (!$backendUser->doesUserHaveAccess($this->pageinfo, Permission::CONTENT_EDIT)) { + if (!$backendUser->doesUserHaveAccess($this->backendLayout->getDrawingConfiguration()->getPageRecord(), Permission::CONTENT_EDIT)) { return false; } return !(bool)($backendUser->getTSConfig()['options.']['disableDelete.']['tt_content'] ?? $backendUser->getTSConfig()['options.']['disableDelete'] ?? false); 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 f2b104b19ae7a43c9f58c01a550d16e45e69a1d3..e1935eb681f165423cf6027a4a1664f18690b28c 100644 --- a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/Column.html +++ b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Grid/Column.html @@ -57,7 +57,7 @@ {f:if(condition: column.items, else: 't3-page-ce-empty')}"> <f:for each="{column.items}" as="item"> <f:if condition="{item.deletePlaceholder} == 0"> - <f:render partial="PageLayout/Record" arguments="{item: item, grid: grid}" /> + <f:render partial="PageLayout/Record" arguments="{_all}" /> </f:if> </f:for> </div> diff --git a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record.html b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record.html index 3f13d95723b9ac8663150b8ab01ddd9c66a3f9ed..8dc2731d838612f9fda6f23a4f1c0a6d23d56b14 100644 --- a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record.html +++ b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record.html @@ -18,10 +18,12 @@ </div> </div> <f:if condition="{item.column.contentEditable} && {grid.allowNewContent}"> - <a href="{item.newContentAfterUrl}" title="{item.newContentAfterLinkTitle}" data-title="{item.newContentAfterLinkTitle}" class="btn btn-default btn-sm t3js-toggle-new-content-element-wizard"> - <core:icon identifier="actions-add" /> - {item.newContentAfterTitle} - </a> + <div class="t3js-page-new-ce t3-page-ce-wrapper-new-ce" id="colpos-{item.column.columnNumber}-page-{item.column.backendLayout.drawingConfiguration.pageId}-{item.column.uniqueId}"> + <a href="{item.newContentAfterUrl}" title="{item.newContentAfterLinkTitle}" data-title="{item.newContentAfterLinkTitle}" class="btn btn-default btn-sm t3js-toggle-new-content-element-wizard"> + <core:icon identifier="actions-add" /> + {item.newContentAfterTitle} + </a> + </div> </f:if> <div class="t3-page-ce-dropzone-available t3js-page-ce-dropzone-available"></div> </div> diff --git a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record/Footer.html b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record/Footer.html index 3f7d3c38841f3221e950791c5f37e604b111fbc9..c0b4c95e89c857158931e3da2218cf261019b2f2 100644 --- a/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record/Footer.html +++ b/typo3/sysext/backend/Resources/Private/Partials/PageLayout/Record/Footer.html @@ -1,7 +1,7 @@ <div class="t3-page-ce-footer"> <div class="t3-page-ce-info"> <f:for each="{item.footerInfo}" as="infoLine" iteration="iteration"> - {infoLine}<f:if condition="!{iteration.isLast}"><br /></f:if> + {infoLine -> f:format.raw()}<f:if condition="!{iteration.isLast}"><br /></f:if> </f:for> </div> </div>