diff --git a/aggregator/tests.py b/aggregator/tests.py index a8e583decf..c83379d9b3 100644 --- a/aggregator/tests.py +++ b/aggregator/tests.py @@ -92,7 +92,7 @@ def setUp(self, mocker): def test_community_index_number_of_queries(self): """Intended to prevent an n+1 issue on the community index view""" url = reverse("community-index") - with self.assertNumQueries(7): + with self.assertNumQueries(8): self.client.get(url) def test_empty_feed_type_not_rendered(self): diff --git a/djangoproject/templates/aggregator/index.html b/djangoproject/templates/aggregator/index.html index 461fed46b5..1995312fbc 100644 --- a/djangoproject/templates/aggregator/index.html +++ b/djangoproject/templates/aggregator/index.html @@ -1,5 +1,5 @@ {% extends "base_community.html" %} -{% load i18n %} +{% load fundraising_extras i18n %} {% block layout_class %}column-container sidebar-right{% endblock %} @@ -97,3 +97,7 @@

{{ feedtype.name }} {% endblock %} + +{% block content-related-extra %} + {% top_corporate_members "diamond" "platinum" "gold" header="Diamond, Platinum and Gold Members" %} +{% endblock %} diff --git a/djangoproject/templates/base_community.html b/djangoproject/templates/base_community.html index fa76161a11..4ea2144cb9 100644 --- a/djangoproject/templates/base_community.html +++ b/djangoproject/templates/base_community.html @@ -23,6 +23,9 @@ {% block content-related %}

{% translate "Additional Information" %}

+ + {% block content-related-extra %}{% endblock %} + {% donation_snippet %}

{% translate "More Help" %}

diff --git a/djangoproject/templates/base_foundation.html b/djangoproject/templates/base_foundation.html index 3925eb316c..c7b1eb64de 100644 --- a/djangoproject/templates/base_foundation.html +++ b/djangoproject/templates/base_foundation.html @@ -15,6 +15,9 @@ {# Always include

label and
with aria role. #}

{% translate "Additional Information" %}

+ + {% block content-related-extra %}{% endblock %} + {% donation_snippet %}

About the foundation

diff --git a/djangoproject/templates/flatpages/foundation.html b/djangoproject/templates/flatpages/foundation.html index e1a3b864e7..067a916332 100644 --- a/djangoproject/templates/flatpages/foundation.html +++ b/djangoproject/templates/flatpages/foundation.html @@ -1,5 +1,5 @@ {% extends "base_foundation.html" %} - +{% load fundraising_extras %} {% block og_title %}{{ flatpage.title }}{% endblock %} {% block title %}{{ flatpage.title }}{% endblock %} @@ -8,3 +8,7 @@

{{ flatpage.title }}

{{ flatpage.content }} {% endblock %} + +{% block content-related-extra %} + {% top_corporate_members "diamond" "platinum" "gold" header="Diamond, Platinum and Gold Members" %} +{% endblock %} diff --git a/djangoproject/templates/fundraising/includes/top_corporate_members.html b/djangoproject/templates/fundraising/includes/top_corporate_members.html index 5fb4aeb4cd..018f59a5f8 100644 --- a/djangoproject/templates/fundraising/includes/top_corporate_members.html +++ b/djangoproject/templates/fundraising/includes/top_corporate_members.html @@ -1,6 +1,6 @@ {% if members %}
-

Diamond and Platinum Members

+

{{header}}

{% for obj in members %}