FSFE/fsfe-website
25
31
Fork 91
Code Issues 65 Pull Requests 5 Wiki Activity

reflect project -> activity change to team pages

Browse Source
This commit is contained in:
Max Mehl 2020-07-07 17:26:22 +02:00
parent 12a9842e3a
commit f8051cf019
Signed by: max.mehl
GPG Key ID: 2704E4AB371E2E92
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
about/people/people.en.xml
View File

@ -15,7 +15,7 @@
<country> Where the person lives (TODO: Where is this used?!)
<function> 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 <council-members /> 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 @@
<person id="bakker">
<name>Carmen Bianca Bakker</name>
<country>NL</country>
<function project="reuse">deputy/f</function>
<function activity="reuse">deputy/f</function>
<team>core</team>
<email>carmenbianca (at) fsfe (dot) org</email>
</person>
@ -274,7 +275,6 @@
<person id="feltrin">
<name>Nicola Feltrin</name>
<country>IT</country>
<function project="ftf">coordinator/m</function>
<team>ftf</team>
<email>nicola (dot) feltrin (at) fsfe (dot) org</email>
</person>

2
about/team.sources
View File

@ -5,4 +5,4 @@ about/people/countries:[]
about/people/groups:[]
about/people/volunteers:[]
about/people/employees:[]
activities/*/project:[]
activities/*/activity:[]

17
build/xslt/people.xsl
View File

@ -165,16 +165,16 @@
</xsl:variable>
<xsl:value-of select="/buildinfo/document/set/group[@id=$group]" />
</xsl:if>
<xsl:if test="@project != ''">
<xsl:if test="@activity != ''">
<xsl:text> </xsl:text>
<xsl:variable name="project">
<xsl:value-of select="@project" />
<xsl:variable name="activity">
<xsl:value-of select="@activity" />
</xsl:variable>
<xsl:element name="a">
<xsl:attribute name="href">
<xsl:value-of select="/buildinfo/document/set/project[@id=$project]/link" />
<xsl:value-of select="/buildinfo/document/set/activity[@id=$activity]/link/@href" />
</xsl:attribute>
<xsl:value-of select="/buildinfo/document/set/project[@id=$project]/title" />
<xsl:value-of select="/buildinfo/document/set/activity[@id=$activity]/title" />
</xsl:element>
</xsl:if>
<xsl:if test="@volunteers != ''">
@ -184,13 +184,6 @@
</xsl:variable>
<xsl:apply-templates select="/buildinfo/document/set/volunteers[@id=$volunteers]/node()" />
</xsl:if>
<xsl:if test="@projects != ''">
<xsl:text> </xsl:text>
<xsl:variable name="projects">
<xsl:value-of select="@projects" />
</xsl:variable>
<xsl:apply-templates select="/buildinfo/document/set/projects[@id=$projects]/node()" />
</xsl:if>
</xsl:for-each>
<!-- Employee status for transparency reasons-->