Skip to content

Commit

Permalink
[TASK] use Default layout in content elements
Browse files Browse the repository at this point in the history
  • Loading branch information
dmh committed Apr 10, 2017
1 parent ab51a44 commit 5f32779
Show file tree
Hide file tree
Showing 15 changed files with 289 additions and 253 deletions.
37 changes: 37 additions & 0 deletions Resources/Private/Layouts/FluidStyledContent/Default.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:spaceless>

<f:comment><!-- ### Wrapper class===frame_class||Margin Top===space_before_class||Margin Bottom===space_after_class ### --></f:comment>
<f:if condition="{data.frame_class} || {data.space_before_class} || {data.space_after_class}">
<div class="{data.frame_class} {data.space_before_class} {data.space_after_class}">
</f:if>

<f:comment><!-- ### element body ### --></f:comment>
<div id="c{data.uid}" class="frame frame-type-{data.CType} {f:if(condition: data.layout, then: ' {data.layout}')} {alignClass}">
<f:if condition="{data._LOCALIZED_UID}">
<a id="c{data._LOCALIZED_UID}"></a>
</f:if>
<f:render section="Before" optional="true">
<f:render partial="DropIn/Before/All" arguments="{_all}" />
</f:render>
<f:render section="Header" optional="true">
<f:render partial="Header/All" arguments="{_all}" />
</f:render>

<f:render section="Main" optional="true" />

<f:render section="Footer" optional="true">
<f:render partial="Footer/All" arguments="{_all}" />
</f:render>
<f:render section="After" optional="true">
<f:render partial="DropIn/After/All" arguments="{_all}" />
</f:render>
</div>

<f:comment><!-- ### Wrapper class===frame_class||Margin Top===space_before_class||Margin Bottom===space_after_class ### --></f:comment>
<f:if condition="{data.frame_class} || {data.space_before_class} || {data.space_after_class}">
</div>
</f:if>

</f:spaceless>
</html>
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<div xmlns="http://www.w3.org/1999/xhtml" lang="en" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">

<f:layout name="ContentFooter" />
<f:layout name="Default" />


<f:section name="content">
<!-- theme_t3kit: Templates/ContentElements/bigIconTextButton.html [begin] -->
<f:section name="Main">
<!-- theme_t3kit: Templates/ContentElements/BigIconTextButton.html [begin] -->
<div class="big-icon-text-btn__wrp">
<div class="big-icon-text-btn{f:if(condition: settings.disableWholeAreaLink, then: '', else: ' _whole-area-link')}">
<f:if condition="{settings.iconClass}">
Expand Down Expand Up @@ -33,7 +32,7 @@ <h3 class="big-icon-text-btn__header">{data.header}</h3>
</f:if>
</div>
</div>
<!-- theme_t3kit: Templates/ContentElements/BigIconTextButton.html [end] -->
</f:section>

<!-- theme_t3kit: Templates/ContentElements/bigIconTextButton.html [end] -->
</f:section>
</div>
</html>
135 changes: 68 additions & 67 deletions Resources/Private/Templates/ContentElements/BootstrapSlider.html
Original file line number Diff line number Diff line change
@@ -1,84 +1,85 @@
<div xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">

<f:layout name="ContentFooter" />
<f:layout name="Default" />

<f:section name="content">
<f:section name="Main">
<!-- theme_t3kit: Templates/ContentElements/BootstrapSlider.html [begin] -->
<f:if condition="{slides}">
<div id="carousel-{data.uid}" class="carousel image-slider slide" data-interval="{settings.interval}000" data-ride="carousel">

<f:if condition="{slides}">
<div id="carousel-{data.uid}" class="carousel image-slider slide" data-interval="{settings.interval}000" data-ride="carousel">

<f:if condition="{settings.quickselect}">
<f:if condition="{slides->f:count()} > 1">
<ol class="carousel-indicators">
<f:for each="{slides}" as="image" iteration="iteration">
<li data-target="#carousel-{data.uid}" data-slide-to="{iteration.index}" class="{f:if(condition: iteration.isFirst, then: 'active')}">
</li>
</f:for>
</ol>
</f:if>
<f:if condition="{settings.quickselect}">
<f:if condition="{slides->f:count()} > 1">
<ol class="carousel-indicators">
<f:for each="{slides}" as="image" iteration="iteration">
<li data-target="#carousel-{data.uid}" data-slide-to="{iteration.index}" class="{f:if(condition: iteration.isFirst, then: 'active')}">
</li>
</f:for>
</ol>
</f:if>
</f:if>

<div class="carousel-inner" role="listbox">
<f:for each="{slides}" as="image" iteration="iteration">
<div class="item{f:if(condition: iteration.isFirst, then: ' active')}">

<div class="carousel-inner" role="listbox">
<f:for each="{slides}" as="image" iteration="iteration">
<div class="item{f:if(condition: iteration.isFirst, then: ' active')}">
<f:render section="Image" arguments="{_all}" />
</div>
</f:for>
</div>

