b13 · achimfritz · Dec 2, 2025 · Oct 31, 2025
diff --git a/Resources/Private/Partials/PageLayout/Grid/Column.html b/Resources/Private/Partials/PageLayout/Grid/Column.html
@@ -4,20 +4,36 @@
 </f:comment>
 <f:variable name="colpos" value="{f:if(condition: column.unused, then: 'unused', else: column.columnNumber)}"/>
 
+<f:if condition="{languageColumns}">
+    <f:then>
+        <f:comment><!-- Language comparison view --></f:comment>
+        <f:variable name="columnIdentifier" value="columnIdentifier_language-{column.context.siteLanguage.languageId}_column-{colpos}" />
+    </f:then>
+    <f:else>
+        <f:comment><!-- Grid / Column view --></f:comment>
+        <f:variable name="columnIdentifier" value="columnIdentifier_column-{colpos}" />
+    </f:else>
+</f:if>
+<f:variable name="columnClasses">
+    t3js-page-column t3-grid-cell t3-page-column
+    {f:if(condition: column.identifierCleaned, then: 't3-grid-cell-{column.identifierCleaned}')}
+    {f:if(condition: column.unassigned, then: 't3-grid-cell-unassigned')}
+    {f:if(condition: '!{column.active} && !{column.unused}', then: 't3-grid-cell-restricted')}
+    {f:if(condition: '!{column.active} && {hideRestrictedColumns} && !{column.unused}', then: 't3-grid-cell-hidden')}
+</f:variable>
+
 <td valign="top" colspan="{column.colSpan}" rowspan="{column.rowSpan}"
-    data-colpos="{column.columnNumber}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
-    class="t3js-page-lang-column-{column.context.siteLanguage.languageId} t3js-page-column t3-grid-cell t3-page-column t3-page-column-{colpos}
-        {f:if(condition: column.unassigned, then: 't3-grid-cell-unassigned')}
-        {f:if(condition: '!{column.active} && !{column.unused}', then: 't3-grid-cell-restricted')}
-        {f:if(condition: '!{column.active} && {hideRestrictedColumns} && !{column.unused}', then: 't3-grid-cell-hidden')}
-        t3-gridCell-width{column.colSpan}
-        t3-gridCell-height{column.rowSpan}">
-    <f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
+    data-colpos="{colpos}" data-language-uid="{column.context.siteLanguage.languageId}"
+    data-tx-container-parent="{column.containerUid}"
+    class="{columnClasses -> f:spaceless()}"
+    role="group" aria-labelledby="{columnIdentifier}">
+    <f:alias map="{columnHeaderLevel: 2}">
+        <f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
+    </f:alias>
     <f:if condition="{column.active} || {column.unused}">
         <div data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
              data-tx-container-parent="{column.containerUid}"
-             class="t3js-sortable t3js-sortable-lang t3js-sortable-lang-{column.context.siteLanguage.languageId} t3-page-ce-wrapper
-            {f:if(condition: column.items, else: 't3-page-ce-empty')}">
+             class=" t3-page-ce-wrapper">
             <f:for each="{column.items}" as="item">
                 <f:render partial="PageLayout/Record" arguments="{_all}" />
             </f:for>

diff --git a/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html b/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
@@ -1,45 +1,47 @@
+{columnHeaderLevel -> f:or(alternative: 2) -> f:variable(name: 'columnHeaderLevel')}
+
 <div class="t3-page-column-header">
     <f:if condition="{column.active}">
         <f:then>
             <div class="t3-page-column-header-icons">
                 <f:if condition="{allowEditContent} && {column.editUrl}">
-                    <a href="{column.editUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}"><core:icon identifier="actions-document-open" /></a>
+                    <a
+                        class="btn btn-link"
+                        href="{column.editUrl}"
+                        title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}"
+                    >
+                        <core:icon identifier="actions-document-open" />
+                        <span class="visually-hidden">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}</span>
+                    </a>
                 </f:if>
             </div>
-            {column.title}
+            <h{columnHeaderLevel} id="{columnIdentifier}" class="t3-page-column-title">{column.title}</h{columnHeaderLevel}>
         </f:then>
         <f:else if="{column.unused}">
-            <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/>
+            <span id="{columnIdentifier}"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/></span>
         </f:else>
         <f:else if="{column.unassigned}">
-            {column.titleUnassigned}
+            <span id="{columnIdentifier}">{column.titleUnassigned}</span>
         </f:else>
         <f:else>
-            {column.titleInaccessible}
+            <span id="{columnIdentifier}">{column.titleInaccessible}</span>
         </f:else>
     </f:if>
 </div>
 <f:format.raw>{column.beforeSectionMarkup}</f:format.raw>
 <f:if condition="{allowEditContent} && {column.contentEditable} && {column.allowNewContent} && {column.active}">
