Merge branch 'develop' into production

TYPO3 · Jan 22, 2025 · 9aa97e5 · 9aa97e5
2 parents 3d6f976 + b90e2a5
commit 9aa97e5
Show file tree

Hide file tree

Showing 13 changed files with 144 additions and 59 deletions.
diff --git a/public/KEYS b/public/KEYS
@@ -356,3 +356,22 @@ gX0APMEdCQFBi+rlcsVV5+u9TVAQY7RFpzTVTe/3PH1Caewm5cWPUg6Qq1nPJXjw
 HsW4nEeY8rExkl5sbQ==
 =A7sV
 -----END PGP PUBLIC KEY BLOCK-----
+
+ID:           6E19848CF6A4CF16
+Type:         256 bit Public Ed25519 Key
+Owner:        Benjamin Franzke <[email protected]>
+Fingerprint:  63BF 864E FCEC 136F 693C  EF1B 6E19 848C F6A4 CF16
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZKKDwBYJKwYBBAHaRw8BAQdAtc5xuAD1mV6wjtHtHE/zs26VBO9vezLoJK9U
+LR6kyre0HkJlbmphbWluIEZyYW56a2UgPGJlbkBibmYuZGV2PoiZBBMWCgBBFiEE
+Y7+GTvzsE29pPO8bbhmEjPakzxYFAmSig8ACGwMFCRLMAwAFCwkIBwICIgIGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQbhmEjPakzxayBAD9Gu1XVOHNjUzmdA51m4+cdrC5
+Fy40bQnFmE0olohxH7EBAJ+M41axYxKtneAmDgne/CQU9/M2b5l/dSsc+z+FfFIJ
+uDgEZKKDwBIKKwYBBAGXVQEFAQEHQDrKQOfVe5aTNIrxW5ckmYFSfAwdvairOt39
+a6EoRA5QAwEIB4h+BBgWCgAmFiEEY7+GTvzsE29pPO8bbhmEjPakzxYFAmSig8AC
+GwwFCRLMAwAACgkQbhmEjPakzxYMagD/VVEXrf4B3wNjZUdJY6BlIwVG74QUbEmJ
+vvs+bk25V5oA/0ktVHo5gqeD90Ce1hQDgevoMEIp1dNRuvjxqIUUPQwI
+=zmTH
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/...13.4/src/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/subpage.tsconfig.twig b/...13.4/src/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/subpage.tsconfig.twig
@@ -4,7 +4,7 @@
 mod {
     web_layout {
         BackendLayouts {
-            Subpage {
+            subpage {
                 title = LLL:EXT:{{ package.extensionKey }}/Resources/Private/Language/locallang_be.xlf:backend_layout.subpage
                 config {
                     backend_layout {

diff --git a/...ckage_tutorial/13.4/src/Configuration/Sets/SitePackage/PageTsConfig/general.tsconfig.twig b/...ckage_tutorial/13.4/src/Configuration/Sets/SitePackage/PageTsConfig/general.tsconfig.twig
@@ -14,14 +14,17 @@ TCEFORM {
 }
 
 TCEMAIN {
-    pages {
-        # Pages will *not* have "(copy)" appended:
-        disablePrependAtCopy = 1
-        # Pages will *not* be hidden upon copy:
-        disableHideAtCopy = 1
-    }
-    tt_content {
-        # Content will *not* have "(copy)" appended:
-        disablePrependAtCopy = 1
+    table {
+        pages {
+            # Pages will *not* have "(copy)" appended:
+            disablePrependAtCopy = 1
+            # Pages will *not* be hidden upon copy:
+            disableHideAtCopy = 1
+        }
+
+        tt_content {
+            # Content will *not* have "(copy)" appended:
+            disablePrependAtCopy = 1
+        }
     }
 }
diff --git a/.../13.4/src/Configuration/Sets/SitePackage/TypoScript/Navigation/footerMenu.typoscript.twig b/.../13.4/src/Configuration/Sets/SitePackage/TypoScript/Navigation/footerMenu.typoscript.twig
@@ -0,0 +1,12 @@
+page {
+    10 {
+        dataProcessing {
+            40 = menu
+            40 {
+                as = footerMenu
+                special = directory
+                special.value = {${{ package.packageName }}.footerMenuRoot}
+            }
+        }
+    }
+}
diff --git a/...e_package_tutorial/13.4/src/Configuration/Sets/SitePackage/settings.definitions.yaml.twig b/...e_package_tutorial/13.4/src/Configuration/Sets/SitePackage/settings.definitions.yaml.twig
@@ -7,6 +7,9 @@ categories:
   {{ package.packageName }}.layout:
     label: 'Layout'
     parent: {{ package.packageName }}
+  {{ package.packageName }}.menus:
+    label: 'Menus'
+    parent: {{ package.packageName }}
 
 settings:
   {{ package.packageName }}.template_path:
@@ -36,3 +39,10 @@ settings:
     category: {{ package.packageName }}.layout
     type: string
     default: 'EXT:{{ package.extensionKey }}/Resources/Public/Icons/favicon.ico'
+
+  {{ package.packageName }}.footerMenuRoot:
+      label: 'Footer menu root uid'
+      description: 'The subpages of this page are displayed in the footer'
+      category: {{ package.packageName }}.menus
+      type: int
+      default: 2
diff --git a/...s/packages/site_package_tutorial/13.4/src/Configuration/TCA/Overrides/tt_content.php.twig b/...s/packages/site_package_tutorial/13.4/src/Configuration/TCA/Overrides/tt_content.php.twig
@@ -0,0 +1,11 @@
+<?php
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+ExtensionManagementUtility::addTcaSelectItemGroup(
+    'tt_content',
+    'CType',
+    '{{ package.extensionKey }}',
+    'LLL:EXT:{{ package.extensionKey }}/Resources/Private/Language/locallang_be.xlf:content_element.group.{{ package.extensionKey }}',
+    'after:default',
+);
diff --git a/...es/site_package_tutorial/13.4/src/ContentBlocks/ContentElements/carousel/config.yaml.twig b/...es/site_package_tutorial/13.4/src/ContentBlocks/ContentElements/carousel/config.yaml.twig
@@ -1,15 +1,21 @@
 name: {{ package.packageNameAlternative }}/carousel
 typeName: {{ package.extensionKey }}_carousel
-group: default
+group: {{ package.extensionKey }}
 prefixFields: true
 prefixType: full
 fields:
   - identifier: carousel_items
     type: Collection
-    foreign_field: parentid
+    minitems: 1
+    appearance:
+      collapseAll: true
+      levelLinksPosition: both
     fields:
       - identifier: image
         type: File
+        allowed: common-image-types
+        minitems: 1
+        relationship: manyToOne
       - identifier: header
         type: Text
       - identifier: description

diff --git a/...site_package_tutorial/13.4/src/ContentBlocks/ContentElements/carousel/language/labels.xlf b/...site_package_tutorial/13.4/src/ContentBlocks/ContentElements/carousel/language/labels.xlf
@@ -1,32 +1,38 @@
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-11-24T18:55:27+00:00" product-name="t3docs/carousel">
-		<header/>
-		<body>
-			<trans-unit id="title" resname="title">
-				<source>Carousel</source>
-			</trans-unit>
-			<trans-unit id="description" resname="description">
-				<source>See also https://getbootstrap.com/docs/5.0/components/carousel/</source>
-			</trans-unit>
-			<trans-unit id="carousel_items.label" resname="carousel_items.label">
-				<source>Carousel Items</source>
-			</trans-unit>
-			<trans-unit id="carousel_items.image.label" resname="carousel_items.image.label">
-				<source>Image</source>
-			</trans-unit>
-			<trans-unit id="carousel_items.header.label" resname="carousel_items.header.label">
-				<source>Header</source>
-			</trans-unit>
-			<trans-unit id="carousel_items.description.label" resname="carousel_items.description.label">
-				<source>Description</source>
-			</trans-unit>
-			<trans-unit id="previous.label" resname="previous.label">
-				<source>Previous</source>
-			</trans-unit>
-			<trans-unit id="next.label" resname="next.label">
-				<source>Next</source>
-			</trans-unit>
-		</body>
-	</file>
+    <file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-11-24T18:55:27+00:00" product-name="t3docs/carousel">
+        <header/>
+        <body>
+            <trans-unit id="title" resname="title">
+                <source>Carousel</source>
+            </trans-unit>
+            <trans-unit id="description" resname="description">
+                <source>See also https://getbootstrap.com/docs/5.0/components/carousel/</source>
+            </trans-unit>
+            <trans-unit id="carousel_items.label" resname="carousel_items.label">
+                <source>Carousel Items</source>
+            </trans-unit>
+            <trans-unit id="carousel_items.image.label" resname="carousel_items.image.label">
+                <source>Image</source>
+            </trans-unit>
+            <trans-unit id="carousel_items.header.label" resname="carousel_items.header.label">
+                <source>Header</source>
+            </trans-unit>
+            <trans-unit id="carousel_items.description.label" resname="carousel_items.description.label">
+                <source>Description</source>
+            </trans-unit>
+            <trans-unit id="previous.label" resname="previous.label">
+                <source>Previous</source>
+            </trans-unit>
+            <trans-unit id="next.label" resname="next.label">
+                <source>Next</source>
+            </trans-unit>
+            <trans-unit id="backend.itemCount" resname="backend.itemCount">
+                <source>Carousel with %s items</source>
+            </trans-unit>
+            <trans-unit id="backend.lastUpdated" resname="backend.lastUpdated">
+                <source>Last updated %s</source>
+            </trans-unit>
+        </body>
+    </file>
 </xliff>
diff --git a/...e_tutorial/13.4/src/ContentBlocks/ContentElements/carousel/templates/backend-preview.html b/...e_tutorial/13.4/src/ContentBlocks/ContentElements/carousel/templates/backend-preview.html
@@ -1,12 +1,24 @@
-<f:asset.css identifier="content-block-t3docs-t3docs/carousel-be" href="{cb:assetPath()}/preview.css"/>
+<f:layout name="Preview"/>
 
-<div class="row">
-    <f:for each="{data.carousel_items}" as="item" iteration="iteration">
-        <div class="col">
-            <f:for each="{item.image}" as="image" iteration="iteration">
-                <f:image image="{image}" width="100"/><br/>
-            </f:for>
-            {item.header}
-        </div>
-    </f:for>
-</div>
+<f:section name="Header">
+    <f:variable name="itemCount"><f:count subject="{data.carousel_items}" /></f:variable>
+    <div>{f:translate(key: '{cb:languagePath()}:backend.itemCount', arguments: {0: '{itemCount}'})}</div>
+</f:section>
+
+<f:section name="Content">
+    <div class="row">
+        <f:for each="{data.carousel_items}" as="item" iteration="iteration">
+            <div class="col">
+                <f:for each="{item.image}" as="image" iteration="iteration">
+                    <f:image image="{image}" width="100"/><br/>
+                </f:for>
+                {item.header}
+            </div>
+        </f:for>
+    </div>
+</f:section>
+
+<f:section name="Footer">
+    <f:variable name="lastUpdated"><f:format.date>{data.rawRecord.crdate}</f:format.date></f:variable>
+    <div>{f:translate(key: '{cb:languagePath()}:backend.lastUpdated', arguments: {0: '{lastUpdated}'})}</div>
+</f:section>
diff --git a/...s/site_package_tutorial/13.4/src/ContentBlocks/ContentElements/jumbotron/config.yaml.twig b/...s/site_package_tutorial/13.4/src/ContentBlocks/ContentElements/jumbotron/config.yaml.twig
@@ -1,6 +1,6 @@
 name: {{ package.packageNameAlternative }}/jumbotron
 typeName: {{ package.extensionKey }}_jumbotron
-group: default
+group: {{ package.extensionKey }}
 prefixFields: true
 prefixType: full
 fields:

diff --git a/resources/packages/site_package_tutorial/13.4/src/Initialisation/data.xml b/resources/packages/site_package_tutorial/13.4/src/Initialisation/data.xml
@@ -590,8 +590,8 @@
 				<field index="mount_pid_ol" type="integer">0</field>
 				<field index="module"></field>
 				<field index="l18n_cfg" type="integer">0</field>
-				<field index="backend_layout">pagets__Default</field>
-				<field index="backend_layout_next_level">pagets__Subpage</field>
+				<field index="backend_layout">pagets__default</field>
+				<field index="backend_layout_next_level">pagets__subpage</field>
 				<field index="tsconfig_includes"></field>
 				<field index="seo_title"></field>
 				<field index="no_index" type="integer">0</field>

diff --git a/.../packages/site_package_tutorial/13.4/src/Resources/Private/Language/locallang_be.xlf.twig b/.../packages/site_package_tutorial/13.4/src/Resources/Private/Language/locallang_be.xlf.twig
@@ -21,6 +21,9 @@
             <trans-unit id="backend_layout.column.right">
                 <source>Right</source>
             </trans-unit>
+            <trans-unit id="content_element.group.{{ package.extensionKey }}">
+                <source>{{ package.title }} elements</source>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/..._package_tutorial/13.4/src/Resources/Private/PageView/Partials/Navigation/FooterMenu.html b/..._package_tutorial/13.4/src/Resources/Private/PageView/Partials/Navigation/FooterMenu.html
@@ -1,4 +1,7 @@
-<ul class="nav col-md-4 justify-content-end">
-    <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">Data privacy</a></li>
-    <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">Imprint</a></li>
-</ul>
+<f:if condition="{footerMenu}">
+    <ul class="nav col-md-4 justify-content-end">
+        <f:for each="{footerMenu}" as="menuItem">
+            <li class="nav-item"><a href="{menuItem.link}" class="nav-link px-2 text-body-secondary">{menuItem.title}</a></li>
+        </f:for>
+    </ul>
+</f:if>