From 1cd1cfcd58e36e3ebd4e83cb714a22a92bc9566f Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Thu, 19 Oct 2023 17:52:48 +1100 Subject: [PATCH] podjango: Factor out credits, feedback and license info This makes it easier to keep up-to-date across multiple templates. --- .../templates/podjango/cast/cast_detail.html | 12 ++++----- .../templates/podjango/credits.inc.html | 6 +++++ .../templates/podjango/feedback.inc.html | 1 + .../podjango/feeds/podcast_description.html | 26 +++---------------- .../templates/podjango/frontpage.html | 15 ++--------- .../templates/podjango/license.inc.html | 7 +++++ 6 files changed, 25 insertions(+), 42 deletions(-) create mode 100644 www/podjango/templates/podjango/credits.inc.html create mode 100644 www/podjango/templates/podjango/feedback.inc.html create mode 100644 www/podjango/templates/podjango/license.inc.html diff --git a/www/podjango/templates/podjango/cast/cast_detail.html b/www/podjango/templates/podjango/cast/cast_detail.html index 745e81ed..00f1bc2f 100644 --- a/www/podjango/templates/podjango/cast/cast_detail.html +++ b/www/podjango/templates/podjango/cast/cast_detail.html @@ -31,15 +31,15 @@ This show was released on {{ object.pub_date|date:"l j F Y" }}; its running time is {{ object.duration}}.

Show Notes

-
+
{{ object.body|safe }}
-

Feedback

-

Send feedback and comments on the oggcast -to <oggcast@faif.us>. -You can keep in touch on our IRC channel, #faif on irc.freenode.net, and -by following @faif on identi.ca.

+
+{% include "podjango/credits.inc.html" %} +{% include "podjango/feedback.inc.html" %} +{% include "podjango/license.inc.html" %} +
{% if object.tags.all %}

Tags: {% for tag in object.tags.all %}{{ tag.label }}{% if not forloop.last %}, {% endif %}{% endfor %}

{% endif %} diff --git a/www/podjango/templates/podjango/credits.inc.html b/www/podjango/templates/podjango/credits.inc.html new file mode 100644 index 00000000..c79f6e65 --- /dev/null +++ b/www/podjango/templates/podjango/credits.inc.html @@ -0,0 +1,6 @@ +

The Corresponding Source is produced by Dan Lynch + of danlynch.org. +Theme + music written and performed + by Mike Tarantino + with Charlie Paxson on drums.

diff --git a/www/podjango/templates/podjango/feedback.inc.html b/www/podjango/templates/podjango/feedback.inc.html new file mode 100644 index 00000000..a0bea795 --- /dev/null +++ b/www/podjango/templates/podjango/feedback.inc.html @@ -0,0 +1 @@ +

Please email feedback and comments on the show to <oggcast@faif.us>. You can keep in touch on our IRC channel, #faif on libera.chat, and by following us on Twitter. You can also follow Conservancy on Mastodon and Twitter.

diff --git a/www/podjango/templates/podjango/feeds/podcast_description.html b/www/podjango/templates/podjango/feeds/podcast_description.html index 9dcb22ce..6fcca1fe 100644 --- a/www/podjango/templates/podjango/feeds/podcast_description.html +++ b/www/podjango/templates/podjango/feeds/podcast_description.html @@ -15,26 +15,6 @@
-

Send feedback and comments on the cast -to <oggcast@faif.us>. -You can keep in touch on our IRC channel, #faif on irc.freenode.net, and - by following Conservancy on - identi.ca and and Twitter.

- -

The Corresponding Source is produced by Dan Lynch - of danlynch.org. -Theme - music written and performed - by Mike Tarantino - with Charlie Paxson on drums.

- -

Creative Commons License - The content - of this - audcast, and the accompanying show notes and music are licensed - under the Creative - Commons Attribution-Share-Alike 4.0 license (CC BY-SA 4.0). -

+{% include "podjango/feedback.inc.html" %} +{% include "podjango/credits.inc.html" %} +{% include "podjango/license.inc.html" %} diff --git a/www/podjango/templates/podjango/frontpage.html b/www/podjango/templates/podjango/frontpage.html index 0d24c94f..fb711214 100644 --- a/www/podjango/templates/podjango/frontpage.html +++ b/www/podjango/templates/podjango/frontpage.html @@ -12,11 +12,8 @@ The discussion includes legal, policy, and many other issues in the Free, Libre, and Open Source Software (FLOSS) world. Occasionally, guests join Bradley and Karen to discuss various topics regarding FLOSS.

-

You can email feedback on the show - to <oggcast@faif.us>, or join - bkuhn and other listeners in our IRC channel, #faif on - irc.freenode.net.

- +{% include "podjango/credits.inc.html" %} +{% include "podjango/feedback.inc.html" %}

Follow the RSS and Other Feeds

@@ -24,14 +21,6 @@ Bradley and Karen to discuss various topics regarding FLOSS.

and mp3 format. These links might work if you want to subscribe to the show with proprietary Apple devices.

-

If you're interested you can - follow Karen, - and the podcast itself - on Twitter. - Also, Bradley - and Karen both have blogs you can - read.

-

{% include 'podjango/feed_links.inc.html' %}Recent Shows

{% for cc in cast %} diff --git a/www/podjango/templates/podjango/license.inc.html b/www/podjango/templates/podjango/license.inc.html new file mode 100644 index 00000000..195e10fb --- /dev/null +++ b/www/podjango/templates/podjango/license.inc.html @@ -0,0 +1,7 @@ +

The content + of this + oggcast, and the accompanying show notes and music are licensed + under the Creative + Commons Attribution-Share-Alike 4.0 license (CC BY-SA 4.0). +