From cf359b6a64854203eacd01dc70dea8a8716326d5 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Fri, 13 Oct 2023 13:08:16 +1100
Subject: [PATCH] Rename cast to "The Corresponding Source", move to URL prefix
 "/cast/"

Also improved detail view rendering where unclosed <ul> tags in the body
content HTML from the database were affecting the display of footer info.
---
 www/conservancy/urls.py                         |  2 +-
 www/podjango/feeds.py                           |  8 ++++----
 .../templates/podjango/base_podcast.html        |  6 +++---
 .../podjango/cast/cast_archive_day.html         |  6 +++---
 .../podjango/cast/cast_archive_month.html       |  6 +++---
 .../podjango/cast/cast_archive_year.html        |  6 +++---
 .../templates/podjango/cast/cast_detail.html    | 17 +++++++++--------
 .../templates/podjango/cast/cast_list.html      | 10 ++++++----
 .../podjango/feeds/podcast_description.html     |  6 ++++--
 www/podjango/templates/podjango/frontpage.html  |  2 +-
 www/podjango/urls.py                            |  2 +-
 11 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/www/conservancy/urls.py b/www/conservancy/urls.py
index 791fa473..8e3b18d9 100644
--- a/www/conservancy/urls.py
+++ b/www/conservancy/urls.py
@@ -67,5 +67,5 @@ urlpatterns = [
     url(r'^assignment/', include('conservancy.apps.assignment.urls')),
     url(r'^fossy/$', static_views.index),
     url(r'^fossy/', include('conservancy.apps.fossy.urls')),
-    url(r'^faif/', include('podjango.urls')),
+    url(r'^cast/', include('podjango.urls')),
 ]
diff --git a/www/podjango/feeds.py b/www/podjango/feeds.py
index 631c71ff..71bb73b3 100644
--- a/www/podjango/feeds.py
+++ b/www/podjango/feeds.py
@@ -65,13 +65,13 @@ def for_podcast_feed_extra_kwargs(self, obj):
              'iTunesExplicit'  : 'No',
              'iTunesBlock' : 'No',
              'iTunesImage' : { 'url' : 'http://faif.us/img/cast/faif_300x300.jpg',
-                               'title' : 'Free as in Freedom',
+                               'title' : 'The Corresponding Source (formerly Free as in Freedom)',
                                'link' : self.author_link,
                                'type' : 'video/jpg'},
              'category' : { 'name' : 'Government & Organizations', 'scheme' : 'http://www.itunes.com/dtds/podcast-1.0.dtd',
                             'subcats' : [ 'Non-Profit' ] },
              'keywords' : 'open source, opensource, freesoftware, software freedom, legal, law, linux, free, license, gpl, lgpl, agpl, bsd',
-             'iTunesAuthor' : 'Free as in Freedom',
+             'iTunesAuthor' : 'Software Freedom Conservancy',
              'iTunesSubtitle' : 'Bi-Weekly Discussion of Legal, Policy, and Any other Issues in the Free, Libre, and Open Source Software (FLOSS) Community',
              'copyrightHolder' : self.copyright_holder(),
              'copyrightLicense' : self.license_no_html() }
@@ -205,7 +205,7 @@ class CastFeed(CastFeedBase):
         return "oggcast@faif.us"
 
     def item_author_name(self, obj):
-        return "Free as in Freedom"
+        return "Software Freedom Conservancy"
 
     def item_author_link(self, obj):
         return "http://faif.us"
@@ -213,7 +213,7 @@ class CastFeed(CastFeedBase):
     def item_categories(self, item):
         return  ('Technology',)
 
-    def copyright_holder(self): return "Free as in Freedom"
+    def copyright_holder(self): return "Software Freedom Conservancy"
 
     def license_no_html(self): return "Licensed under a Creative Commons Attribution-Share Alike 3.0 USA License."
 
diff --git a/www/podjango/templates/podjango/base_podcast.html b/www/podjango/templates/podjango/base_podcast.html
index 8f30bd0d..af06c367 100644
--- a/www/podjango/templates/podjango/base_podcast.html
+++ b/www/podjango/templates/podjango/base_podcast.html
@@ -8,7 +8,7 @@
 {% load static %}
 
 {% block head %}
