Skip to content

Commit b2fd92e

Browse files
garbastgarbast
committed
Merge branch 'release/2.2.3'
2 parents 64b27c6 + b928351 commit b2fd92e

8 files changed

Lines changed: 59 additions & 51 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ jobs:
6969
-p ${{ matrix.packages.php }} \
7070
-s lintPhp
7171
72-
- name: Composer install
73-
run: |
74-
Build/Scripts/runTests.sh \
75-
-p ${{ matrix.packages.php }} \
76-
-s composerInstall
77-
7872
- name: Composer install core
7973
run: |
8074
Build/Scripts/additionalTests.sh \

‎.github/workflows/pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55

66
push:
7-
branches: [ develop, main ]
7+
branches: [ main ]
88

99
permissions:
1010
contents: write

‎Documentation/guides.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
interlink-shortcode="evoweb/sf-books"
1717
/>
1818
<project title="Collapsible container"
19-
release="2.2.2"
20-
version="2.2.2"
19+
release="2.2.3"
20+
version="2.2.3"
2121
copyright="since 2024 by evoWeb"
2222
/>
2323
<inventory id="t3tsref" url="https://docs.typo3.org/m/typo3/reference-typoscript/main/en-us/"/>

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,45 @@
11
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
22

3+
<f:comment>
4+
Styling requires the colpos to be set to the string 'unused'. To preserve type safety in the
5+
controller, the string is only used in the template by setting the below "colpos" variable.
6+
</f:comment>
37
<f:variable name="colpos" value="{f:if(condition: column.unused, then: 'unused', else: column.columnNumber)}"/>
4-
<f:variable name="columnIdentifier" value="columnIdentifier_column-{colpos}" />
8+
9+
<f:if condition="{languageColumns}">
10+
<f:then>
11+
<f:comment><!-- Language comparison view --></f:comment>
12+
<f:variable name="columnIdentifier" value="columnIdentifier_language-{column.context.siteLanguage.languageId}_column-{colpos}" />
13+
</f:then>
14+
<f:else>
15+
<f:comment><!-- Grid / Column view --></f:comment>
16+
<f:variable name="columnIdentifier" value="columnIdentifier_column-{colpos}" />
17+
</f:else>
18+
</f:if>
19+
520
<f:variable name="columnClasses">
621
t3js-page-column t3-grid-cell t3-page-column
22+
{f:if(condition: column.identifierCleaned, then: 't3-grid-cell-{column.identifierCleaned}')}
723
{f:if(condition: column.unassigned, then: 't3-grid-cell-unassigned')}
824
{f:if(condition: '!{column.active} && !{column.unused}', then: 't3-grid-cell-restricted')}
925
{f:if(condition: '!{column.active} && {hideRestrictedColumns} && !{column.unused}', then: 't3-grid-cell-hidden')}
10-
t3-gridCell-width{column.colSpan}
11-
t3-gridCell-height{column.rowSpan}
26+
1227
{f:if(condition: column.definition.collapsed, then: 'collapsed')}
1328
</f:variable>
1429

1530
<td valign="top" colspan="{column.colSpan}" rowspan="{column.rowSpan}"
16-
data-colpos="{column.columnNumber}" data-tx-container-parent="{column.containerUid}" data-language-uid="{column.context.siteLanguage.languageId}"
31+
data-colpos="{colpos}" data-language-uid="{column.context.siteLanguage.languageId}"
32+
data-tx-container-parent="{column.containerUid}"
1733
class="{columnClasses -> f:spaceless()}"
1834
role="group" aria-labelledby="{columnIdentifier}">
19-
<f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
35+
<f:alias map="{columnHeaderLevel: 2}">
36+
<f:render partial="PageLayout/Grid/ColumnHeader" arguments="{_all}" />
37+
</f:alias>
2038
<f:if condition="{column.active} || {column.unused}">
2139
<div data-colpos="{column.columnNumber}" data-language-uid="{column.context.siteLanguage.languageId}"
40+
data-tx-container-parent="{column.containerUid}"
2241
data-collapse-colpos="{column.containerUid}-{column.columnNumber}"
23-
class="t3js-sortable t3js-sortable-lang t3js-sortable-lang-{column.context.siteLanguage.languageId} t3-page-ce-wrapper
24-
{f:if(condition: column.items, else: 't3-page-ce-empty')}">
42+
class=" t3-page-ce-wrapper">
2543
<f:for each="{column.items}" as="item">
2644
<f:render partial="PageLayout/Record" arguments="{_all}" />
2745
</f:for>

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

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,25 @@
22
xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
33
data-namespace-typo3-fluid="true">
44

