diff --git a/_includes/events-training-list-top.html b/_includes/events-training-list-top.html index 1402a12d8..f8bcb6d49 100644 --- a/_includes/events-training-list-top.html +++ b/_includes/events-training-list-top.html @@ -9,69 +9,136 @@ {% assign firstYearNum = firstYear | plus: 0 %} {% capture lastYear %}{{include.collection.last.date | date: "%Y"}}{% endcapture %} {% assign lastYearNum = lastYear | plus: 0 %} + {% if page.reversed == false %} + {% for y in (firstYear..lastYear) %} + {% for m in (1..12) %} + {% assign currentMonthEvents = '' | split: ','' %} - {% for y in (firstYear..lastYear) %} - {% for m in (1..12) %} - {% assign currentMonthEvents = '' | split: ','' %} + {% for event in include.collection %} + {% capture year %}{{event.date | date: "%Y"}}{% endcapture %} + {% assign yearNum = year | plus: 0 %} + {% capture month %}{{event.date | date: "%m"}}{% endcapture %} + {% assign monthNum = month | plus: 0 %} + {% if monthNum == m and yearNum == y %} + {% assign currentMonthEvents = currentMonthEvents | push: event %} + {% endif %} + {% endfor %} - {% for event in include.collection %} - {% capture year %}{{event.date | date: "%Y"}}{% endcapture %} - {% assign yearNum = year | plus: 0 %} - {% capture month %}{{event.date | date: "%m"}}{% endcapture %} - {% assign monthNum = month | plus: 0 %} - {% if monthNum == m and yearNum == y %} - {% assign currentMonthEvents = currentMonthEvents | push: event %} - {% endif %} - {% endfor %} + {% capture monthName %} + {% case m %} + {% when 1 %}January + {% when 2 %}February + {% when 3 %}March + {% when 4 %}April + {% when 5 %}May + {% when 6 %}June + {% when 7 %}July + {% when 8 %}August + {% when 9 %}September + {% when 10 %}October + {% when 11 %}November + {% when 12 %}December + {% endcase %} + {% endcapture %} - {% capture monthName %} - {% case m %} - {% when 1 %}January - {% when 2 %}February - {% when 3 %}March - {% when 4 %}April - {% when 5 %}May - {% when 6 %}June - {% when 7 %}July - {% when 8 %}August - {% when 9 %}September - {% when 10 %}October - {% when 11 %}November - {% when 12 %}December - {% endcase %} - {% endcapture %} + {% for event in currentMonthEvents %} + {% capture year %}{{event.date | date: "%Y"}}{% endcapture %} + {% capture day %}{{event.date | date: "%d"}}{% endcapture %} + {% if forloop.first %} +
{{event.location}}
+ {% if event.organizer %} +{{event.organizer}}
+ {% else %} +{{event.start}}{% if event.start != event.end %} - {{event.end}}{% endif %}
+ {% endif %} +{{event.location}}
- {% if event.organizer %} -{{event.organizer}}
+ {% endfor %} + {% endfor %} + {% endfor %} + {% else %} + {% for y in (firstYear..lastYear) reversed %} + {% for m in (1..12) reversed %} + {% assign currentMonthEvents = '' | split: ','' %} + + {% for event in include.collection %} + {% capture year %}{{event.date | date: "%Y"}}{% endcapture %} + {% assign yearNum = year | plus: 0 %} + {% capture month %}{{event.date | date: "%m"}}{% endcapture %} + {% assign monthNum = month | plus: 0 %} + {% if monthNum == m and yearNum == y %} + {% assign currentMonthEvents = currentMonthEvents | push: event %} + {% endif %} + {% endfor %} + + {% capture monthName %} + {% case m %} + {% when 1 %}January + {% when 2 %}February + {% when 3 %}March + {% when 4 %}April + {% when 5 %}May + {% when 6 %}June + {% when 7 %}July + {% when 8 %}August + {% when 9 %}September + {% when 10 %}October + {% when 11 %}November + {% when 12 %}December + {% endcase %} + {% endcapture %} + + {% for event in currentMonthEvents %} + {% capture year %}{{event.date | date: "%Y"}}{% endcapture %} + {% capture day %}{{event.date | date: "%d"}}{% endcapture %} + {% if forloop.first %} +{{event.location}}
+ {% if event.organizer %} +{{event.organizer}}
+ {% else %} +{{event.start}}{% if event.start != event.end %} - {{event.end}}{% endif %}
+ {% endif %} +