<f:render section="Image" arguments="{_all}" />
</div>
</f:for>
<f:if condition="{slides->f:count()} > 1">
<div class="container carousel-control-wrapper">
<a class="carousel-control left" href="#carousel-{data.uid}" role="button" data-slide="prev">
<span class="swiper-button-prev swiper-button-white"></span>
</a>
<a class="carousel-control right" href="#carousel-{data.uid}" role="button" data-slide="next">
<span class="swiper-button-next swiper-button-white"></span>
</a>
</div>
</f:if>
</div>
</f:if>
</f:section>

<f:if condition="{slides->f:count()} > 1">
<div class="container carousel-control-wrapper">
<a class="carousel-control left" href="#carousel-{data.uid}" role="button" data-slide="prev">
<span class="swiper-button-prev swiper-button-white"></span>
</a>
<a class="carousel-control right" href="#carousel-{data.uid}" role="button" data-slide="next">
<span class="swiper-button-next swiper-button-white"></span>
</a>
</div>
<f:section name="Image">
<f:image src="{image.uid}" height="{data.imageheight}c" width="{data.imagewidth}c" treatIdAsReference="1"/>
<f:if condition="{image.referenceProperties.title}">
<f:then>
<div class="carousel-caption">
<h2 class="img-slider__caption-header">{image.referenceProperties.title}</h2>

<f:if condition="{image.referenceProperties.description}">
<p class="img-slider__caption-p js__img-slider__caption-p">{image.referenceProperties.description}</p>
</f:if>
</div>
</f:if>
</f:section>

<f:section name="Image">
<f:image src="{image.uid}" height="{data.imageheight}c" width="{data.imagewidth}c" treatIdAsReference="1"/>
<f:if condition="{image.referenceProperties.title}">
<f:if condition="{image.referenceProperties.link}">
<f:link.typolink parameter="{image.referenceProperties.link}" class="btn btn-primary"><f:translate key="contentElement.slider.linkText" extensionName="theme_t3kit" /></f:link.typolink>
</f:if>
</div>
</f:then>
<f:else>
<f:then>
<div class="carousel-caption">
<h2 class="img-slider__caption-header">{image.referenceProperties.title}</h2>

<f:if condition="{image.referenceProperties.description}">
<f:if condition="{image.referenceProperties.description}">
<div class="carousel-caption">
<p class="img-slider__caption-p js__img-slider__caption-p">{image.referenceProperties.description}</p>
</f:if>

<f:if condition="{image.referenceProperties.link}">
<f:link.typolink parameter="{image.referenceProperties.link}" class="btn btn-primary"><f:translate key="contentElement.slider.linkText" extensionName="theme_t3kit" /></f:link.typolink>
</f:if>
</div>
<f:if condition="{image.referenceProperties.link}">
<f:link.typolink parameter="{image.referenceProperties.link}" class="btn btn-primary"><f:translate key="contentElement.slider.linkText" extensionName="theme_t3kit" /></f:link.typolink>
</f:if>
</div>
</f:if>
</f:then>
<f:else>
<f:then>
<f:if condition="{image.referenceProperties.description}">
<div class="carousel-caption">
<p class="img-slider__caption-p js__img-slider__caption-p">{image.referenceProperties.description}</p>

<f:if condition="{image.referenceProperties.link}">
<f:link.typolink parameter="{image.referenceProperties.link}" class="btn btn-primary"><f:translate key="contentElement.slider.linkText" extensionName="theme_t3kit" /></f:link.typolink>
</f:if>
</div>
</f:if>
</f:then>
<f:else>
<f:if condition="{image.referenceProperties.link}">
<div class="carousel-caption">
<f:link.typolink parameter="{image.referenceProperties.link}" class="btn btn-primary"><f:translate key="contentElement.slider.linkText" extensionName="theme_t3kit" /></f:link.typolink>
</div>
</f:if>
</f:else>
<f:if condition="{image.referenceProperties.link}">
<div class="carousel-caption">
<f:link.typolink parameter="{image.referenceProperties.link}" class="btn btn-primary"><f:translate key="contentElement.slider.linkText" extensionName="theme_t3kit" /></f:link.typolink>
</div>
</f:if>
</f:else>
</f:if>
</f:section>
</div>
</f:else>
</f:if>
<!-- theme_t3kit: Templates/ContentElements/BootstrapSlider.html [end] -->
</f:section>


</html>
12 changes: 6 additions & 6 deletions Resources/Private/Templates/ContentElements/Button.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div xmlns="http://www.w3.org/1999/xhtml" lang="en" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">

<f:layout name="ContentFooter" />
<f:layout name="Default" />

