Skip to content

Commit 761d5c9

Browse files
achimfritzachimfritz
committed
Revert "[BUGFIX] html markup"
This reverts commit ba1972d.
1 parent ba1972d commit 761d5c9

File tree

6 files changed

+63
-111
lines changed

6 files changed

+63
-111
lines changed

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

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,20 @@
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-
257
<td valign="top" colspan="{column.colSpan}" rowspan="{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}">
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}">
3015
<f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
3116
<f:if condition="{column.active} || {column.unused}">
3217
<div data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
3318
data-tx-container-parent="{column.containerUid}"
34-
class=" t3-page-ce-wrapper">
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')}">
3521
<f:for each="{column.items}" as="item">
3622
<f:render partial="PageLayout/Record" arguments="{_all}" />
3723
</f:for>

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

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,43 @@
33
<f:then>
44
<div class="t3-page-column-header-icons">
55
<f:if condition="{allowEditContent} && {column.editUrl}">
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>
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>
147
</f:if>
158
</div>
16-
<span id="{columnIdentifier}">{column.title}</span>
9+
{column.title}
1710
</f:then>
1811
<f:else if="{column.unused}">
19-
<span id="{columnIdentifier}"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/></span>
12+
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/>
2013
</f:else>
2114
<f:else if="{column.unassigned}">
22-
<span id="{columnIdentifier}">{column.titleUnassigned}</span>
15+
{column.titleUnassigned}
2316
</f:else>
2417
<f:else>
25-
<span id="{columnIdentifier}">{column.titleInaccessible}</span>
18+
{column.titleInaccessible}
2619
</f:else>
2720
</f:if>
2821
</div>
2922
<f:format.raw>{column.beforeSectionMarkup}</f:format.raw>
3023
<f:if condition="{allowEditContent} && {column.contentEditable} && {column.allowNewContent} && {column.active}">
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" />
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" />
4330
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
44-
</button>
45-
</typo3-backend-new-content-element-wizard-button>
46-
</f:else>
47-
</f:if>
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>
4843
<div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available" hidden></div>
4944
</div>
5045
</f:if>

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

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
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}"
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}"
129
>
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">
10+
<div class="t3-page-ce-element t3-page-ce-dragitem t3js-page-ce-dragitem" id="{item.uniqueId}">
1511
<f:render partial="PageLayout/Record/{item.record.CType}/Header" arguments="{_all}" optional="1">
1612
<f:render partial="PageLayout/RecordDefault/Header" arguments="{_all}" />
1713
</f:render>
@@ -23,25 +19,20 @@
2319
<f:render partial="PageLayout/Record/{item.record.CType}/Footer" arguments="{_all}" optional="1">
2420
<f:render partial="PageLayout/RecordDefault/Footer" arguments="{_all}" />
2521
</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>
3122
</div>
3223
<f:if condition="{allowEditContent} && {item.column.contentEditable} && {item.column.allowNewContent} && {column.active}">
3324
<div class="t3-page-ce-actions t3js-page-new-ce" id="colpos-{item.column.columnNumber}-page-{item.context.pageId}-{item.column.uniqueId}">
3425
<f:if condition="{column.newContentElementWizardShouldBeSkipped}">
3526
<f:then>
3627
<a href="{item.newContentAfterUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}" class="btn btn-default btn-sm">
37-
<core:icon identifier="actions-plus" />
28+
<core:icon identifier="actions-add" />
3829
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
3930
</a>
4031
</f:then>
4132
<f:else>
4233
<typo3-backend-new-content-element-wizard-button url="{item.newContentAfterUrl}" subject="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}">
4334
<button type="button" class="btn btn-default btn-sm">
44-
<core:icon identifier="actions-plus" />
35+
<core:icon identifier="actions-add" />
4536
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
4637
</button>
4738
</typo3-backend-new-content-element-wizard-button>

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,17 @@
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>
177
<td valign="top" colspan="{column.colSpan}" rowspan="{column.rowSpan}"
18-
data-colpos="{colpos}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
8+
data-colpos="{column.columnNumber}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
199
class="t3js-page-lang-column-{column.context.siteLanguage.languageId} t3js-page-column t3-grid-cell t3-page-column t3-page-column-{colpos}
2010
{f:if(condition: column.unassigned, then: 't3-grid-cell-unassigned')}
2111
{f:if(condition: '!{column.active} && !{column.unused}', then: 't3-grid-cell-restricted')}
2212
{f:if(condition: '!{column.active} && {hideRestrictedColumns} && !{column.unused}', then: 't3-grid-cell-hidden')}
2313
t3-gridCell-width{column.colSpan}
24-
t3-gridCell-height{column.rowSpan}" role="group" aria-labelledby="{columnIdentifier}">
14+
t3-gridCell-height{column.rowSpan}">
2515
<f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
2616
<f:if condition="{column.active} || {column.unused}">
27-
<div data-colpos="{colpos}" data-language-uid="{column.context.siteLanguage.languageId}"
17+
<div data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
2818
data-tx-container-parent="{column.containerUid}"
2919
class="t3js-sortable t3js-sortable-lang t3js-sortable-lang-{column.context.siteLanguage.languageId} t3-page-ce-wrapper
3020
{f:if(condition: column.items, else: 't3-page-ce-empty')}">

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,19 @@
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')}">
7-
<core:icon identifier="actions-document-open" />
8-
</a>
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>
97
</f:if>
108
</div>
11-
<span id="{columnIdentifier}">{column.title}</span>
9+
{column.title}
1210
</f:then>
1311
<f:else if="{column.unused}">
14-
<span id="{columnIdentifier}"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/></span>
12+
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:unusedColPos"/>
1513
</f:else>
1614
<f:else if="{column.unassigned}">
17-
<span id="{columnIdentifier}">{column.titleUnassigned}</span>
15+
{column.titleUnassigned}
1816
</f:else>
1917
<f:else>
20-
<span id="{columnIdentifier}">{column.titleInaccessible}</span>
18+
{column.titleInaccessible}
2119
</f:else>
2220
</f:if>
2321
</div>
@@ -28,14 +26,14 @@
2826
<f:if condition="{column.newContentElementWizardShouldBeSkipped}">
2927
<f:then>
3028
<a href="{column.newContentUrl}" title="{newContentTitle}" class="btn btn-default btn-sm">
31-
<core:icon identifier="actions-plus" />
29+
<core:icon identifier="actions-add" />
3230
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
3331
</a>
3432
</f:then>
3533
<f:else>
3634
<typo3-backend-new-content-element-wizard-button url="{column.newContentUrl}" subject="{newContentTitle}">
3735
<button type="button" class="btn btn-default btn-sm">
38-
<core:icon identifier="actions-plus" />
36+
<core:icon identifier="actions-add" />
3937
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
4038
</button>
4139
</typo3-backend-new-content-element-wizard-button>

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

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
{f:if(condition: '{item.disabled} && {item.context.drawingConfiguration.showHidden} == 0', then: '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-
style="{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}"
119
>
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}">
10+
<div class="t3-page-ce-element t3-page-ce-dragitem t3js-page-ce-dragitem" id="{item.uniqueId}">
1411
<f:render partial="PageLayout/Record/{item.record.CType}/Header" arguments="{_all}" optional="1">
1512
<f:render partial="PageLayout/RecordDefault/Header" arguments="{_all}" />
1613
</f:render>
@@ -22,25 +19,20 @@
2219
<f:render partial="PageLayout/Record/{item.record.CType}/Footer" arguments="{_all}" optional="1">
2320
<f:render partial="PageLayout/RecordDefault/Footer" arguments="{_all}" />
2421
</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>
3022
</div>
3123
<f:if condition="{allowEditContent} && {item.column.contentEditable} && {item.column.allowNewContent} && {column.active}">
3224
<div class="t3-page-ce-actions t3js-page-new-ce" id="colpos-{item.column.columnNumber}-page-{item.context.pageId}-{item.column.uniqueId}">
3325
<f:if condition="{column.newContentElementWizardShouldBeSkipped}">
3426
<f:then>
3527
<a href="{item.newContentAfterUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}" class="btn btn-default btn-sm">
36-
<core:icon identifier="actions-plus" />
28+
<core:icon identifier="actions-add" />
3729
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
3830
</a>
3931
</f:then>
4032
<f:else>
4133
<typo3-backend-new-content-element-wizard-button url="{item.newContentAfterUrl}" subject="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}">
4234
<button type="button" class="btn btn-default btn-sm">
43-
<core:icon identifier="actions-plus" />
35+
<core:icon identifier="actions-add" />
4436
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
4537
</button>
4638
</typo3-backend-new-content-element-wizard-button>

0 commit comments

Comments
 (0)