[TASK] adapt grid templates to use with Gridelements v9

t3kit · Dec 15, 2018 · a78d995 · a78d995
1 parent b36b185
commit a78d995
Show file tree

Hide file tree

Showing 17 changed files with 139 additions and 31 deletions.
diff --git a/Configuration/GridElements/TypoScript/DefaultGrid.setupts b/Configuration/GridElements/TypoScript/DefaultGrid.setupts
@@ -9,6 +9,7 @@ lib.gridelements {
             20 = EXT:fluid_styled_content/Resources/Private/Partials/
             30 = EXT:theme_t3kit/Resources/Private/Partials/ContentElements/
             40 = EXT:theme_t3kit/Resources/Private/Partials/FluidStyledContent/
+            40 = EXT:theme_t3kit/Resources/Private/Partials/GridElements/
         }
         templateRootPaths {
             20 = EXT:theme_t3kit/Resources/Private/Templates/ContentElements/
@@ -19,6 +20,10 @@ lib.gridelements {
             # "inherit" from lib.fluidContent
             800 < lib.contentElement.dataProcessing.800
             830 < lib.contentElement.dataProcessing.830
+            200 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+            200 {
+                references.fieldName = media
+            }
         }
     }
 }

diff --git a/Resources/Private/Layouts/GridElements/Default.html b/Resources/Private/Layouts/GridElements/Default.html
@@ -1,4 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+
+<f:variable name="container">{data.pi_flexform.data.columns.lDEF.container.vDEF}</f:variable>
+
 <f:spaceless>
 
 	<f:comment><!-- ### Wrapper class===frame_class||Margin Top===space_before_class||Margin Bottom===space_after_class||Background Image end if set ### --></f:comment>
@@ -21,7 +24,7 @@
 	</f:if>
 
 	<f:comment><!-- ### element body ### --></f:comment>
-	<div id="c{data.uid}" class="frame frame-type-{data.CType} {layoutClass} {f:if(condition: data.layout, then: ' frame-layout-{data.layout}')} {alignClass} {f:if( condition: data.flexform_container, then: ' {data.flexform_container}')}">
+	<div id="c{data.uid}" class="frame frame-type-{data.CType} {layoutClass} {f:if(condition: data.layout, then: ' frame-layout-{data.layout}')} {alignClass} {f:if( condition: container, then: ' {container}')}">
 		<f:if condition="{data._LOCALIZED_UID}">
 			<a id="c{data._LOCALIZED_UID}"></a>
 		</f:if>

diff --git a/Resources/Private/Partials/GridElements/RenederColumns.html b/Resources/Private/Partials/GridElements/RenederColumns.html
@@ -0,0 +1,7 @@
+<f:variable name="row">{children.1}</f:variable>
+<f:variable name="col">{col}</f:variable>
+
+<f:for each="{row.{col}}" as="elem">
+
+		<f:cObject typoscriptObjectPath="tt_content.{elem.data.CType}" data="{elem.data}"/>
+</f:for>
diff --git a/Resources/Private/Templates/GridElements/2ColumnGrid.html b/Resources/Private/Templates/GridElements/2ColumnGrid.html
@@ -3,10 +3,10 @@
 	<f:comment><!-- ### Content ### --></f:comment>
 	<div class="row">
 		<div class="col-md-6">
-			<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+			<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
 		</div>
 		<div class="col-md-6">
-			<f:format.raw>{data.tx_gridelements_view_column_1}</f:format.raw>
+			<f:render partial="RenederColumns" arguments="{children: children, col: 1}"/>
 		</div>
 	</div>
 </f:section>
diff --git a/Resources/Private/Templates/GridElements/3ColumnGrid.html b/Resources/Private/Templates/GridElements/3ColumnGrid.html
@@ -3,13 +3,13 @@
 	<f:comment><!-- ### Content ### --></f:comment>
 	<div class="row">
 		<div class="col-md-4">
