From de82d3106ff5e7b4baa28264ad182d182729b342 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Thu, 1 Feb 2024 17:20:34 +0100 Subject: [PATCH] Re-organise sponsor listings, adding financial sponsors per core discussion. Moving forwards we'll have three types of sponsors: - Contributing - those that the sponsor team are responsible for. - Financial - those who donate to an NPO. - Servers - those who provide servers/infrastructure. For the financial sponsors, there are a few rules: - "NPO" means a recognised NPO, (which includes SPI and PGCA). - Each NPO may choose whether or not to list any sponsors on this page. - Each NPO may define the criteria under which sponsors are listed, and any levels they wish to use. - Conference/event sponsorship does not count; it must be sponsorship of the organisation itself. - Sponsors may be listed once under each NPO they have donated to. Note that the same sponsor may be listed in any or all of the categories (contributing, financial, servers). Patch by myself and Jonathan. --- media/img/about/sponsors/logo_xata.svg | 1 + pgweb/sponsors/models.py | 4 +- pgweb/sponsors/views.py | 10 ++- pgweb/urls.py | 2 + pgweb/util/contexts.py | 2 + templates/sponsors/contributing.html | 41 +++++++++++++ templates/sponsors/financial.html | 85 ++++++++++++++++++++++++++ templates/sponsors/servers.html | 4 +- templates/sponsors/sponsors.html | 47 +++++--------- 9 files changed, 160 insertions(+), 36 deletions(-) create mode 100644 media/img/about/sponsors/logo_xata.svg create mode 100644 templates/sponsors/contributing.html create mode 100644 templates/sponsors/financial.html diff --git a/media/img/about/sponsors/logo_xata.svg b/media/img/about/sponsors/logo_xata.svg new file mode 100644 index 00000000..4a9d920f --- /dev/null +++ b/media/img/about/sponsors/logo_xata.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pgweb/sponsors/models.py b/pgweb/sponsors/models.py index 68b3d4e8..d1133485 100644 --- a/pgweb/sponsors/models.py +++ b/pgweb/sponsors/models.py @@ -9,7 +9,7 @@ class SponsorType(models.Model): sortkey = models.IntegerField(null=False, default=10) # sortkey==0 --> do not show in list - purge_urls = ('/about/servers/', '/about/sponsors/', ) + purge_urls = ('/about/servers/', '/about/contributing/', ) def __str__(self): return self.typename @@ -25,7 +25,7 @@ class Sponsor(models.Model): logoname = models.CharField(max_length=64, null=False, blank=False) country = models.ForeignKey(Country, null=False, on_delete=models.CASCADE) - purge_urls = ('/about/sponsors/', '/about/servers/', ) + purge_urls = ('/about/servers/', '/about/contributing/', ) def __str__(self): return self.name diff --git a/pgweb/sponsors/views.py b/pgweb/sponsors/views.py index a2621f88..1b7223af 100644 --- a/pgweb/sponsors/views.py +++ b/pgweb/sponsors/views.py @@ -6,12 +6,20 @@ from .models import Sponsor, Server @cache(minutes=30) def sponsors(request): + return render_pgweb(request, 'about', 'sponsors/sponsors.html', {}) + + +def contributing(request): sponsors = Sponsor.objects.select_related().filter(sponsortype__sortkey__gt=0).order_by('sponsortype__sortkey', '?') - return render_pgweb(request, 'about', 'sponsors/sponsors.html', { + return render_pgweb(request, 'about', 'sponsors/contributing.html', { 'sponsors': sponsors, }) +def financial(request): + return render_pgweb(request, 'about', 'sponsors/financial.html', {}) + + def servers(request): servers = Server.objects.select_related().all() return render_pgweb(request, 'about', 'sponsors/servers.html', { diff --git a/pgweb/urls.py b/pgweb/urls.py index 722b5cf2..80e0bfd6 100644 --- a/pgweb/urls.py +++ b/pgweb/urls.py @@ -94,6 +94,8 @@ urlpatterns = [ url(r'^bugs_redir/(\d+)/$', pgweb.misc.views.bugs_redir), url(r'^about/sponsors/$', pgweb.sponsors.views.sponsors), + url(r'^about/contributing/$', pgweb.sponsors.views.contributing), + url(r'^about/financial/$', pgweb.sponsors.views.financial), url(r'^about/servers/$', pgweb.sponsors.views.servers), url(r'^robots.txt$', pgweb.core.views.robots), diff --git a/pgweb/util/contexts.py b/pgweb/util/contexts.py index bdae22be..7d13862f 100644 --- a/pgweb/util/contexts.py +++ b/pgweb/util/contexts.py @@ -11,6 +11,8 @@ sitenav = { {'title': 'Donate', 'link': '/about/donate/'}, {'title': 'History', 'link': '/docs/current/history.html'}, {'title': 'Sponsors', 'link': '/about/sponsors/', 'submenu': [ + {'title': 'Contributing', 'link': '/about/contributing/'}, + {'title': 'Financial', 'link': '/about/financial/'}, {'title': 'Servers', 'link': '/about/servers/'}, ]}, {'title': 'Latest News', 'link': '/about/newsarchive/'}, diff --git a/templates/sponsors/contributing.html b/templates/sponsors/contributing.html new file mode 100644 index 00000000..dd055fba --- /dev/null +++ b/templates/sponsors/contributing.html @@ -0,0 +1,41 @@ +{%extends "base/page.html"%} +{%block title%}Contributing Sponsors{%endblock%} +{%block contents%} + +