<f:section name="content">
<!-- theme_t3kit: Templates/CustomContentElements/Button.html [begin] -->
<f:section name="Main">
<!-- theme_t3kit: Templates/ContentElements/Button.html [begin] -->
<f:if condition="{data.header_link}">
<f:link.typolink parameter="{data.header_link}" class="{layoutClass}{f:if(condition: settings.buttonSize, then: ' {settings.buttonSize}')}{f:if(condition: settings.blockLevel, then: ' btn-block')}">{data.header}</f:link.typolink>
</f:if>
<!-- theme_t3kit: Templates/CustomContentElements/Button.html [end] -->
<!-- theme_t3kit: Templates/ContentElements/Button.html [end] -->
</f:section>

</div>
</html>

12 changes: 6 additions & 6 deletions Resources/Private/Templates/ContentElements/Contacts.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{namespace theme=KayStrobach\Themes\ViewHelpers}
<div xmlns="http://www.w3.org/1999/xhtml" lang="en" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">

<f:layout name="ContentFooter" />
<f:section name="content">
<!-- theme_t3kit: Templates/ContentElements/Contacts.html [begin] -->
<f:layout name="Default" />

<f:section name="Main">
<!-- theme_t3kit: Templates/ContentElements/Contacts.html [begin] -->
<ul class="nav contact-links" >
<li><p><span class="icons icon-t3-mobile"></span><span><f:translate key="callUs_label" extensionName="themes"/></span> <a href="tel:{f:cObject(typoscriptObjectPath: 'lib.contacts.phone')}"><f:translate key="callUsTel_label" />{theme:constant(constant: 'themes.configuration.contacts.phone')}</a></p></li>
<li><p><span class="icons icon-t3-mail"></span><span><f:translate key="emailUs_label" extensionName="themes"/></span> <f:link.email email="{theme:constant(constant: 'themes.configuration.contacts.email')}" /></p></li>
</ul>

<!-- theme_t3kit: Templates/ContentElements/Contacts.html [end] -->
</f:section>
</div>

</html>
12 changes: 6 additions & 6 deletions Resources/Private/Templates/ContentElements/CopyrightText.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div xmlns="http://www.w3.org/1999/xhtml" lang="en" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">

<f:layout name="ContentFooter" />
<f:section name="content">
<!-- theme_t3kit: Templates/ContentElements/CopyrightText.html [begin] -->
<f:layout name="Default" />

<f:section name="Main">
<!-- theme_t3kit: Templates/ContentElements/CopyrightText.html [begin] -->
<f:cObject typoscriptObjectPath="lib.footer.copyright" />

<!-- theme_t3kit: Templates/ContentElements/CopyrightText.html [end] -->
</f:section>
</div>

</html>
86 changes: 44 additions & 42 deletions Resources/Private/Templates/ContentElements/FullWidthImage.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,49 @@
<div xmlns="http://www.w3.org/1999/xhtml" lang="en" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">

<f:layout name="ContentFooter" />
<f:section name="content">
<f:layout name="Default" />

<f:section name="Main">
<!-- theme_t3kit: Templates/ContentElements/FullWidthImage.html [begin] -->
<f:if condition="{images}">
<f:for each="{images}" as="image" iteration="imageIteration">
<f:if condition="{imageIteration.isFirst}">
<div class="full-width-image">
<div class="full-width-image__wrp">
<img
src="<f:uri.image src="{image.uid}"
width="{f:if(condition: data.imagewidth, then: data.imagewidth, else: settings.defaultWidth)}"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"
treatIdAsReference="1" />"
srcset="
<f:uri.image src="{image.uid}" treatIdAsReference="1" width="320c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 320w,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="640c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 640w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="768c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 768w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="1080c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 1080w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="1280c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 1280w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="1440c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 1440w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="1920c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 1920w"
sizes="100vw"
class="img-responsive full-width-image__img"
alt="{image.alternative}" >
<f:if condition="{images}">
<f:for each="{images}" as="image" iteration="imageIteration">
<f:if condition="{imageIteration.isFirst}">
<div class="full-width-image">
<div class="full-width-image__wrp">
<img
src="<f:uri.image src="{image.uid}"
width="{f:if(condition: data.imagewidth, then: data.imagewidth, else: settings.defaultWidth)}"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"
treatIdAsReference="1" />"
srcset="
<f:uri.image src="{image.uid}" treatIdAsReference="1" width="320c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 320w,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="640c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 640w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="768c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 768w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="1080c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 1080w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="1280c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 1280w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="1440c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 1440w ,

<f:uri.image src="{image.uid}" treatIdAsReference="1" width="1920c"
height="{f:if(condition: data.imageheight, then: data.imageheight, else: settings.defaultHeight)}"/> 1920w"
sizes="100vw"
class="img-responsive full-width-image__img"
alt="{image.alternative}" >
</div>
</div>
</div>
</f:if>
</f:for>
</f:if>
</f:if>
</f:for>
</f:if>
<!-- theme_t3kit: Templates/ContentElements/FullWidthImage.html [end] -->
</f:section>
</div>

</html>
Loading

0 comments on commit 5f32779

Please sign in to comment.