diff --git a/templates/users/_membership_detail.html b/templates/users/_membership_detail.html new file mode 100644 index 000000000..7b97bfaa5 --- /dev/null +++ b/templates/users/_membership_detail.html @@ -0,0 +1,35 @@ +
+ +

+ 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. +

+ +
diff --git a/templates/users/membership_form.html b/templates/users/membership_form.html index ecc032467..7c65589b3 100644 --- a/templates/users/membership_form.html +++ b/templates/users/membership_form.html @@ -18,21 +18,7 @@

Edit your PSF Basic Membership

Register to become a PSF Basic Member

{% endif %} -
-

- 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. -

-

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

-
+ {% include 'users/_membership_detail.html' %} {% if form.errors %}
diff --git a/templates/users/nominations_view.html b/templates/users/nominations_view.html index 8c28aa87b..fe0fbbd76 100644 --- a/templates/users/nominations_view.html +++ b/templates/users/nominations_view.html @@ -15,11 +15,13 @@ {% block user_content %}
+

Your History of PSF Board Nominations

+ {% for election, nominations in elections.items %} -

{{ election.name }} Election

+

{{ election.name }} Election

{% if nominations.nominations_recieved|length > 0 %} -

Nominations Received

+

Nominations Received

{% comment %}