Skip to content

Commit e386b63

Browse files
achimfritzachimfritz
committed
[BUGFIX] html markup
1 parent 06c364b commit e386b63

File tree

6 files changed

+111
-63
lines changed

6 files changed

+111
-63
lines changed

‎Resources/Private/Partials/PageLayout/Grid/Column.html‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,34 @@
44
</f:comment>
55
<f:variable name="colpos" value="{f:if(condition: column.unused, then: 'unused', else: column.columnNumber)}"/>
66

7+
<f:if condition="{languageColumns}">
8+
<f:then>
9+
<f:comment><!-- Language comparison view --></f:comment>
10+
<f:variable name="columnIdentifier" value="columnIdentifier_language-{column.context.siteLanguage.languageId}_column-{colpos}" />
11+
</f:then>
12+
<f:else>
13+
<f:comment><!-- Grid / Column view --></f:comment>
14+
<f:variable name="columnIdentifier" value="columnIdentifier_column-{colpos}" />
15+
</f:else>
16+
</f:if>
17+
<f:variable name="columnClasses">
18+
t3js-page-column t3-grid-cell t3-page-column
19+
{f:if(condition: column.identifierCleaned, then: 't3-grid-cell-{column.identifierCleaned}')}
20+
{f:if(condition: column.unassigned, then: 't3-grid-cell-unassigned')}
21+
{f:if(condition: '!{column.active} && !{column.unused}', then: 't3-grid-cell-restricted')}
22+
{f:if(condition: '!{column.active} && {hideRestrictedColumns} && !{column.unused}', then: 't3-grid-cell-hidden')}
23+
</f:variable>
24+
725
<td valign="top" colspan="{column.colSpan}" rowspan="{column.rowSpan}"
8-
data-colpos="{column.columnNumber}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
9-
class="t3js-page-lang-column-{column.context.siteLanguage.languageId} t3js-page-column t3-grid-cell t3-page-column t3-page-column-{colpos}
10-
{f:if(condition: column.unassigned, then: 't3-grid-cell-unassigned')}
11-
{f:if(condition: '!{column.active} && !{column.unused}', then: 't3-grid-cell-restricted')}
12-
{f:if(condition: '!{column.active} && {hideRestrictedColumns} && !{column.unused}', then: 't3-grid-cell-hidden')}
13-
t3-gridCell-width{column.colSpan}
14-
t3-gridCell-height{column.rowSpan}">
26+
data-colpos="{colpos}" data-language-uid="{column.context.siteLanguage.languageId}"
27+
data-tx-container-parent="{column.containerUid}"
28+
class="{columnClasses -> f:spaceless()}"
29+
role="group" aria-labelledby="{columnIdentifier}">
1530
<f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
1631
<f:if condition="{column.active} || {column.unused}">
1732
<div data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
1833
data-tx-container-parent="{column.containerUid}"
19-
class="t3js-sortable t3js-sortable-lang t3js-sortable-lang-{column.context.siteLanguage.languageId} t3-page-ce-wrapper
20-
{f:if(condition: column.items, else: 't3-page-ce-empty')}">
34+
class=" t3-page-ce-wrapper">
2135
<f:for each="{column.items}" as="item">
2236
<f:render partial="PageLayout/Record" arguments="{_all}" />
2337
</f:for>

