From 399675d6c3f54650b93b2cc98174e823d9fd5cb4 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@sfconservancy.org>
Date: Sat, 23 Oct 2021 12:50:28 -0700
Subject: [PATCH] Rework blog menu order.

---
 www/conservancy/templates/base_blog.html | 36 +++++++++++++-----------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/www/conservancy/templates/base_blog.html b/www/conservancy/templates/base_blog.html
index 1db733a1..d42828db 100644
--- a/www/conservancy/templates/base_blog.html
+++ b/www/conservancy/templates/base_blog.html
@@ -9,30 +9,32 @@
 {% block outercontent %}
  <div id="container">
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
-<h2>Authors</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>
-{% endfor %}
-</ul>
-
-<h2>Tags</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>
-{% endfor %}
-</ul>
 {% if all_year_list %}
+
+<h2><a href="/blog/">See all blog posts&hellip;</a></h2>
+<!-- <p><a href="/blog/query/">Query...</a></p> -->
+
 <h2>Blog Index by Year</h2>
 <ul>
 {% for year in all_year_list reversed %}<li><a href="/blog/{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
 </ul>
 {% endif %}
 
-<h2><a href="/blog/">See all posts&hellip;</a></h2>
-<!-- <p><a href="/blog/query/">Query...</a></p> -->
+<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>
+{% 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>
+{% endfor %}
+</ul>
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>