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 @@
1
+<ul class="people">
2
+
3
+  <li>
4
+    <p>
5
+      <a href="/about/albers/albers">
6
+        <img alt="Erik Albers" src="/about/albers/albers-avatar.jpg" />
7
+      </a>
8
+      <span class="name"><a href="/about/albers/albers">Erik
9
+Albers</a></span>
10
+      <span class="email"><a href="mailto:eal@fsfe.org">eal (at) fsfe (dot) org</a> (<a
11
+href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=eal%40fsfe.org">PGP</a>)</span>
12
+      <span class="languages">Speaks: English, German, Spanish</span>
13
+      <span class="additional-information">Full-time employee of FSFE</span>
14
+    </p>
15
+  </li>
16
+
17
+  <li>
18
+    <p>
19
+      <img alt="Jan-Christoph Borchardt"
20
+src="/about/borchardt/borchardt-avatar.jpg" />
21
+      <span class="name">Jan-Christoph Borchardt</span>
22
+      <span class="email"><a href="mailto:hey@jancborchardt.net">hey
23
+(at) jancborchardt (dot) net</a>  (<a
24
+href="https://keybase.io/jancborchardt/pgp_keys.asc?fingerprint=ecd0c4a3a2fc72b354e4fc78cbd846fc845cbe17">PGP</a>)</span>
25
+      <span class="languages">Speaks: English, German</span>
26
+    </p>
27
+  </li>
28
+
29
+  <li>
30
+    <p>
31
+      <img alt="Lucile Falgueyrac"
32
+src="/graphics/default-avatar.png" />
33
+      <span class="name">Lucile Falgueyrac</span>
34
+      <span class="email"><a href="mailto:lucilefalg@tila.im">lucilefalg
35
+(at) tila (dot) im</a> (<a
36
+href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=get&amp;search=0x83E1D9A12C7FF2D5">PGP</a>)</span>
37
+      <span class="languages">Speaks: English, French, German</span>
38
+    </p>
39
+  </li>
40
+
41
+  <li>
42
+    <p>
43
+      <a href="/about/repentinus/repentinus">
44
+       <img alt="Heiki Lõhmus" src="/about/repentinus/avatar.jpg" />
45
+      </a>
46
+      <span class="name"><a href="/about/repentinus/repentinus">Heiki
47
+Lõhmus</a></span>
48
+      <span class="email"><a href="mailto:repentinus@fsfe.org">repentinus (at)
49
+fsfe (dot) org</a> (<a
50
+href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=repentinus%40fsfe.org">PGP</a>)</span>
51
+      <span class="languages">Speaks: English, Estonian</span>
52
+      <span class="additional-information">Vice-President of FSFE</span>
53
+    </p>
54
+  </li>
55
+
56
+  <li>
57
+    <p>
58
+      <img alt="Polina Malaja" src="/about/malaja/malaja-avatar.jpg" />
59
+      <span class="name">Polina Malaja</span>
60
+      <span class="email"><a href="mailto:polina@fsfe.org">polina (at) fsfe
61
+(dot) org</a> (<a
62
+href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&amp;search=polina%40fsfe.org">PGP</a>)</span>
63
+      <span class="languages">Speaks: English, Estonian, Russian</span>
64
+    </p>
65
+  </li>
66
+
67
+</ul>

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

@@ -80,29 +80,15 @@
80 80
     <p>
81 81
       The central CARE team may be reached by e-mail at <a href="mailto:care at
82 82
 	      fsfe dot org">care at fsfe dot org</a>. The CARE team members are
83
-      listed below, and you are welcome to contact them individually too.
83
+      listed below, and you are welcome to contact them individually 
84
+      too. We recommend to communicate via encrypted email. The easiest 
85
+      way to do so is if you write one of the team-members indivually. 
86
+      You find their mails and PGP-key in this aphabetically ordered 
87
+      list:
84 88
     </p>
85
-
86
-    <div id="team" class="section grid-100">
87
-	<care-team-list />
88
-    </div>
89
-    
90
-    <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>
91 89
     
92
-
93
-<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>
94
-<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>
95
-
96
-<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>
97
-     <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>
98
-
99
-
100
-
101
-    <ul>
102
-    <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>
103
-     <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>
104
-     <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>
105
-    </ul>
90
+    <!-- Imports list from codeofconduct-careteam.en.xml -->
91
+    <care-team-list /> 
106 92
 
107 93
     <p>
108 94
       Complaints about the CARE team members should be directed to <a

+ 2
- 4
about/codeofconduct.xsl View File

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

Loading…
Cancel
Save