Skip to content

Commit cf4899f

Browse files
XpirixXpirix
authored
Merge pull request #20 from qgis/replace_sponsors_occurencies
Rename sponsorship terminology to "sustaining member"
2 parents 38b8bbe + fcd31d4 commit cf4899f

File tree

11 files changed

+144
-85
lines changed

11 files changed

+144
-85
lines changed

‎django_project/changes/forms.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,13 @@ def __init__(self, *args, **kwargs):
334334
self.project = kwargs.pop('project')
335335
form_title = (
336336
'<h2 class="is-title is-size-4">'
337-
f'Sponsorship Level Form for {self.project.name}'
337+
f'Sustaining Member Level Form for {self.project.name}'
338338
'</h2>'
339339
)
340340
if 'instance' in kwargs and kwargs['instance']:
341341
form_title = (
342342
'<h2 class="is-title is-size-4">'
343-
f'Edit Sponsorship Level {kwargs["instance"].name}'
343+
f'Edit Sustaining Member Level {kwargs["instance"].name}'
344344
'</h2>'
345345
)
346346
self.helper = FormHelper()

‎django_project/changes/migrations/0012_alter_sponsor_agreement_alter_sponsor_approved_and_more.py‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Generated by Django 4.2.20 on 2025-04-28 11:15
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('changes', '0011_auto_20200730_0531'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='sponsor',
15+
name='agreement',
16+
field=models.FileField(blank=True, help_text='Attach sustaining member agreement', upload_to='docs'),
17+
),
18+
migrations.AlterField(
19+
model_name='sponsor',
20+
name='approved',
21+
field=models.BooleanField(default=False, help_text='Whether this sustaining member has been approved for use by the project owner.'),
22+
),
23+
migrations.AlterField(
24+
model_name='sponsor',
25+
name='invoice_number',
26+
field=models.CharField(blank=True, help_text='Invoice number for the sustaining member.', max_length=255, null=True, verbose_name='Sustaining membership invoice number'),
27+
),
28+
migrations.AlterField(
29+
model_name='sponsorshiplevel',
30+
name='approved',
31+
field=models.BooleanField(default=False, help_text='Whether this sustaining membership level has been approved for use by the project owner.'),
32+
),
33+
migrations.AlterField(
34+
model_name='sponsorshiplevel',
35+
name='currency',
36+
field=models.CharField(help_text='The currency which associated with this sustaining membership level.', max_length=255),
37+
),
38+
migrations.AlterField(
39+
model_name='sponsorshiplevel',
40+
name='logo',
41+
field=models.ImageField(help_text='An image of sustaining membership level logo e.g. a bronze medal.Most browsers support dragging the image directly on to the "Choose File" button above.', upload_to='images/projects'),
42+
),
43+
migrations.AlterField(
44+
model_name='sponsorshiplevel',
45+
name='name',
46+
field=models.CharField(help_text='Name of sustaining membership level. e.g. Gold, Bronze, etc', max_length=255),
47+
),
48+
migrations.AlterField(
49+
model_name='sponsorshiplevel',
50+
name='value',
51+
field=models.IntegerField(help_text='Amount of money associated with this sustaining membership level.'),
52+
),
53+
]

‎django_project/changes/models/sponsor.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class Sponsor(models.Model):
131131
)
132132

133133
agreement = models.FileField(
134-
help_text='Attach sponsor agreement',
134+
help_text='Attach sustaining member agreement',
135135
upload_to=os.path.join(MEDIA_ROOT, 'docs'),
136136
blank=True)
137137

@@ -145,7 +145,7 @@ class Sponsor(models.Model):
145145

146146
approved = models.BooleanField(
147147
help_text=_(
148-
'Whether this sponsor has been approved for use by the '
148+
'Whether this sustaining member has been approved for use by the '
149149
'project owner.'),
150150
default=False
151151
)
@@ -167,11 +167,11 @@ class Sponsor(models.Model):
167167
)
168168

169169
invoice_number = models.CharField(
170-
_("Sponsorship invoice number"),
170+
_("Sustaining membership invoice number"),
171171
max_length=255,
172172
null=True,
173173
blank=True,
174-
help_text=_("Invoice number for the sponsor.")
174+
help_text=_("Invoice number for the sustaining member.")
175175
)
176176

