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 %} - + - - + + {% 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 @@ {% 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 %} -
Send feedback and comments on the oggcast to <oggcast@faif.us>. -You can keep in touch with Free as in Freedom -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 following @faif on identi.ca.
{% if object.tags.all %}{% 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 @@ {% extends "podjango/base_podcast.html" %} -{% block subtitle %}Free as in Freedom - {% endblock %} +{% block subtitle %}The Corresponding Source - {% endblock %} {% block content %} -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}}.
{{ obj.summary|safe }}
+Send feedback and comments on the cast to <oggcast@faif.us>. -You can keep in touch with Free as in Freedom 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 following Conservancy on identi.ca and and Twitter.
-Free as in Freedom is produced by Dan Lynch +
The Corresponding Source is produced by Dan Lynch of danlynch.org. 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.
and Karen both have blogs you can read. -