diff --git a/about/people/people.en.xml b/about/people/people.en.xml index 398b4f0305..b40d34c958 100644 --- a/about/people/people.en.xml +++ b/about/people/people.en.xml @@ -15,7 +15,7 @@ Where the person lives (TODO: Where is this used?!) The function(s) of the person (you can have more). This is a bit more complicated to express, as it uses several sources of possible functions: - functions.en.xml: This is the most important file. Here are all "normal" functions like intern or sysadmin, but also "ranks" for other projects - - projects.en.xml: There are several projects like Legal Team (ftf), Education (education) or Open Standards (os) + - activity.en.xml: There are several projects like Legal Team (ftf), Education (education) or Open Standards (os) - countries.en.xml: (translated) names for countries, i.e. for coordinators of a country team - groups.en.xml: (translated) names for groups (mostly cities), i.e. for coordinators of a local group - function-fellowship.en.xml: Functions related to the fellowship @@ -56,7 +56,7 @@ - /about/people/people.en.xml (this file): All FSFE-teammembers, even those not belonging to team@ (i.e. country teams) - /about/team.**.xhtml: The frame of the team page: Information texts, Headlines etc - /about/team.xsl: In this file, tags like are defined. - - /about/team.sources: Where to look for people-files, translations of functions/projects/countries and so on + - /about/team.sources: Where to look for people-files, translations of functions/activities/countries and so on - /about/people/avatars/: Place for all avatar pictures - /build/xslt/people.xsl: The building of the team lists itself: Links, Background colors, inclusion of avatars etc --> @@ -119,7 +119,8 @@ Carmen Bianca Bakker NL - deputy/f + deputy/f + core carmenbianca (at) fsfe (dot) org @@ -274,7 +275,6 @@ Nicola Feltrin IT - coordinator/m ftf nicola (dot) feltrin (at) fsfe (dot) org diff --git a/about/team.sources b/about/team.sources index 46849e990d..d3f12d4620 100644 --- a/about/team.sources +++ b/about/team.sources @@ -5,4 +5,4 @@ about/people/countries:[] about/people/groups:[] about/people/volunteers:[] about/people/employees:[] -activities/*/project:[] +activities/*/activity:[] diff --git a/build/xslt/people.xsl b/build/xslt/people.xsl index 5d7140e442..14339ca510 100644 --- a/build/xslt/people.xsl +++ b/build/xslt/people.xsl @@ -165,16 +165,16 @@ - + - - + + - + - + @@ -184,13 +184,6 @@ - - - - - - -