Merge branch post-branch into master via CloudCannon

This commit is contained in:
Set Hallstrom 2019-07-08 13:23:52 +02:00 committed by GitHub
commit f5ed917202
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4,11 +4,19 @@ layout: default
description: Kalender för händelser på Kulturföreningen Momangen
image: /uploads/stickerwall.jpg
---
{% for event in site.events %}
{% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}
{% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %}
{% capture postdate -%} {{ event.date | date: '%s' }} {%- endcapture %}
{% if now <= endtime %} {% unless now <= postdate %}
<div class="column" style="border: none;">
<h3>Kommande event</h3>
<div class="flexitem" style="margin-left: 0;">
{% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}
{% for event in site.events %}
{% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}
{% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %}
{% capture postdate -%} {{ event.date | date: '%s' }} {%- endcapture %}
{% if now <= endtime %} {% unless now <= postdate %}
@ -34,6 +42,7 @@ image: /uploads/stickerwall.jpg
</div>{% endunless %}{% endif %} {% endfor %}
</div>
</div>
{% endunless %}{% endif %} {% endfor %}
<div class="column" style="border: none;">
<h3>Förflutna events</h3>
<div class="flexitem">