diff --git a/conservancy/podjango/static/podjango/img/cast/halfbakedmedia-logo.png b/conservancy/podjango/static/podjango/img/cast/halfbakedmedia-logo.png deleted file mode 100644 index 9956f784..00000000 Binary files a/conservancy/podjango/static/podjango/img/cast/halfbakedmedia-logo.png and /dev/null differ diff --git a/conservancy/podjango/static/podjango/img/cast/halfbakedmedia-logo_100px.png b/conservancy/podjango/static/podjango/img/cast/halfbakedmedia-logo_100px.png deleted file mode 100644 index 6a51dc0e..00000000 Binary files a/conservancy/podjango/static/podjango/img/cast/halfbakedmedia-logo_100px.png and /dev/null differ diff --git a/conservancy/podjango/static/podjango/img/cast/rss-miro.png b/conservancy/podjango/static/podjango/img/cast/rss-miro.png deleted file mode 100644 index 53505248..00000000 Binary files a/conservancy/podjango/static/podjango/img/cast/rss-miro.png and /dev/null differ diff --git a/conservancy/podjango/static/podjango/img/feed-icon-14x14.png b/conservancy/podjango/static/podjango/img/feed-icon-14x14.png deleted file mode 100644 index b3c949d2..00000000 Binary files a/conservancy/podjango/static/podjango/img/feed-icon-14x14.png and /dev/null differ diff --git a/conservancy/podjango/static/podjango/license/index.html b/conservancy/podjango/static/podjango/license/index.html deleted file mode 100644 index 9a646fc7..00000000 --- a/conservancy/podjango/static/podjango/license/index.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends "base_standard.html" %} - -{% block content %} -

License and Source For This Website

- -

The software running this website is copyrighted © 2007-2008, - Software Freedom Law Center, Inc. and copyrighted © 2010, 2016 Bradley M. - Kuhn. The software licensed under the terms of - the AGPLv3-or-later. - You can find a copy the sources of the Debian packages on - this site, but it may be more interesting to know that the site is - running on stock Debian lenny with Apache, Django, mod_python, and - sqlite installed, and that the main sources for the site's code itself - is hosted - on Github (temporarily, hopefully).

- -

The documents on this website are copyrighted © 2010, 2012, 2015, 2016 Bradley - M. Kuhn and Karen M. Sandler, and are licensed - as CC-By-SA-4.0 - International. In some cases, the documents are dual-licensed - (AGPLv3-or-later|CC-By-SA-4.0-International), to make it more - convenient to intermix the document with code.

- -

Creative
-   Commons LicenseThe content of this - audcast, the accompanying show notes and music are copyrighted - © 2010, 2011, 2012, 2013, 2014, 2015, 2016 by Bradley M. Kuhn, - Karen M. Sandler, Dan Lynch, and Mike - Tarantino. Some speech recording and other materials are - copyrighted by the individual speakers.

- -

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

The icons for the RSS audio feeds and direct audio links are borrowed from - the PodPress project - and are licensed under GPLv2.

- -{% endblock %} diff --git a/conservancy/podjango/templates/podjango/base_podcast.html b/conservancy/podjango/templates/podjango/base_podcast.html index b3bee58a..5ff4139a 100644 --- a/conservancy/podjango/templates/podjango/base_podcast.html +++ b/conservancy/podjango/templates/podjango/base_podcast.html @@ -3,7 +3,7 @@ -{% extends "base_standard.html" %} +{% extends "base_conservancy.html" %} {% load static %} diff --git a/conservancy/podjango/templates/podjango/feeds.html b/conservancy/podjango/templates/podjango/feeds.html index 36a95e5e..c690ff35 100644 --- a/conservancy/podjango/templates/podjango/feeds.html +++ b/conservancy/podjango/templates/podjango/feeds.html @@ -1,4 +1,4 @@ -{% extends "base_standard.html" %} +{% extends "base_conservancy.html" %} {% block subtitle %}News Feeds - {% endblock %}