177177
sustaining_membership = models.BooleanField(

‎django_project/changes/models/sponsorship_level.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,30 @@ class SponsorshipLevel(models.Model):
3636
"""A sponsor model e.g. gui, backend, web site etc."""
3737

3838
name = models.CharField(
39-
help_text='Name of sponsorship level. e.g. Gold, Bronze, etc',
39+
help_text='Name of sustaining membership level. e.g. Gold, Bronze, etc',
4040
max_length=255,
4141
null=False,
4242
blank=False,
4343
unique=False)
4444

4545
value = models.IntegerField(
46-
help_text='Amount of money associated with this sponsorship level.',
46+
help_text='Amount of money associated with this sustaining membership level.',
4747
blank=False,
4848
null=False,
4949
unique=False
5050
)
5151

5252
currency = models.CharField(
5353
help_text='The currency which associated with '
54-
'this sponsorship level.',
54+
'this sustaining membership level.',
5555
max_length=255,
5656
null=False,
5757
blank=False,
5858
unique=False)
5959

6060
logo = models.ImageField(
6161
help_text=(
62-
'An image of sponsorship level logo e.g. a bronze medal.'
62+
'An image of sustaining membership level logo e.g. a bronze medal.'
6363
'Most browsers support dragging the image directly on to the '
6464
'"Choose File" button above.'),
6565
upload_to=os.path.join(MEDIA_ROOT, 'images/projects'),
@@ -85,7 +85,7 @@ class SponsorshipLevel(models.Model):
8585

8686
approved = models.BooleanField(
8787
help_text=_(
88-
'Whether this sponsorship level has been approved for use by '
88+
'Whether this sustaining membership level has been approved for use by '
8989
'the project owner.'),
9090
default=False
9191
)

‎django_project/changes/templates/sponsor/future-list.html‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% load thumbnail %}
33
{% load custom_markup %}
44
{% load static %}
5-
{% block title %}Future Sponsors - {{ block.super }}{% endblock %}
5+
{% block title %}Future Sustaining Members - {{ block.super }}{% endblock %}
66

77
{% block extra_head %}
88
{% endblock %}
@@ -20,28 +20,19 @@
2020
}
2121
</style>
2222
<h1 class="title">
23-
Future Sponsors
23+
Future Sustaining Members
2424
</h1>
25-
<p>
26-
We appreciate the commitment of our future sponsors who will support the QGIS project.
27-
Their contributions will help us maintain our infrastructure, fund development work,
28-
and promote QGIS through workshops and conferences.
29-
</p>
30-
<div class="container rich tips">
31-
<div class="icon">💁</div>
32-
<div class="cont coloring-2">
33-
<h5 id="how-become-a-sponsor">How to become a sponsor?
34-
<a class="heading-anchor" href="#how-become-a-sponsor"></a>
35-
</h5>
36-
<p>
37-
For information on becoming a sponsor, please visit
38-
<a href="https://qgis.org/funding/membership/" target="_blank">
39-
Sponsorship Program Overview</a>.
40-
</p>
41-
</div>
42-
</div>
43-
4425
<div class="buttons">
26+
{% if user.is_staff or user == the_project.owner or user in the_project.sponsorship_managers.all %}
27+
<a class="button is-success is-outlined has-tooltip-arrow has-tooltip-bottom"
28+
href='{% url "sponsor-create" %}'
29+
data-tooltip="Create New Sustaining Member">
30+
<span class="icon">
31+
<i class="fas fa-plus-circle"></i>
32+
</span>
33+
<span>Create New</span>
34+
</a>
35+
{% endif %}
4536
{% if not is_sustaining_member %}
4637
<a class="button is-success has-tooltip-arrow has-tooltip-bottom"
4738
href='mailto:finance@qgis.org?subject=QGIS%20Sustaining%20Membership'
@@ -52,7 +43,7 @@ <h5 id="how-become-a-sponsor">How to become a sponsor?
5243
<span>Sign Up!</span>
5344
</a>
5445
{% else %}
55-
<a class="button is-light has-tooltip-arrow has-tooltip-bottom"
46+
<a class="button is-warning is-outlined has-tooltip-arrow has-tooltip-bottom"
5647
href='{% url "sustaining-membership" %}'
5748
data-tooltip="Your sustaining membership">
5849
<span class="icon">
@@ -63,17 +54,10 @@ <h5 id="how-become-a-sponsor">How to become a sponsor?
6354
{% endif %}
6455