-			<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+				<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
 		</div>
 		<div class="col-md-4">
-			<f:format.raw>{data.tx_gridelements_view_column_1}</f:format.raw>
+				<f:render partial="RenederColumns" arguments="{children: children, col: 1}"/>
 		</div>
 		<div class="col-md-4">
-			<f:format.raw>{data.tx_gridelements_view_column_2}</f:format.raw>
+				<f:render partial="RenederColumns" arguments="{children: children, col: 2}"/>
 		</div>
 	</div>
 </f:section>
diff --git a/Resources/Private/Templates/GridElements/4ColumnGrid.html b/Resources/Private/Templates/GridElements/4ColumnGrid.html
@@ -3,16 +3,16 @@
 	<f:comment><!-- ### Content ### --></f:comment>
 	<div class="row">
 		<div class="col-md-3">
-			<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+			<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
 		</div>
 		<div class="col-md-3">
-			<f:format.raw>{data.tx_gridelements_view_column_1}</f:format.raw>
+			<f:render partial="RenederColumns" arguments="{children: children, col: 1}"/>
 		</div>
 		<div class="col-md-3">
-			<f:format.raw>{data.tx_gridelements_view_column_2}</f:format.raw>
+			<f:render partial="RenederColumns" arguments="{children: children, col: 2}"/>
 		</div>
 		<div class="col-md-3">
-			<f:format.raw>{data.tx_gridelements_view_column_3}</f:format.raw>
+			<f:render partial="RenederColumns" arguments="{children: children, col: 3}"/>
 		</div>
 	</div>
 </f:section>
diff --git a/Resources/Private/Templates/GridElements/Adv1ColumnGrid.html b/Resources/Private/Templates/GridElements/Adv1ColumnGrid.html
@@ -1,27 +1,38 @@
 <f:layout name="Default" />
 <f:section name="Main">
+
+	<f:variable name="container">{data.pi_flexform.data.columns.lDEF.container.vDEF}</f:variable>
+	<f:variable name="column_1_xs">{data.pi_flexform.data.columns.lDEF.column_1_xs.vDEF}</f:variable>
+	<f:variable name="column_1_sm">{data.pi_flexform.data.columns.lDEF.column_1_sm.vDEF}</f:variable>
+	<f:variable name="column_1_md">{data.pi_flexform.data.columns.lDEF.column_1_md.vDEF}</f:variable>
+	<f:variable name="column_1_lg">{data.pi_flexform.data.columns.lDEF.column_1_lg.vDEF}</f:variable>
+	<f:variable name="column_1_offset">{data.pi_flexform.data.columns.lDEF.column_1_offset.vDEF}</f:variable>
+	<f:variable name="column_1_class">{data.pi_flexform.data.columns.lDEF.column_1_class.vDEF}</f:variable>
+
 	<f:comment><!-- ### Content ### --></f:comment>
 	<f:comment><!-- ### if container||columns is set add row start tag ### --></f:comment>
-	<f:if condition="{data.flexform_container}">
+	<f:if condition="{container}">
 		<f:then>
 			<div class="row">
 		</f:then>
 		<f:else>
-			<f:if condition="{data.flexform_column_1_sm}{data.flexform_column_1_md}{data.flexform_column_1_lg}">
+			<f:if condition="{column_1_sm}{column_1_md}{column_1_lg}">
 				<div class="row">
 			</f:if>
 		</f:else>
 	</f:if>
 
-		<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+	<div class="col1 {column_1_xs} {column_1_sm} {column_1_md} {column_1_lg} {column_1_offset} {column_1_class} ">
+			<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
+	</div>
 
 	<f:comment><!-- ### if container||columns is set add row end tag ### --></f:comment>
-	<f:if condition="{data.flexform_container}">
+	<f:if condition="{container}">
 		<f:then>
 			</div>
 		</f:then>
 		<f:else>
