diff --git a/_layouts/_includes/foundational_supporters.html b/_layouts/_includes/foundational_supporters.html index a981b42b..a80044d9 100644 --- a/_layouts/_includes/foundational_supporters.html +++ b/_layouts/_includes/foundational_supporters.html @@ -3,14 +3,14 @@

Foundational Supporters

Black Python Devs operates primarily on support from individuals. It is those supporters that serve as the foundation for what we do.

We would like to recognize our supporters who donate at least $200 each year.

- {% for data_year in data %} {% if data_year == year %} + {% for data_year in foundational_supporters %} {% if data_year == year %}
{% else %}
{% endif %} {{data_year}}
- {% for data_lists in data[data_year] | sort | slice(3) %} + {% for data_lists in foundational_supporters[data_year] | sort | slice(3) %}
    diff --git a/_layouts/_includes/partnerships.html b/_layouts/_includes/partnerships.html new file mode 100644 index 00000000..18060a54 --- /dev/null +++ b/_layouts/_includes/partnerships.html @@ -0,0 +1,17 @@ +
    +

    Partnerships

    +

    Black Python Devs has partnered with the following organizations to offer discounts and benefits to our community.

    +
    + {% for partner in partnerships %} + + {% endfor %} +
    +
    diff --git a/_layouts/partnerships.html b/_layouts/partnerships.html deleted file mode 100644 index e69de29b..00000000 diff --git a/_layouts/support.html b/_layouts/support.html index 012d6c42..6c40fc68 100644 --- a/_layouts/support.html +++ b/_layouts/support.html @@ -3,6 +3,9 @@ {% block content %} {{content}} {% include "_includes/support_widget.html" %} +{% set partnerships=data.partnerships %} +{% include "_includes/partnerships.html" %} +{% set foundational_supporters=data.foundational_supporters %} {% include "_includes/foundational_supporters.html" %} {% include "_includes/pitch_deck.html" %} {% endblock %} diff --git a/app.py b/app.py index 93e65ad3..72287cc0 100644 --- a/app.py +++ b/app.py @@ -8,7 +8,6 @@ navigation = [ {"text": "News", "url": "/blog/blog1.html", "fa": "fa fa-newspaper fa-fw"}, {"text": "About Us", "url": "/about.html", "fa": "fa fa-info-circle fa-fw"}, - {"text": "Discounts", "url": "/partnerships.html", "fa": "fa-regular fa-handshake"}, {"text": "Events", "fa": "fa fa-calendar fa-fw", "url": "/events.html"}, { "text": "Support Us", @@ -46,7 +45,12 @@ class Support(Page): Parser = MarkdownPageParser content_path = "support.md" template = "support.html" - data = json.loads(pathlib.Path("_data/foundational_supporters.json").read_text()) + data = { + "foundational_supporters": json.loads( + pathlib.Path("_data/foundational_supporters.json").read_text() + ), + "partnerships": json.loads(pathlib.Path("_data/partnerships.json").read_text()), + } @app.page @@ -64,12 +68,6 @@ class BPDEvents(Collection): routes = ["./-events"] -@app.page -class Partnerships(Page): - template = "partnerships.html" - data = json.loads(pathlib.Path("_data/partnerships.json").read_text()) - - @app.collection class Pages(Collection): Parser = MarkdownPageParser diff --git a/support.md b/support.md index 38d4260f..a44e1573 100644 --- a/support.md +++ b/support.md @@ -7,4 +7,4 @@ title: Support Black Python Devs is a Non-Profit, fiscally hosted under the [GNOME Foundation](https://foundation.gnome.org/). The GNOME Foundation takes a small percentage for administration costs and support but at least 90% of proceeds goes directly to Black Python Devs Fund to support operational costs and supporting community events in the communities of Black Python Devs. -Looking for member discounts? View our [Partnerships](/partnerships.html) page. +Looking for member discounts? View our [Partnerships](#partnerships).