6556
{% if user.is_authenticated %}
66-
{% if user.is_staff or user == the_project.owner or user in the_project.sponsorship_managers.all %}
67-
<a class="button is-light has-tooltip-arrow has-tooltip-bottom icon"
68-
href='{% url "sponsor-create" %}'
69-
data-tooltip="Create New Sponsor">
70-
<i class="fas fa-plus-circle"></i>
71-
</a>
72-
{% endif %}
7357
{% if not unapproved %}
7458
<a class="button is-light has-tooltip-arrow has-tooltip-bottom icon"
7559
href='{% url "pending-sponsor-list" %}'
76-
data-tooltip="View Pending Sponsorship Period">
60+
data-tooltip="View Sustaining Membership Period">
7761
<i class="fas fa-hourglass-half"></i>
7862
</a>
7963
{% endif %}
@@ -90,37 +74,54 @@ <h5 id="how-become-a-sponsor">How to become a sponsor?
9074
</a>
9175
<a class="button is-light has-tooltip-arrow has-tooltip-bottom rss-icon"
9276
href='{% url "sponsor-rss-feed" %}'
93-
data-tooltip="RSS Feed for Sponsors">
77+
data-tooltip="RSS Feed for Sustaining Members">
9478
<i class="fas fa-rss-square"></i>
9579
</a>
9680
<a class="button is-light has-tooltip-arrow has-tooltip-bottom rss-icon"
9781
href='{% url "sponsor-atom-feed" %}'
98-
data-tooltip="Atom Feed for Sponsors">
82+
data-tooltip="Atom Feed for Sustaining Members">
9983
<i class="fas fa-rss"></i>
10084
</a>
10185
<a class="button is-light has-tooltip-arrow has-tooltip-bottom json-feed"
10286
href='{% url "sponsor-json-feed" %}'
103-
data-tooltip="JSON Feed for Sponsors">
87+
data-tooltip="JSON Feed for Sustaining Members">
10488
<i class="fas fa-rss-square"></i>
10589
</a>
10690
<a class="button is-light has-tooltip-arrow has-tooltip-bottom rss-icon"
10791
href='{% url "past-sponsor-rss-feed" %}'
108-
data-tooltip="RSS Feed for Past Sponsors">
92+
data-tooltip="RSS Feed for Past Sustaining Members">
10993
<i class="fas fa-rss-square" style="font-weight: bold"></i>
11094
</a>
11195
</div>
96+
<p>
97+
We appreciate the commitment of our future sustaining members who will support the QGIS project.
98+
Their contributions will help us maintain our infrastructure, fund development work,
99+
and promote QGIS through workshops and conferences.
100+
</p>
101+
<div class="container rich tips">
102+
<div class="icon">💁</div>
103+
<div class="cont coloring-2">
104+
<h5>How to become a sustaining member?</h5>
105+
<p>
106+
For information on becoming a sustaining member, please visit
107+
<a href="https://qgis.org/funding/membership/" target="_blank">
108+
Sustaining membership program</a>.
109+
</p>
110+
</div>
111+
</div>
112+
112113

113114
{% if num_sponsors == 0 %}
114115
{% if unapproved %}
115-
<h3 class="subtitle">All sponsors are approved.</h3>
116+
<h3 class="subtitle">All sustaining members are approved.</h3>
116117
{% else %}
117-
<h3 class="subtitle">No future sponsors are defined.</h3>
118+
<h3 class="subtitle">No future sustaining members are defined.</h3>
118119
{% endif %}
119120
{% endif %}
120121

121122
{% if sponsors %}
122123
<hr/>
123-
<h2 class="subtitle">List of Future Sponsors</h2>
124+
<h2 class="subtitle">List of Future Sustaining Members</h2>
124125
{% endif %}
125126

126127
{% include "sponsor/sponsor-card.html" with sponsors=sponsors list_future_sponsors=True %}

‎django_project/changes/templates/sponsor/list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ <h1 class="title">
6363
{% if user.is_staff or user == the_project.owner or user in the_project.sponsorship_managers.all %}
6464
<a class="button is-light has-tooltip-arrow has-tooltip-bottom icon"
6565
href='{% url "future-sponsor-list" %}'
66-
data-tooltip="Future Sponsor List">
66+
data-tooltip="Future Sustaining Member List">
6767
<i class="fas fa-money-bill-wave"></i>
6868
</a>
6969
{% endif %}