-			<f:if condition="{data.flexform_column_1_sm}{data.flexform_column_1_md}{data.flexform_column_1_lg}">
+			<f:if condition="{column_1_sm}{column_1_md}{column_1_lg}">
 				</div>
 			</f:if>
 		</f:else>

diff --git a/Resources/Private/Templates/GridElements/Adv2ColumnGrid.html b/Resources/Private/Templates/GridElements/Adv2ColumnGrid.html
@@ -1,8 +1,27 @@
 <f:layout name="Default" />
 <f:section name="Main">
+
+	<f:variable name="column_1_xs">{data.pi_flexform.data.columns.lDEF.column_1_xs.vDEF}</f:variable>
+	<f:variable name="column_1_sm">{data.pi_flexform.data.columns.lDEF.column_1_sm.vDEF}</f:variable>
+	<f:variable name="column_1_md">{data.pi_flexform.data.columns.lDEF.column_1_md.vDEF}</f:variable>
+	<f:variable name="column_1_lg">{data.pi_flexform.data.columns.lDEF.column_1_lg.vDEF}</f:variable>
+	<f:variable name="column_1_offset">{data.pi_flexform.data.columns.lDEF.column_1_offset.vDEF}</f:variable>
+	<f:variable name="column_1_class">{data.pi_flexform.data.columns.lDEF.column_1_class.vDEF}</f:variable>
+
+	<f:variable name="column_2_xs">{data.pi_flexform.data.columns.lDEF.column_2_xs.vDEF}</f:variable>
+	<f:variable name="column_2_sm">{data.pi_flexform.data.columns.lDEF.column_2_sm.vDEF}</f:variable>
+	<f:variable name="column_2_md">{data.pi_flexform.data.columns.lDEF.column_2_md.vDEF}</f:variable>
+	<f:variable name="column_2_lg">{data.pi_flexform.data.columns.lDEF.column_2_lg.vDEF}</f:variable>
+	<f:variable name="column_2_offset">{data.pi_flexform.data.columns.lDEF.column_2_offset.vDEF}</f:variable>
+	<f:variable name="column_2_class">{data.pi_flexform.data.columns.lDEF.column_2_class.vDEF}</f:variable>
+
 	<f:comment><!-- ### Content ### --></f:comment>
 	<div class="row">
-		<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
-		<f:format.raw>{data.tx_gridelements_view_column_1}</f:format.raw>
+			<div class="col1 {column_1_xs} {column_1_sm} {column_1_md} {column_1_lg} {column_1_offset} {column_1_class} ">
+				<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
+			</div>
+			<div class="col2 {column_2_xs} {column_2_sm} {column_2_md} {column_2_lg} {column_2_offset} {column_2_class} ">
+				<f:render partial="RenederColumns" arguments="{children: children, col: 1}"/>
+			</div>
 	</div>
 </f:section>
diff --git a/Resources/Private/Templates/GridElements/Adv3ColumnGrid.html b/Resources/Private/Templates/GridElements/Adv3ColumnGrid.html
@@ -1,9 +1,37 @@
+
 <f:layout name="Default" />
 <f:section name="Main">