-<meta name="description" content="Free as in Freedom is a bi-weekly oggcast about legal, policy and other issues in Free, Libre and Open Source Software" />
+<meta name="description" content="The Corresponding Source (formerly Free as in Freedom) is a bi-weekly oggcast about legal, policy and other issues in Free, Libre and Open Source Software" />
 <meta name="keywords" content="software, freedom, podjango, open source, gnu, GNU, Open Source, Free and Open Source, Free and Open Source Software, FLOSS, FOSS, protect, protection, help, policy, linux, non-profit, oggcast, podcast" />
 <style>
  ul {
@@ -17,8 +17,8 @@
  }
  a.feedlink img { margin-left: 0.5rem }
 </style>
-<link rel="alternate" type="application/rss+xml" title="MP3 Audio Feed for Free as in Freedom" href="{% url 'podjango:feed-mp3' %}" />
-<link rel="alternate" type="application/rss+xml" title="Ogg/Vorbis Audio Feed for Free as in Freedom" href="{% url 'podjango:feed-ogg' %}" />
+<link rel="alternate" type="application/rss+xml" title="MP3 Audio Feed" href="{% url 'podjango:feed-mp3' %}" />
+<link rel="alternate" type="application/rss+xml" title="Ogg/Vorbis Audio Feed" href="{% url 'podjango:feed-ogg' %}" />
 {% endblock %}
 
 {% comment %}
diff --git a/www/podjango/templates/podjango/cast/cast_archive_day.html b/www/podjango/templates/podjango/cast/cast_archive_day.html
index 7bfd66ef..9dd52425 100644
--- a/www/podjango/templates/podjango/cast/cast_archive_day.html
+++ b/www/podjango/templates/podjango/cast/cast_archive_day.html
@@ -4,14 +4,14 @@
 <!-- and/or convey this template in any form. -->
 {% extends "podjango/base_podcast.html" %}
 
-{% block subtitle %}Free as in Freedom Archive: {{ day|date:"F j, Y" }} - {% endblock %}
+{% block subtitle %}Archive: {{ day|date:"F j, Y" }} - {% endblock %}
 
 {% block content %}
 
 
-<h1>{% include 'podjango/feed_links.inc.html' %} Free as in Freedom</h1>
+<h1>{% include 'podjango/feed_links.inc.html' %} The Corresponding Source</h1>
 
-<h2>Free as in Freedom Archive: {{ day|date:"F j, Y" }}</h2>
+<h2>Archive: {{ day|date:"F j, Y" }}</h2>
 
 {% for object in object_list %}
     <div class="pa2 mb2" style="background: #F0FFB8">
diff --git a/www/podjango/templates/podjango/cast/cast_archive_month.html b/www/podjango/templates/podjango/cast/cast_archive_month.html
index af995ce8..988d965b 100644
--- a/www/podjango/templates/podjango/cast/cast_archive_month.html
+++ b/www/podjango/templates/podjango/cast/cast_archive_month.html
@@ -4,14 +4,14 @@
 <!-- and/or convey this template in any form. -->
 {% extends "podjango/base_podcast.html" %}
 
-{% block subtitle %}Free as in Freedom Archive: {{ month|date:"F, Y" }} - {% endblock %}
+{% block subtitle %}Archive: {{ month|date:"F, Y" }} - {% endblock %}
 
 {% block content %}
 
 
-<h1>{% include 'podjango/feed_links.inc.html' %}Free as in Freedom</h1>
+<h1>{% include 'podjango/feed_links.inc.html' %}The Corresponding Source</h1>
 
-<h2>Free as in Freedom Archive: {{ month|date:"F, Y" }}</h2>
+<h2>Archive: {{ month|date:"F, Y" }}</h2>
 
 {% for object in object_list %}
     <div class="pa2 mb2" style="background: #F0FFB8">
