Show current events on the upcoming events page until they are over

Partly addresses #895

Author: Philippus

_layouts/events.html

@@ -2,7 +2,16 @@
 layout: inner-page-parent
 ---
 
-{% include events-training-list-top.html collection=paginator.events %}
+{% capture now %}{{site.time | date: '%s' | plus: 0}}{% endcapture %}
+{% assign upcomingEvents = '' | split: ',' %}
+{% for event in paginator.events %}
+	{% capture date %}{{event.end|date: '%s'|plus: 86400}}{% endcapture %}
+	{% if now <= date %}
+		{% assign upcomingEvents = upcomingEvents | push: event %}
+	{% endif %}
+{% endfor %}
+
+{% include events-training-list-top.html collection=upcomingEvents %}
 
   	{{content}}
 	</div>

_layouts/pastevents.html

@@ -2,7 +2,16 @@
 layout: inner-page-parent
 ---
 
-{% include events-training-list-top.html collection=paginator.events %}
+{% capture now %}{{site.time | date: '%s' | plus: 0}}{% endcapture %}
+{% assign pastEvents = '' | split: ',' %}
+{% for event in paginator.events %}
+	{% capture date %}{{event.end|date: '%s'|plus: 86400}}{% endcapture %}
+	{% if now > date %}
+		{% assign pastEvents = pastEvents | push: event %}
+	{% endif %}
+{% endfor %}
+
+{% include events-training-list-top.html collection=pastEvents %}
 
   	{{content}}
 	</div>

events/index.md

@@ -8,7 +8,6 @@ paginate:
   per_page: 9999
   collection: events
   permalink: /:num/
-  discardPastItems: true
   title_suffix: ""
 ---
 

pastevents/index.md

@@ -8,7 +8,6 @@ paginate:
   collection: events
   per_page: 9999
   permalink: /:num/
-  pastItems: true
   reversed: true
   title_suffix: ""
 ---