‎django_project/changes/templates/sponsor/past-list.html‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,17 @@
2222
<h1 class="title">
2323
Past Sustaining Members
2424
</h1>
25-
<p>
26-
We thank our sustaining members and donors
27-
who support the QGIS project, often regularly,
28-
and enable us to pay for our infrastructure
29-
and important development work, as well as
30-
finance developer meetings and promotion of
31-
QGIS in workshops and conferences.
32-
</p>
33-
<div class="container rich tips">
34-
<div class="icon">💁</div>
35-
<div class="cont coloring-2">
36-
<h5 id="how-become-a-sustaining-member">How to become a sustaining member?
37-
</h5>
38-
<p>
39-
For information on becoming a sustaining member,
40-
please visit
41-
<a href="https://qgis.org/funding/membership/" target="_blank">
42-
Sustaining Membership Program Overview</a>.
43-
</p>
44-
</div>
45-
</div>
46-
4725
<div class="buttons">
26+
{% if user.is_staff or user == the_project.owner or user in the_project.sponsorship_managers.all %}
27+
<a class="button is-outlined is-success has-tooltip-arrow has-tooltip-bottom"
28+
href='{% url "sponsor-create" %}'
29+
data-tooltip="Create New Sustaining Member">
30+
<span class="icon">
31+
<i class="fas fa-plus-circle"></i>
32+
</span>
33+
<span>Create New</span>
34+
</a>
35+
{% endif %}
4836
{% if not is_sustaining_member %}
4937
<a class="button is-success has-tooltip-arrow has-tooltip-bottom"
5038
href='mailto:finance@qgis.org?subject=QGIS%20Sustaining%20Membership'
@@ -55,7 +43,7 @@ <h5 id="how-become-a-sustaining-member">How to become a sustaining member?
5543
<span>Sign Up!</span>
5644
</a>
5745
{% else %}
58-
<a class="button is-light has-tooltip-arrow has-tooltip-bottom"
46+
<a class="button is-warning is-outlined has-tooltip-arrow has-tooltip-bottom"
5947
href='{% url "sustaining-membership" %}'
6048
data-tooltip="Your sustaining membership">
6149
<span class="icon">
@@ -69,14 +57,9 @@ <h5 id="how-become-a-sustaining-member">How to become a sustaining member?
6957
{% if user.is_staff or user == the_project.owner or user in the_project.sponsorship_managers.all %}
7058
<a class="button is-light has-tooltip-arrow has-tooltip-bottom icon"
7159
href='{% url "future-sponsor-list" %}'
72-
data-tooltip="Future Sponsor List">
60+
data-tooltip="Future Sustaining Member List">
7361
<i class="fas fa-money-bill-wave"></i>
7462
</a>
75-
<a class="button is-outlined is-success has-tooltip-arrow has-tooltip-bottom icon"
76-
href='{% url "sponsor-create" %}'
77-
data-tooltip="Create New Sustaining Member">
78-
<i class="fas fa-plus-circle"></i>
79-
</a>
8063
{% endif %}
8164
{% if not unapproved %}
8265
<a class="button is-light has-tooltip-arrow has-tooltip-bottom icon"
@@ -118,6 +101,28 @@ <h5 id="how-become-a-sustaining-member">How to become a sustaining member?
118101
</a>
119102
</div>
120103

104+
<p>
105+
We thank our sustaining members and donors
106+
who support the QGIS project, often regularly,
107+
and enable us to pay for our infrastructure
108+
and important development work, as well as
109+
finance developer meetings and promotion of
110+
QGIS in workshops and conferences.
111+
</p>
112+
<div class="container rich tips">
113+
<div class="icon">💁</div>
114+
<div class="cont coloring-2">
115+
<h5 id="how-become-a-sustaining-member">How to become a sustaining member?
116+
</h5>
117+
<p>
118+
For information on becoming a sustaining member,
119+
please visit
120+
<a href="https://qgis.org/funding/membership/" target="_blank">
121+
Sustaining Membership Program Overview</a>.
122+
</p>
123+
</div>
124+
</div>
125+
121126
{% if num_sponsors == 0 %}
122127
{% if unapproved %}
123128
<h3 class="subtitle">All sustaining members are approved.</h3>

0 commit comments

Comments
 (0)
⚡