Better headings on archive pages, refs #469

simonw · Jul 16, 2024 · 13f4dcb · 13f4dcb
1 parent ff200b9
commit 13f4dcb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py
@@ -10,13 +10,14 @@ def blog_mixed_list(context, items):
 
 
 @register.inclusion_tag("includes/blog_mixed_list.html", takes_context=True)
-def blog_mixed_list_with_dates(context, items, year_headers=False, day_headers=False):
+def blog_mixed_list_with_dates(context, items, year_headers=False, day_headers=False, day_links=False):
     context.update(
         {
             "items": items,
             "showdate": not day_headers,
             "year_headers": year_headers,
             "day_headers": day_headers,
+            "day_links": day_links,
         }
     )
     return context

diff --git a/templates/archive_day.html b/templates/archive_day.html
@@ -3,7 +3,7 @@
 {% block title %}Archive for {{ date|date:"l, jS F Y" }}{% endblock %}
 
 {% block primary %}
-<h2>{{ date|date:"l, jS F Y"}}</h2>
+<h2 class="archive-h2">{{ date|date:"l, jS F Y"}}</h2>
 {% load blog_tags %}
 {% blog_mixed_list items %}
 

diff --git a/templates/archive_month.html b/templates/archive_month.html
@@ -8,7 +8,7 @@ <h2 class="archive-h2">{{ date|date:"F Y"}}</h2>
 
 {% load blog_tags %}
 
-{% blog_mixed_list_with_dates items day_headers=1 %}
+{% blog_mixed_list_with_dates items day_headers=1 day_links=1 %}
 
 {% include "_pagination.html" %}
 

diff --git a/templates/archive_year.html b/templates/archive_year.html
@@ -3,9 +3,9 @@
 {% block title %}Archive for {{ year }}{% endblock %}
 
 {% block primary %}
-<div class="entry">
-<h2>Archive for {{ year }}</h2>
+<h2 class="archive-h2">Archive for {{ year }}</h2>
 
+<div class="entry">
 <ul>
 {% for month in months %}
 <li><strong><a href="/{{ year }}/{{ month.date|date:"M" }}/">{{ month.date|date:"F" }}</a></strong> - {% for count in month.counts_not_0 %}{{ count.1 }} {% if count.0 == "entry" %}{{ count.1|pluralize:"entry,entries" }}{% else %}{{ count.0 }}{{ count.1|pluralize }}{% endif %}{% if not forloop.last %}, {% endif %}{% endfor %}

diff --git a/templates/includes/blog_mixed_list.html b/templates/includes/blog_mixed_list.html
@@ -1,7 +1,7 @@
 {% load entry_tags %}{% load humanize %}
 {% for item in items %}
 {% if year_headers %}{% ifchanged item.obj.created.year %}<h3 class="blog-mixed-list-year">{{ item.obj.created.year }}</h3>{% endifchanged %}{% endif %}
-{% if day_headers %}{% ifchanged item.obj.created.date %}<h3 class="blog-mixed-list-year">{{ item.obj.created.date }}</h3>{% endifchanged %}{% endif %}
+{% if day_headers %}{% ifchanged item.obj.created.date %}<h3 class="blog-mixed-list-year">{% if day_links %}<a href="/{{ item.obj.created|date:"Y/M/j/" }}">{{ item.obj.created.date }}</a>{% else %}{{ item.obj.created.date }}{% endif %}</h3>{% endifchanged %}{% endif %}
 {% if item.type == "photoset" %}
 <div class="photoset segment">
   <a class="primary" href="{{ item.obj.get_absolute_url }}"><img class="primary" src="{{ item.obj.primary.url_s }}" alt="{{ item.obj.primary.title }}" width="75" height="75"></a>