-    <div class="t3-page-ce t3js-page-ce" data-page="{column.context.pageId}" id="{column.uniqueId}">
-        <div class="t3-page-ce-actions t3js-page-new-ce" id="colpos-{column.columnNumber}-page-{column.context.pageId}-{column.uniqueId}">
-            <f:if condition="{column.newContentElementWizardShouldBeSkipped}">
-                <f:then>
-                    <a href="{column.newContentUrl}" title="{newContentTitle}" class="btn btn-default btn-sm">
-                        <core:icon identifier="actions-add" />
-                        <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
-                    </a>
-                </f:then>
-                <f:else>
-                    <typo3-backend-new-content-element-wizard-button url="{column.newContentUrl}" subject="{newContentTitle}">
-                        <button type="button" class="btn btn-default btn-sm">
-                            <core:icon identifier="actions-add" />
-                            <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
-                        </button>
-                    </typo3-backend-new-content-element-wizard-button>
-                </f:else>
-            </f:if>
-        </div>
+    <div class="t3-page-ce t3js-page-ce" data-page="{column.context.pageId}">
+        <f:if condition="{column.newContentElementWizardShouldBeSkipped}">
+            <f:then>
+                <a href="{column.newContentUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}" class="btn btn-default btn-sm">
+                    <core:icon identifier="actions-plus" />
+                    <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
+                </a>
+            </f:then>
+            <f:else>
+                    <f:render partial="PageLayout/ActionControls" arguments="{url: column.newContentUrl}" />
+            </f:else>
+        </f:if>
         <div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available" hidden></div>
     </div>
 </f:if>
diff --git a/Resources/Private/Partials/PageLayout/Record.html b/Resources/Private/Partials/PageLayout/Record.html
@@ -1,13 +1,17 @@
-{f:if(condition: '{item.disabled} && {item.context.drawingConfiguration.showHidden} == 0', then: 'display: none;') -> 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}"
-     data-move-element-url="{f:be.uri(route: 'move_element', parameters: '{uid: item.record.uid, originalPid: item.record.pid, expandPage: item.record.pid, returnUrl: context.returnUrl}')}"
-     style="{style}"
+{f:if(condition: '{item.disabled} && {item.context.drawingConfiguration.showHidden} == 0', then: 'height: 0; display: none;') -> f:variable(name: 'style')}
+<div
+    role="group"
+    aria-labelledby="element-{item.table}-{item.record.uid}-label"
+    class="t3-page-ce {item.wrapperClassName} t3js-page-ce t3js-page-ce-sortable"
+    id="element-{item.table}-{item.record.uid}"
+    data-table="{item.table}"
+    data-uid="{item.record.uid}"
+    data-language-uid="{item.record.sys_language_uid}"
+    data-move-element-url="{f:be.uri(route: 'move_element', parameters: '{uid: item.record.uid, originalPid: item.record.pid, expandPage: item.record.pid, returnUrl: context.returnUrl}')}"
+    style="{style}"
 >
-    <div class="t3-page-ce-element t3-page-ce-dragitem t3js-page-ce-dragitem" id="{item.uniqueId}">
+    <span id="element-{item.table}-{item.record.uid}-label" class="visually-hidden">id={item.record.uid} - <f:if condition="{item.record.header}">{item.record.header} - </f:if>{item.contentTypeLabel}</span>
+    <div class="t3-page-ce-element t3-page-ce-dragitem">
         <f:render partial="PageLayout/Record/{item.record.CType}/Header" arguments="{_all}" optional="1">
             <f:render partial="PageLayout/RecordDefault/Header" arguments="{_all}" />
         </f:render>
@@ -19,23 +23,23 @@
         <f:render partial="PageLayout/Record/{item.record.CType}/Footer" arguments="{_all}" optional="1">
             <f:render partial="PageLayout/RecordDefault/Footer" arguments="{_all}" />
         </f:render>
+        <f:if condition="{item.inconsistentLanguage}">
+            <div class="t3-page-ce-footer">
+                <span class="badge badge-warning">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.inconsistentLanguageWarning')}</span>
+            </div>
+        </f:if>
     </div>
     <f:if condition="{allowEditContent} && {item.column.contentEditable} && {item.column.allowNewContent} && {column.active}">
         <div class="t3-page-ce-actions t3js-page-new-ce" id="colpos-{item.column.columnNumber}-page-{item.context.pageId}-{item.column.uniqueId}">
             <f:if condition="{column.newContentElementWizardShouldBeSkipped}">
                 <f:then>
                     <a href="{item.newContentAfterUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}" class="btn btn-default btn-sm">
-                        <core:icon identifier="actions-add" />
+                        <core:icon identifier="actions-plus" />
                         <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
                     </a>
                 </f:then>
                 <f:else>
-                    <typo3-backend-new-content-element-wizard-button url="{item.newContentAfterUrl}" subject="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}">
-                        <button type="button" class="btn btn-default btn-sm">
-                            <core:icon identifier="actions-add" />
-                            <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
-                        </button>
-                    </typo3-backend-new-content-element-wizard-button>
+                    <f:render partial="PageLayout/ActionControls" arguments="{url: item.newContentAfterUrl}" />
                 </f:else>
             </f:if>
         </div>

