Browse Source

update list of CARE team members and import them from a file

tags/stw2018
Max Mehl 1 year ago
parent
commit
23ed4eb481
Signed by: max.mehl <max.mehl@fsfe.org> GPG Key ID: 2704E4AB371E2E92
3 changed files with 76 additions and 25 deletions
  1. 67
    0
      about/codeofconduct-careteam.en.xml
  2. 7
    21
      about/codeofconduct.en.xhtml
  3. 2
    4
      about/codeofconduct.xsl

+ 67
- 0
about/codeofconduct-careteam.en.xml View File

@@ -0,0 +1,67 @@
<ul class="people">

<li>
<p>
<a href="/about/albers/albers">
<img alt="Erik Albers" src="/about/albers/albers-avatar.jpg" />
</a>
<span class="name"><a href="/about/albers/albers">Erik
Albers</a></span>
<span class="email"><a href="mailto:eal@fsfe.org">eal (at) fsfe (dot) org</a> (<a
href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=eal%40fsfe.org">PGP</a>)</span>
<span class="languages">Speaks: English, German, Spanish</span>
<span class="additional-information">Full-time employee of FSFE</span>
</p>
</li>

<li>
<p>
<img alt="Jan-Christoph Borchardt"
src="/about/borchardt/borchardt-avatar.jpg" />
<span class="name">Jan-Christoph Borchardt</span>
<span class="email"><a href="mailto:hey@jancborchardt.net">hey
(at) jancborchardt (dot) net</a> (<a
href="https://keybase.io/jancborchardt/pgp_keys.asc?fingerprint=ecd0c4a3a2fc72b354e4fc78cbd846fc845cbe17">PGP</a>)</span>
<span class="languages">Speaks: English, German</span>
</p>
</li>

<li>
<p>
<img alt="Lucile Falgueyrac"
src="/graphics/default-avatar.png" />
<span class="name">Lucile Falgueyrac</span>
<span class="email"><a href="mailto:lucilefalg@tila.im">lucilefalg
(at) tila (dot) im</a> (<a
href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=get&amp;search=0x83E1D9A12C7FF2D5">PGP</a>)</span>
<span class="languages">Speaks: English, French, German</span>
</p>
</li>

<li>
<p>
<a href="/about/repentinus/repentinus">
<img alt="Heiki Lõhmus" src="/about/repentinus/avatar.jpg" />
</a>
<span class="name"><a href="/about/repentinus/repentinus">Heiki
Lõhmus</a></span>
<span class="email"><a href="mailto:repentinus@fsfe.org">repentinus (at)
fsfe (dot) org</a> (<a
href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=repentinus%40fsfe.org">PGP</a>)</span>
<span class="languages">Speaks: English, Estonian</span>
<span class="additional-information">Vice-President of FSFE</span>
</p>
</li>

<li>
<p>
<img alt="Polina Malaja" src="/about/malaja/malaja-avatar.jpg" />
<span class="name">Polina Malaja</span>
<span class="email"><a href="mailto:polina@fsfe.org">polina (at) fsfe
(dot) org</a> (<a
href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=polina%40fsfe.org">PGP</a>)</span>
<span class="languages">Speaks: English, Estonian, Russian</span>
</p>
</li>

</ul>

+ 7
- 21
about/codeofconduct.en.xhtml View File

@@ -80,29 +80,15 @@
<p>
The central CARE team may be reached by e-mail at <a href="mailto:care at
fsfe dot org">care at fsfe dot org</a>. The CARE team members are
listed below, and you are welcome to contact them individually too.
listed below, and you are welcome to contact them individually
too. We recommend to communicate via encrypted email. The easiest
way to do so is if you write one of the team-members indivually.
You find their mails and PGP-key in this aphabetically ordered
list:
</p>

<div id="team" class="section grid-100">
<care-team-list />
</div>
<p>We recommend to communicate via encrypted email. The easiest way to do so is if you write one of the team-members indivually. You find their mails and PGP-key in this aphabetically ordered list:</p>

<p><div class="captioned left" style="max-width: 72px; width: 30%;"><a href="/about/albers/albers"><img src="/about/albers/albers-avatar.png" alt="Erik Albers" /></a></div>
<a href="mailto:eal@fsfe.org">Erik Albers</a> (<a href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=eal%40fsfe.org">PGP</a>) Active languages: English, German, Spanish; Additional information: full-time staffer at FSFE;</p>

<p><div class="captioned left" style="max-width: 72px; width: 30%;"><a href="/about/repentinus/repentinus.en.html"><img src="/about/repentinus/avatar.jpg" alt="Heiki Lõhmus" /></a></div>
<a href="mailto:repentinus@fsfe.org">Heiki Löhmus</a> (<a href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=repentinus%40fsfe.org">PGP</a>) Active languages: English, Estonian; Additional information: Vice-President FSFE;</p>



<ul>
<li><a href="mailto:eal@fsfe.org">Erik Albers</a> (<a href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=eal%40fsfe.org">PGP</a>) Languages: English, German, Spain</li>
<li><a href="mailto:repentinus@fsfe.org">Heiki Löhmus</a> (<a href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=repentinus%40fsfe.org">PGP</a>) Languages: English, Estonian</li>
<li><a href="mailto:polina@fsfe.org">Polina Malaja</a> (<a href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=polina%40fsfe.org">PGP</a>) Languages: English, Estionan, Russian</li>
</ul>
<!-- Imports list from codeofconduct-careteam.en.xml -->
<care-team-list />

<p>
Complaints about the CARE team members should be directed to <a

+ 2
- 4
about/codeofconduct.xsl View File

@@ -7,11 +7,9 @@
<xsl:import href="../tools/xsltsl/countries.xsl" />
<xsl:import href="../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="care-team-list">
<xsl:call-template name="country-people-list">
<xsl:with-param name="team" select="'care'" />
</xsl:call-template>
<xsl:copy-of select="document('codeofconduct-careteam.en.xml')"/>
</xsl:template>

</xsl:stylesheet>

Loading…
Cancel
Save