From 85822cfd9f5ecedf47733d666ba8315628031dd7 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Wed, 23 Jul 2025 21:57:13 +1000
Subject: [PATCH] blog: Remove RSS feed links next to individual tags

Instead the tags are now added to the RSS feed link at the top of the page when
in use.
---
 conservancy/templates/base_blog.html       | 8 +++-----
 conservancy/templates/blog/entry_list.html | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/conservancy/templates/base_blog.html b/conservancy/templates/base_blog.html
index 60a23331..08f3eda2 100644
--- a/conservancy/templates/base_blog.html
+++ b/conservancy/templates/base_blog.html
@@ -3,7 +3,7 @@
 {% block category %}blog{% endblock %}
 
 {% block head %}
-<link rel="alternate" type="application/rss+xml" title="RSS" href="/feeds/blog/" />
+<link rel="alternate" type="application/rss+xml" title="RSS" href="/feeds/blog/{% if query_string %}?{{ query_string }}{% endif %}" />
 {% endblock %}
 
 {% block outercontent %}
@@ -24,16 +24,14 @@
 <h2>Blogs by Tag</h2>
 <ul>
 {% for tag in all_tags %}
-<li><a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a>
-(<a href="/feeds/blog/?tag={{ tag.slug }}">rss</a>)</li>
+<li><a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a></li>
 {% endfor %}
 </ul>
 
 <h2>Blogs by Author</h2>
 <ul>
 {% for author in all_authors %}
-<li><a href="/blog/?author={{ author.username }}">{{ author.formal_name }}</a>
-(<a href="/feeds/blog/?author={{ author.username }}">rss</a>)</li>
+<li><a href="/blog/?author={{ author.username }}">{{ author.formal_name }}</a></li>
 {% endfor %}
 </ul>
          </div>
diff --git a/conservancy/templates/blog/entry_list.html b/conservancy/templates/blog/entry_list.html
index 327cfc4a..b55cae02 100644
--- a/conservancy/templates/blog/entry_list.html
+++ b/conservancy/templates/blog/entry_list.html
@@ -8,7 +8,7 @@
   <p><a href="/">Home</a> / <a href="/news/">News</a></p>
 </div>
 
-<h2><a href="/feeds/blog/" class="feedlink"><img src="{% static 'img/feed-icon-14x14.png' %}" alt="[RSS]"/></a> Conservancy Blog{% if author %} &mdash; {{ author.formal_name }}{% endif %}</h2>
+<h2><a href="/feeds/blog/{% if query_string %}?{{ query_string }}{% endif %}" class="feedlink"><img src="{% static 'img/feed-icon-14x14.png' %}" alt="[RSS]"/></a> Conservancy Blog{% if author %} &mdash; {{ author.formal_name }}{% endif %}</h2>
 
 {% if authors or tags %}
 <p>Displaying posts