diff --git a/www/podjango/templates/podjango/cast/cast_archive_year.html b/www/podjango/templates/podjango/cast/cast_archive_year.html
index 416f61dc..b134fdf0 100644
--- a/www/podjango/templates/podjango/cast/cast_archive_year.html
+++ b/www/podjango/templates/podjango/cast/cast_archive_year.html
@@ -4,13 +4,13 @@
 <!-- and/or convey this template in any form. -->
 {% extends "podjango/base_podcast.html" %}
 
-{% block subtitle %}Free as in Freedom Archive: {{ year }} - {% endblock %}
+{% block subtitle %}Archive: {{ year }} - {% endblock %}
 
 {% block content %}
 
-<h1>{% include 'podjango/feed_links.inc.html' %} Free as in Freedom</h1>
+<h1>{% include 'podjango/feed_links.inc.html' %} The Corresponding Source</h1>
 
-<h2>Free as in Freedom Archive: {{ year }}</h2>
+<h2>Archive: {{ year }}</h2>
 
 <ul>
 {% for object in object_list %}
diff --git a/www/podjango/templates/podjango/cast/cast_detail.html b/www/podjango/templates/podjango/cast/cast_detail.html
index b23de573..e0e11b4a 100644
--- a/www/podjango/templates/podjango/cast/cast_detail.html
+++ b/www/podjango/templates/podjango/cast/cast_detail.html
@@ -4,11 +4,11 @@
 <!-- and/or convey this template in any form. -->
 {% extends "podjango/base_podcast.html" %}
 
-{% block subtitle %}{{ object.title|striptags }} - Free as in Freedom  - {% endblock %}
+{% block subtitle %}{{ object.title|striptags }} - The Corresponding Source  - {% endblock %}
 
 {% block content %}
 
-<h1>{% include 'podjango/feed_links.inc.html' %} Free as in Freedom</h1>
+<h1>{% include 'podjango/feed_links.inc.html' %} The Corresponding Source</h1>
 
 <h2><a class="feedlink" href="{{ object.ogg_path }}">{% include 'podjango/audio_ogg_button.inc.html' %}</a>
 <a class="feedlink" href="{{ object.mp3_path }}">{% include 'podjango/audio_mp3_button.inc.html' %}</a>
@@ -18,7 +18,9 @@
 
 <h3>Download</h3>
 
+<p>
 <a href="{{ object.ogg_path }}" class="document_format">ogg</a><a href="{{ object.mp3_path }}"  class="document_format">mp3</a>
+</p>
 
 <h3>Summary</h3>
 
@@ -29,15 +31,14 @@ This show was released on {{ object.pub_date|date:"l j F Y" }}; its
 running time is {{ object.duration}}.</p>
 
 <h3>Show Notes</h3>
-{{ object.body|safe }}
-<br/>
-
-<hr width="80%"/>
+<div>
+  {{ object.body|safe }}
+</div>
 
+<h3>Feedback</h3>
 <p>Send feedback and comments on the oggcast
 to <a href="mailto:oggcast@faif.us">&lt;oggcast@faif.us&gt;</a>.
-You can keep in touch with <a href="http://faif.us">Free as in Freedom</a>
-on our IRC channel, #faif on irc.freenode.net, and
+You can keep in touch on our IRC channel, #faif on irc.freenode.net, and
 by <a href="http://identi.ca/faif">following @faif on identi.ca</a>.</p>
 
 {% if object.tags.all %}<p class="blog-tags">Tags: {% for tag in object.tags.all %}<a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>{% endif %}
diff --git a/www/podjango/templates/podjango/cast/cast_list.html b/www/podjango/templates/podjango/cast/cast_list.html
index 84afa718..1984291c 100644
--- a/www/podjango/templates/podjango/cast/cast_list.html
+++ b/www/podjango/templates/podjango/cast/cast_list.html
@@ -4,11 +4,11 @@
 <!-- and/or convey this template in any form. -->
 {% extends "podjango/base_podcast.html" %}
 
