Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2020-02-10 17:22:21 +01:00
@@ -9,25 +9,27 @@
<f:if condition="{feed.image} and {feed.message}">
<div class="col-md-3">
<div class="teaserbox teaserbox--social">
<div class="teaserbox__image teaserbox__image--social-media" style="background-image: url({feed.image})">
<f:switch expression="{feed.configuration.token.socialType}">
<f:case value="1">
<div class="teaserbox__icon">
<i class="fa fa-facebook"></i>
</div>
</f:case>
<f:case value="2">
<div class="teaserbox__icon">
<i class="fa fa-instagram"></i>
</div>
</f:case>
</f:switch>
</div>
<f:link.typolink parameter="{feed.postUrl}" target="_blank" title="{feed.title}">
<div class="teaserbox__image teaserbox__image--social-media" style="background-image: url({feed.image})">
<f:switch expression="{feed.configuration.token.socialType}">
<f:case value="1">
<div class="teaserbox__icon">
<i class="fa fa-facebook"></i>
</div>
</f:case>
<f:case value="2">
<div class="teaserbox__icon">
<i class="fa fa-instagram"></i>
</div>
</f:case>
</f:switch>
</div>
</f:link.typolink>
<div class="teaserbox__main teaserbox__main--fixed-height">
<p>{feed.postDate -> f:format.date(format: 'd.m.Y')} @{feed.configuration.name}</p>
<f:format.raw>{feed.decodedMessage -> f:format.crop(maxCharacters: '120') -> pxa:parseMessage(type: feed.configuration.token.type) -> f:format.nl2br()}</f:format.raw>
</div>
<f:link.typolink class="teaserbox teaserbox--social" parameter="{feed.postUrl}" target="_blank" title="{feed.title}">
<f:link.typolink parameter="{feed.postUrl}" target="_blank" title="{feed.title}">
<button class="button button--full teaserbox__button">{f:translate(key: 'tx_eptheme.label.teaserbutton.to_post', extensionName: 'ep_theme')}</button>
</f:link.typolink>
</div>