[tor-commits] [community/staging] Fix Mentor display

[hiro at torproject.org]

commit 5eae339ed7a32f881f1ee23f0185ec5572d05655
Author: Pili Guerra <pili at piliguerra.com>
Date:   Wed Feb 5 11:59:58 2020 +0100

    Fix Mentor display
---
 content/gsoc/cloudflare-captcha-monitoring/contents.lr | 4 +++-
 content/gsoc/gettor-distribution/contents.lr           | 2 +-
 content/gsoc/onion-toolbox/contents.lr                 | 4 +++-
 content/gsoc/ooni-explorer-advanced-search/contents.lr | 4 +++-
 content/gsoc/ooni-probe-experiments/contents.lr        | 4 +++-
 content/gsoc/privacy-aware-geo-lookup/contents.lr      | 4 +++-
 content/gsoc/privacy-friendly-web/contents.lr          | 3 ++-
 content/gsoc/salmon-bridge-distribution/contents.lr    | 4 +++-
 content/gsoc/snowflake-android-proxy/contents.lr       | 3 ++-
 content/gsoc/tor-relay-ipv6-support/contents.lr        | 4 +++-
 models/project.ini                                     | 4 ----
 templates/macros/projects.html                         | 6 ++++++
 12 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
index dbdc7e4..c311934 100644
--- a/content/gsoc/cloudflare-captcha-monitoring/contents.lr
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -18,7 +18,9 @@ languages:
 python
 javascript
 ---
-mentors: GeKo, arma
+mentors:
+GeKo
+arma
 ---
 difficulty: medium
 ---
diff --git a/content/gsoc/gettor-distribution/contents.lr b/content/gsoc/gettor-distribution/contents.lr
index b39c92e..797a2ff 100644
--- a/content/gsoc/gettor-distribution/contents.lr
+++ b/content/gsoc/gettor-distribution/contents.lr
@@ -20,7 +20,7 @@ ansible
 ---
 org: Tor
 ---
-mentors: 
+mentors:
 cohosh
 hiro
 ---
diff --git a/content/gsoc/onion-toolbox/contents.lr b/content/gsoc/onion-toolbox/contents.lr
index ed8b5e4..bae15c0 100644
--- a/content/gsoc/onion-toolbox/contents.lr
+++ b/content/gsoc/onion-toolbox/contents.lr
@@ -19,7 +19,9 @@ Python
 Docker
 PythonQt5
 ---
-mentors: hiro, asn
+mentors:
+hiro
+asn
 ---
 difficulty: medium
 ---
diff --git a/content/gsoc/ooni-explorer-advanced-search/contents.lr b/content/gsoc/ooni-explorer-advanced-search/contents.lr
index 99b9484..b4d883c 100644
--- a/content/gsoc/ooni-explorer-advanced-search/contents.lr
+++ b/content/gsoc/ooni-explorer-advanced-search/contents.lr
@@ -18,7 +18,9 @@ languages: React
 ---
 org: OONI
 ---
-mentors: Federico Ceratto, Arturo Filastò
+mentors:
+Federico Ceratto
+Arturo Filastò
 ---
 difficulty: Medium
 ---
diff --git a/content/gsoc/ooni-probe-experiments/contents.lr b/content/gsoc/ooni-probe-experiments/contents.lr
index 8f18dcc..c6426ef 100644
--- a/content/gsoc/ooni-probe-experiments/contents.lr
+++ b/content/gsoc/ooni-probe-experiments/contents.lr
@@ -18,7 +18,9 @@ languages: Golang
 ---
 org: OONI
 ---
-mentors: Simone Basso, Arturo Filastò
+mentors:
+Simone Basso
+Arturo Filastò
 ---
 difficulty: low-high
 ---
diff --git a/content/gsoc/privacy-aware-geo-lookup/contents.lr b/content/gsoc/privacy-aware-geo-lookup/contents.lr
index d0ba616..1a58eb2 100644
--- a/content/gsoc/privacy-aware-geo-lookup/contents.lr
+++ b/content/gsoc/privacy-aware-geo-lookup/contents.lr
@@ -20,7 +20,9 @@ Java
 ---
 org: OONI
 ---
-mentors: Simone Basso, Arturo Filastò
+mentors:
+Simone Basso
+Arturo Filastò
 ---
 difficulty: Medium
 ---
diff --git a/content/gsoc/privacy-friendly-web/contents.lr b/content/gsoc/privacy-friendly-web/contents.lr
index c56e209..2878195 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -20,7 +20,8 @@ CSS
 HTML
 Python
 ---
-mentors: hiro
+mentors:
+hiro
 ---
 difficulty: medium
 ---
diff --git a/content/gsoc/salmon-bridge-distribution/contents.lr b/content/gsoc/salmon-bridge-distribution/contents.lr
index 11855dc..85a5598 100644
--- a/content/gsoc/salmon-bridge-distribution/contents.lr
+++ b/content/gsoc/salmon-bridge-distribution/contents.lr
@@ -18,7 +18,9 @@ languages:
 ---
 org: Tor
 ---
-mentors: 
+mentors:
+cohosh
+ahf
 ---
 difficulty: 
 ---
diff --git a/content/gsoc/snowflake-android-proxy/contents.lr b/content/gsoc/snowflake-android-proxy/contents.lr
index 96f802b..1e2dbf9 100644
--- a/content/gsoc/snowflake-android-proxy/contents.lr
+++ b/content/gsoc/snowflake-android-proxy/contents.lr
@@ -19,7 +19,8 @@ Android
 ---
 org: Tor
 ---
-mentors: cohosh
+mentors:
+cohosh
 ---
 difficulty: 
 ---
diff --git a/content/gsoc/tor-relay-ipv6-support/contents.lr b/content/gsoc/tor-relay-ipv6-support/contents.lr
index 4aff974..ea4a9df 100644
--- a/content/gsoc/tor-relay-ipv6-support/contents.lr
+++ b/content/gsoc/tor-relay-ipv6-support/contents.lr
@@ -17,7 +17,9 @@ key: 10
 languages:
 C
 ---
-mentors: teor, ahf, dgoulet, catalyst
+mentors:
+teor
+ahf
 ---
 difficulty: Medium
 ---
diff --git a/models/project.ini b/models/project.ini
index 09ba867..6d5f780 100644
--- a/models/project.ini
+++ b/models/project.ini
@@ -34,10 +34,6 @@ type = strings
 label = Languages
 type = strings
 
-[fields.mentors]
-label = Mentors
-type = string
-
 [fields.difficulty]
 label = Difficulty Level
 type = string
diff --git a/templates/macros/projects.html b/templates/macros/projects.html
index bbda578..a4e2850 100644
--- a/templates/macros/projects.html
+++ b/templates/macros/projects.html
@@ -4,9 +4,15 @@
     <h5 class="mb-0">
       <a href="{{ item.path|url }}">{{ item.title }}</a>
     </h5>
+    Languages:
     {% for lang in item.languages %}
       <span class="badge badge-primary">{{ lang }}</span>
     {% endfor %}
+    <br>
+    Mentors:
+    {% for person in item.mentors %}
+      <span class="badge badge-secondary">{{ person }}</span>
+    {% endfor %}
   </div>
   <div>
     <div class="card-body">