Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit40c3dbb

Browse files
authored
update Basic Membership Form header text (#2710)
* update Basic Membership Form header text* update user profile detail page* move repeated text to an include* update nominations history page to make sense for people that have never nominated
1 parent43b22c1 commit40c3dbb

File tree

4 files changed

+43
-31
lines changed

4 files changed

+43
-31
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<divclass="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<ahref="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<ahref="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+
<ahref="https://www.psfmember.org">psfmember.org</a> website.
23+
To affirm your PSF Voting Eligibility you will need to use
24+
<ahref="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<ahref="https://www.psfmember.org">psfmember.org</a>,
30+
please create an account and verify your email,
31+
then email<ahref="mailto:psf-donations@python.org">psf-donations@python.org</a>
32+
to have your account linked to your membership.
33+
</p>
34+
35+
</div>

‎templates/users/membership_form.html

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,7 @@ <h1 class="default-title">Edit your PSF Basic Membership</h1>
1818
<h1class="default-title">Register to become a PSF Basic Member</h1>
1919
{% endif %}
2020

21-
<divclass="info">
22-
<p>
23-
Basic membership is<b>not a voting membership class</b>.<br>For more information see Article IV
24-
of the<ahref="https://www.python.org/psf/bylaws/">PSF Bylaws</a>.
25-
</p>
26-
<p>
27-
All other membership classes are recorded on<ahref="https://psfmember.org">psfmember.org</a>.<br>
28-
Please log in there and review your<ahref="https://psfmember.org/user-information/">user profile</a>
29-
to see your membership status.<br>
30-
If you believe you are a member but do not have an account on psfmember.org, please
31-
<ahref="https://psfmember.org/wp-login.php?action=register">create an account</a> and verify your
32-
email, then email<ahref="mailto:psf-donations@python.org">psf-donations@python.org</a> to get your account linked to your membership.
33-
</p>
34-
<p>For more information and to sign up for other kinds of PSF membership, visit our<ahref="https://www.python.org/psf/membership/">Membership Page</a>.</p>
35-
</div>
21+
{% include 'users/_membership_detail.html' %}
3622

3723
{% if form.errors %}
3824
<divclass="user-feedback level-error">

‎templates/users/nominations_view.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
{% block user_content %}
1616

1717
<div>
18+
<h1>Your History of PSF Board Nominations</h1>
19+
1820
{% for election, nominations in elections.items %}
19-
<h1><ahref="{% url 'nominations:nominees_list' election=election.slug %}">{{ election.name }} Election</a></h1>
21+
<h2><ahref="{% url 'nominations:nominees_list' election=election.slug %}">{{ election.name }} Election</a></h2>
2022

2123
{% if nominations.nominations_recieved|length> 0 %}
22-
<h2>Nominations Received</h2>
24+
<h3>Nominations Received</h3>
2325
<ul>
2426
{% for nomination in nominations.nominations_recieved %}
2527
<li>
@@ -45,7 +47,7 @@ <h2>Nominations Received</h2>
4547
{% endif %}
4648

4749
{% if nominations.nominations_made|length> 0 %}
48-
<h2>Nominations Made</h2>
50+
<h3>Nominations Made</h3>
4951
<ul>
5052
{% for nomination in nominations.nominations_made %}
5153
<li>

‎templates/users/user_detail.html

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,9 @@
2424
<p><spanclass="profile-label"><spanclass="icon-python"aria-hidden="true"></span>PSF Basic Member?</span> {{ object.has_membership|yesno|capfirst }}</p>
2525
{% if object.has_membership %}
2626
<divstyle="margin-left: 1em;">
27-
<p>
28-
Basic membership is<b>not a voting membership class</b>.<br>For more information see Article IV
29-
of the<ahref="https://www.python.org/psf/bylaws/">PSF Bylaws</a>.
30-
</p>
31-
<p>
32-
All other membership classes are recorded on<ahref="https://psfmember.org">psfmember.org</a>.<br>
33-
Please log in there and review your<ahref="https://psfmember.org/user-information/">user profile</a>
34-
to see your membership status.<br>
35-
If you believe you are a member but do not have an account on psfmember.org, please
36-
<ahref="https://psfmember.org/wp-login.php?action=register">create an account</a> and verify your
37-
email, then email<ahref="mailto:psf-donations@python.org">psf-donations@python.org</a> to get your account linked to your membership.
38-
</p>
27+
{% include 'users/_membership_detail.html' %}
3928
</div>
40-
{% endif %}
29+
{% endif %}
4130
</div>
4231
{% comment %}
4332
<divclass="user-profile-location">

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp