Support Mastodon social links for contributors (#3797)

* Support Mastodon social links for contributors

* Styling

* Typo

Author: tunetheweb

src/config/contributors.json

@@ -575,6 +575,7 @@
     "avatar_url": "10931297",
     "github": "tunetheweb",
     "linkedin": "tunetheweb",
+    "mastodon": "https://webperf.social/@tunetheweb",
     "name": "Barry Pollard",
     "teams": {
       "2019": [
@@ -606,6 +607,9 @@
         "editors",
         "leads",
         "reviewers"
+      ],
+      "2024": [
+        "developers"
       ]
     },
     "twitter": "tunetheweb",

src/templates/base.html

@@ -64,6 +64,11 @@
       <symbol id="linkedin-logo" viewBox="0 0 200 200">
         <path d="M185.2 0H14.8C6.6 0 0 6.4 0 14.3v171.3c0 7.9 6.6 14.3 14.8 14.3h170.4c8.1 0 14.8-6.4 14.8-14.3V14.3C199.9 6.4 193.3 0 185.2 0zM60.6 167.3H30.4V77.1h30.2v90.2zM45.5 64.8h-.2c-10.1 0-16.7-6.9-16.7-15.6 0-8.8 6.7-15.6 17.1-15.6 10.3 0 16.7 6.7 16.9 15.6 0 8.6-6.5 15.6-17.1 15.6zm124 102.5h-30.2V119c0-12.1-4.4-20.4-15.3-20.4-8.4 0-13.3 5.6-15.5 11-.8 1.9-1 4.6-1 7.3v50.4H77.3s.4-81.8 0-90.3h30.2v12.8c4-6.1 11.2-14.9 27.2-14.9 19.9 0 34.8 12.9 34.8 40.6v51.8zm-62.2-77.1c0-.1.1-.2.2-.3v.3h-.2z" fill="currentColor" />
       </symbol>
+      <!-- Mastodon -->
+      <symbol id="mastodon-logo" viewBox="0 0 61 65">
+        <path d="M60.7539 14.3904C59.8143 7.40642 53.7273 1.90257 46.5117 0.836066C45.2943 0.655854 40.6819 0 29.9973 0H29.9175C19.2299 0 16.937 0.655854 15.7196 0.836066C8.70488 1.87302 2.29885 6.81852 0.744617 13.8852C-0.00294988 17.3654 -0.0827298 21.2237 0.0561464 24.7629C0.254119 29.8384 0.292531 34.905 0.753482 39.9598C1.07215 43.3175 1.62806 46.6484 2.41704 49.9276C3.89445 55.9839 9.87499 61.0239 15.7344 63.0801C22.0077 65.2244 28.7542 65.5804 35.2184 64.1082C35.9295 63.9428 36.6318 63.7508 37.3252 63.5321C38.8971 63.0329 40.738 62.4745 42.0913 61.4937C42.1099 61.4799 42.1251 61.4621 42.1358 61.4417C42.1466 61.4212 42.1526 61.3986 42.1534 61.3755V56.4773C42.153 56.4557 42.1479 56.4345 42.1383 56.4151C42.1287 56.3958 42.1149 56.3788 42.0979 56.3655C42.0809 56.3522 42.0611 56.3429 42.04 56.3382C42.019 56.3335 41.9971 56.3336 41.9761 56.3384C37.8345 57.3276 33.5905 57.8234 29.3324 57.8156C22.0045 57.8156 20.0336 54.3384 19.4693 52.8908C19.0156 51.6397 18.7275 50.3346 18.6124 49.0088C18.6112 48.9866 18.6153 48.9643 18.6243 48.9439C18.6333 48.9236 18.647 48.9056 18.6643 48.8915C18.6816 48.8774 18.7019 48.8675 18.7237 48.8628C18.7455 48.858 18.7681 48.8585 18.7897 48.8641C22.8622 49.8465 27.037 50.3423 31.2265 50.3412C32.234 50.3412 33.2387 50.3412 34.2463 50.3146C38.4598 50.1964 42.9009 49.9808 47.0465 49.1713C47.1499 49.1506 47.2534 49.1329 47.342 49.1063C53.881 47.8507 60.1038 43.9097 60.7362 33.9301C60.7598 33.5372 60.8189 29.8148 60.8189 29.4071C60.8218 28.0215 61.2651 19.5781 60.7539 14.3904Z" fill="currentColor"/>
+        <path d="M50.3943 22.237V39.5876H43.5185V22.7481C43.5185 19.2029 42.0411 17.3949 39.036 17.3949C35.7325 17.3949 34.0778 19.5338 34.0778 23.7585V32.9759H27.2434V23.7585C27.2434 19.5338 25.5857 17.3949 22.2822 17.3949C19.2949 17.3949 17.8027 19.2029 17.8027 22.7481V39.5876H10.9298V22.237C10.9298 18.6918 11.835 15.8754 13.6453 13.7877C15.5128 11.7049 17.9623 10.6355 21.0028 10.6355C24.522 10.6355 27.1813 11.9885 28.9542 14.6917L30.665 17.5633L32.3788 14.6917C34.1517 11.9885 36.811 10.6355 40.3243 10.6355C43.3619 10.6355 45.8114 11.7049 47.6847 13.7877C49.4931 15.8734 50.3963 18.6899 50.3943 22.237Z" fill="white"/>
+      </symbol>
       <!-- Globe -->
       <symbol id="globe-logo" viewBox="0 0 30 30">
         <circle cx="14.5" cy="14.5" r="13.5" stroke-width="2" stroke-miterlimit="10" fill="none" stroke="currentColor" />

src/templates/base/base.html

@@ -453,7 +453,7 @@
                     </li>
                     <li>
                       <a href="https://github.com/HTTPArchive/almanac.httparchive.org" aria-labelledby="github-logo-mobile">
-                        <svg width="20" height="20" role="img">
+                        <svg width="22" height="20" role="img">
                           <title id="github-logo-mobile">GitHub</title>
                           <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#github-logo"></use>
                         </svg>
@@ -552,7 +552,7 @@
             </li>
             <li>
               <a href="https://github.com/HTTPArchive/almanac.httparchive.org" rel="me" aria-labelledby="github-logo-footer-mobile">
-                <svg width="20" height="20" role="img">
+                <svg width="22" height="20" role="img">
                   <title id="github-logo-footer-mobile">GitHub</title>
                   <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#github-logo"></use>
                 </svg>
@@ -585,7 +585,7 @@
           </li>
           <li>
             <a href="https://github.com/HTTPArchive/almanac.httparchive.org" rel="me" aria-labelledby="github-logo-footer">
-              <svg width="20" height="20" role="img">
+              <svg width="22" height="20" role="img">
                 <title id="github-logo-footer">GitHub</title>
                 <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#github-logo"></use>
               </svg>

src/templates/base/base_chapter.html

@@ -90,7 +90,7 @@ <h2 id="explore-results">
     {{ self.queries() }}
   </a>
   <a class="alt btn" hreflang="en" href="https://github.com/HTTPArchive/almanac.httparchive.org/issues/new?assignees=&labels=bug%2C+writing&title=Issue+with+the+{{ year }}+{{ metadata.get('chapter') }}+chapter">
-    <svg width="18" height="18" role="img" aria-hidden="true">
+    <svg width="19" height="18" role="img" aria-hidden="true">
       <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#github-logo"></use>
     </svg>
     {{ self.suggest_edit() }}
@@ -266,9 +266,18 @@ <h2 id="authors">
                     @{{ authordata.twitter }}
                   </a>
                   {% endif %}
+                  {% if authordata.mastodon %}
+                  <a class="mastodon" href="{{ authordata.mastodon }}" aria-labelledby="author-{{ author }}-mastodon">
+                    <svg width="22" height="22" role="img">
+                      <title id="author-{{ author }}-mastodon">{{ onMastodon(authordata.mastodon) }}</title>
+                      <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#mastodon-logo"></use>
+                    </svg>
+                    @{{ authordata.mastodon }}
+                  </a>
+                  {% endif %}
                   {% if authordata.github %}
                   <a class="github" href="https://github.com/{{ authordata.github }}" aria-labelledby="author-{{ author }}-github">
-                    <svg width="22" height="22">
+                    <svg width="22" height="20">
                       <title id="author-{{ author }}-github">{{ onGitHub(authordata.github) }}</title>
                       <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#github-logo"></use>
                     </svg>

src/templates/base/base_ebook.html

@@ -374,11 +374,22 @@ <h1 class="title title-lg">
             </a>
           </div>
           {% endif %}
+          {% if contributor.mastodon %}
+          <div class="contributor-social">
+            <a href="{{ contributor.mastodon }}" aria-labelledby="contributors-{{ id }}-mastodon">
+              <svg role="img">
+                <title id="contributors-{{ id }}-mastodon">{{ onMastodon(contributor.mastodon) }}</title>
+                <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#mastodon-logo"></use>
+              </svg>
+              {{ contributor.mastodon }}
+            </a>
+          </div>
+          {% endif %}
           {% if contributor.github %}
           <div class="contributor-social">
             <a href="https://github.com/{{ contributor.github }}" aria-labelledby="contributors-{{ id }}-github">
               <svg role="img">
-                <title id="contributors-{{ id }}-github">{{ onTwitter(contributor.github) }}</title>
+                <title id="contributors-{{ id }}-github">{{ onGitHub(contributor.github) }}</title>
                 <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#github-logo"></use>
               </svg>
               {{ contributor.github }}
@@ -389,7 +400,7 @@ <h1 class="title title-lg">
           <div class="contributor-social">
             <a href="https://www.linkedin.com/in/{{ contributor.twitter }}" aria-labelledby="contributors-{{ id }}-linkedin">
               <svg role="img">
-                <title id="contributors-{{ id }}-linkedin">{{ onTwitter(contributor.linkedin) }}</title>
+                <title id="contributors-{{ id }}-linkedin">{{ onLinkedIn(contributor.linkedin) }}</title>
                 <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#linkedin-logo"></use>
               </svg>
               {{ contributor.linkedin }}

src/templates/base/contributors.html

@@ -98,7 +98,7 @@
   align-items: center;
   border-radius: 15px;
   box-shadow: 0 0 16px 0 rgba(78, 85, 100, 0.2);
-  padding: 24px 24px;
+  padding: 20px 18px;
   width: 250px;
   min-width: 250px;
   margin: 10px;
@@ -327,9 +327,16 @@ <h1 class="title title-lg">
             </svg>
           </a>
           {% endif %}
+          {% if contributor.mastodon %}
+          <a href="https://mastodon.com/{{ contributor.mastodon }}" aria-label="{{ onMastodon(contributor.mastodon) }}">
+            <svg width="22" height="22" role="img">
+              <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#mastodon-logo"></use>
+            </svg>
+          </a>
+          {% endif %}
           {% if contributor.github %}
           <a href="https://github.com/{{ contributor.github }}" aria-label="{{ onGitHub(contributor.github) }}">
-            <svg width="22" height="22" role="img">
+            <svg width="22" height="20" role="img">
               <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#github-logo"></use>
             </svg>
           </a>

src/templates/base/ebook.ejs.html

@@ -104,6 +104,15 @@ <h2 id="{{ metadata.get('chapter') }}-authors">
                                     @{{ authordata.twitter }}
                                 </a>
                                 {% endif %}
+                                {% if authordata.mastodon %}
+                                <a class="mastodon" href="{{ authordata.mastodon }}" aria-labelledby="{{ metadata.get('chapter') }}-author-{{ author }}-mastodon">
+                                    <svg aria-hidden="true">
+                                        <title id="{{ metadata.get('chapter') }}-author-{{ author }}-mastodon">{{ onMastodon(authordata.mastodon) }}</title>
+                                        <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#mastodon-logo"></use>
+                                    </svg>
+                                    @{{ authordata.mastodon }}
+                                </a>
+                                {% endif %}
                                 {% if authordata.github %}
                                 <a class="github" href="https://github.com/{{ authordata.github }}" aria-labelledby="{{ metadata.get('chapter') }}-author-{{ author }}-github">
                                     <svg aria-hidden="true">

src/templates/en/base.html

@@ -112,6 +112,7 @@
 {% block mentionsAlt %}{% endblock %}
 
 {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} on Twitter{% endmacro %}
+{% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} on Mastodon{% endmacro %}
 {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} on GitHub{% endmacro %}
 {% macro onLinkedIn(authorName) %}{{authorName}} on LinkedIn{% endmacro %}
 {% macro website(authorName) %}{{authorName}} website{% endmacro %}

src/templates/es/base.html

@@ -112,6 +112,7 @@
 {% block mentionsAlt %}{% endblock %}
 
 {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} en Twitter{% endmacro %}
+{% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} en Mastodon{% endmacro %}
 {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} en GitHub{% endmacro %}
 {% macro onLinkedIn(authorName) %}{{authorName}} en LinkedIn{% endmacro %}
 {% macro website(authorName) %}{{authorName}} sitio web{% endmacro %}

src/templates/fr/base.html

@@ -112,6 +112,7 @@
 {% block mentionsAlt %}{% endblock %}
 
 {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} sur Twitter{% endmacro %}
+{% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} sur Mastodon{% endmacro %}
 {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} sur GitHub{% endmacro %}
 {% macro onLinkedIn(authorName) %}{{authorName}} sur LinkedIn{% endmacro %}
 {% macro website(authorName) %}site web de {{authorName}}{% endmacro %}