-	<f:comment><!-- ### Content ### --></f:comment>
+
+	<f:variable name="column_1_xs">{data.pi_flexform.data.columns.lDEF.column_1_xs.vDEF}</f:variable>
+	<f:variable name="column_1_sm">{data.pi_flexform.data.columns.lDEF.column_1_sm.vDEF}</f:variable>
+	<f:variable name="column_1_md">{data.pi_flexform.data.columns.lDEF.column_1_md.vDEF}</f:variable>
+	<f:variable name="column_1_lg">{data.pi_flexform.data.columns.lDEF.column_1_lg.vDEF}</f:variable>
+	<f:variable name="column_1_offset">{data.pi_flexform.data.columns.lDEF.column_1_offset.vDEF}</f:variable>
+	<f:variable name="column_1_class">{data.pi_flexform.data.columns.lDEF.column_1_class.vDEF}</f:variable>
+
+	<f:variable name="column_2_xs">{data.pi_flexform.data.columns.lDEF.column_2_xs.vDEF}</f:variable>
+	<f:variable name="column_2_sm">{data.pi_flexform.data.columns.lDEF.column_2_sm.vDEF}</f:variable>
+	<f:variable name="column_2_md">{data.pi_flexform.data.columns.lDEF.column_2_md.vDEF}</f:variable>
+	<f:variable name="column_2_lg">{data.pi_flexform.data.columns.lDEF.column_2_lg.vDEF}</f:variable>
+	<f:variable name="column_2_offset">{data.pi_flexform.data.columns.lDEF.column_2_offset.vDEF}</f:variable>
+	<f:variable name="column_2_class">{data.pi_flexform.data.columns.lDEF.column_2_class.vDEF}</f:variable>
+
+	<f:variable name="column_3_xs">{data.pi_flexform.data.columns.lDEF.column_3_xs.vDEF}</f:variable>
+	<f:variable name="column_3_sm">{data.pi_flexform.data.columns.lDEF.column_3_sm.vDEF}</f:variable>
+	<f:variable name="column_3_md">{data.pi_flexform.data.columns.lDEF.column_3_md.vDEF}</f:variable>
+	<f:variable name="column_3_lg">{data.pi_flexform.data.columns.lDEF.column_3_lg.vDEF}</f:variable>
+	<f:variable name="column_3_offset">{data.pi_flexform.data.columns.lDEF.column_3_offset.vDEF}</f:variable>
+	<f:variable name="column_3_class">{data.pi_flexform.data.columns.lDEF.column_3_class.vDEF}</f:variable>
+
 	<div class="row">
-		<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
-		<f:format.raw>{data.tx_gridelements_view_column_1}</f:format.raw>
-		<f:format.raw>{data.tx_gridelements_view_column_2}</f:format.raw>
+			<div class="col1 {column_1_xs} {column_1_sm} {column_1_md} {column_1_lg} {column_1_offset} {column_1_class} ">
+				<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
+			</div>
+			<div class="col2 {column_2_xs} {column_2_sm} {column_2_md} {column_2_lg} {column_2_offset} {column_2_class} ">
+				<f:render partial="RenederColumns" arguments="{children: children, col: 1}"/>
+			</div>
+			<div class="col3 {column_3_xs} {column_3_sm} {column_3_md} {column_3_lg} {column_3_offset} {column_3_class} ">
+				<f:render partial="RenederColumns" arguments="{children: children, col: 2}"/>
+			</div>
 	</div>
 </f:section>
diff --git a/Resources/Private/Templates/GridElements/Adv4ColumnGrid.html b/Resources/Private/Templates/GridElements/Adv4ColumnGrid.html
@@ -1,10 +1,40 @@
 <f:layout name="Default" />
 <f:section name="Main">