‎Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,48 @@
33
<f:then>
44
<div class="t3-page-column-header-icons">
55
<f:if condition="{allowEditContent} && {column.editUrl}">
6-
<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>
6+
<a
7+
class="btn btn-link"
8+
href="{column.editUrl}"
9+
title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}"
10+
>
11+
<core:icon identifier="actions-document-open" />
12+
<span class="visually-hidden">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}</span>
13+
</a>
714
</f:if>
815
</div>
9-
{column.title}
16+
<span id="{columnIdentifier}">{column.title}</span>
1017
</f:then>
1118
<f:else if="{column.unused}">
12-
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/>
19+
<span id="{columnIdentifier}"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/></span>
1320
</f:else>
1421
<f:else if="{column.unassigned}">
15-
{column.titleUnassigned}
22+
<span id="{columnIdentifier}">{column.titleUnassigned}</span>
1623
</f:else>
1724
<f:else>
18-
{column.titleInaccessible}
25+
<span id="{columnIdentifier}">{column.titleInaccessible}</span>
1926
</f:else>
2027
</f:if>
2128
</div>
2229
<f:format.raw>{column.beforeSectionMarkup}</f:format.raw>
2330
<f:if condition="{allowEditContent} && {column.contentEditable} && {column.allowNewContent} && {column.active}">
24-
<div class="t3-page-ce t3js-page-ce" data-page="{column.context.pageId}" id="{column.uniqueId}">
25-
<div class="t3-page-ce-actions t3js-page-new-ce" id="colpos-{column.columnNumber}-page-{column.context.pageId}-{column.uniqueId}">
26-
<f:if condition="{column.newContentElementWizardShouldBeSkipped}">
27-
<f:then>
28-
<a href="{column.newContentUrl}" title="{newContentTitle}" class="btn btn-default btn-sm">
29-
<core:icon identifier="actions-add" />
31+
<div class="t3-page-ce t3js-page-ce">
32+
<f:if condition="{column.newContentElementWizardShouldBeSkipped}">
33+
<f:then>
34+
<a href="{column.newContentUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}" class="btn btn-default btn-sm">
35+
<core:icon identifier="actions-plus" />
36+
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
37+
</a>
38+
</f:then>
39+
<f:else>
40+
<typo3-backend-new-content-element-wizard-button url="{column.newContentUrl}" subject="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}">
41+
<button type="button" class="btn btn-default btn-sm">
42+
<core:icon identifier="actions-plus" />
3043
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
31-
</a>
32-
</f:then>
33-
<f:else>
34-
<typo3-backend-new-content-element-wizard-button url="{column.newContentUrl}" subject="{newContentTitle}">
35-
<button type="button" class="btn btn-default btn-sm">
36-
<core:icon identifier="actions-add" />
37-
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
38-
</button>
39-
</typo3-backend-new-content-element-wizard-button>
40-
</f:else>
41-
</f:if>
42-
</div>
44+
</button>
45+
</typo3-backend-new-content-element-wizard-button>
46+
</f:else>
47+
</f:if>
4348
<div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available" hidden></div>
4449
</div>
4550
</f:if>

‎Resources/Private/Partials/PageLayout/Record.html‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
{f:if(condition: '{item.disabled} && {item.context.drawingConfiguration.showHidden} == 0', then: 'display: none;') -> f:variable(name: 'style')}
2-
<div class="t3-page-ce {item.wrapperClassName} t3js-page-ce t3js-page-ce-sortable"
3-
id="element-tt_content-{item.record.uid}"
4-
data-table="tt_content"
5-
data-uid="{item.record.uid}"
6-
data-language-uid="{item.record.sys_language_uid}"
7-
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}')}"
8-
style="{style}"
1+
{f:if(condition: '{item.disabled} && {item.context.drawingConfiguration.showHidden} == 0', then: 'height: 0; display: none;') -> f:variable(name: 'style')}
2+
<div
3+
role="group"
4+
aria-labelledby="element-{item.table}-{item.record.uid}-label"
5+
class="t3-page-ce {item.wrapperClassName} t3js-page-ce t3js-page-ce-sortable"
6+
id="element-{item.table}-{item.record.uid}"
7+
data-table="{item.table}"
8+
data-uid="{item.record.uid}"
9+
data-language-uid="{item.record.sys_language_uid}"
10+
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}')}"
11+
style="{style}"
912
>
10-
<div class="t3-page-ce-element t3-page-ce-dragitem t3js-page-ce-dragitem" id="{item.uniqueId}">
13+
<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>
14+
<div class="t3-page-ce-element t3-page-ce-dragitem">
1115
<f:render partial="PageLayout/Record/{item.record.CType}/Header" arguments="{_all}" optional="1">
1216
<f:render partial="PageLayout/RecordDefault/Header" arguments="{_all}" />
1317
</f:render>
@@ -19,20 +23,25 @@
1923
<f:render partial="PageLayout/Record/{item.record.CType}/Footer" arguments="{_all}" optional="1">
2024
<f:render partial="PageLayout/RecordDefault/Footer" arguments="{_all}" />
2125
</f:render>
26+
<f:if condition="{item.inconsistentLanguage}">
27+
<div class="t3-page-ce-footer">
28+
<span class="badge badge-warning">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.inconsistentLanguageWarning')}</span>
29+
</div>
30+
</f:if>
2231
</div>
2332
<f:if condition="{allowEditContent} && {item.column.contentEditable} && {item.column.allowNewContent} && {column.active}">
2433
<div class="t3-page-ce-actions t3js-page-new-ce" id="colpos-{item.column.columnNumber}-page-{item.context.pageId}-{item.column.uniqueId}">
2534
<f:if condition="{column.newContentElementWizardShouldBeSkipped}">
2635
<f:then>
2736
<a href="{item.newContentAfterUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}" class="btn btn-default btn-sm">
28-
<core:icon identifier="actions-add" />
37+
<core:icon identifier="actions-plus" />
2938
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
3039
</a>
3140
</f:then>
3241
<f:else>
3342
<typo3-backend-new-content-element-wizard-button url="{item.newContentAfterUrl}" subject="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}">
3443
<button type="button" class="btn btn-default btn-sm">
35-
<core:icon identifier="actions-add" />
44+
<core:icon identifier="actions-plus" />
3645
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
3746
</button>
3847
</typo3-backend-new-content-element-wizard-button>

