Skip to content

Commit

Permalink
[TASK] Remove header tags from gridelements (#368)
Browse files Browse the repository at this point in the history 
* Add theme_t3kit templates to GridElements objects

* cleanup TypoScript of GridElements

* Generalise FluidTemplate definition

* Optimize TypoScript for GridElements
  • Loading branch information
@goldi42 @MattiasNilsson
goldi42 authored and MattiasNilsson committed Jan 14, 2018
1 parent 8b403e6 commit 639608a
Show file tree
Hide file tree
Showing 15 changed files with 242 additions and 426 deletions.
17 changes: 0 additions & 17 deletions Configuration/GridElements/TypoScript/2ColumnGrid.setupts
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
lib.gridelements {
2ColumnGrid < .defaultGridSetup
2ColumnGrid {
columns.0 {
renderObj >
renderObj = COA
renderObj {
20 =< tt_content
}
}
columns.1 < .columns.0

cObject = FLUIDTEMPLATE
cObject {
layoutRootPaths {
20 = EXT:fluid_styled_content/Resources/Private/Layouts
30 = EXT:theme_t3kit/Resources/Private/Layouts/GridElements
}
partialRootPaths {
20 = EXT:fluid_styled_content/Resources/Private/Partials
}
file = EXT:theme_t3kit/Resources/Private/Templates/GridElements/2ColumnGrid.html
dataProcessing {
# "inherit" from lib.fluidContent
Expand Down
23 changes: 0 additions & 23 deletions Configuration/GridElements/TypoScript/3ColumnGrid.setupts
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,8 @@
lib.gridelements {
3ColumnGrid < .defaultGridSetup
3ColumnGrid {
columns.0 {
renderObj >
renderObj = COA
renderObj {
20 =< tt_content
}
}
columns.1 < .columns.0
columns.2 < .columns.0

cObject = FLUIDTEMPLATE
cObject {
layoutRootPaths {
20 = EXT:fluid_styled_content/Resources/Private/Layouts
30 = EXT:theme_t3kit/Resources/Private/Layouts/GridElements
}
partialRootPaths {
20 = EXT:fluid_styled_content/Resources/Private/Partials
}
file = EXT:theme_t3kit/Resources/Private/Templates/GridElements/3ColumnGrid.html
dataProcessing {
# "inherit" from lib.fluidContent
800 < lib.contentElement.dataProcessing.800
830 < lib.contentElement.dataProcessing.830
}
}
}
}
Expand Down
24 changes: 0 additions & 24 deletions Configuration/GridElements/TypoScript/4ColumnGrid.setupts
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,8 @@
lib.gridelements {
4ColumnGrid < .defaultGridSetup
4ColumnGrid {
columns.0 {
renderObj >
renderObj = COA
renderObj {
20 =< tt_content
}
}
columns.1 < .columns.0
columns.2 < .columns.0
columns.3 < .columns.0

cObject = FLUIDTEMPLATE
cObject {
layoutRootPaths {
20 = EXT:fluid_styled_content/Resources/Private/Layouts
30 = EXT:theme_t3kit/Resources/Private/Layouts/GridElements
}
partialRootPaths {
20 = EXT:fluid_styled_content/Resources/Private/Partials
}
file = EXT:theme_t3kit/Resources/Private/Templates/GridElements/4ColumnGrid.html
dataProcessing {
# "inherit" from lib.fluidContent
800 < lib.contentElement.dataProcessing.800
830 < lib.contentElement.dataProcessing.830
}
}
}
}
Expand Down
119 changes: 51 additions & 68 deletions Configuration/GridElements/TypoScript/Adv1ColumnGrid.setupts
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,74 @@
lib.gridelements {
# layoutRootPaths {
# 1913 = EXT:fluid_styled_content/Resources/Private/Layouts/
# }
Adv1ColumnGrid < .defaultGridSetup
Adv1ColumnGrid {
columns.0 {
prepend = COA
prepend {
10 = TEXT
10 {
field = flexform_column_1_xs
required = 1
noTrimWrap = | |
}
20 < .10
20.field = flexform_column_1_sm
20.noTrimWrap = | |
30 < .10
30.field = flexform_column_1_md
30.noTrimWrap = | |
40 < .10
40.field = flexform_column_1_lg
40.noTrimWrap = | |
50 < .10
50.field = flexform_column_1_layout
50.noTrimWrap = | |
60 < .10
60.field = flexform_column_1_offset
60.noTrimWrap = | |
70 < .10
70.field = flexform_column_1_class
70.noTrimWrap = | |
stdWrap.noTrimWrap = |<div class="col1 |">|
}
renderObj >
renderObj = COA
renderObj {
20 =< tt_content
}
wrap = |</div>

# Content wrapper
innerWrap.cObject = COA
innerWrap.cObject {
10 = TEXT
10.value = <div
20 = COA
20 {
columns {
0 < .default
0 {
prepend = COA
prepend {
10 = TEXT
10 {
field = flexform_column_1_content_wrapper
field = flexform_column_1_xs
required = 1
noTrimWrap = | ||
noTrimWrap = | |
}
20 < .10
20.field = flexform_column_1_sm
20.noTrimWrap = | |
30 < .10
30.field = flexform_column_1_md
30.noTrimWrap = | |
40 < .10
40.field = flexform_column_1_lg
40.noTrimWrap = | |
50 < .10
50.field = flexform_column_1_layout
50.noTrimWrap = | |
60 < .10
60.field = flexform_column_1_offset
60.noTrimWrap = | |
70 < .10
70.field = flexform_column_1_class
70.noTrimWrap = | |
stdWrap.noTrimWrap = |<div class="col1 |">|
}
wrap = |</div>

stdWrap {
trim = 1
noTrimWrap = | class="|"|
required = 1
# Content wrapper
innerWrap.cObject = COA
innerWrap.cObject {
10 = TEXT
10.value = <div
20 = COA
20 {
10 = TEXT
10 {
field = flexform_column_1_content_wrapper
required = 1
noTrimWrap = | ||
}

stdWrap {
trim = 1
noTrimWrap = | class="|"|
required = 1
}
}
}

30 = TEXT
30.value = >|</div>
if.isTrue.field = flexform_column_1_content_wrapper
30 = TEXT
30.value = >|</div>
if.isTrue.field = flexform_column_1_content_wrapper
}
}

}

cObject = FLUIDTEMPLATE
cObject {
layoutRootPaths {
20 = EXT:fluid_styled_content/Resources/Private/Layouts
30 = EXT:theme_t3kit/Resources/Private/Layouts/GridElements
}
partialRootPaths {
20 = EXT:fluid_styled_content/Resources/Private/Partials
}
file = EXT:theme_t3kit/Resources/Private/Templates/GridElements/Adv1ColumnGrid.html
dataProcessing {
10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
10 {
references.fieldName = media
}
# "inherit" from lib.fluidContent
800 < lib.contentElement.dataProcessing.800
830 < lib.contentElement.dataProcessing.830
}
}
}
Expand Down
32 changes: 17 additions & 15 deletions Configuration/GridElements/TypoScript/Adv2ColumnGrid.setupts
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
lib.gridelements {
Adv2ColumnGrid < .Adv1ColumnGrid
Adv2ColumnGrid {
columns.1 < .columns.0
columns.1.prepend {
10.field = flexform_column_2_xs
20.field = flexform_column_2_sm
30.field = flexform_column_2_md
40.field = flexform_column_2_lg
50.field = flexform_column_2_layout
60.field = flexform_column_2_offset
70.field = flexform_column_2_class
stdWrap.noTrimWrap = |<div class="col2|">|
}
columns.1 {
# Content wrapper
innerWrap.cObject.20.10.field = flexform_column_2_content_wrapper
innerWrap.cObject.if.isTrue.field = flexform_column_2_content_wrapper
columns {
1 < .0
1 {
prepend {
10.field = flexform_column_2_xs
20.field = flexform_column_2_sm
30.field = flexform_column_2_md
40.field = flexform_column_2_lg
50.field = flexform_column_2_layout
60.field = flexform_column_2_offset
70.field = flexform_column_2_class
stdWrap.noTrimWrap = |<div class="col2|">|
}
# Content wrapper
innerWrap.cObject.20.10.field = flexform_column_2_content_wrapper
innerWrap.cObject.if.isTrue.field = flexform_column_2_content_wrapper
}
}
cObject.file = EXT:theme_t3kit/Resources/Private/Templates/GridElements/Adv2ColumnGrid.html
}
Expand Down
67 changes: 34 additions & 33 deletions Configuration/GridElements/TypoScript/Adv3ColumnGrid.setupts
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
lib.gridelements {
Adv3ColumnGrid < .Adv1ColumnGrid
Adv3ColumnGrid {
columns.1 < .columns.0
columns.1.prepend {
10.field = flexform_column_2_xs
20.field = flexform_column_2_sm
30.field = flexform_column_2_md
40.field = flexform_column_2_lg
50.field = flexform_column_2_layout
60.field = flexform_column_2_offset
70.field = flexform_column_2_class
stdWrap.noTrimWrap = |<div class="col2 |">|
}
columns.1 {
# Content wrapper
innerWrap.cObject.20.10.field = flexform_column_2_content_wrapper
innerWrap.cObject.if.isTrue.field = flexform_column_2_content_wrapper
}
columns.2 < .columns.0
columns.2.prepend {
10.field = flexform_column_3_xs
20.field = flexform_column_3_sm
30.field = flexform_column_3_md
40.field = flexform_column_3_lg
50.field = flexform_column_3_layout
60.field = flexform_column_3_offset
70.field = flexform_column_3_class
stdWrap.noTrimWrap = |<div class="col3 |">|
}
columns.2 {
# Content wrapper
innerWrap.cObject.20.10.field = flexform_column_3_content_wrapper
innerWrap.cObject.if.isTrue.field = flexform_column_3_content_wrapper
}

columns {
1 < .0
1 {
prepend {
10.field = flexform_column_2_xs
20.field = flexform_column_2_sm
30.field = flexform_column_2_md
40.field = flexform_column_2_lg
50.field = flexform_column_2_layout
60.field = flexform_column_2_offset
70.field = flexform_column_2_class
stdWrap.noTrimWrap = |<div class="col2 |">|
}
# Content wrapper
innerWrap.cObject.20.10.field = flexform_column_2_content_wrapper
innerWrap.cObject.if.isTrue.field = flexform_column_2_content_wrapper
}
2 < .0
2 {
prepend {
10.field = flexform_column_3_xs
20.field = flexform_column_3_sm
30.field = flexform_column_3_md
40.field = flexform_column_3_lg
50.field = flexform_column_3_layout
60.field = flexform_column_3_offset
70.field = flexform_column_3_class
stdWrap.noTrimWrap = |<div class="col3 |">|
}
# Content wrapper
innerWrap.cObject.20.10.field = flexform_column_3_content_wrapper
innerWrap.cObject.if.isTrue.field = flexform_column_3_content_wrapper
}
}
cObject.file = EXT:theme_t3kit/Resources/Private/Templates/GridElements/Adv3ColumnGrid.html
}
}
Expand Down
Loading

0 comments on commit 639608a

Please sign in to comment.