EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix weird link rendering in content teasers

Browse Source
This commit is contained in:
Björn Fromme
2021-08-18 16:21:02 +02:00
parent 0be0b484ed
commit b9de11315a
2 changed files with 37 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
+11 -21
View File
@@ -1,40 +1,30 @@
<html data-namespace-typo3-fluid="true" lang="en" <html data-namespace-typo3-fluid="true" lang="en"
xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml"
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<f:section name="Teaser"> <f:section name="Teaser">
<f:if condition="{data.header_link}"> <f:link.typolink parameter="{data.header_link}"
<v:condition.string.isNumeric value="{data.header_link}"> class="teaserbox teaserbox--default">
<f:then>
<f:link.typolink parameter="{data.header_link}" title="{data.header}" class="teaserbox teaserbox--default">
<f:render section="Content" arguments="{_all}"/>
</f:link.typolink>
</f:then>
<f:else>
<a href="{data.header_link}" target="_blank" title="{data.header}" class="teaserbox teaserbox--default">
<f:render section="Content" arguments="{_all}"/>
</a>
</f:else>
</v:condition.string.isNumeric>
</f:if>
</f:section>
<f:section name="Content">
<div class="teaserbox__image"> <div class="teaserbox__image">
<f:if condition="{context.country}"> <f:if condition="{context.country}">
<f:image class="teaserbox__flag" <f:image class="teaserbox__flag"
src="{ep:flagiconSource(country: context.country)}" alt="{context.country.name}"/> src="{ep:flagiconSource(country: context.country)}"
alt="{context.country.name}"/>
</f:if> </f:if>
<f:render partial="TeaserImage" arguments="{image: teaserImage}"/> <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
</div> </div>
<div class="teaserbox__main" data-rte-content> <div class="teaserbox__main" data-rte-content>
<span class="headline headline--3 headline--teaser">{data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}</span> <span class="headline headline--3 headline--teaser">
{data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}
</span>
<hr> <hr>
{data.bodytext -> f:format.html()} {data.bodytext -> f:format.html()}
</div> </div>
<button class="button button--full">{data.button -> v:or(alternative: 'Details')}</button> <button class="button w-full">
{data.button -> v:or(alternative: 'Details')}
</button>
</f:link.typolink>
</f:section> </f:section>
</html> </html>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
+9 -21
View File
@@ -3,35 +3,23 @@
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<f:layout name="Default"/>
<f:section name="Teaser"> <f:section name="Teaser">
<f:if condition="{data.header_link}"> <f:link.typolink parameter="{data.header_link}"
<v:condition.string.isNumeric value="{data.header_link}"> class="teaserbox teaserbox--default">
<f:then>
<f:link.typolink parameter="{data.header_link}" title="{data.header}" class="teaserbox teaserbox--default">
<f:render section="Content" arguments="{_all}"/>
</f:link.typolink>
</f:then>
<f:else>
<a href="{data.header_link}" target="_blank" title="{data.header}" class="teaserbox teaserbox--default">
<f:render section="Content" arguments="{_all}"/>
</a>
</f:else>
</v:condition.string.isNumeric>
</f:if>
</f:section>
<f:section name="Content">
<div class="teasebox__image"> <div class="teasebox__image">
<f:render partial="TeaserImage" arguments="{image: teaserImage}"/> <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
</div> </div>
<div class="teaserbox__main" data-rte-content> <div class="teaserbox__main" data-rte-content>
<span class="headline headline--3 headline--teaser">{data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}</span> <span class="headline headline--3 headline--teaser">
{data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}
</span>
<hr> <hr>
{data.bodytext -> f:format.html()} {data.bodytext -> f:format.html()}
</div> </div>
<button class="button button--full">{data.button -> v:or(alternative: 'Details')}</button> <button class="button button--full">
{data.button -> v:or(alternative: 'Details')}
</button>
</f:link.typolink>
</f:section> </f:section>
</html> </html>