Add deadline to training page (#720)

* added deadline in Training page.

* slight fix

* changed deadline for a school

* added if statement (produces nil error)

* unnecesarry plus 0 filter

* again take out plus 0 filter

* comment out unspecified deadlines and fixed nil / parsing error with excert:none on front matter.

* apply changes to list_of_schools.md file

* return yml to previous status, remove space before : , and if not blank argument

* filtered the format of the dates to match

* filter dates in training page

* fix dates

Author: GuillermoFidalgo

_data/training-schools.yml

@@ -129,10 +129,10 @@
     in Cogne (Italy)
 - author: Kilian Lieret
   date: 2020-02-17
-  deadline: ''
   end_date: 2020-02-19
   source: https://indico.cern.ch/event/854880/
   title: Analysis Preservation Bootcamp
+  deadline: ''
 - author: Guillermo Fidalgo
   date: 2020-03-06
   deadline: 2020-01-15
@@ -141,8 +141,8 @@
   title: Moscow International School of Physics 2020
 - author: Kilian Lieret
   date: 2020-03-16
-  deadline: ''
-  end_date: 2020-03-19
+  deadline: 2020-03-19
+  end_date: 2020-03-18
   source: https://indico.cern.ch/event/853710/
   title: Inverted CERN School of Computing (iCSC 2020)
 - author: Guillermo Fidalgo
@@ -171,7 +171,7 @@
   title: Thematic CERN School of Computing 2020
 - author: Guillermo Fidalgo
   date: 2020-06-17
-  deadline: 2020-02-14
+  deadline: 2020-02-21
   end_date: 2020-06-30
   source: https://indico.cern.ch/event/856903/page/18705-home
   title: 2020 CERN-JINR European School of HEP

_includes/list_of_schools.md

@@ -2,20 +2,24 @@
 
 {% assign schools = site.data.training-schools | sort:"date" %}
 
-{% capture now %}{{'now' | date: '%s' | plus: 0 }}{% endcapture %}
+{% capture now %}{{'now' | date: '%s' }}{% endcapture %}
 
 ## Current and Upcoming Training Schools
 #### **Warning** : Application deadlines are **before the date shown**
 {% for post in schools %}
-  {% capture date %}{{post.end_date | date: '%s' | plus: 0 }}{% endcapture %}
+  {% capture date %}{{post.end_date | date: '%s' }}{% endcapture %}
   {% if date > now %}
+  {% if post.deadline != blank %}
+  1. [**{{post.date | date: "%-d %b"}} - {{post.end_date | date: "%-d %b %Y"}}** - {{post.title}} - **Deadline:** {{post.deadline | date: "%-d %b %Y"}} ]({{post.source}})
+  {% else %}
   1. [**{{post.date | date: "%-d %b"}} - {{post.end_date | date: "%-d %b %Y"}}** - {{post.title}} ]({{post.source}})
   {% endif %}
+  {% endif %}
 {% endfor %}
 
 ## Past Schools
 {% for post in schools reversed %}
-  {% capture date %}{{post.end_date | date: '%s' | plus: 0 %}}{% endcapture %}
+  {% capture date %}{{post.end_date | date: '%s' | plus: 0 }}{% endcapture %}
   {% if date < now %}
   1. [**{{post.date | date: "%-d %b"}} - {{post.end_date | date: "%-d %b %Y"}}** - {{post.title}} ]({{post.source}})
   {% endif %}

_workinggroups/training.md

@@ -4,6 +4,7 @@ layout: plain
 redirect_from:
   - /workinggroups/2015/11/04/training.html
   - /activities/training.html
+excerpt: none
 ---
 
 The HSF Training Working Group aims to help the research community to provide
@@ -43,15 +44,19 @@ The [HSF-Training GitHub Organization](https://github.com/hsf-training) has [Ana
 
 {% assign schools = site.data.training-schools | sort:"date" %}
 
-{% capture now %}{{'now' | date: '%s' | plus: 0 }}{% endcapture %}
+{% capture now %}{{'now' | date: '%s' }}{% endcapture %}
 
 ## Current and Upcoming Training Schools
 #### **Warning** : Application deadlines are **before the date shown**
 {% for post in schools %}
-  {% capture date %}{{post.end_date | date: '%s' | plus: 0 }}{% endcapture %}
+  {% capture date %}{{post.end_date | date: '%s' }}{% endcapture %}
   {% if date > now %}
+  {% if post.deadline != blank %}
+  1. [**{{post.date | date: "%-d %b"}} - {{post.end_date | date: "%-d %b %Y"}}** - {{post.title}} - **Deadline:** {{post.deadline| date: "%-d %b %Y"}} ]({{post.source}})
+  {% else %}
   1. [**{{post.date | date: "%-d %b"}} - {{post.end_date | date: "%-d %b %Y"}}** - {{post.title}} ]({{post.source}})
   {% endif %}
+  {% endif %}
 {% endfor %}
 
 #### For full list of Upcoming and Past Schools enter [here](/Schools/events.html)