From 56c051e9664da1931131708d0d7c6224bf7ed20b Mon Sep 17 00:00:00 2001
From: Benjamin Golub <bgolub@benjamingolub.com>
Date: Sat, 15 Nov 2008 10:17:42 -0500
Subject: [PATCH] tag feeds

---
 base.html | 1 +
 main.py   | 5 +++--
 tag.html  | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/base.html b/base.html
index f1f3d4b..c6e35b2 100644
--- a/base.html
+++ b/base.html
@@ -9,6 +9,7 @@
     <link rel="shortcut icon" href="/static/images/blog.png" type="image/png"/>
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js" type="text/javascript"></script>
     <script src="/static/javascript/base.js" type="text/javascript"></script>
+    {% block extra_head %}{% endblock %}
 </head>
 <body>
     <div id="header">
diff --git a/main.py b/main.py
index edfdc9f..64d3f7b 100644
--- a/main.py
+++ b/main.py
@@ -153,6 +153,9 @@ def render_feed(self, entries):
 
 
     def render(self, template_file, extra_context={}):
+        if "entries" in extra_context and \
+            self.request.get('format', None) == 'atom':
+            return self.render_feed(extra_context["entries"])
         extra_context['request'] = self.request
         extra_context['admin'] = users.is_current_user_admin()
         extra_context['recent_entries'] = self.get_recent_entries()
@@ -214,8 +217,6 @@ def get(self):
             entries = db.Query(Entry).order('-published').fetch(limit=10, offset=offset)
         if not entries and offset > 0:
             return self.redirect('/')
-        if self.request.get('format', None) == 'atom':
-            return self.render_feed(entries)
         extra_context = {
             'entries': entries,
             'next': max(offset - 10, 0),
diff --git a/tag.html b/tag.html
index db81de2..e110122 100644
--- a/tag.html
+++ b/tag.html
@@ -4,6 +4,10 @@
     {{ tag }} -
 {% endblock %}
 
+{% block extra_head %}
+    <link rel="alternate" type="application/atom+xml" href="{{ request.path }}?format=atom" title="Entries tagged &quot;{{ tag }}&quot;"/>
+{% endblock %}
+
 {% block above_entries %}
     <div class="infomessage">
         Entries tagged <a href="/t/{{ tag }}">{{ tag }}</a>
