Fix further podcast links, remove unused base template and CSS, improve layout
This commit is contained in:
parent
5e2cb22fb7
commit
d1960cf04c
GPG key ID:
023C05E2C9C068F0
8 changed files with 23 additions and 300 deletions
|
|
@ -1,241 +0,0 @@
|
|||
* { margin: 0; padding: 0; }
|
||||
img { border: 0; }
|
||||
body { margin: 0; padding: 0; }
|
||||
.clear { clear: both; }
|
||||
.hidden { display: none; }
|
||||
|
||||
p, h1, h2, h3, h4, h5, h6, #mainContent ul, #mainContent ol {
|
||||
margin-top: 1em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
body {
|
||||
/* font-family: "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif; */
|
||||
font-size: 95%;
|
||||
}
|
||||
|
||||
a { text-decoration: none; color: #146624; }
|
||||
a:hover { text-decoration: underline; color: #665f14; }
|
||||
|
||||
h1 { margin-top: .75em; margin-bottom: .5em; }
|
||||
h2 { margin-top: .75em; margin-bottom: .5em; }
|
||||
h3 { margin-top: .6em; margin-bottom: .4em; }
|
||||
|
||||
#mainContent h1 { border-bottom: 1px solid #00334b; }
|
||||
#mainContent h2 { border-bottom: 1px solid #aaa; }
|
||||
|
||||
#mainContent ul, #mainContent ol { padding-left: 1.5em; }
|
||||
|
||||
#mainContent img { margin: 3px; }
|
||||
|
||||
.internalNavigate { width: 19%; float: right; }
|
||||
#mainContent .internalNavigate ul { list-style-type: none; padding-left: 0; }
|
||||
.internalNavigate ul li { margin-top: .3em; margin-bottom: .3em; }
|
||||
|
||||
.affiliate-link { float: right; }
|
||||
#affiliate-podjango, #affiliate-mr {
|
||||
padding: 2px 10px;
|
||||
white-space: nowrap;
|
||||
font-size: x-small;
|
||||
text-align: right;
|
||||
}
|
||||
#affiliate-podjango { background: #d4ff9d; }
|
||||
#affiliate-mr { background: #ddd; }
|
||||
|
||||
/* Header */
|
||||
|
||||
#podjangoheader {
|
||||
height: 3.5em;
|
||||
background-color: #12d5bc;
|
||||
border-bottom: 1px solid #808080;
|
||||
}
|
||||
#podjangoheader h1 {
|
||||
font-size: 3em;
|
||||
/* -indent: -5000px; */
|
||||
/* margin: 0; /\* hide in favor of image *\/ */
|
||||
}
|
||||
/* #logobutton { */
|
||||
/* display: block; */
|
||||
/* position: absolute; left: 17px; top: 10px; height: 120px; width: 440px; */
|
||||
/* background: url(/img/podjango-header.png) left center no-repeat; */
|
||||
/* } */
|
||||
|
||||
|
||||
/* Navigation bar */
|
||||
#navbar-outer { background: #CDDBDC; }
|
||||
#navbar { margin-left: 104px; margin-top: 3px; float: left; display: inline; }
|
||||
#navbar ul { list-style: none; }
|
||||
#navbar-clear { clear: both; border-bottom: 1px solid #808080; }
|
||||
#navbar li a {
|
||||
display: block;
|
||||
background: #fafafe;
|
||||
padding: .2em .8em;
|
||||
margin-right: 3px;
|
||||
border: 1px solid #808080;
|
||||
font-size: .8em;
|
||||
background: #fff url(/img/nav-bg.png) bottom repeat-x;
|
||||
}
|
||||
#navbar li:hover a { background: #fff99d; }
|
||||
#navbar li { float: left; display: inline; margin-bottom: 3px; }
|
||||
|
||||
#mainContent {
|
||||
margin-left: 50px;
|
||||
margin-right: 50px;
|
||||
}
|
||||
|
||||
#container {
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
#container #mainContent {
|
||||
background: #fffff;
|
||||
margin-left: 210px;
|
||||
margin-right: 50px;
|
||||
padding-bottom: 32767px;
|
||||
margin-bottom: -32767px;
|
||||
}
|
||||
#container #sidebar {
|
||||
width: 200px;
|
||||
float: left;
|
||||
padding-bottom: 32767px;
|
||||
margin-bottom: -32767px;
|
||||
background-color: #e5e5e5;
|
||||
}
|
||||
|
||||
#container #sidebar li {
|
||||
text-align: center;
|
||||
list-style: none;
|
||||
padding: 3px 10px 3px 10px;
|
||||
margin: 5px;
|
||||
border: 1px solid #CCC;
|
||||
background: #fff url(/img/nav-bg.png) bottom repeat-x;
|
||||
}
|
||||
|
||||
#container #sidebar.Directors ul li.Directors,
|
||||
#container #sidebar.Contact ul li.Contact,
|
||||
#container #sidebar.Officers ul li.Officers,
|
||||
#container #sidebar.Staff ul li.Staff,
|
||||
#container #sidebar.Current ul li.Current,
|
||||
#container #sidebar.Services ul li.Services,
|
||||
#container #sidebar.Applying ul li.Applying
|
||||
{
|
||||
color: #000033;
|
||||
font-weight: bold;
|
||||
background: #fff url(/img/nav-bg-up.png) top repeat-x;
|
||||
}
|
||||
#container #sidebar h2 {
|
||||
text-align: center;
|
||||
font-size: 150%;
|
||||
margin: 1.5em 0 0.8em 0;
|
||||
}
|
||||
#container #sidebar hr {
|
||||
width: 75%;
|
||||
float: center;
|
||||
clear: all;
|
||||
}
|
||||
|
||||
/* Navbar Submenus (currently unused) */
|
||||
#navbar li ul { display: none; border: 1px solid #444; }
|
||||
#navbar li:hover ul { display: block; position: absolute; }
|
||||
#navbar li ul li { float: none; }
|
||||
#navbar li ul li a { border: 0px; margin: 0px; }
|
||||
|
||||
.shaded { background: #ffeab7; padding: .1em .5em; margin-bottom: .5em; }
|
||||
|
||||
.columns {
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.column-small {
|
||||
width: 31%;
|
||||
padding-bottom: 32767px;
|
||||
margin-bottom: -32767px;
|
||||
}
|
||||
.column-large {
|
||||
margin-left: 35%;
|
||||
margin-right: 50px;
|
||||
padding-bottom: 32767px;
|
||||
margin-bottom: -32767px;
|
||||
}
|
||||
|
||||
.column-left { float: left; }
|
||||
.column-right { float: right; }
|
||||
|
||||
.column h2 { font-size: 1.25em; }
|
||||
.column h3 { font-size: 1.1em; }
|
||||
|
||||
.column h2 a { text-decoration: none; color: #000000; }
|
||||
.column h2 a:hover { text-decoration: underline; }
|
||||
|
||||
#podjangofooter {
|
||||
margin-top: 1em;
|
||||
border-top: 1px solid #ccc;
|
||||
text-align: center;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
span.continued {
|
||||
display: block;
|
||||
font-size: .83em;
|
||||
font-weight: bold;
|
||||
margin-top: 1em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
p.date {
|
||||
font-style: italic;
|
||||
font-size: .83em;
|
||||
margin-bottom: .3em;
|
||||
margin-top: .3em;
|
||||
}
|
||||
|
||||
a.feedlink /* RSS icon */ { display: block; float: right; font-size: 10pt; }
|
||||
|
||||
blockquote, div.quote /* div.quote is used by podjango whitepaper */ {
|
||||
margin-left: 2em;
|
||||
margin-right: 2em;
|
||||
padding-left: 1em;
|
||||
padding-right: 1em;
|
||||
border: 1px solid #fff;
|
||||
background: #eee;
|
||||
}
|
||||
|
||||
.newsgraphic { float: right; }
|
||||
.newsgraphic img { border: 1px solid #000; }
|
||||
|
||||
.secondary_info { font-size: 83%; }
|
||||
.next_page_button { float: right; }
|
||||
.document_format { border: 1px solid #888; padding: .2em; background: #fff99d;}
|
||||
.copyright_info { font-size: 90%; }
|
||||
hr.footnote-separator { width: 80%; margin-left: auto; margin-right: auto; }
|
||||
|
||||
/* Resources pages */
|
||||
div.download-formats { margin-top: 2em; margin-bottom: 2em; }
|
||||
.download-formats p { display: inline; }
|
||||
#mainContent .download-formats ul { display: inline; list-style: none;
|
||||
padding-left: 0; }
|
||||
.download-formats ul li { display: inline; padding-left: 2em; }
|
||||
|
||||
/* Resources - book styles */
|
||||
hr.chapter-separator { display: none; }
|
||||
h2.likechapterHead { text-align: center; }
|
||||
h2.chapterHead { text-align: center; }
|
||||
#mainContent ul.author { list-style-type: none; padding-left: 0; }
|
||||
#mainContent div.footnotes { font-style: normal; } /* remove italics */
|
||||
span.sectionToc { padding-left: 2em; } /* indent TOC properly */
|
||||
span.subsectionToc { padding-left: 4em; }
|
||||
span.subsubsectionToc { padding-left: 6em;}
|
||||
.js, .js p, .js p.bibitem, .js p.bibitem-p { background-color: #cde7e9; }
|
||||
|
||||
body.podjango-overview #navbar ul li.overview a,
|
||||
body.podjango-Members #navbar ul li.Members a,
|
||||
body.podjango-news #navbar ul li.news a,
|
||||
body.podjango-blog #navbar ul li.blog a,
|
||||
body.podjango-About #navbar ul li.About a,
|
||||
body.podjango-donate #navbar ul li.donate a /* NO COMMA HERE! */
|
||||
{
|
||||
color: #000033;
|
||||
font-weight: bold;
|
||||
background: #fff url(/img/nav-bg-up.png) top repeat-x;
|
||||
}
|
||||
|
|
@ -5,13 +5,24 @@
|
|||
|
||||
{% extends "base_standard.html" %}
|
||||
|
||||
{% 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="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 {
|
||||
padding-left: 2rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
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' %}" />
|
||||
{% endblock %}
|
||||
|
||||
{% comment %}
|
||||
{% block internal_navigate %}
|
||||
|
||||
<h3>Tags</h3>
|
||||
<ul>
|
||||
{% for tag in all_tags %}
|
||||
|
|
@ -24,3 +35,4 @@
|
|||
<!-- <p><a href="/podcast/query/">Query...</a></p> -->
|
||||
|
||||
{% endblock %}
|
||||
{% endcomment %}
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
|
||||
<head>
|
||||
<title>{% block title %}{% block subtitle %}{% endblock %}Free as in Freedom{% endblock %}</title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<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="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" />
|
||||
<link rel="stylesheet" type="text/css" media="screen, projection" href="/podjango.css" />
|
||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||
{% block head %}{% endblock %}
|
||||
</head>
|
||||
|
||||
<body class="faif-{% block category %}other{% endblock %}">
|
||||
<div id="podjangoheader">
|
||||
<h1><a href="/">Free as in Freedom</a></h1>
|
||||
</div>
|
||||
{% block outercontent %}<div id="mainContent">
|
||||
<p>We raised $2,515.72 toward Dan Lynch's trip to a conference to represent
|
||||
the show and record content! We'll be coordinated with Dan about what
|
||||
conference he wants to attend.</p>
|
||||
|
||||
<p>If you'd like to further support Free as in Freedom,
|
||||
please <a href="https://sfconservancy.org/supporter/">become a supporter of
|
||||
Software
|
||||
Freedom Conservancy, the charity</a> where Bradley and Karen work.</p>
|
||||
|
||||
{% block content %}{% endblock %}</div>{% endblock %}
|
||||
<div id="podjangofooter">
|
||||
{% block copyright_info %}
|
||||
|
||||
<p>Free as in Freedom is produced by <a href="http://danlynch.org/blog/">Dan Lynch</a>
|
||||
of <a href="http://www.danlynch.org">danlynch.org</a>. Theme
|
||||
music written and performed
|
||||
by <a href="http://www.miketarantino.com">Mike Tarantino</a>
|
||||
with <a href="http://www.charliepaxson.com">Charlie Paxson</a> on drums.</p>
|
||||
|
||||
<p><a href="/">Main Page</a> | <a href="/license/">License of show
|
||||
and website</a> | <a href="{% url 'podjango:feed-ogg' %}">Ogg Feed</a> | <a href="{% url 'podjango:feed-mp3' %}">MP3 Feed</a></p>
|
||||
<p class="copyright_info">Please see the
|
||||
<a href="/license">license page</a> for details about the licensing
|
||||
of the show, the content of this website, and the software that runs
|
||||
this website.</p>
|
||||
{% endblock %}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -14,9 +14,9 @@
|
|||
<h2>Free as in Freedom Archive: {{ day|date:"F j, Y" }}</h2>
|
||||
|
||||
{% for object in object_list %}
|
||||
<div class="shaded">
|
||||
<p class="date">{{ object.pub_date|date:"F j, Y" }}</p>
|
||||
<div class="pa2 mb2" style="background: #F0FFB8">
|
||||
<h3><a href="{{ object.get_absolute_url }}">{{ object.title|safe }}</a></h3>
|
||||
<p class="date">{{ object.pub_date|date:"F j, Y" }}</p>
|
||||
{{ object.summary|safe }}
|
||||
<p><span class="continued"><a href="{{ object.get_absolute_url
|
||||
}}">Read More...</a></span></p>
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
<h2>Free as in Freedom Archive: {{ month|date:"F, Y" }}</h2>
|
||||
|
||||
{% for object in object_list %}
|
||||
<div class="shaded">
|
||||
<p class="date">{{ object.pub_date|date:"F j, Y" }}</p>
|
||||
<div class="pa2 mb2" style="background: #F0FFB8">
|
||||
<h3><a href="{{ object.get_absolute_url }}">{{ object.title|safe }}</a></h3>
|
||||
<p class="date">{{ object.pub_date|date:"F j, Y" }}</p>
|
||||
{{ object.summary|safe }}
|
||||
<p><span class="continued"><a href="{{ object.get_absolute_url
|
||||
}}">Read More...</a></span></p>
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ tagged {% for tag in tags %}{% if not forloop.last %}{% if not forloop.first %},
|
|||
{% endif %}
|
||||
|
||||
{% for object in object_list %}
|
||||
<div class="shaded">
|
||||
<p class="date">{{ object.pub_date|date:"F j, Y" }}</p>
|
||||
<div class="pa2 mb2" style="background: #F0FFB8">
|
||||
<h3>
|
||||
<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>
|
||||
|
||||
<a href="{{ object.get_absolute_url }}">{{ object.title|safe }}</a></h3>
|
||||
<p class="date">{{ object.pub_date|date:"F j, Y" }}</p>
|
||||
<h4>Summary</h4>
|
||||
|
||||
{{ object.summary|safe }}
|
||||
|
|
|
|||
|
|
@ -37,14 +37,14 @@ Bradley and Karen to discuss various topics regarding FLOSS.</p>
|
|||
<h2>{% include 'podjango/feed_links.inc.html' %}<a href="{% url 'podjango:cast' %}">Recent Free as in Freedom Shows</a></h2>
|
||||
|
||||
{% for cc in cast %}
|
||||
<div class="shaded">
|
||||
<div class="pa2 mb2" style="background: #F0FFB8">
|
||||
<a class="feedlink" href="{{ cc.ogg_path }}">{% include 'podjango/audio_ogg_button.inc.html' %}</a>
|
||||
<a class="feedlink" href="{{ cc.mp3_path }}">{% include 'podjango/audio_mp3_button.inc.html' %}</a>
|
||||
<p class="date">{{ cc.pub_date|date:"F j, Y" }}</p>
|
||||
<h3><a href="{{ cc.get_absolute_url }}">{{ cc.title|safe }}</a></h3>
|
||||
<p class="date">{{ cc.pub_date|date:"F j, Y" }}</p>
|
||||
{{ cc.summary|safe }}
|
||||
</div>
|
||||
{% endfor %}
|
||||
<p><a href="{% url 'podjango:cast' }">All oggcasts…</a></p>
|
||||
<p><a href="{% url 'podjango:cast' %}">All oggcasts…</a></p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ admin.autodiscover()
|
|||
app_name = 'podjango'
|
||||
urlpatterns = [
|
||||
url(r'^$', frontpage.view),
|
||||
url(r'^cast/?', include('podjango.apps.cast.urls')),
|
||||
url(r'^cast/', include('podjango.apps.cast.urls')),
|
||||
url(r'^feeds/cast-ogg/?$', OggCastFeed(), name='feed-ogg'),
|
||||
url(r'^feeds/cast-mp3/?$', OggCastFeed(), name='feed-mp3'),
|
||||
url(r'^feeds/$', view, name='feeds'),
|
||||
|
|
|
|||
Loading…
Reference in a new issue