‎Resources/Private/Partials12/PageLayout/Grid/Column.html‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,27 @@
44
</f:comment>
55
<f:variable name="colpos" value="{f:if(condition: column.unused, then: 'unused', else: column.columnNumber)}"/>
66

7+
<f:if condition="{languageColumns}">
8+
<f:then>
9+
<f:comment><!-- Language comparison view --></f:comment>
10+
<f:variable name="columnIdentifier" value="columnIdentifier_language-{column.context.siteLanguage.languageId}_column-{colpos}" />
11+
</f:then>
12+
<f:else>
13+
<f:comment><!-- Grid / Column view --></f:comment>
14+
<f:variable name="columnIdentifier" value="columnIdentifier_column-{colpos}" />
15+
</f:else>
16+
</f:if>
717
<td valign="top" colspan="{column.colSpan}" rowspan="{column.rowSpan}"
8-
data-colpos="{column.columnNumber}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
18+
data-colpos="{colpos}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
919
class="t3js-page-lang-column-{column.context.siteLanguage.languageId} t3js-page-column t3-grid-cell t3-page-column t3-page-column-{colpos}
1020
{f:if(condition: column.unassigned, then: 't3-grid-cell-unassigned')}
1121
{f:if(condition: '!{column.active} && !{column.unused}', then: 't3-grid-cell-restricted')}
1222
{f:if(condition: '!{column.active} && {hideRestrictedColumns} && !{column.unused}', then: 't3-grid-cell-hidden')}
1323
t3-gridCell-width{column.colSpan}
14-
t3-gridCell-height{column.rowSpan}">
24+
t3-gridCell-height{column.rowSpan}" role="group" aria-labelledby="{columnIdentifier}">
1525
<f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
1626
<f:if condition="{column.active} || {column.unused}">
17-
<div data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
27+
<div data-colpos="{colpos}" data-language-uid="{column.context.siteLanguage.languageId}"
1828
data-tx-container-parent="{column.containerUid}"
1929
class="t3js-sortable t3js-sortable-lang t3js-sortable-lang-{column.context.siteLanguage.languageId} t3-page-ce-wrapper
2030
{f:if(condition: column.items, else: 't3-page-ce-empty')}">

