From f2040cf7dcf9938ec7bd320de81a694be257ecbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Mon, 7 Mar 2022 17:13:06 +0100
Subject: [PATCH] Further simplify grid-elements templates

---
 .../ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig | 1 +
 .../Templates/Gridelements/HalfAndTwoQuarters.html        | 8 +-------
 .../Resources/Private/Templates/Gridelements/Halves.html  | 8 +-------
 .../Private/Templates/Gridelements/Quarters.html          | 8 +-------
 .../Resources/Private/Templates/Gridelements/Thirds.html  | 8 ++------
 .../Templates/Gridelements/TwoQuartersAndHalf.html        | 8 +-------
 6 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig
index e12ab69e..c5745442 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig
+++ b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig
@@ -107,6 +107,7 @@ TCEFORM {
 		space_before_class {
 			types {
 				list.disabled = 1
+				gridelements_pi1.disabled = 1
 			}
 			removeItems := addToList(extra-small, small, medium, extra-large)
 			altLabels.. = Standard
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/HalfAndTwoQuarters.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/HalfAndTwoQuarters.html
index 5cd1257c..f78c8edc 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/HalfAndTwoQuarters.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/HalfAndTwoQuarters.html
@@ -6,14 +6,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:if condition="{data.header_layout} != 100">
-            <f:if condition="{data.header}">
-                <ep:container data="{data}">
-                    <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
-                </ep:container>
-            </f:if>
-        </f:if>
         <ep:container data="{data}">
+            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-2 gap-8">
                 <div class="col-span-2 md:col-span-1">
                     {data.tx_gridelements_view_column_51 -> f:format.raw()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Halves.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Halves.html
index cac1042b..1e490ebe 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Halves.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Halves.html
@@ -6,14 +6,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:if condition="{data.header_layout} != 100">
-            <f:if condition="{data.header}">
-                <ep:container data="{data}">
-                    <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
-                </ep:container>
-            </f:if>
-        </f:if>
         <ep:container data="{data}">
+            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-1 md:grid-cols-2 gap-8">
                 <f:if condition="{data.tx_gridelements_view_column_21 -> v:format.trim()}">
                     <div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Quarters.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Quarters.html
index 9cb32b9a..b174afc8 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Quarters.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Quarters.html
@@ -6,14 +6,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:if condition="{data.header_layout} != 100">
-            <f:if condition="{data.header}">
-                <ep:container data="{data}">
-                    <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
-                </ep:container>
-            </f:if>
-        </f:if>
         <ep:container data="{data}">
+            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-8">
                 {data.tx_gridelements_view_column_41 -> f:format.raw()}
                 {data.tx_gridelements_view_column_42 -> f:format.raw()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Thirds.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Thirds.html
index 783b7f3d..e2ae221d 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Thirds.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/Thirds.html
@@ -6,12 +6,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <ep:container data="{data}" cssClasses="py-8">
-            <f:if condition="{data.header_layout} != 100">
-                <f:if condition="{data.header}">
-                    <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
-                </f:if>
-            </f:if>
+        <ep:container data="{data}">
+            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
                 {data.tx_gridelements_view_column_31 -> f:format.raw()}
                 {data.tx_gridelements_view_column_32 -> f:format.raw()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/TwoQuartersAndHalf.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/TwoQuartersAndHalf.html
index 8723173e..8011018d 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/TwoQuartersAndHalf.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Gridelements/TwoQuartersAndHalf.html
@@ -6,14 +6,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:if condition="{data.header_layout} != 100">
-            <f:if condition="{data.header}">
-                <ep:container data="{data}">
-                    <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
-                </ep:container>
-            </f:if>
-        </f:if>
         <ep:container data="{data}">
+            <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link}" />
             <div class="grid grid-cols-2 gap-8">
                 <div class="col-span-2 md:col-span-1">
                     <div class="grid grid-cols-2 gap-8">