Skip to content

Commit 9a2e59f

Browse files
ewdurbinewdurbin
committed
move repeated text to an include
1 parent fea78cf commit 9a2e59f

File tree

3 files changed

+37
-70
lines changed

3 files changed

+37
-70
lines changed

‎templates/users/_membership_detail.html

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<div class="info">
2+
3+
<p>
4+
Your Basic Membership information is managed here.
5+
</p>
6+
7+
<p>
8+
To manage your Supporting and Contributing Memberships, visit <a href="https://psfmember.org/user-information/">psfmember.org</a>.
9+
</p>
10+
11+
<p>
12+
Voting in PSF elections requires a Supporting, Contributing, or Fellow Membership.
13+
<b>Basic Membership is not a voting class</b>.
14+
To learn more about PSF Membership classes, and to enroll as a Supporting or Contributing Member,
15+
visit <a href="https://www.python.org/psf/membership/">Our Membership Page</a>.
16+
</p>
17+
18+
<p>
19+
This site (python.org), will list you as a Basic Member
20+
even if you are a Supporting, Contribution, or Fellowship member
21+
because the voting tiers of membership are managed on the separate,
22+
<a href="https://www.psfmember.org">psfmember.org</a> website.
23+
To affirm your PSF Voting Eligibility you will need to use
24+
<a href="https://psfmember.org/civicrm/votingaffirmation/">psfmember.org</a>.
25+
</p>
26+
27+
<p>
28+
If you believe you are a Supporting, Contributing, or Fellow Member
29+
but do not have an account on <a href="https://www.psfmember.org">psfmember.org</a>,
30+
please create an account and verify your email,
31+
then email <a href="mailto:[email protected]">[email protected]</a>
32+
to have your account linked to your membership.
33+
</p>
34+
35+
</div>

‎templates/users/membership_form.html

+1-35
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,7 @@ <h1 class="default-title">Edit your PSF Basic Membership</h1>
1818
<h1 class="default-title">Register to become a PSF Basic Member</h1>
1919
{% endif %}
2020

21-
<div class="info">
22-
23-
<p>
24-
Your Basic Membership information is managed here.
25-
</p>
26-
27-
<p>
28-
To manage your Supporting and Contributing Memberships, visit <a href="https://psfmember.org/user-information/">psfmember.org</a>.
29-
</p>
30-
31-
<p>
32-
Voting in PSF elections requires a Supporting, Contributing, or Fellow Membership.
33-
<b>Basic Membership is not a voting class</b>.
34-
To learn more about PSF Membership classes, and to enroll as a Supporting or Contributing Member,
35-
visit <a href="https://www.python.org/psf/membership/">Our Membership Page</a>.
36-
</p>
37-
38-
<p>
39-
This site (python.org), will list you as a Basic Member
40-
even if you are a Supporting, Contribution, or Fellowship member
41-
because the voting tiers of membership are managed on the separate,
42-
<a href="https://www.psfmember.org">psfmember.org</a> website.
43-
To affirm your PSF Voting Eligibility you will need to use
44-
<a href="https://psfmember.org/civicrm/votingaffirmation/">psfmember.org</a>.
45-
</p>
46-
47-
<p>
48-
If you believe you are a Supporting, Contributing, or Fellow Member
49-
but do not have an account on <a href="https://www.psfmember.org">psfmember.org</a>,
50-
please create an account and verify your email,
51-
then email <a href="mailto:[email protected]">[email protected]</a>
52-
to have your account linked to your membership.
53-
</p>
54-
55-
</div>
21+
{% include 'users/_membership_detail.html' %}
5622

5723
{% if form.errors %}
5824
<div class="user-feedback level-error">

‎templates/users/user_detail.html

+1-35
Original file line numberDiff line numberDiff line change
@@ -24,41 +24,7 @@
2424
<p><span class="profile-label"><span class="icon-python" aria-hidden="true"></span>PSF Basic Member?</span> {{ object.has_membership|yesno|capfirst }}</p>
2525
{% if object.has_membership %}
2626
<div style="margin-left: 1em;">
27-
<div class="info">
28-
29-
<p>
30-
Your Basic Membership information is managed here.
31-
</p>
32-
33-
<p>
34-
To manage your Supporting and Contributing Memberships, visit <a href="https://psfmember.org/user-information/">psfmember.org</a>.
35-
</p>
36-
37-
<p>
38-
Voting in PSF elections requires a Supporting, Contributing, or Fellow Membership.
39-
<b>Basic Membership is not a voting class</b>.
40-
To learn more about PSF Membership classes, and to enroll as a Supporting or Contributing Member,
41-
visit <a href="https://www.python.org/psf/membership/">Our Membership Page</a>.
42-
</p>
43-
44-
<p>
45-
This site (python.org), will list you as a Basic Member
46-
even if you are a Supporting, Contribution, or Fellowship member
47-
because the voting tiers of membership are managed on the separate,
48-
<a href="https://www.psfmember.org">psfmember.org</a> website.
49-
To affirm your PSF Voting Eligibility you will need to use
50-
<a href="https://psfmember.org/civicrm/votingaffirmation/">psfmember.org</a>.
51-
</p>
52-
53-
<p>
54-
If you believe you are a Supporting, Contributing, or Fellow Member
55-
but do not have an account on <a href="https://www.psfmember.org">psfmember.org</a>,
56-
please create an account and verify your email,
57-
then email <a href="mailto:[email protected]">[email protected]</a>
58-
to have your account linked to your membership.
59-
</p>
60-
61-
</div>
27+
{% include 'users/_membership_detail.html' %}
6228
</div>
6329
{% endif %}
6430
</div>

0 commit comments

Comments
 (0)