Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion _members/aldo-canfora.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Aldo Canfora
image: https://github.com/AldoCanfora.png
role: phd
order: 4
order: 6
category: current
affiliation: University of Bologna - CINECA
links:
home-page: https://www.unibo.it/sitoweb/aldo.canfora2/en
Expand Down
1 change: 1 addition & 0 deletions _members/armando-bazzani.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Armando Bazzani
image: images/armando_bazzani.png
role: associate-professor
order: 1
category: current
affiliation: University of Bologna - INFN Bologna
aliases:
- A. Bazzani
Expand Down
3 changes: 2 additions & 1 deletion _members/daniele-pucci.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Daniele Pucci
image: https://github.com/puccj.png
role: phd
order: 7
order: 9
category: current
affiliation: University of Bologna
links:
home-page: https://www.unibo.it/sitoweb/daniele.pucci4/en
Expand Down
3 changes: 2 additions & 1 deletion _members/dragosdumitru-ioan.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Dragos Dumitru Ioan
image: images/dragos_ioan.png
role: researcher
order: 8
order: 11
category: current
affiliation: University of Bologna - INFN Bologna
links:
home-page: https://www.unibo.it/sitoweb/dragosdumitru.ioan/en
Expand Down
3 changes: 2 additions & 1 deletion _members/filippo-dalla.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Filippo Dalla
image: images/filippo_dalla.png
role: phd
order: 2
order: 5
category: current
affiliation: University of Bologna - INFN Bologna
links:
home-page: https://www.unibo.it/sitoweb/filippo.dalla3/en
Expand Down
3 changes: 2 additions & 1 deletion _members/giulio-colombini.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Giulio Colombini
image: https://github.com/GColom.png
role: postdoc
order: 1
order: 3
category: current
affiliation: University of Bologna - INFN Bologna
links:
home-page: https://www.unibo.it/sitoweb/giulio.colombini2/en
Expand Down
3 changes: 2 additions & 1 deletion _members/gregorio-berselli.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Gregorio Berselli
image: https://github.com/Grufoony.png
role: phd
order: 5
order: 7
category: current
affiliation: University of Bologna - INFN Bologna
links:
home-page: https://www.unibo.it/sitoweb/gregorio.berselli2/en
Expand Down
3 changes: 2 additions & 1 deletion _members/lorenzo-dimeco.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Lorenzo Di Meco
image: https://github.com/lorenzodimeco3.png
role: phd
order: 3
order: 4
category: current
affiliation: University of Bologna - INFN Bologna
links:
home-page: https://www.unibo.it/sitoweb/lorenzo.dimeco3/en
Expand Down
3 changes: 2 additions & 1 deletion _members/matteo-falcioni.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Matteo Falcioni
image: images/matteo_falcioni.png
role: researcher
order: 9
order: 10
category: current
affiliation: University of Bologna
links:
github: MatteoFalcioni
Expand Down
1 change: 1 addition & 0 deletions _members/mirko-degliesposti.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Mirko degli Esposti
image: images/mirko_degkliesposti.png
role: full-professor
order: 2
category: current
affiliation: University of Bologna
links:
home-page: https://www.unibo.it/sitoweb/mirko.degliesposti/en
Expand Down
3 changes: 2 additions & 1 deletion _members/tommaso-rondini.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name: Tommaso Rondini
image: images/tommaso_rondini.png
role: phd
order: 6
order: 8
category: current
affiliation: University of Bologna - INFN Bologna
links:
home-page: https://www.unibo.it/sitoweb/tommaso.rondini2/en
Expand Down
54 changes: 38 additions & 16 deletions team/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ The City Science Laboratory brings together a multidisciplinary team of research

{% include section.html %}

{% assign professors = site.members | where_exp: "m", "m.role contains 'professor'" | sort: "order" %}
{% assign current_members = site.members | where: "category", "current" | sort: "order" %}
{% assign former_members = site.members | where: "category", "former" | sort: "order" %}
{% assign external_members = site.members | where: "category", "external" | sort: "order" %}

{% for member in professors %}
## Current Members

{% for member in current_members %}
{% include portrait.html
name=member.name
image=member.image
Expand All @@ -28,20 +32,38 @@ The City Science Laboratory brings together a multidisciplinary team of research
%}
{% endfor %}

{% assign others = site.members | sort: "order" %}
{% for member in others %}
{% unless member.role contains 'professor' %}
{% include portrait.html
name=member.name
image=member.image
role=member.role
affiliation=member.affiliation
links=member.links
order=member.order
description=member.description
slug=member.slug
%}
{% endunless %}
{% if former_members.size > 0 %}
## Former Members

{% for member in former_members %}
{% include portrait.html
name=member.name
image=member.image
role=member.role
affiliation=member.affiliation
links=member.links
order=member.order
description=member.description
slug=member.slug
%}
{% endfor %}
{% endif %}

{% if external_members.size > 0 %}
## External Collaborators

{% for member in external_members %}
{% include portrait.html
name=member.name
image=member.image
role=member.role
affiliation=member.affiliation
links=member.links
order=member.order
description=member.description
slug=member.slug
%}
{% endfor %}
{% endif %}