5+
{columnHeaderLevel -> f:or(alternative: 2) -> f:variable(name: 'columnHeaderLevel')}
6+
57
<div class="t3-page-column-header">
68
<f:if condition="{column.active}">
79
<f:then>
810
<div class="t3-page-column-header-icons">
911
<f:render section="collapsibleToggleIcon" arguments="{_all}"/>
1012
<f:if condition="{allowEditContent} && {column.editUrl}">
11-
<a href="{column.editUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}"
12-
class="btn btn-sm btn-default btn-borderless">
13+
<a
14+
class="btn btn-link"
15+
href="{column.editUrl}"
16+
title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}"
17+
>
1318
<core:icon identifier="actions-document-open" />
19+
<span class="visually-hidden">{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:editColumn')}</span>
1420
</a>
1521
</f:if>
1622
</div>
17-
<span id="{columnIdentifier}">{column.title}</span>
23+
<h{columnHeaderLevel} id="{columnIdentifier}" class="t3-page-column-title">{column.title}</h{columnHeaderLevel}>
1824
<f:render section="collapsibleMinitemWarning" arguments="{_all}"/>
1925
</f:then>
2026
<f:else if="{column.unused}">
@@ -29,9 +35,19 @@
2935
</f:if>
3036
</div>
3137
<f:format.raw>{column.beforeSectionMarkup}</f:format.raw>
32-
<f:if condition="{allowEditContent} && {column.contentEditable} && {column.context.allowNewContent} && {column.active}">
33-
<div class="t3-page-ce t3js-page-ce" data-page="{column.context.pageId}" id="{column.uniqueId}">
34-
<f:render partial="PageLayout/ActionControls" arguments="{column: column, allowEditContent: allowEditContent, url: column.newContentUrl}" />
38+
<f:if condition="{allowEditContent} && {column.contentEditable} && {column.allowNewContent} && {column.active}">
39+
<div class="t3-page-ce t3js-page-ce" data-page="{column.context.pageId}">
40+
<f:if condition="{column.newContentElementWizardShouldBeSkipped}">
41+
<f:then>
42+
<a href="{column.newContentUrl}" title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newContentElement')}" class="btn btn-default btn-sm">
43+
<core:icon identifier="actions-plus" />
44+
<f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:createNewContent" />
45+
</a>
46+
</f:then>
47+
<f:else>
48+
<f:render partial="PageLayout/ActionControls" arguments="{url: column.newContentUrl}" />
49+
</f:else>
50+
</f:if>
3551
<div class="t3-page-ce-dropzone t3js-page-ce-dropzone-available" hidden></div>
3652
</div>
3753
</f:if>
@@ -41,15 +57,15 @@
4157
<f:section name="collapsibleToggleIcon">
4258
<a href="#"
4359
class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
44-
title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
45-
data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
60+
title="{f:translate(id: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
61+
data-toggle-title="{f:translate(id: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
4662
data-collapse-state="collapsed">
4763
<core:icon identifier="actions-view-list-expand" />
4864
</a>
4965
<a href="#"
5066
class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
51-
title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
52-
data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
67+
title="{f:translate(id: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
68+
data-toggle-title="{f:translate(id: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
5369
data-collapse-state="expanded">
5470
<core:icon identifier="actions-view-list-collapse" />
5571
</a>
@@ -75,7 +91,7 @@
7591
<button type="button" class="btn btn-default btn-sm me-2">
7692
<core:icon identifier="actions-view-list-expand"/>
7793
</button>
78-
{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:contentcollapsed')}
94+
<f:translate id="LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:contentcollapsed"/>
7995
</div>
8096
</f:section>
8197

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
}
2121
},
2222
"require": {
23-
"typo3/cms-backend": "^13.0 || 13.0.x-dev || dev-main",
24-
"typo3/cms-core": "^13.0 || 13.0.x-dev || dev-main",
25-
"b13/container": "^3.1.1"
23+
"typo3/cms-backend": "^13.0 || 13.*.*@dev || ^14.0 || 14.*.*@dev || dev-main",
24+
"typo3/cms-core": "^13.0 || 13.*.*@dev || ^14.0 || 14.*.*@dev || dev-main",
25+
"b13/container": "^3.1.1 || dev-master"
2626
},
2727
"require-dev": {
2828
"friendsofphp/php-cs-fixer": "^3.64.0",

‎ext_emconf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'author_email' => 'ew-collapsible-container@evoweb.de',
99
'author_company' => 'evoWeb',
1010
'state' => 'stable',
11-
'version' => '2.2.2',
11+
'version' => '2.2.3',
1212
'constraints' => [
1313
'depends' => [
1414
'typo3' => '13.4.0-13.4.99',

0 commit comments

Comments
 (0)