Merge pull request #2446 from DOAJ/feature/3995_senior-ambassador

Add senior ambassadors section to Ambassadors Page

cms/pages/about/ambassadors.md

@@ -7,11 +7,27 @@ toc: true
 sticky_sidenav: true
 highlight: true
 featuremap: ~~Ambassadors:Fragment->AmbassadorsData:Template~~
-
+manual_toc_tokens: |
+  [
+    {
+        "children": [],
+        "data-toc-label": "",
+        "html": "Senior Ambassadors",
+        "id": "senior-ambassadors",
+        "level": 2,
+        "name": "Senior Ambassadors"
+      },
+      {
+        "children": [],
+        "data-toc-label": "",
+        "html": "Ambassadors",
+        "id": "ambassadors",
+        "level": 2,
+        "name": "Ambassadors"
+      }
+  ]
 ---
 
 DOAJ has 13 active Ambassadors, who work with local communities around the world. Ambassadors work within Low- or Middle-Income Countries (LMIC) to raise DOAJ's profile through local outreach and engagment activities. Ambassadors advocate for good practice in open access and publishing, assist with information around applying to DOAJ, and conduct training and events on behalf of DOAJ. 
 
-In 2024, we reveiwed the Ambassador Programme and have implemented a range of changes. In 2025, our Ambassador Programme will have a pilot year where our focus will be on projects led by Ambassadors, supported by DOAJ. If you are interested in becoming an Ambasador, please look out for calls and information that will be published on [our blog](https://blog.doaj.org/).
-
-#
+In 2024, we reveiwed the Ambassador Programme and have implemented a range of changes. In 2025, our Ambassador Programme will have a pilot year where our focus will be on projects led by Ambassadors, supported by DOAJ. If you are interested in becoming an Ambasador, please look out for calls and information that will be published on [our blog](https://blog.doaj.org/).

portality/core.py

@@ -1,6 +1,7 @@
 import os
 import threading
 import yaml
+import json
 
 from flask import Flask
 from flask_login import LoginManager
@@ -286,6 +287,12 @@ def jinja_debug(text):
         return ''
     app.jinja_env.filters['debug']=jinja_debug
 
+    # a jinja filter that parses a string to json
+    def parse_json(value):
+        return json.loads(value) if isinstance(value, str) else value
+
+    app.jinja_env.filters['parse_json'] = parse_json
+
 
 def _load_data(app):
     if not "data" in app.jinja_env.globals:

portality/templates-v2/public/includes/_ambassador-profile.html

@@ -0,0 +1,33 @@
+<li class="col-sm-6 col-md-4 col-lg-4">
+    <div class="title-list__text">
+        <figure class="portrait" aria-hidden="true">
+            {% if i.photo %}
+            <div class="portrait__bg-img" style="background-image: url('/assets/img/ambassadors/{{ i.photo }}')"
+                 alt="Portrait of {{ i.name }}"></div>
+            {% else %}
+            <div class="portrait__img--empty"></div>
+            {% endif %}
+        </figure>
+        <p class="label">{{ i.region }}</p>
+        <h3 class="title-list__heading">{{ i.name }}</h3>
+        {% if i.bio %}
+        <p class="title-list__para">
+            {% autoescape off %}{{ i.bio }}{% endautoescape %}
+        </p>
+        {% endif %}
+        {% if i.coi %}
+        <div class="title-list__para">
+            <h3 class="label label--tertiary">Conflict of interest statement(s):</h3>
+            <ul class="tags">
+                {% for year, link in i.coi.items() %}
+                <li>
+                    {% if link %}<a href="{{ link }}" target="_blank" class="tag">{% endif %}
+                    {{ year }}
+                    {% if link %}</a>{% endif %}
+                </li>
+                {% endfor %}
+            </ul>
+        </div>
+        {% endif %}
+    </div>
+</li>

portality/templates-v2/public/includes/_ambassadors.html

@@ -1,38 +1,19 @@
-<!-- About section: ambassadors -->
-<h2>Ambassadors</h2>
-<ul class="row title-list">
-    {% for i in data.ambassadors %}
-        <li class="col-sm-6 col-md-4 col-lg-4">
-            <div class="title-list__text">
-                <figure class="portrait" aria-hidden="true">
-                    {% if i.photo %}
-                        <div class="portrait__bg-img" style="background-image: url('/assets/img/ambassadors/{{ i.photo }}')" alt="Portrait of {{ i.name }}"></div>
-                    {% else %}
-                        <div class="portrait__img--empty"></div>
-                    {% endif %}
-                </figure>
-                <p class="label">{{ i.region }}</p>
-                <h3 class="title-list__heading">{{ i.name }}</h3>
-                {% if i.bio %}
-                    <p class="title-list__para">
-                        {% autoescape off %}{{ i.bio }}{% endautoescape %}
-                    </p>
-                {% endif %}
-                {% if i.coi %}
-                    <div class="title-list__para">
-                        <h3 class="label label--tertiary">Conflict of interest statement(s):</h3>
-                        <ul class="tags">
-                            {% for year, link in i.coi.items() %}
-                                <li>
-                                    {% if link %}<a href="{{ link }}" target="_blank" class="tag">{% endif %}
-                                    {{ year }}
-                                    {% if link %}</a>{% endif %}
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    </div>
-                {% endif %}
-            </div>
-        </li>
-    {% endfor %}
-</ul>
+<!-- About section: senior-ambassadors -->
+{% if data.ambassadors.senior %}
+    <h2 id="senior-ambassadors">Senior Ambassadors</h2>
+    <ul class="row title-list">
+        {% for i in data.ambassadors.senior %}
+            {% include 'public/includes/_ambassador-profile.html' with context %}
+        {% endfor %}
+    </ul>
+{% endif %}
+
+{% if data.ambassadors.general %}
+    <h2 id="ambassadors">Ambassadors</h2>
+    <ul class="row title-list">
+        {% for i in data.ambassadors.general %}
+            {% include 'public/includes/_ambassador-profile.html' with context %}
+        {% endfor %}
+    </ul>
+{% endif %}
+

portality/templates-v2/public/includes/_sidenav_toc.html

@@ -16,4 +16,5 @@
     </ul>
 {%- endmacro %}
 
-{{ toc(page.toc_tokens, False) }}
+{% set manual_toc_tokens = page.manual_toc_tokens | parse_json %}
+{{ toc(manual_toc_tokens if manual_toc_tokens else page.toc_tokens, False) }}