Merge branch 'nevercodealone:main' into master

.gitlab-ci.yml

@@ -103,9 +103,8 @@ deploy_live:
     - docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY
   script:
     - docker compose -f docker-compose.conversis.yml -p $SHORTCODE1 up -d --remove-orphans
-    - docker exec $SHORTCODE1-web chown www-data:www-data -R /var/www/html/var/
-  after_script:
     - docker exec $SHORTCODE1-web rm -rf /var/www/html/var/cache/*
+    - docker exec $SHORTCODE1-web chown www-data:www-data -R /var/www/html/var/
   environment:
     name: live
     url: https://$URL

config/image-formats.xml

@@ -192,16 +192,22 @@
             <option name="png_compression_level">6</option>
         </options>
     </format>
+    <format key="content-full">
+        <meta>
+            <title lang="en">Content Full</title>
+        </meta>
+        <scale x="1200" y="675"/>
+    </format>
     <format key="tailwind-training-overview-header">
         <meta>
             <title lang="en">Tailwind Training overview header</title>
         </meta>
         <scale x="912" />
     </format>
-  <format key="tailwind-daisyui-training-overview-card">
-    <meta>
-      <title lang="en">Tailwind Daisy UI Training Overview Card</title>
-    </meta>
-    <scale x="200" y="280"/>
-  </format>
+    <format key="tailwind-daisyui-training-overview-card">
+      <meta>
+        <title lang="en">Tailwind Daisy UI Training Overview Card</title>
+      </meta>
+      <scale x="200" y="280"/>
+    </format>
 </formats>

config/templates/includes/tailwind/blocks.xml

@@ -11,24 +11,28 @@
         </meta>
 
         <types>
+            <xi:include href="blocks/image.xml"
+                xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
             <xi:include href="blocks/hero.xml"
                 xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
             <xi:include href="blocks/hero-startpage.xml"
-                        xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
+                xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
             <xi:include href="blocks/introduction.xml"
                 xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
             <xi:include href="blocks/button.xml"
-                        xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
+                xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
             <xi:include href="blocks/cta-button.xml"
-                        xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
+                xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
             <xi:include href="blocks/feature.xml"
-                        xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
+                xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
             <xi:include href="blocks/formats.xml"
-                        xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
+                xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
             <xi:include href="blocks/team.xml"
-                        xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
+                xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
             <xi:include href="blocks/logo-gallery.xml"
-                        xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
+                xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
+            <xi:include href="blocks/subpages-overview.xml"
+                xpointer="xmlns(sulu=http://schemas.sulu.io/template/template)xpointer(/sulu:properties/sulu:block/sulu:types/sulu:type)"/>
         </types>
     </block>
 </properties>

config/templates/includes/tailwind/blocks/image.xml

@@ -0,0 +1,25 @@
+<properties xmlns="http://schemas.sulu.io/template/template"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xsi:schemaLocation="http://schemas.sulu.io/template/template http://schemas.sulu.io/template/template-1.0.xsd">
+  <block name="blocks" default-type="image">
+    <!-- @see https://docs.sulu.io/en/2.1/reference/content-types/block.html -->
+    <types>
+      <type name="image">
+        <meta>
+          <title>Image</title>
+        </meta>
+        <properties>
+          <property name="image" type="media_selection" maxOccurs="1">
+            <meta>
+              <title>Bild</title>
+            </meta>
+            <params>
+              <param name="types" value="image"/>
+            </params>
+          </property>
+        </properties>
+      </type>
+    </types>
+  </block>
+</properties>

config/templates/includes/tailwind/blocks/subpages-overview.xml

@@ -0,0 +1,37 @@
+<properties xmlns="http://schemas.sulu.io/template/template"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://schemas.sulu.io/template/template http://schemas.sulu.io/template/template-1.0.xsd">
+    <block name="blocks" default-type="subpages-overview">
+        <!-- @see https://docs.sulu.io/en/2.1/reference/content-types/block.html -->
+
+        <types>
+            <type name="subpages-overview">
+                <meta>
+                    <title lang="en">Subpages overview</title>
+                    <title lang="de">Unterseiten Übersicht</title>
+                </meta>
+                <properties>
+                    <property name="items" type="smart_content">
+                        <meta>
+                            <title lang="en">Items</title>
+                        </meta>
+                        <params>
+                            <param name="provider" value="pages"/>
+                            <param name="max_per_page" value="50"/>
+                            <param name="page_parameter" value="p"/>
+                            <param name="properties" type="collection">
+                                <param name="image" value="excerpt.images"/>
+                                <param name="article" value="article"/>
+                                <param name="url" value="url"/>
+                                <param name="excerptTitle" value="excerpt.title"/>
+                                <param name="excerptImages" value="excerpt.images"/>
+                                <param name="excerptDescription" value="excerpt.description"/>
+                                <param name="seoDescription" value="seo.description"/>
+                            </param>
+                        </params>
+                    </property>
+                </properties>
+            </type>
+        </types>
+    </block>
+</properties>