From 98c376bbee81a497e5f410a55b0df0101fe1e7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9lestin=20Matte?= Date: Tue, 2 Nov 2021 16:52:33 +0100 Subject: [PATCH 2/3] Use orgname in templates to make them organization-generic --- web/pglister/lists/templates/base.html | 6 +++--- web/pglister/lists/templates/home.html | 9 +++++---- web/pglister/lists/templates/unsubscribe_confirm.html | 3 ++- web/pglister/lists/templates/unsubscribe_help.html | 5 +++-- web/pglister/lists/templates/unsubscribe_link.html | 3 ++- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/web/pglister/lists/templates/base.html b/web/pglister/lists/templates/base.html index feb1e57..6c9da22 100644 --- a/web/pglister/lists/templates/base.html +++ b/web/pglister/lists/templates/base.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - {%if title%}{{title}} - {%endif%}PostgreSQL mailing lists + {%if title%}{{title}} - {%endif%}{% org "name" %} mailing lists @@ -14,8 +14,8 @@
- PostgreSQL - + {% org +
{%if messages%} diff --git a/web/pglister/lists/templates/home.html b/web/pglister/lists/templates/home.html index d122a4b..59034c4 100644 --- a/web/pglister/lists/templates/home.html +++ b/web/pglister/lists/templates/home.html @@ -1,13 +1,14 @@ {%extends "base.html"%} +{%load pglister%} {%block content%} -

PostgreSQL mailing lists

+

{% org "name" %} mailing lists

Manage subscriptions Unsubscribe

- From this site you can manage all your PostgreSQL mailing list + From this site you can manage all your {% org "name" %} mailing list subscriptions. To manage them, click on the link above.

Note 1: Please ensure you read the Archive Policy @@ -26,7 +27,7 @@ unable to deliver mail to our list members.

- If you are not already logged into your PostgreSQL Community account, + If you are not already logged into your {% org "name" %} Community account, you will be redirected and asked to log in first. Once you're logged in, you can see all of the lists which you are subscribed to with the email address associated with your community account. @@ -38,7 +39,7 @@ unable to deliver mail to our list members. using those addresses as well.

- If you are a moderator of PostgreSQL mailing lists, you'll have a link + If you are a moderator of {% org "name" %} mailing lists, you'll have a link at the bottom of the page which says "Manage/Moderate lists". If you believe you should have such a link and you do not, please contact the PostgreSQL WWW Mailing list. diff --git a/web/pglister/lists/templates/unsubscribe_confirm.html b/web/pglister/lists/templates/unsubscribe_confirm.html index af1cd3f..9174e22 100644 --- a/web/pglister/lists/templates/unsubscribe_confirm.html +++ b/web/pglister/lists/templates/unsubscribe_confirm.html @@ -1,6 +1,7 @@ {%extends "base.html"%} +{%load pglister%} {%block content%} -

PostgreSQL mailing lists

+

{% org "name" %} mailing lists

Unsubscribe

{{view.message}} diff --git a/web/pglister/lists/templates/unsubscribe_help.html b/web/pglister/lists/templates/unsubscribe_help.html index 3889ad0..cd7941b 100644 --- a/web/pglister/lists/templates/unsubscribe_help.html +++ b/web/pglister/lists/templates/unsubscribe_help.html @@ -1,10 +1,11 @@ {%extends "base.html"%} +{%load pglister%} {%block content%} -

PostgreSQL mailing lists

+

{% org "name" %} mailing lists

Unsubscribe

With account

- If you have subscribed to a PostgreSQL mailinglist using your community account, + If you have subscribed to a {% org "name" %} mailinglist using your community account, the easiest way to unsubscribe is to use the manage subscriptions page, logged in to the same account. If you have lost your password, you can use the lost diff --git a/web/pglister/lists/templates/unsubscribe_link.html b/web/pglister/lists/templates/unsubscribe_link.html index badce53..39ed490 100644 --- a/web/pglister/lists/templates/unsubscribe_link.html +++ b/web/pglister/lists/templates/unsubscribe_link.html @@ -1,6 +1,7 @@ {%extends "base.html"%} +{%load pglister%} {%block content%} -

PostgreSQL mailing lists

+

{% org "name" %} mailing lists

Unsubscribe

{%if not done%}

-- 2.33.1