Add buttons for newer/older news entries within category (#1718)

Author: gregjkal

news/views.py

@@ -1,4 +1,5 @@
 from datetime import timedelta
+from functools import partial
 
 from django.conf import settings
 from django.contrib import messages
@@ -149,6 +150,13 @@ def get_context_data(self, **kwargs):
             context["next_url"] = next_url
         context["next"] = get_published_or_none(self.object.get_next_by_publish_at)
         context["prev"] = get_published_or_none(self.object.get_previous_by_publish_at)
+        category_kwarg = {f"{self.object.tag}__isnull": False}
+        context["next_in_category"] = get_published_or_none(
+            partial(self.object.get_next_by_publish_at, **category_kwarg)
+        )
+        context["prev_in_category"] = get_published_or_none(
+            partial(self.object.get_previous_by_publish_at, **category_kwarg)
+        )
         context["user_can_approve"] = self.object.can_approve(self.request.user)
         context["user_can_edit"] = self.object.can_edit(self.request.user)
         context["user_can_delete"] = self.object.can_delete(self.request.user)

templates/news/detail.html

@@ -92,12 +92,27 @@ <h1 class="text-3xl">
       <div class="flex my-4 md:mx-auto md:w-3/4">
         <div class="w-1/2 text-left">
           {% if next %}
-            <a href="{{ next.get_absolute_url }}" class="py-1 px-2 text-xs text-white rounded-md border md:text-sm border-orange bg-orange hover:bg-orange/75 dark:bg-charcoal dark:hover:bg-charcoal/75 dark:hover:text-orange">Newer Entries</a>
+            <a href="{{ next.get_absolute_url }}" class="py-1 px-2 text-xs text-white rounded-md border md:text-sm border-orange bg-orange hover:bg-orange/75 dark:bg-charcoal dark:hover:bg-charcoal/75 dark:hover:text-orange">Newer Entry</a>
           {% endif %}
         </div>
         <div class="w-1/2 text-right">
           {% if prev %}
-            <a href="{{ prev.get_absolute_url }}" class="py-1 px-2 text-xs text-white rounded-md border md:text-sm border-orange bg-orange hover:bg-orange/75 dark:bg-charcoal dark:hover:bg-charcoal/75 dark:hover:text-orange">Older Entries</a>
+            <a href="{{ prev.get_absolute_url }}" class="py-1 px-2 text-xs text-white rounded-md border md:text-sm border-orange bg-orange hover:bg-orange/75 dark:bg-charcoal dark:hover:bg-charcoal/75 dark:hover:text-orange">Older Entry</a>
+          {% endif %}
+        </div>
+      </div>
+    {% endif %}
+
+    {% if next_in_category or prev_in_category %}
+      <div class="flex my-4 md:mx-auto md:w-3/4">
+        <div class="w-1/2 text-left">
+          {% if next_in_category %}
+            <a href="{{ next_in_category.get_absolute_url }}" class="py-1 px-2 text-xs text-white rounded-md border md:text-sm border-orange bg-orange hover:bg-orange/75 dark:bg-charcoal dark:hover:bg-charcoal/75 dark:hover:text-orange">Newer {{ entry.tag|title }} Entry</a>
+          {% endif %}
+        </div>
+        <div class="w-1/2 text-right">
+          {% if prev_in_category %}
+            <a href="{{ prev_in_category.get_absolute_url }}" class="py-1 px-2 text-xs text-white rounded-md border md:text-sm border-orange bg-orange hover:bg-orange/75 dark:bg-charcoal dark:hover:bg-charcoal/75 dark:hover:text-orange">Older {{ entry.tag|title }} Entry</a>
           {% endif %}
         </div>
       </div>