Merge pull request #899 from Philippus/current-events

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

Author: SethTisue

_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>

_layouts/training.html

@@ -2,8 +2,17 @@
 layout: inner-page-parent
 ---
 
-{% include events-training-list-top.html collection=paginator.trainings %}
+{% capture now %}{{site.time | date: '%s' | plus: 0}}{% endcapture %}
+{% assign upcomingTrainings = '' | split: ',' %}
+{% for training in paginator.trainings %}
+	{% capture date %}{{training.when|date: '%s'|plus: 86400}}{% endcapture %}
+	{% if now <= date %}
+		{% assign upcomingTrainings = upcomingTrainings | push: training %}
+	{% endif %}
+{% endfor %}
+
+{% include events-training-list-top.html collection=upcomingTrainings %}
 	</div>
 
 	{% include paginator.html urlPath="training" %}		
-</div>
+</div>

_plugins/octopress-paginate.rb

@@ -175,16 +175,6 @@ def collection(page)
         collection = collection.reject{|p| (p.data['tags'] & tags).empty?}
       end
 
-      # Custom mod: reject all "past" (with date before our current 'tomorrow') elements if "discardPastItems" is set to true:
-      if page.data['paginate']['discardPastItems']
-        collection = collection.reject{|p| (p.date < (Date.today.next_day(1)).to_time)}
-      end
-
-      # Custom mod: retrieve only "past" (with date before our 'today') elements if "pastItems" is set to true:
-      if page.data['paginate']['pastItems']
-        collection = collection.select{|p| (p.date < Date.today.to_time)}
-      end
-      
       collection
     end
 

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: ""
 ---

training/index.md

@@ -5,8 +5,8 @@ permalink: /training/
 
 # Pagination
 paginate:
+  per_page: 9999
   collection: trainings
   permalink: /:num/
-  discardPastItems: true
   title_suffix: ""
----
+---