‎Resources/Private/Partials12/PageLayout/Grid/ColumnHeader.html‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@
33
<f:then>
44
<div class="t3-page-column-header-icons">
55
<f:if condition="{allowEditContent} && {column.editUrl}">
6-
<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>
6+
<a href="{column.editUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}">
7+
<core:icon identifier="actions-document-open" />
8+
</a>
79
</f:if>
810
</div>
9-
{column.title}
11+
<span id="{columnIdentifier}">{column.title}</span>
1012
</f:then>
1113
<f:else if="{column.unused}">
12-
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/>
14+
<span id="{columnIdentifier}"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/></span>
1315
</f:else>
1416
<f:else if="{column.unassigned}">
15-
{column.titleUnassigned}
17+
<span id="{columnIdentifier}">{column.titleUnassigned}</span>
1618
</f:else>
1719
<f:else>
18-
{column.titleInaccessible}
20+
<span id="{columnIdentifier}">{column.titleInaccessible}</span>
1921
</f:else>
2022
</f:if>
2123
</div>
@@ -26,14 +28,14 @@
2628
<f:if condition="{column.newContentElementWizardShouldBeSkipped}">
2729
<f:then>
2830
<a href="{column.newContentUrl}" title="{newContentTitle}" class="btn btn-default btn-sm">
29-
<core:icon identifier="actions-add" />
31+
<core:icon identifier="actions-plus" />
3032
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
3133
</a>
3234
</f:then>
3335
<f:else>
3436
<typo3-backend-new-content-element-wizard-button url="{column.newContentUrl}" subject="{newContentTitle}">
3537
<button type="button" class="btn btn-default btn-sm">
36-
<core:icon identifier="actions-add" />
38+
<core:icon identifier="actions-plus" />
3739
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
3840
</button>
3941
</typo3-backend-new-content-element-wizard-button>

‎Resources/Private/Partials12/PageLayout/Record.html‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{f:if(condition: '{item.disabled} && {item.context.drawingConfiguration.showHidden} == 0', then: 'display: none;') -> f:variable(name: 'style')}
2-
<div class="t3-page-ce {item.wrapperClassName} t3js-page-ce t3js-page-ce-sortable"
3-
id="element-tt_content-{item.record.uid}"
4-
data-table="tt_content"
5-
data-uid="{item.record.uid}"
6-
data-language-uid="{item.record.sys_language_uid}"
7-
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}')}"
8-
style="{style}"
2+
<div
3+
role="group"
4+
aria-labelledby="element-{item.table}-{item.record.uid}-label"
5+
class="t3-page-ce {item.wrapperClassName} t3js-page-ce t3js-page-ce-sortable"
6+
id="element-{item.table}-{item.record.uid}"
7+
data-table="{item.table}"
8+
data-uid="{item.record.uid}"
9+
data-language-uid="{item.record.sys_language_uid}"
10+
style="{style}"
911
>
10-
<div class="t3-page-ce-element t3-page-ce-dragitem t3js-page-ce-dragitem" id="{item.uniqueId}">
12+
<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>
13+
<div class="t3-page-ce-element t3-page-ce-dragitem" id="{item.uniqueId}">
1114
<f:render partial="PageLayout/Record/{item.record.CType}/Header" arguments="{_all}" optional="1">
1215
<f:render partial="PageLayout/RecordDefault/Header" arguments="{_all}" />
1316
</f:render>
@@ -19,20 +22,25 @@
1922
<f:render partial="PageLayout/Record/{item.record.CType}/Footer" arguments="{_all}" optional="1">
2023
<f:render partial="PageLayout/RecordDefault/Footer" arguments="{_all}" />
2124
</f:render>
25+
<f:if condition="{item.inconsistentLanguage}">
26+
<div class="t3-page-ce-footer">
27+
<span class="badge badge-warning">{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.inconsistentLanguageWarning')}</span>
28+
</div>
29+
</f:if>
2230
</div>
2331
<f:if condition="{allowEditContent} && {item.column.contentEditable} && {item.column.allowNewContent} && {column.active}">
2432
<div class="t3-page-ce-actions t3js-page-new-ce" id="colpos-{item.column.columnNumber}-page-{item.context.pageId}-{item.column.uniqueId}">
2533
<f:if condition="{column.newContentElementWizardShouldBeSkipped}">
2634
<f:then>
2735
<a href="{item.newContentAfterUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}" class="btn btn-default btn-sm">
28-
<core:icon identifier="actions-add" />
36+
<core:icon identifier="actions-plus" />
2937
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
3038
</a>
3139
</f:then>
3240
<f:else>
3341
<typo3-backend-new-content-element-wizard-button url="{item.newContentAfterUrl}" subject="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}">
3442
<button type="button" class="btn btn-default btn-sm">
35-
<core:icon identifier="actions-add" />
43+
<core:icon identifier="actions-plus" />
3644
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
3745
</button>
3846
</typo3-backend-new-content-element-wizard-button>

0 commit comments

Comments
 (0)