diff --git a/website/blog/templates/blog/blog_post_list_page.html b/website/blog/templates/blog/blog_post_list_page.html index 3f31347..68a0d68 100644 --- a/website/blog/templates/blog/blog_post_list_page.html +++ b/website/blog/templates/blog/blog_post_list_page.html @@ -1,15 +1,4 @@ -{% extends "common/content_page.html" %} - -{% load wagtailroutablepage_tags %} - -{% block extra_css %} - -{% endblock %} - -{% block hero_buttons %} - - {{ block.super }} -{% endblock %} +{% extends "common/listing_page.html" %} {% block post_content %}
diff --git a/website/common/templates/common/listing_page.html b/website/common/templates/common/listing_page.html index 6728f91..c87f8ad 100644 --- a/website/common/templates/common/listing_page.html +++ b/website/common/templates/common/listing_page.html @@ -2,14 +2,27 @@ {% load wagtailroutablepage_tags %} -{% block extra_css %} +{% block extra_head %} + {{ block.super }} {% endblock %} +{% block hero_buttons %} + + {{ block.super }} +{% endblock %} + {% block post_content %}
{% for page in listing_pages %} {% include "common/listing-item.html" %} {% endfor %}
+ + {% if listing_pages.has_other_pages %} +
+
+ {% include "common/pagination.html" with page=listing_pages %} +
+ {% endif %} {% endblock %} diff --git a/website/common/templates/common/pagination.html b/website/common/templates/common/pagination.html index 4384c7f..ddb38c8 100644 --- a/website/common/templates/common/pagination.html +++ b/website/common/templates/common/pagination.html @@ -1,33 +1,33 @@ {% load wagtailadmin_tags %} diff --git a/website/common/tests/test_pages.py b/website/common/tests/test_pages.py index 9d7383e..1088515 100644 --- a/website/common/tests/test_pages.py +++ b/website/common/tests/test_pages.py @@ -55,6 +55,7 @@ class ListingPageTestCase(TestCase): response = self.client.get(self.page.url) self.assertEqual(response.status_code, 200) self.assertEqual(len(response.context["listing_pages"]), 2) + self.assertContains(response, self.page.reverse_subpage("feed")) def test_feed_accessible(self) -> None: response = self.client.get(self.page.url + self.page.reverse_subpage("feed"))