basic fixups to templates and stylesheet

7 files changed, 16 insertions, 23 deletions

diff --git a/theme/templates/article.html b/theme/templates/article.html
index 8afd2c0..23bf022 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -23,6 +23,7 @@
  {{ translations.translations_for(article) }}
   </header>
   <footer class="post-info">
+    <div class="right_stuff">
     <abbr class="published" title="{{ article.date.isoformat() }}">
       {{ article.locale_date }}
     </abbr>
@@ -33,11 +34,12 @@
 	{% endif %}
     {% if article.authors %}
     <address class="vcard author">
-      By {% for author in article.authors %}
+      {% for author in article.authors %}
           <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
         {% endfor %}
     </address>
     {% endif %}
+    </div>
   </footer><!-- /.post-info -->
   <div class="entry-content">
     {{ article.content }}
diff --git a/theme/templates/author.html b/theme/templates/author.html
index b679382..9285e43 100644
--- a/theme/templates/author.html
+++ b/theme/templates/author.html
@@ -1,4 +1,4 @@
-{% extends "index.html" %}
+{% extends "list.html" %}
 
 {% block title %}{{ SITENAME }} - Articles by {{ author }}{% endblock %}
 {% block pagetitle %}Articles by {{ author }}{% endblock %}
diff --git a/theme/templates/base.html b/theme/templates/base.html
index f895fe3..bcc5f98 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -5,30 +5,24 @@
 {% block head %}
 <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
 <meta charset="utf-8" />
-{% if FEED_ALL_ATOM %}
-<link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
-{% endif %}
-{% if FEED_ALL_RSS %}
-<link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
+{% if FEED_RSS %}
+<link href="{{ FEED_DOMAIN }}//feeds/posts.atom.xml" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Posts RSS Feed" />
 {% endif %}
 {% if FEED_ATOM %}
-<link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+<link href="{{ FEED_DOMAIN }}//feeds/posts.rss.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Posts Atom Feed" />
 {% endif %}
-{% if FEED_RSS %}
-<link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+{% if CATEGORY_FEED_RSS and category %}
+<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
 {% endif %}
 {% if CATEGORY_FEED_ATOM and category %}
 <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
 {% endif %}
-{% if CATEGORY_FEED_RSS and category %}
-<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+{% if TAG_FEED_RSS and tag %}
+<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
 {% endif %}
 {% if TAG_FEED_ATOM and tag %}
 <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
 {% endif %}
-{% if TAG_FEED_RSS and tag %}
-<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
-{% endif %}
 {% block stylesheets %}
 <link rel="stylesheet" type="text/css" href="/static/style/reset.css" />
 <link rel="stylesheet" type="text/css" href="/static/style/default.css" />
@@ -64,7 +58,7 @@
 <span class="path">
 {% block path %}{% endblock %}
 </span>
-<h1 class="pagetitle">{% block pagetitle %}Hey Hey Hey!{% endblock %}</h1>
+<h1 class="pagetitle">{% block pagetitle %}{% endblock %}</h1>
 <h2 class="pagesubtitle">{% block pagesubtitle %}{% endblock %}</h2>
 <div class="right_stuff">
 {% block right_stuff %}
@@ -76,7 +70,6 @@
 <div class="content" id="main_content">
 &nbsp;
 {% block content %}
-Here lies content!
 {% endblock %}
 </div>
 {% block commentary %} {% endblock %}
diff --git a/theme/templates/category.html b/theme/templates/category.html
index c5bfe9b..2a5d250 100644
--- a/theme/templates/category.html
+++ b/theme/templates/category.html
@@ -1,3 +1,3 @@
-{% extends "index.html" %}
+{% extends "list.html" %}
 {% block pagetitle %}Articles in the {{ category }} category{% endblock %}
 
diff --git a/theme/templates/index.html b/theme/templates/index.html
index 33f1a6a..6537dd8 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -17,13 +17,11 @@
 <br />
 <br />
 RSS feeds: <br />
- &nbsp; - <a href="/journal/rss/latest_links/"> web links</a><br />
- &nbsp; - <a href="http://git.bnewbold.net/?p=bnewnet.git;a=rss;opt=--no-merges"> site code changes</a><br />
+ &nbsp; - <a href="/feeds/posts.rss.xml"> articles</a><br />
 <br /><br />
 Other sites: <br />
  &nbsp; - <a href="https://github.com/bnewbold"> github</a><br />
  &nbsp; - <a href="https://keybase.io/bnewbold"> keybase</a><br />
- &nbsp; - <a href="http://equator.memeschemes.com"> equator</a><br />
 {% endblock %}
 
 {% block content %}
diff --git a/theme/templates/simple_index.html b/theme/templates/list.html
index 4bd8198..4bd8198 100644
--- a/theme/templates/simple_index.html
+++ b/theme/templates/list.html
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 100cd04..bcbcf5e 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -8,8 +8,8 @@
     {{ page.content }}
 
 	{% if page.modified %}
-		<p>
+        <div class="right_stuff">
 		Last updated: {{ page.locale_modified }}
-		</p>
+        </div>
 	{% endif %}
 {% endblock %}