diff --git a/Resources/Private/Partials12/PageLayout/Grid/Column.html b/Resources/Private/Partials12/PageLayout/Grid/Column.html
@@ -4,19 +4,28 @@
 </f:comment>
 <f:variable name="colpos" value="{f:if(condition: column.unused, then: 'unused', else: column.columnNumber)}"/>
 
+<f:if condition="{languageColumns}">
+    <f:then>
+        <f:comment><!-- Language comparison view --></f:comment>
+        <f:variable name="columnIdentifier" value="columnIdentifier_language-{column.context.siteLanguage.languageId}_column-{colpos}" />
+    </f:then>
+    <f:else>
+        <f:comment><!-- Grid / Column view --></f:comment>
+        <f:variable name="columnIdentifier" value="columnIdentifier_column-{colpos}" />
+    </f:else>
+</f:if>
 <td valign="top" colspan="{column.colSpan}" rowspan="{column.rowSpan}"
-    data-colpos="{column.columnNumber}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
+    data-colpos="{colpos}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
     class="t3js-page-lang-column-{column.context.siteLanguage.languageId} t3js-page-column t3-grid-cell t3-page-column t3-page-column-{colpos}
         {f:if(condition: column.unassigned, then: 't3-grid-cell-unassigned')}
         {f:if(condition: '!{column.active} && !{column.unused}', then: 't3-grid-cell-restricted')}
         {f:if(condition: '!{column.active} && {hideRestrictedColumns} && !{column.unused}', then: 't3-grid-cell-hidden')}
         t3-gridCell-width{column.colSpan}
-        t3-gridCell-height{column.rowSpan}">
+        t3-gridCell-height{column.rowSpan}" role="group" aria-labelledby="{columnIdentifier}">
     <f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
     <f:if condition="{column.active} || {column.unused}">
-        <div data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
-             data-tx-container-parent="{column.containerUid}"
-             class="t3js-sortable t3js-sortable-lang t3js-sortable-lang-{column.context.siteLanguage.languageId} t3-page-ce-wrapper
+        <div data-colpos="{colpos}" data-language-uid="{column.context.siteLanguage.languageId}" data-tx-container-parent="{column.containerUid}"
+            class="t3js-sortable t3js-sortable-lang t3js-sortable-lang-{column.context.siteLanguage.languageId} t3-page-ce-wrapper
             {f:if(condition: column.items, else: 't3-page-ce-empty')}">
             <f:for each="{column.items}" as="item">
                 <f:render partial="PageLayout/Record" arguments="{_all}" />

diff --git a/Resources/Private/Partials12/PageLayout/Grid/ColumnHeader.html b/Resources/Private/Partials12/PageLayout/Grid/ColumnHeader.html
@@ -3,19 +3,21 @@
         <f:then>
             <div class="t3-page-column-header-icons">
                 <f:if condition="{allowEditContent} && {column.editUrl}">
-                    <a href="{column.editUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}"><core:icon identifier="actions-document-open" /></a>
+                    <a href="{column.editUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}">
+                        <core:icon identifier="actions-document-open" />
+                    </a>
                 </f:if>
             </div>
-            {column.title}
+            <span id="{columnIdentifier}">{column.title}</span>
         </f:then>
         <f:else if="{column.unused}">
-            <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/>
+            <span id="{columnIdentifier}"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/></span>
         </f:else>
         <f:else if="{column.unassigned}">
-            {column.titleUnassigned}
+            <span id="{columnIdentifier}">{column.titleUnassigned}</span>
         </f:else>
         <f:else>
-            {column.titleInaccessible}
+            <span id="{columnIdentifier}">{column.titleInaccessible}</span>
         </f:else>
     </f:if>
 </div>
@@ -26,16 +28,14 @@
             <f:if condition="{column.newContentElementWizardShouldBeSkipped}">
                 <f:then>
                     <a href="{column.newContentUrl}" title="{newContentTitle}" class="btn btn-default btn-sm">
-                        <core:icon identifier="actions-add" />
+                        <core:icon identifier="actions-plus" />
                         <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
                     </a>
                 </f:then>
                 <f:else>
-                    <typo3-backend-new-content-element-wizard-button url="{column.newContentUrl}" subject="{newContentTitle}">
-                        <button type="button" class="btn btn-default btn-sm">
-                            <core:icon identifier="actions-add" />
-                            <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
-                        </button>
+                    <typo3-backend-new-content-element-wizard-button class="btn btn-default btn-sm" url="{column.newContentUrl}" subject="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}">
+                        <core:icon identifier="actions-plus" />
+                        <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
                     </typo3-backend-new-content-element-wizard-button>
                 </f:else>
             </f:if>