-{% block subtitle %}Free as in Freedom - {% endblock %}
+{% block subtitle %}The Corresponding Source - {% endblock %}
 
 {% block content %}
 
-<h1>{% include 'podjango/feed_links.inc.html' %} Free as in Freedom</h1>
+<h1>{% include 'podjango/feed_links.inc.html' %} The Corresponding Source</h1>
 
 {% if tags %}
 <p>Displaying casts
@@ -32,8 +32,10 @@ tagged {% for tag in tags %}{% if not forloop.last %}{% if not forloop.first %},
     This show was released on {{ object.pub_date|date:"l j F Y" }}; its
     running time is {{ object.duration}}.</p>
     <h4>Show Notes</h4>
-    {{ object.body|safe }}
-    <br/>
+    <div>
+      {{ object.body|safe }}
+    </div>
+
     {% if object.tags.all %}<p class="cast-tags small">Tags: {% for tag in object.tags.all %}<a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>{% endif %}
     </div>
 {% endfor %}
diff --git a/www/podjango/templates/podjango/feeds/podcast_description.html b/www/podjango/templates/podjango/feeds/podcast_description.html
index 60162ca8..9dcb22ce 100644
--- a/www/podjango/templates/podjango/feeds/podcast_description.html
+++ b/www/podjango/templates/podjango/feeds/podcast_description.html
@@ -7,7 +7,9 @@
 <p>
 {{ obj.summary|safe }}
 </p>
+<div>
 <h3>Show Notes:</h3>
+</div>
 
 {{ obj.body|safe }}
 
@@ -15,11 +17,11 @@
 
 <p>Send feedback and comments on the cast
 to <a href="mailto:cast@faif.us">&lt;oggcast@faif.us&gt;</a>.
-You can keep in touch with <a href="http://faif.us">Free as in Freedom</a> on our IRC channel, #faif on irc.freenode.net, and
+You can keep in touch on our IRC channel, #faif on irc.freenode.net, and
   by <a href="http://identi.ca/conservancy">following Conservancy on
     identi.ca</a> and <a href="https://twitter.com/conservancy">and Twitter</a>.</p>
 
-<p>Free as in Freedom is produced by <a href="http://danlynch.org/blog/">Dan Lynch</a>
+<p>The Corresponding Source is produced by <a href="http://danlynch.org/blog/">Dan Lynch</a>
   of <a href="http://danlynch.org/">danlynch.org</a>.
 Theme
   music written and performed
diff --git a/www/podjango/templates/podjango/frontpage.html b/www/podjango/templates/podjango/frontpage.html
index 83782856..0d24c94f 100644
--- a/www/podjango/templates/podjango/frontpage.html
+++ b/www/podjango/templates/podjango/frontpage.html
@@ -32,7 +32,7 @@ Bradley and Karen to discuss various topics regarding FLOSS.</p>
   and <a href="http://gnomg.org">Karen</a> both have blogs you can
   read.</p>
 
-<h2>{% include 'podjango/feed_links.inc.html' %}<a href="{% url 'podjango:cast' %}">Recent Free as in Freedom Shows</a></h2>
+<h2>{% include 'podjango/feed_links.inc.html' %}<a href="{% url 'podjango:cast' %}">Recent Shows</a></h2>
 
 {% for cc in cast %}
 <div class="pa2 mb2" style="background: #F0FFB8">
diff --git a/www/podjango/urls.py b/www/podjango/urls.py
index 86a9440d..0cfa8ab6 100644
--- a/www/podjango/urls.py
+++ b/www/podjango/urls.py
@@ -32,7 +32,7 @@ admin.autodiscover()
 app_name = 'podjango'
 urlpatterns = [
     url(r'^$', frontpage.view),
-    url(r'^cast/', include('podjango.apps.cast.urls')),
+    url(r'', include('podjango.apps.cast.urls')),
     url(r'^feeds/cast-ogg/$', OggCastFeed(), name='feed-ogg'),
     url(r'^feeds/cast-mp3/$', Mp3CastFeed(), name='feed-mp3'),
     url(r'^feeds/$', view, name='feeds'),