From 792a169b3dee98a17dd5f9c71ceb418e16166b5a Mon Sep 17 00:00:00 2001 From: "Jonathan S. Katz" Date: Mon, 23 Nov 2020 20:34:47 -0500 Subject: [PATCH] Move community recognition guidelines into policy pages This consolidates the pages into the policies section. A redirect is set up from the previous community recognition page to the policy pages. --- pgweb/events/migrations/0002_event_badged.py | 2 +- pgweb/events/models.py | 2 +- pgweb/urls.py | 1 + templates/events/archive.html | 2 +- templates/index.html | 2 +- templates/pages/about/donate.html | 2 +- templates/pages/about/policies.html | 4 +- .../policies/conferences.html} | 68 ++----------------- templates/pages/about/policies/npos.html | 48 +++++++++++++ 9 files changed, 61 insertions(+), 70 deletions(-) rename templates/pages/{community/recognition.html => about/policies/conferences.html} (57%) create mode 100644 templates/pages/about/policies/npos.html diff --git a/pgweb/events/migrations/0002_event_badged.py b/pgweb/events/migrations/0002_event_badged.py index 05713292..f6200fb3 100644 --- a/pgweb/events/migrations/0002_event_badged.py +++ b/pgweb/events/migrations/0002_event_badged.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='event', name='badged', - field=models.BooleanField(default=False, help_text='Choose "Community event" if this is a community recognized event following the community event guidelines.', verbose_name='Community event'), + field=models.BooleanField(default=False, help_text='Choose "Community event" if this is a community recognized event following the community event guidelines.', verbose_name='Community event'), ), migrations.AddField( model_name='event', diff --git a/pgweb/events/models.py b/pgweb/events/models.py index 82e282ce..c7f48085 100644 --- a/pgweb/events/models.py +++ b/pgweb/events/models.py @@ -13,7 +13,7 @@ class Event(TwostateModerateModel): country = models.ForeignKey(Country, null=True, blank=True, on_delete=models.CASCADE) language = models.ForeignKey(Language, null=True, blank=True, default='eng', help_text="Primary language for event. When multiple languages, specify this in the event description", on_delete=models.CASCADE) - badged = models.BooleanField(null=False, blank=False, default=False, verbose_name='Community event', help_text='Choose "Community event" if this is a community recognized event following the community event guidelines.') + badged = models.BooleanField(null=False, blank=False, default=False, verbose_name='Community event', help_text='Choose "Community event" if this is a community recognized event following the community event guidelines.') description_for_badged = models.TextField(blank=True, null=True, verbose_name='Description for community event', help_text='DEPRECRATED: This was used in the beginning of community events to collect additional information.') startdate = models.DateField(null=False, blank=False, verbose_name="Start date") enddate = models.DateField(null=False, blank=False, verbose_name="End date") diff --git a/pgweb/urls.py b/pgweb/urls.py index f523269c..db4a0234 100644 --- a/pgweb/urls.py +++ b/pgweb/urls.py @@ -72,6 +72,7 @@ urlpatterns = [ url(r'^community/lists/subscribe/$', RedirectView.as_view(url='https://lists.postgresql.org/', permanent=True)), url(r'^community/lists/listinfo/$', pgweb.lists.views.listinfo), + url(r'^community/recognition/$', RedirectView.as_view(url='/about/policies/', permanent=True)), url(r'^community/survey/vote/(\d+)/$', pgweb.survey.views.vote), url(r'^community/survey[/\.](\d+)(-.*)?/$', pgweb.survey.views.results), url(r'^community/user-groups/$', pgweb.pugs.views.index), diff --git a/templates/events/archive.html b/templates/events/archive.html index c8d4e180..88738b8c 100644 --- a/templates/events/archive.html +++ b/templates/events/archive.html @@ -11,7 +11,7 @@ whatsoever.

PostgreSQL Community Event - indicates that an event is recognised under the community event guidelines and is directly helping the PostgreSQL community. + indicates that an event is recognised under the community event guidelines and is directly helping the PostgreSQL community.

{%for event in events %}
diff --git a/templates/index.html b/templates/index.html index 87a70c78..9b6a807f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -107,7 +107,7 @@

PostgreSQL Community Event - indicates that an event is recognised under the community event guidelines and is directly helping the PostgreSQL community. + indicates that an event is recognised under the community event guidelines and is directly helping the PostgreSQL community.

diff --git a/templates/pages/about/donate.html b/templates/pages/about/donate.html index 652c8ac3..fd443f1a 100644 --- a/templates/pages/about/donate.html +++ b/templates/pages/about/donate.html @@ -23,7 +23,7 @@ It focuses on Education, User Groups, and Advocacy.

refer to the party you are donating to and your tax professional.

PostgreSQL Nonprofit Organisation (NPO) Recognition

-

For information about how Recognised PostgreSQL Nonprofit Organisations (NPOs) become recognised, please review the guidelines here

. +

For information about how Recognised PostgreSQL Nonprofit Organisations (NPOs) become recognised, please review the guidelines here

.

Questions

If you have any questions about donations please contact either the diff --git a/templates/pages/about/policies.html b/templates/pages/about/policies.html index 777a5228..1f89f1e7 100644 --- a/templates/pages/about/policies.html +++ b/templates/pages/about/policies.html @@ -46,8 +46,8 @@

{%endblock%} diff --git a/templates/pages/community/recognition.html b/templates/pages/about/policies/conferences.html similarity index 57% rename from templates/pages/community/recognition.html rename to templates/pages/about/policies/conferences.html index 2a475a96..695bb6dd 100644 --- a/templates/pages/community/recognition.html +++ b/templates/pages/about/policies/conferences.html @@ -1,69 +1,11 @@ {%extends "base/page.html"%} -{%block title%}Community Guidelines{%endblock%} +{%load pgfilters%} +{%block title%}Community Conference Recognition{%endblock%} {%block contents%} -

Community Recognition Guidelines

+

Community Conference Recognition

-

The PostgreSQL community is comprised of an international group of individuals and 3rd-party organisations who contribute to the PostgreSQL Development Group through various efforts. In order to help recognise the efforts of everyone contributing to the PostgreSQL project, the PostgreSQL Core Committee has put together a set of guidelines to fairly recognise these contributions to the community.

- -

The following sections provide the guidelines for how various affiliates of the PostgreSQL community can qualify for official recognition by the PostgreSQL Development Group.

- - - - - -

Recognised PostgreSQL Nonprofit Organisations (NPOs)

-

Last updated: July 29, 2017

- -

Recognised PostgreSQL Nonprofit Organisations (NPOs) will be listed on the PostgreSQL Website as such. To become recognised as an NPO, the organisation must self-certify that they meet the criteria below, aimed at ensuring they meet the standards of openness expected in the PostgreSQL Community. -

-

- Use of the terms "MUST", "MUST NOT", "SHOULD" and "SHOULD NOT" in the criteria below should be interpreted per RFC2119. -

- -

General

- - - -

Membership

- - -

Directors

- - -

Vetting

- - - -

Community Conference Recognition

-

Last updated: January 28, 2020

+

Last updated: January 28, 2020. {%git_changes_link%} View history before December 8, 2020.

The Community Conference Recognition programme is a voluntary scheme under which submitters of events to the PostgreSQL Website listings may self-assess their entry against the criteria below, and if they comply may market their event as a PostgreSQL Community event.

@@ -123,7 +65,7 @@
  • A statement on the event website MUST indicate where any profits from the event will go, which specifically MUST support PostgreSQL community activities, either through:
      -
    1. a recognized PostgreSQL Nonprofit Organisation
      2. +
    2. a recognized PostgreSQL Nonprofit Organisation
    3. a detailed list of how the profits will support ongoing PostgreSQL Global Development Group development
    4. to the future growth and expansion of the event, OR
      5. diff --git a/templates/pages/about/policies/npos.html b/templates/pages/about/policies/npos.html new file mode 100644 index 00000000..5b1ff07a --- /dev/null +++ b/templates/pages/about/policies/npos.html @@ -0,0 +1,48 @@ +{%extends "base/page.html"%} +{%load pgfilters%} +{%block title%}Recognised PostgreSQL Nonprofit Organisations{%endblock%} +{%block contents%} + +

      Recognised PostgreSQL Nonprofit Organisations

      + +

      Last updated: July 29, 2017. {%git_changes_link%} View history before December 8, 2020.

      + +

      Recognised PostgreSQL Nonprofit Organisations (NPOs) will be listed on the PostgreSQL Website as such. To become recognised as an NPO, the organisation must self-certify that they meet the criteria below, aimed at ensuring they meet the standards of openness expected in the PostgreSQL Community. +

      +

      + Use of the terms "MUST", "MUST NOT", "SHOULD" and "SHOULD NOT" in the criteria below should be interpreted per RFC2119. +

      + +

      General

      + +
        +
      • A Code of Conduct SHOULD be adopted and apply to all members and directors.
        • +
      • The organisation MUST be registered as a Non Profit Organisation in the territory in which it operates.
        • +
      • No payments may be made to directors or members for their service with the exception of reimbursement of expenses incurred on the organisation's business, and sponsorship of conference attendance where deemed appropriate to help ensure the success of an event.
        • +
      • The organisation MUST work towards the betterment of the PostgreSQL Project and/or community. It may not participate in any activities which may bring the project into disrepute or otherwise work against the interests of the project or the community.
        • +
      • The PostgreSQL Core Team may recognise, not recognise, or rescind a previous recognition of any organisation without justification, regardless of whether or not the criteria above are met.
        • +
      • These criteria may be reviewed and potentially updated at any time.
        • +
      + +

      Membership

      +
        +
      • Membership MUST be open to anyone, limited only to the geographic area in which the NPO operates or a specific spoken language, if desired.
        • +
      • Membership MUST be at zero cost or a nominal cost (up to US $50 per year) to allow participation from any interested community members.
        • +
      • Corporate memberships may be allowed, at higher cost than individual membership if desired, provided the same membership terms are available to any company.
        • +
      • Membership MUST be renewed at least once every three years. "Lifetime" memberships MUST NOT be allowed.
        • +
      + +

      Directors

      +
        +
      • The board of directors MUST be elected by the membership, and all members including any corporate members MUST have an equal vote.
        • +
      • The board of directors SHOULD NOT consist of 50% or more directors working for the same company or group of companies under the same ultimate ownership or management, a situation which MUST be actively avoided as much as is possible. Should such a situation arise, for example, following the resignation of a director, an election SHOULD be held as soon as possible to restore the balance of the board.
        • +
      • Director terms MUST last no longer than three years without re-election. A limit on the number of terms served may be set. "Lifetime" directorships MUST NOT be allowed.
        • +
      + +

      Vetting

      +
        +
      • Voting for the board of directors MUST be done in a way that may be externally vetted.
        • +
      • Financial reports MUST be published at least annually for review by the membership.
        • +
      • The organisation MUST make its financial reports and voting processes and records available to the PostgreSQL Core Team or their nominated representative for review if requested.
        • +
      +{%endblock%} -- 2.39.5