Delete layout pages for single features to reduce complexity, move layout to specific pages

Author: marcopernpruner

_includes/list-events.html

@@ -27,6 +27,6 @@
                     {% endif %}
                 </li>
             {% endfor %}
-        </li>
+        </ul>
     </div>
 {% endif %}

_layouts/collaborations-list.html

@@ -1,6 +1,22 @@
 ---
 title: Collaborations
-layout: collaborations-list
+layout: page
 permalink: /collaborations/
 ---
 
+{% assign currentCollaborations = site.data.collaborations | where_exp: "collaboration", "collaboration.endYear == nil" | sort: "name" %}
+{% assign formerCollaborations = site.data.collaborations | where_exp: "collaboration", "collaboration.endYear != nil" | sort: "name" %}
+
+{% if currentCollaborations.size > 0 %}
+  # Active Collaborations
+  <div>
+    {% include list-collaborations.html source=currentCollaborations style="card" %}
+  </div>
+{% endif %}
+
+{% if formerCollaborations.size > 0 %}
+  # Past Collaborations
+  <div>
+    {% include list-collaborations.html source=formerCollaborations style="card" %}
+  </div>
+{% endif %}

_layouts/dissemination-list.html

@@ -1,8 +1,19 @@
 ---
 title: Dissemination
-layout: dissemination-list
+layout: page
 permalink: /dissemination/
 
 ---
 
-{% include toc.md %}
+{% include toc.md %}
+
+{% assign disseminationByCategory = site.data.dissemination | group_by: "category" | sort: "name" %}
+
+{% for category in disseminationByCategory %}
+  {% assign categoryID = category.name | replace: " ", "-" | downcase %}
+  <h1 id="{{ categoryID }}">{{ category.name }}</h1>
+
+  <div>
+    {% include list-dissemination.html source=category.items style="table" %}
+  </div>
+{% endfor %}

_layouts/events-list.html

@@ -1,6 +1,31 @@
 ---
 title: Events
-layout: events-list
+layout: page
 permalink: /events/
 ---
 
+{% assign todayDate = 'now' | date: '%Y-%m-%d' %}
+{% assign currentEvents = site.data.events | where_exp: "event", "event.startDate <= todayDate" | where_exp: "event", "event.endDate >= todayDate" | sort: "startDate" | reverse %}
+{% assign incomingEvents = site.data.events | where_exp: "event", "event.startDate > todayDate" | sort: "startDate" | reverse %}
+{% assign pastEvents = site.data.events | where_exp: "event", "event.endDate < todayDate" | sort: "startDate" | reverse %}
+
+{% if currentEvents.size > 0 %}
+  <h1>Ongoing Events</h1>
+  <div>
+    {% include list-events.html source=currentEvents %}
+  </div>
+{% endif %}
+
+{% if incomingEvents.size > 0 %}
+  <h1>Incoming Events</h1>
+  <div>
+    {% include list-events.html source=incomingEvents %}
+  </div>
+{% endif %}
+
+{% if pastEvents.size > 0 %}
+  <h1>Past Events</h1>
+  <div>
+    {% include list-events.html source=pastEvents %}
+  </div>
+{% endif %}

_layouts/projects-list.html

@@ -1,7 +1,23 @@
 ---
 title: Projects
-layout: projects-list
+layout: page
 permalink: /projects/
 ---
 
-Here you can find a list of the projects the unit is/has been involved in.
+Here you can find a list of the projects the unit is/has been involved in.
+
+{% assign todayDate = 'now' | date: '%Y-%m-%d' %}
+{% assign currentProjectsWithoutEnd = site.data.projects | where_exp: "project", "project.endDate == nil" %}
+{% assign currentProjectsWithEnd = site.data.projects | where_exp: "project", "project.endDate >= todayDate" %}
+{% assign currentProjects = currentProjectsWithoutEnd | concat: currentProjectsWithEnd %}
+{% assign formerProjects = site.data.projects | where_exp: "project", "project.endDate < todayDate" %}
+
+<h1>Current Projects</h1>
+<div>
+  {% include list-projects.html source=currentProjects style="card" %}
+</div>
+
+<h1>Former Projects</h1>
+<div>
+  {% include list-projects.html source=formerProjects style="card" %}
+</div>

_layouts/publications-list.html

@@ -1,7 +1,15 @@
 ---
 title: Publications
-layout: publications-list
+layout: page
 permalink: /publications/
 
 ---
 
+{% assign publicationsByYear = site.data.publications | where_exp: "publication", "publication.id_iris != nil" | group_by: "year" | sort: "name" | reverse %}
+
+{% for year in publicationsByYear %}
+  <h1>{{ year.name }} <small>({{ year.items.size }})</small></h1>
+  <div>
+    {% include list-publications.html source=year.items sort="title" %}
+  </div>
+{% endfor %}

_layouts/tools-list.html

@@ -1,7 +1,14 @@
 ---
 title: Tools
-layout: tools-list
+layout: page
 permalink: /tools/
 ---
 
-Here you can find a list of the tools developed within the unit.
+Here you can find a list of the tools developed within the unit.
+
+{% assign tools = site.data.tools | sort_natural: "name" %}
+{% assign details = "description" | split: ", " %}
+
+<div>
+  {% include list-tools.html source=tools details=details %}
+</div>