Commit 2d22d01c authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into 613-add-meet-typo3-user-list-and-special-label-to-events

parents 0409d1bd ac320fc1
Pipeline #25427 passed with stages
in 5 minutes and 15 seconds
<f:variable name="datetimeFormat" value="Y-m-d H:i" />
<f:variable name="visibleDatetimeFormat" value="j M. Y H:i" />
<f:if condition="{event.startDate} && {event.enddate}">
<f:then>
<f:comment><!--Check if startdate and enddate are on the same day--></f:comment>
<f:if condition="
{f:format.date(date:event.startdate, format:'Y-m-d')} == {f:format.date(date:event.enddate, format:'Y-m-d')}
">
<f:then>
<time>
<f:format.date date="{event.startdate}" format="{visibleDatetimeFormat}"/>
-
<f:format.date date="{event.enddate}" format="H:i"/>
</time>
</f:then>
<f:else>
<time datetime="{f:format.date(date:event.startdate, format: datetimeFormat)}">
<f:format.date date="{event.startdate}" format="{visibleDatetimeFormat}"/>
</time>
<time datetime="{f:format.date(date:event.enddate, format: datetimeFormat)}">
-
<f:format.date date="{event.enddate}" format="{visibleDatetimeFormat}"/>
</time>
</f:else>
</f:if>
</f:then>
<f:else>
<f:if condition="{event.startdate}">
<time datetime="{f:format.date(date:event.startdate, format: datetimeFormat)}">
<f:format.date date="{event.startdate}" format="{visibleDatetimeFormat}"/>
</time>
</f:if>
<f:if condition="{event.enddate}">
<time datetime="{f:format.date(date:event.enddate, format: datetimeFormat)}">
-
<f:format.date date="{event.enddate}" format="{visibleDatetimeFormat}"/>
</time>
</f:if>
</f:else>
</f:if>
......@@ -16,17 +16,9 @@
<header>
<h1>{event.title}</h1>
<div class="small font--monospace">
<span class="font-color--brand-primary">
<time datetime="{f:format.date(date:event.startdate, format:'Y-m-d H:i')}">
<f:format.date date="{event.startdate}" format="D. jS F, Y H:i"/>
</time>
<f:if condition="{event.enddate}">
<time datetime="{f:format.date(date:event.enddate, format:'Y-m-d H:I')}">
-
<f:format.date date="{event.enddate}" format="D. jS F, Y H:i"/>
</time>
</f:if>
</span>
<span class="font-color--brand-primary">
<f:render partial="Event/Detail/EventDetailTime" arguments="{_all}" />
</span>
<f:if condition="{event.location.city}">
<div>{event.location.city}, {event.location.country}</div>
</f:if>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment