`__
* The `Beeware Enthusiasts mailing list `__
---
diff --git a/models/blog-post.ini b/models/blog-post.ini
index b7a4f4b..5f9e0bc 100644
--- a/models/blog-post.ini
+++ b/models/blog-post.ini
@@ -13,6 +13,12 @@ label = Author
type = string
width = 1/2
+[fields.mastodon_handle]
+label = Mastodon Handle
+type = string
+width = 1/4
+addon_label = @
+
[fields.twitter_handle]
label = Twitter Handle
type = string
diff --git a/models/team-member.ini b/models/team-member.ini
index 05ea458..f2009f1 100644
--- a/models/team-member.ini
+++ b/models/team-member.ini
@@ -25,6 +25,12 @@ type = string
width = 1/4
addon_label = @
+[fields.mastodon_handle]
+label = Mastodon Handle
+type = string
+width = 1/4
+addon_label = @
+
[fields.email]
label = email
type = string
diff --git a/templates/blog-post.html b/templates/blog-post.html
index 14aa993..d8829ff 100644
--- a/templates/blog-post.html
+++ b/templates/blog-post.html
@@ -15,7 +15,9 @@
{{ breadcrumbs(this) }}
{{ this.title }}
{{ t_posted_by }}
- {% if this.twitter_handle %}
+ {% if this.mastodon_handle %}
+ {{ this.author or this.mastodon_handle }}
+ {% elif this.twitter_handle %}
{{ this.author or this.twitter_handle }}
{% else %}
{{ this.author }}
diff --git a/templates/layout.html b/templates/layout.html
index 3fb9220..43105f1 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -54,7 +54,7 @@
{%- endif -%}
-
+
@@ -185,14 +185,14 @@
© Russell Keith-Magee {{ none|dateformat('Y') }}
GitHub |
- Discord |
- Twitter |
+ Discord |
+ Mastodon |
{{ t_sitemap }}
{{ t_posted_by }}
- {% if post.twitter_handle %}
- {{ post.author or post.twitter_handle }}
+ {% if this.mastodon_handle %}
+ {{ this.author or this.mastodon_handle }}
+ {% elif this.twitter_handle %}
+ {{ this.author or this.twitter_handle }}
{% else %}
{{ post.author }}
{% endif %}
diff --git a/templates/macros/member-badge.html b/templates/macros/member-badge.html
index 80dca17..aafd934 100644
--- a/templates/macros/member-badge.html
+++ b/templates/macros/member-badge.html
@@ -5,8 +5,14 @@
{{ member.github_handle }}
+ {% if member.twitter_handle %}
{{ member.twitter_handle }}
+ {% endif %}
+ {% if member.mastodon_handle %}
+
+ {{ member.mastodon_handle }}
+ {% endif %}
{{ member.email }}
{% if member.superpower %}
diff --git a/templates/news.html b/templates/news.html
index c193028..9f39a31 100644
--- a/templates/news.html
+++ b/templates/news.html
@@ -27,8 +27,10 @@
{% for child in blog[:10] %}
{{ t_posted_by }}
- {% if child.twitter_handle %}
- {{ child.author or child.twitter_handle }}
+ {% if this.mastodon_handle %}
+ {{ this.author or this.mastodon_handle }}
+ {% elif this.twitter_handle %}
+ {{ this.author or this.twitter_handle }}
{% else %}
{{ child.author }}
{% endif %}