Contributing Sponsors

+ +

The following is a categorized list of significant contributing sponsors to PostgreSQL. These are + sponsors who contribute their employee time to furthering the PostgreSQL project. + Sponsors are listed in no particular order within each section, with just the location of the head + office for each company shown.

+ +{% for sponsor in sponsors %} + {% ifchanged sponsor.sponsortype %} + {% if not forloop.first %} + + + {% endif %} +

{{ sponsor.sponsortype.typename }}

+ + + {% endifchanged%} + + + + + + {% endfor %} + + + +

Sponsorship Recognition

+

+ Sponsorship recognition is wholly determined by the Sponsorship Committee and was last updated in March, 2023. +

+{%endblock%} diff --git a/templates/sponsors/financial.html b/templates/sponsors/financial.html new file mode 100644 index 00000000..0dad1299 --- /dev/null +++ b/templates/sponsors/financial.html @@ -0,0 +1,85 @@ +{%extends "base/page.html"%} +{%block title%}Financial Sponsors{%endblock%} +{%block contents%} + +

Financial Sponsors

+ +

Financial Sponsors are people or companies who have donated money to help + support one of the Recognised PostgreSQL Nonprofit Organisations that + support the project around the world. Each NPO determines how their sponsors are grouped and listed in this section. +

+ +

PostgreSQL Community Association

+ +

The PostgreSQL Community Association is dedicated to stewarding the project +trademarks and domain names, to ensure that PostgreSQL will remain free and open to all. The following sponsorship +levels are used:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LevelWhat activities can be supported?Minimum Donation in USD
BenefactorExpand PGCA's mission$20,000
PatronEnsure PGCA's ongoing operations$10,000
SupporterSupport maintenance of domains$5,000
Friend$2,500
DonorAll donations are appreciated.< $2,500
+ +

+ Find out more information about what PGCA does and its mission on the + PGCA donation page. +

+ +

PostgreSQL Community Association Sponsors

+ + + + + + + + + + + + + + + + + + +
NameDate of donationLevel
+ + + + Xata1st February 2024Supporter
+ +{%endblock%} diff --git a/templates/sponsors/servers.html b/templates/sponsors/servers.html index 05ff8ba2..188ee178 100644 --- a/templates/sponsors/servers.html +++ b/templates/sponsors/servers.html @@ -1,8 +1,8 @@ {%extends "base/page.html"%} -{%block title%}Servers{%endblock%} +{%block title%}Server Sponsors{%endblock%} {%block contents%} -

Servers

+

Server Sponsors

The servers that power the services of www.postgresql.org are provided by diff --git a/templates/sponsors/sponsors.html b/templates/sponsors/sponsors.html index 9fc51e41..40b1ee7c 100644 --- a/templates/sponsors/sponsors.html +++ b/templates/sponsors/sponsors.html @@ -4,37 +4,22 @@

Sponsors

-

The following is a categorized list of significant sponsors to PostgreSQL. -Sponsors are listed in no particular order within each section, with just the location of the head office -for each company shown.

+

Sponsors to the PostgreSQL project are listed in three different categories, based on the ways in which they support + the project:

-{% for sponsor in sponsors %} - {% ifchanged sponsor.sponsortype %} - {% if not forloop.first %} - - - {% endif %} -

{{ sponsor.sponsortype.typename }}

- - - {% endifchanged%} - - - - - - {% endfor %} - - +

Contributing Sponsors

+

Contributing Sponsors are companies that support the project by allowing their + employees to spend some or all of their working time helping to build PostgreSQL and work on other project areas + and eco-system projects that benefit PostgreSQL users and the project in general.

-

Sponsorship Recognition

-

- Sponsorship recognition is wholly determined by the Sponsorship Committee and was last updated in March, 2023. -

+

Financial Sponsors

+

Financial Sponsors are people or companies who have donated money to help + support one of the Recognised PostgreSQL Nonprofit Organisations that + support the project around the world. Each NPO determines how their sponsors are grouped and listed in this section. +

+ +

Server Sponsors

+

A project like PostgreSQL requires a significant amount of online infrastructure in order to operate. These + Server Sponsors provide one or more servers and/or hosting to help support the project. +

{%endblock%} -- 2.39.5