From d4a8bce84c06025a0cefbba9b823493435a6161e Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Wed, 16 Apr 2025 14:16:35 -0400 Subject: [PATCH 1/4] update Basic Membership Form header text --- templates/users/membership_form.html | 38 +++++++++++++++++++++------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/templates/users/membership_form.html b/templates/users/membership_form.html index ecc032467..2d50b24fa 100644 --- a/templates/users/membership_form.html +++ b/templates/users/membership_form.html @@ -19,19 +19,39 @@

Register to become a PSF Basic Member

{% endif %}
+ +

+ Your Basic Membership information is managed here. +

+ +

+ To manage your Supporting and Contributing Memberships, visit psfmember.org. +

+ +

+ Voting in PSF elections requires a Supporting, Contributing, or Fellow Membership. + Basic Membership is not a voting class. + To learn more about PSF Membership classes, and to enroll as a Supporting or Contributing Member, + visit Our Membership Page. +

+

- Basic membership is not a voting membership class.
For more information see Article IV - of the PSF Bylaws. + This site (python.org), will list you as a Basic Member + even if you are a Supporting, Contribution, or Fellowship member + because the voting tiers of membership are managed on the separate, + psfmember.org website. + To affirm your PSF Voting Eligibility you will need to use + psfmember.org.

+

- All other membership classes are recorded on psfmember.org.
- Please log in there and review your user profile - to see your membership status.
- If you believe you are a member but do not have an account on psfmember.org, please - create an account and verify your - email, then email psf-donations@python.org to get your account linked to your membership. + If you believe you are a Supporting, Contributing, or Fellow Member + but do not have an account on psfmember.org, + please create an account and verify your email, + then email psf-donations@python.org + to have your account linked to your membership.

-

For more information and to sign up for other kinds of PSF membership, visit our Membership Page.

+
{% if form.errors %} From fea78cf28e4e57a8fa09e648399ebed82d500a34 Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Wed, 16 Apr 2025 14:19:57 -0400 Subject: [PATCH 2/4] update user profile detail page --- templates/users/user_detail.html | 49 +++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/templates/users/user_detail.html b/templates/users/user_detail.html index ce2f5ee90..91c8001f0 100644 --- a/templates/users/user_detail.html +++ b/templates/users/user_detail.html @@ -24,20 +24,43 @@

PSF Basic Member? {{ object.has_membership|yesno|capfirst }}

{% if object.has_membership %}
-

- Basic membership is not a voting membership class.
For more information see Article IV - of the PSF Bylaws. -

-

- All other membership classes are recorded on psfmember.org.
- Please log in there and review your user profile - to see your membership status.
- If you believe you are a member but do not have an account on psfmember.org, please - create an account and verify your - email, then email psf-donations@python.org to get your account linked to your membership. -

+
+ +

+ Your Basic Membership information is managed here. +

+ +

+ To manage your Supporting and Contributing Memberships, visit psfmember.org. +

+ +

+ Voting in PSF elections requires a Supporting, Contributing, or Fellow Membership. + Basic Membership is not a voting class. + To learn more about PSF Membership classes, and to enroll as a Supporting or Contributing Member, + visit Our Membership Page. +

+ +

+ This site (python.org), will list you as a Basic Member + even if you are a Supporting, Contribution, or Fellowship member + because the voting tiers of membership are managed on the separate, + psfmember.org website. + To affirm your PSF Voting Eligibility you will need to use + psfmember.org. +

+ +

+ If you believe you are a Supporting, Contributing, or Fellow Member + but do not have an account on psfmember.org, + please create an account and verify your email, + then email psf-donations@python.org + to have your account linked to your membership. +

+ +
- {% endif %} + {% endif %} {% comment %}