From d751dc38f393c2fab32e60bb097a95c9bbad4dff Mon Sep 17 00:00:00 2001
From: Robert Kaye <rob@musicbrainz.org>
Date: Fri, 1 Mar 2024 12:51:22 +0100
Subject: [PATCH] general updates: remove freso, adjust simon and reo's titles.
 Move Akshat to volunteer section.

---
 metabrainz/templates/index/team.html | 82 +++++++++-------------------
 1 file changed, 26 insertions(+), 56 deletions(-)

diff --git a/metabrainz/templates/index/team.html b/metabrainz/templates/index/team.html
index ef02a1dc..ebb0201e 100644
--- a/metabrainz/templates/index/team.html
+++ b/metabrainz/templates/index/team.html
@@ -23,7 +23,7 @@ <h4>{{ _('<span class="name">Robert Kaye</span> &mdash; Executive Director') }}<
           pr_url='https://partyrobotics.com') }}
         </p>
         <p>
-          {{ _('He lives in Barcelona, Spain.') }}
+          {{ _('Originally from Germany, he now lives in Barcelona, Spain.') }}
         </p>
         <ul class="links">
           <li><strong>IRC:</strong> mayhem</li>
@@ -51,39 +51,10 @@ <h4>{{ _('<span class="name">Michael Wiencek</span> &mdash; Senior Software Engi
       </div>
     </div>
 
-    <div class="person">
-      <img class="pic" src="{{ url_for('static', filename='img/team/frederik_olesen.jpg') }}"/>
-      <div class="bio">
-        <h4>{{ _('<span class="name">Frederik “Freso” S. Olesen</span> &mdash; Community Manager') }}</h4>
-        <p>
-          {{ _('Hired in the fall of 2015 as the MetaBrainz Community Manager, Freso is in charge of most of the public communication
-          channels (IRC, forums, blog, etc.) and various community projects (like the Google Code-in). He has been a
-          <a href="%(mb_freso_url)s">MusicBrainz contributor since 2006</a> and an open source enthusiast for
-          even longer.', mb_freso_url='https://musicbrainz.org/user/Freso') }}
-        </p>
-        <p>
-          {{ _('On the rare occasions that he is not found in front of a monitor of some sort, Freso can be found
-          <a href="%(mb_freso_artist)s">playing music</a> or (far more commonly)
-          dancing to it. He has even taught some dance classes and workshops in
-          <a href="%(bboy_url)s">b-boying</a>!',
-          mb_freso_artist='https://musicbrainz.org/artist/d112e7ac-3811-4773-abe3-f06c5e697ff4',
-          bboy_url='https://en.wikipedia.org/wiki/B-boying') }}
-        </p>
-        <p>
-          {{ _('Freso was born and raised in Copenhagen, Denmark but now lives across the sound in Landskrona, Sweden.') }}
-        </p>
-        <ul class="links">
-          <li><strong>IRC:</strong> Freso</li>
-          <li><strong>MusicBrainz:</strong> <a href="https://musicbrainz.org/user/Freso">Freso</a></li>
-          <li><strong>GitHub:</strong> <a href="https://github.com/Freso">Freso</a></li>
-        </ul>
-      </div>
-    </div>
-
     <div class="person">
       <img class="pic" src="{{ url_for('static', filename='img/team/nicolas_tamargo.jpg') }}"/>
       <div class="bio">
-        <h4>{{ _('<span class="name">Nicolás Tamargo</span> &mdash; Style Leader/Customer Support/Software Engineer') }}</h4>
+        <h4>{{ _('<span class="name">Nicolás Tamargo</span> &mdash; Style Leader/Customer Support/Community Manager/Software Engineer') }}</h4>
         <p>
           {{ _('Nicolás started (and still moonlights as) a hardcore editor, because he just likes
           organizing data that much. He was eventually offered the style leader position, in which
@@ -185,30 +156,6 @@ <h4>{{ _('<span class="name">Kartik Ohri</span> &mdash; ListenBrainz/CritiqueBra
       </div>
     </div>
 
-    <div class="person">
-      <img
-        alt="Akshat Tiwari's photo"
-        class="pic"
-        src="{{ url_for('static', filename='img/team/akshat.jpg') }}"
-      />
-      <div class="bio">
-        <h4>{{ _('<span class="name">Akshat Tiwari</span> &mdash; Junior Software Engineer') }}</h4>
-        <p>
-          {{ _('Akshat started contributing to the MusicBrainz Android App out of love for the project and after dwelling
-          on the variety of projects MetaBrainz operates, he decided to focus on the MusicBrainz project.
-          He was accepted as a Google Summer of Code student and is now a contractor for MetaBrainz, where
-          he focuses on the improvement of the MusicBrainz user interface and user experience.
-          
-          Akshat has always been fascinated by the creativity of people. He resides in New Delhi, India.') }}
-        </p>
-        <ul class="links">
-          <li><strong>IRC:</strong> akshaaatt</li>
-          <li><strong>GitHub:</strong> <a href="https://github.com/akshaaatt">akshaaatt</a></li>
-          <li><strong>Medium:</strong> <a href="https://medium.com/@akshaaatt">akshaaatt</a></li>
-        </ul>
-      </div>
-    </div>
-
     <div class="person">
       <img
         alt="Adam James' photo"
@@ -239,7 +186,7 @@ <h4>{{ _('<span class="name">Adam James</span> &mdash; System Administrator') }}
         src="{{ url_for('static', filename='img/team/aerozol.jpg') }}"
       />
       <div class="bio">
-        <h4>{{ _('<span class="name">Simon Hartman</span> &mdash; Design & UX Consultant') }}</h4>
+        <h4>{{ _('<span class="name">Simon Hartman</span> &mdash; Design, UX Consultant & Social Media Jockey') }}</h4>
         <p>
           {{ _('Simon has been contributing data and complaints about UX and design to MusicBrainz since 2009.
           In 2022 he started complaining about UX and design in an official capacity. He lives in New Zealand
@@ -276,6 +223,29 @@ <h4>{{ _('<span class="name">Ansh Goyal</span> &mdash; Junior Software Engineer'
 
     <h2>{{ _('Voluntary Project Leaders') }}</h2>
 
+    <div class="person">
+      <img
+        alt="Akshat Tiwari's photo"
+        class="pic"
+        src="{{ url_for('static', filename='img/team/akshat.jpg') }}"
+      />
+      <div class="bio">
+        <h4>{{ _('<span class="name">Akshat Tiwari</span> &mdash; Junior Software Engineer') }}</h4>
+        <p>
+          {{ _('Akshat started contributing to the MusicBrainz Android App out of love for the project and after dwelling
+          on the variety of projects MetaBrainz operates, he decided to focus on the MusicBrainz project.
+          He was accepted as a Google Summer of Code student and is now a contractor for MetaBrainz, where
+          he focuses on the improvement of the MusicBrainz user interface and user experience.
+          
+          Akshat has always been fascinated by the creativity of people. He resides in New Delhi, India.') }}
+        </p>
+        <ul class="links">
+          <li><strong>IRC:</strong> akshaaatt</li>
+          <li><strong>GitHub:</strong> <a href="https://github.com/akshaaatt">akshaaatt</a></li>
+          <li><strong>Medium:</strong> <a href="https://medium.com/@akshaaatt">akshaaatt</a></li>
+        </ul>
+      </div>
+    </div>
     <div class="person">
       <img class="pic" src="{{ url_for('static', filename='img/team/param_singh.jpg') }}" />
       <div class="bio">