From 57334b60a0f3589f182451801b606540b55d19ee Mon Sep 17 00:00:00 2001
From: Set Hallstrom <set@hallstrom.ch>
Date: Tue, 2 Jul 2019 15:23:52 +0200
Subject: [PATCH] fixing broken future event system

---
 ...19-07-20-utställning.md => utställning.md} |  0
 events.html                                   | 34 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)
 rename _events/{_2019-07-20-utställning.md => utställning.md} (100%)

diff --git a/_events/_2019-07-20-utställning.md b/_events/utställning.md
similarity index 100%
rename from _events/_2019-07-20-utställning.md
rename to _events/utställning.md
diff --git a/events.html b/events.html
index d4566e2..092b2b4 100644
--- a/events.html
+++ b/events.html
@@ -6,17 +6,29 @@ image: /uploads/stickerwall.jpg
 ---
 <div class="column">
   <h3>Kommande event</h3>
-  
-  {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}   {% for event in site.events %}   {% capture endtime -%}   {{ event.event_data.end_datetime | date: '%s' }}   {%- endcapture %}   {% if now <= endtime %}
-  <div class="column" style="margin-left: 0;{% if forloop.last == true %}border: none;{% endif %}">
-  <a href="cloudcannon:collections/{{ event.path }}" class="editor-link cms-editor-link">Redigera Event</a>
-  <h2><a href="{{ event.url }}" class="nodecoration" style="border:none;">{{ event.title }}</a></h2>
-  <a href="{{ site.baseurl }}{{ event.url }}" title="Event: {{ event.title }}" alt="Event: {{ event.title }}"><img src="{{ event.image }}" width="100%" style="margin-bottom: 30px;" title="Event: {{ event.title }}" alt="Event: {{ event.title }}" /></a>
-  <p><strong>{% assign d = event.event_data.start_datetime | date: "%-d"  %}{% case d %}{% when '1' or '21' or '31' or '2' or '22' %}{{ d }}:a     {% else %}{{ d }}:e{% endcase %}     {% assign m = event.event_data.start_datetime | date: "%-m" %}     {% case m %}     {% when '1' %}Januari     {% when '2' %}Februari     {% when '3' %}Mars    {% when '4' %}April     {% when '5' %}Maj     {% when '6' %}Juni     {% when '7' %}Juli     {% when '8' %}Augusti     {% when '9' %}September     {% when '10' %}Oktober     {% when '11' %}November     {% when '12' %}December     {% endcase %}     {{ event.event_data.start_datetime | date: "%Y" }}     kl. {{ event.event_data.start_datetime | date: "%R"}}</strong><br />
-    Typ av konst: {{ event.category }}</p>
-  <h3 style="margin-bottom: 30px;">{{ event.description | truncatewords: 10 }}</h3>
-  <a href="{{ event.url }}" class="cta">Läs mer</a><br /><br /> </div> {% endif %}  {% endfor %}
-    
+
+  {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %} 
+  {% for event in site.events %} 
+  {% 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="row" style="margin-left: 0;{% if forloop.last == true %}border: none;{% endif %}">
+    <a href="cloudcannon:collections/{{ event.path }}" class="editor-link cms-editor-link">Redigera Event</a>
+    <h2><a href="{{ event.url }}" class="nodecoration" style="border:none;">{{ event.title }}</a></h2>
+    <a href="{{ site.baseurl }}{{ event.url }}" title="Event: {{ event.title }}" alt="Event: {{ event.title }}"><img
+        src="{{ event.image }}" style="margin-bottom: 30px;" title="Event: {{ event.title }}"
+        alt="Event: {{ event.title }}" /></a>
+    <p><strong>{% assign d = event.event_data.start_datetime | date: "%-d"  %}{% case d %}{% when '1' or '21' or '31' or '2' or '22' %}{{ d }}:a
+        {% else %}{{ d }}:e{% endcase %} {% assign m = event.event_data.start_datetime | date: "%-m" %} {% case m %}
+        {% when '1' %}Januari {% when '2' %}Februari {% when '3' %}Mars {% when '4' %}April {% when '5' %}Maj
+        {% when '6' %}Juni {% when '7' %}Juli {% when '8' %}Augusti {% when '9' %}September {% when '10' %}Oktober
+        {% when '11' %}November {% when '12' %}December {% endcase %} {{ event.event_data.start_datetime | date: "%Y" }}
+        kl. {{ event.event_data.start_datetime | date: "%R"}}</strong><br />
+      Typ av konst: {{ event.category }}</p>
+    <h3 style="margin-bottom: 30px;">{{ event.description | truncatewords: 10 }}</h3>
+    <a href="{{ event.url }}" class="cta">Läs mer</a><br /><br />
+  </div> {% endunless %}{% endif %} {% endfor %}
+
 </div>
 <div class="column">
   <h3>Förflutna events</h3>