Merge branch 'develop'

This commit is contained in:
Björn Fromme
2021-08-31 17:06:58 +02:00
@@ -44,8 +44,8 @@
<f:render partial="ContentSlider" arguments="{images: region.images, id: 'region-{region.uid}', thumbnails: 1}"/>
</f:if>
<f:if condition="{bars}">
<f:then><div class="ep-headbar">{f:if(condition: '{region.season} == "w"', then: 'Skipass', else: 'Highlights')}</div></f:then>
<f:else><h2>{f:if(condition: '{region.season} == "w"', then: 'Skipass', else: 'Highlights')}</h2></f:else>
<f:then><div class="ep-headbar">{f:if(condition: '{region.season} == "w"', then: 'Skipass', else: 'Highlights')} {region.name}</div></f:then>
<f:else><h3>{f:if(condition: '{region.season} == "w"', then: 'Skipass', else: 'Highlights')} {region.name}</h3></f:else>
</f:if>
<f:if condition="{region.skiPass}">
<div class="region-details region-details--skipass" data-rte-content>
@@ -60,7 +60,7 @@
<f:if condition="{region.news}">
<f:if condition="{bars}">
<f:then><div class="ep-headbar">Aktuell</div></f:then>
<f:else><h2>Aktuell</h2></f:else>
<f:else><h3>Aktuelles {region.name}</h3></f:else>
</f:if>
<div class="region-details region-details--news" data-rte-content>
{region.news -> f:format.html()}