+
+	<f:variable name="column_1_xs">{data.pi_flexform.data.columns.lDEF.column_1_xs.vDEF}</f:variable>
+	<f:variable name="column_1_sm">{data.pi_flexform.data.columns.lDEF.column_1_sm.vDEF}</f:variable>
+	<f:variable name="column_1_md">{data.pi_flexform.data.columns.lDEF.column_1_md.vDEF}</f:variable>
+	<f:variable name="column_1_lg">{data.pi_flexform.data.columns.lDEF.column_1_lg.vDEF}</f:variable>
+	<f:variable name="column_1_offset">{data.pi_flexform.data.columns.lDEF.column_1_offset.vDEF}</f:variable>
+	<f:variable name="column_1_class">{data.pi_flexform.data.columns.lDEF.column_1_class.vDEF}</f:variable>
+
+	<f:variable name="column_2_xs">{data.pi_flexform.data.columns.lDEF.column_2_xs.vDEF}</f:variable>
+	<f:variable name="column_2_sm">{data.pi_flexform.data.columns.lDEF.column_2_sm.vDEF}</f:variable>
+	<f:variable name="column_2_md">{data.pi_flexform.data.columns.lDEF.column_2_md.vDEF}</f:variable>
+	<f:variable name="column_2_lg">{data.pi_flexform.data.columns.lDEF.column_2_lg.vDEF}</f:variable>
+	<f:variable name="column_2_offset">{data.pi_flexform.data.columns.lDEF.column_2_offset.vDEF}</f:variable>
+	<f:variable name="column_2_class">{data.pi_flexform.data.columns.lDEF.column_2_class.vDEF}</f:variable>
+
+	<f:variable name="column_3_xs">{data.pi_flexform.data.columns.lDEF.column_3_xs.vDEF}</f:variable>
+	<f:variable name="column_3_sm">{data.pi_flexform.data.columns.lDEF.column_3_sm.vDEF}</f:variable>
+	<f:variable name="column_3_md">{data.pi_flexform.data.columns.lDEF.column_3_md.vDEF}</f:variable>
+	<f:variable name="column_3_lg">{data.pi_flexform.data.columns.lDEF.column_3_lg.vDEF}</f:variable>
+	<f:variable name="column_3_offset">{data.pi_flexform.data.columns.lDEF.column_3_offset.vDEF}</f:variable>
+	<f:variable name="column_3_class">{data.pi_flexform.data.columns.lDEF.column_3_class.vDEF}</f:variable>
+
 	<f:comment><!-- ### Content ### --></f:comment>
 	<div class="row">
-		<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
-		<f:format.raw>{data.tx_gridelements_view_column_1}</f:format.raw>
-		<f:format.raw>{data.tx_gridelements_view_column_2}</f:format.raw>
-		<f:format.raw>{data.tx_gridelements_view_column_3}</f:format.raw>
+			<div class="col1 {column_1_xs} {column_1_sm} {column_1_md} {column_1_lg} {column_1_offset} {column_1_class} ">
+				<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
+			</div>
+			<div class="col2 {column_2_xs} {column_2_sm} {column_2_md} {column_2_lg} {column_2_offset} {column_2_class} ">
+				<f:render partial="RenederColumns" arguments="{children: children, col: 1}"/>
+			</div>
+			<div class="col3 {column_3_xs} {column_3_sm} {column_3_md} {column_3_lg} {column_3_offset} {column_3_class} ">
+				<f:render partial="RenederColumns" arguments="{children: children, col: 2}"/>
+			</div>
+			<div class="col4 {column_4_xs} {column_4_sm} {column_4_md} {column_4_lg} {column_4_offset} {column_4_class} ">
+				<f:render partial="RenederColumns" arguments="{children: children, col: 3}"/>
+			</div>
 	</div>
 </f:section>
diff --git a/Resources/Private/Templates/GridElements/Collapsible.html b/Resources/Private/Templates/GridElements/Collapsible.html
@@ -14,7 +14,7 @@
 		</div>
 		<div id="collapse-{data.uid}" class="panel-collapse collapse {f:if(condition: data.pi_flexform.data.columns.lDEF.expanded.vDEF, then: 'in', else: '')}" role="tabpanel">
 			<div class="panel-body">
-				<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+				<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
 			</div>
 		</div>
 	</div>

diff --git a/Resources/Private/Templates/GridElements/CollapsibleGroup.html b/Resources/Private/Templates/GridElements/CollapsibleGroup.html
@@ -1,6 +1,6 @@
 <f:layout name="NoBgImage" />
 <f:section name="Main">
 	<div class="panel-group" id="group-{f:if(condition: data._LOCALIZED_UID, then: data._LOCALIZED_UID, else: data.uid)}" role="tablist" aria-multiselectable="{f:if(condition: '{data.pi_flexform.data.columns.lDEF.multiselectable.vDEF}', then: 'true', else: 'false')}">
-		<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+		<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
 	</div>
 </f:section>
