[FEATURE] Allow selection of headline type in accordion (#358)

t3kit · Nov 24, 2017 · 91976b2 · 91976b2
1 parent 7a3cf26
commit 91976b2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/Configuration/GridElements/TypoScript/Collapsible.setupts b/Configuration/GridElements/TypoScript/Collapsible.setupts
@@ -17,6 +17,7 @@ lib.gridelements {
             }
             partialRootPaths {
                 20 = EXT:fluid_styled_content/Resources/Private/Partials
+                30 = EXT:theme_t3kit/Resources/Private/Partials/FluidStyledContent/
             }
             file = EXT:theme_t3kit/Resources/Private/Templates/GridElements/Collapsible.html
             dataProcessing {

diff --git a/Resources/Private/Templates/GridElements/Collapsible.html b/Resources/Private/Templates/GridElements/Collapsible.html
@@ -2,10 +2,15 @@
 <f:section name="Main">
 	<div class="panel panel-default {layoutClass} {alignClass}">
 		<div class="panel-heading" role="tab" id="heading-{data.uid}">
-			<h4 class="panel-title">
-				<f:link.page pageUid="#collapse-{data.uid}" absolute="1" class="{f:if(condition: data.pi_flexform.data.columns.lDEF.expanded.vDEF, then: '', else: 'collapsed')}"
-				additionalAttributes="{'data-toggle':'collapse', 'data-target': '#collapse-{data.uid}', 'data-parent': '#group-{data.tx_gridelements_container}'}">{data.header}</f:link.page>
-			</h4>
+            <f:variable name="parentHeader">{data.parentgrid_header_layout}</f:variable>
+            <f:render partial="Header/Header" arguments="{
+				header: '{f:render(section: \'accordionLink\', arguments: \'{_all}\')}',
+                layout: '{f:if(condition:\'{parentHeader} > 0 && {parentHeader} < 6 \', then:\'{parentHeader + 1}\')}',
+				positionClass: 'panel-title',
+				link: '',
+				uid: '{data.uid}',
+				default: 4
+				}" />
 		</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">
@@ -14,3 +19,8 @@ <h4 class="panel-title">
 		</div>
 	</div>
 </f:section>
+
+<f:section name="accordionLink">
+	<f:link.page pageUid="#collapse-{data.uid}" absolute="1" class="{f:if(condition: data.pi_flexform.data.columns.lDEF.expanded.vDEF, then: '', else: 'collapsed')}"
+				 additionalAttributes="{'data-toggle':'collapse', 'data-target': '#collapse-{data.uid}', 'data-parent': '#group-{data.tx_gridelements_container}'}">{data.header}</f:link.page>
+</f:section>
diff --git a/felayout_t3kit/dev/styles/main/contentElements/simpleAccordion.less b/felayout_t3kit/dev/styles/main/contentElements/simpleAccordion.less
@@ -1,7 +1,11 @@
-.panel-title > a {
-    display: block;
-    padding: 10px 15px;
-    margin: -10px -15px;
+.panel-title {
+    font-weight: normal;
+
+    > a {
+        display: block;
+        padding: 10px 15px;
+        margin: -10px -15px;
+    }
 }
 
 .panel-title > a.empty {