diff --git a/_members/aldo-canfora.md b/_members/aldo-canfora.md index ca1fcb96..c32b762b 100644 --- a/_members/aldo-canfora.md +++ b/_members/aldo-canfora.md @@ -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 diff --git a/_members/armando-bazzani.md b/_members/armando-bazzani.md index 2ce94204..43711257 100644 --- a/_members/armando-bazzani.md +++ b/_members/armando-bazzani.md @@ -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 diff --git a/_members/daniele-pucci.md b/_members/daniele-pucci.md index 63bebafd..115c2529 100644 --- a/_members/daniele-pucci.md +++ b/_members/daniele-pucci.md @@ -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 diff --git a/_members/dragosdumitru-ioan.md b/_members/dragosdumitru-ioan.md index e96b13bb..fc3973b5 100644 --- a/_members/dragosdumitru-ioan.md +++ b/_members/dragosdumitru-ioan.md @@ -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 diff --git a/_members/filippo-dalla.md b/_members/filippo-dalla.md index 07e32103..c58c22d8 100644 --- a/_members/filippo-dalla.md +++ b/_members/filippo-dalla.md @@ -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 diff --git a/_members/giulio-colombini.md b/_members/giulio-colombini.md index ca26fdf0..a4a2bc28 100644 --- a/_members/giulio-colombini.md +++ b/_members/giulio-colombini.md @@ -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 diff --git a/_members/gregorio-berselli.md b/_members/gregorio-berselli.md index 537d95d0..9bf09920 100644 --- a/_members/gregorio-berselli.md +++ b/_members/gregorio-berselli.md @@ -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 diff --git a/_members/lorenzo-dimeco.md b/_members/lorenzo-dimeco.md index 6a96c3e0..22023ba2 100644 --- a/_members/lorenzo-dimeco.md +++ b/_members/lorenzo-dimeco.md @@ -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 diff --git a/_members/matteo-falcioni.md b/_members/matteo-falcioni.md index 07b73649..152bd4b0 100644 --- a/_members/matteo-falcioni.md +++ b/_members/matteo-falcioni.md @@ -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 diff --git a/_members/mirko-degliesposti.md b/_members/mirko-degliesposti.md index 7328c943..10a83689 100644 --- a/_members/mirko-degliesposti.md +++ b/_members/mirko-degliesposti.md @@ -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 diff --git a/_members/tommaso-rondini.md b/_members/tommaso-rondini.md index 2b62cf76..fef684a2 100644 --- a/_members/tommaso-rondini.md +++ b/_members/tommaso-rondini.md @@ -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 diff --git a/team/index.md b/team/index.md index d811dbac..8957b52e 100644 --- a/team/index.md +++ b/team/index.md @@ -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 @@ -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 %}