diff --git a/Resources/Private/Templates/GridElements/Parallax.html b/Resources/Private/Templates/GridElements/Parallax.html
@@ -14,6 +14,6 @@
 				<div class="parallax parallax-resimg clearfix {f:cObject(typoscriptObjectPath:'lib.responsiveBackgroundImage', data:files.0.uid)} {f:if(condition: data.pi_flexform.data.columns.lDEF.hideInMobile.vDEF, then: ' hidden-xs hidden-sm')}" style="height: {f:if(condition: data.pi_flexform.data.columns.lDEF.height.vDEF, then: data.pi_flexform.data.columns.lDEF.height.vDEF, else: 'auto')};" >
 		</f:if>
 	</f:if>
-	<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+	<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
 </div>
 </f:section>
diff --git a/Resources/Private/Templates/GridElements/SliderContainer.html b/Resources/Private/Templates/GridElements/SliderContainer.html
@@ -8,7 +8,7 @@
 	<div class="slider-container slider-container-{f:if(condition: '{data.pi_flexform.data.columns.lDEF.effect.vDEF}', then: 'effect', else: 'default')} {f:if(condition: '{data.pi_flexform.data.columns.lDEF.paginationPosition.vDEF}', then: '_pagination-outside', else: '_pagination-inside')} {f:if(condition: '{data.pi_flexform.data.columns.lDEF.arrowsPosition.vDEF}', then: '_arrows-outside', else: '_arrows-inside')}">
 		<div class="swiper-container slider-container__container js__slider-container__container" data-autoplay="{f:if(condition: '{data.pi_flexform.data.columns.lDEF.autoplay.vDEF}', then: '{data.pi_flexform.data.columns.lDEF.autoplay.vDEF}')}" data-loop="{f:if(condition: data.pi_flexform.data.columns.lDEF.loop.vDEF, then: 'loop')}" data-effect="{f:if(condition: '{data.pi_flexform.data.columns.lDEF.effect.vDEF}', then: '{data.pi_flexform.data.columns.lDEF.effect.vDEF}', else: 'slider')}" data-slidesperview="{f:if(condition: '{data.pi_flexform.data.columns.lDEF.slidesPerView.vDEF}', then: '{data.pi_flexform.data.columns.lDEF.slidesPerView.vDEF}', else: 3)}" data-speed="{f:if(condition: '{data.pi_flexform.data.columns.lDEF.speed.vDEF}', then: '{data.pi_flexform.data.columns.lDEF.speed.vDEF}', else: 300)}">
 			<div class="swiper-wrapper slider-container__wrapper js__slider-container__wrapper">
-				<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+				<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
 			</div>
 		</div>
 		<f:if condition="{data.pi_flexform.data.columns.lDEF.paggination.vDEF}">

diff --git a/Resources/Private/Templates/GridElements/Tab.html b/Resources/Private/Templates/GridElements/Tab.html
@@ -1,4 +1,4 @@
 <f:layout name="{f:if(condition: data.tx_gridelements_container, then: 'Empty', else: 'NoBgImage')}" />
 <f:section name="Main">
-	<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+	<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
 </f:section>
diff --git a/Resources/Private/Templates/GridElements/TabGroup.html b/Resources/Private/Templates/GridElements/TabGroup.html
@@ -6,6 +6,6 @@
 		</f:for>
 	</ul>
 	<div class="tab-content">
-		<f:format.raw>{data.tx_gridelements_view_column_0}</f:format.raw>
+		<f:render partial="RenederColumns" arguments="{children: children, col: 0}"/>
 	</div>
 </f:section>
diff --git a/ext_localconf.php b/ext_localconf.php
@@ -72,3 +72,8 @@
     \T3kit\themeT3kit\Slot\GetSystemInformationSlot::class,
     'getSystemInformation'
 );
+
+
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
+    '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:' . $_EXTKEY . '/Configuration/PageTS/tsconfig.txt">'
+);