update Basic Membership Form header text

templates/users/_membership_detail.html

@@ -0,0 +1,35 @@
+    <div class="info">
+
+      <p>
+        Your Basic Membership information is managed here.
+      </p>
+
+      <p>
+        To manage your Supporting and Contributing Memberships, visit <a href="https://psfmember.org/user-information/">psfmember.org</a>.
+      </p>
+
+      <p>
+        Voting in PSF elections requires a Supporting, Contributing, or Fellow Membership.
+        <b>Basic Membership is not a voting class</b>.
+        To learn more about PSF Membership classes, and to enroll as a Supporting or Contributing Member,
+        visit <a href="https://www.python.org/psf/membership/">Our Membership Page</a>.
+      </p>
+
+      <p>
+        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,
+        <a href="https://www.psfmember.org">psfmember.org</a> website.
+        To affirm your PSF Voting Eligibility you will need to use
+        <a href="https://psfmember.org/civicrm/votingaffirmation/">psfmember.org</a>.
+      </p>
+
+      <p>
+        If you believe you are a Supporting, Contributing, or Fellow Member
+        but do not have an account on <a href="https://www.psfmember.org">psfmember.org</a>,
+        please create an account and verify your email,
+        then email <a href="mailto:[email protected]">[email protected]</a>
+        to have your account linked to your membership.
+      </p>
+
+    </div>

templates/users/membership_form.html

@@ -18,21 +18,7 @@ <h1 class="default-title">Edit your PSF Basic Membership</h1>
     <h1 class="default-title">Register to become a PSF Basic Member</h1>
     {% endif %}
 
-    <div class="info">
-      <p>
-        Basic membership is <b>not a voting membership class</b>.<br>For more information see Article IV
-        of the <a href="https://www.python.org/psf/bylaws/">PSF Bylaws</a>.
-      </p>
-      <p>
-        All other membership classes are recorded on <a href="https://psfmember.org">psfmember.org</a>.<br>
-        Please log in there and review your <a href="https://psfmember.org/user-information/">user profile</a>
-        to see your membership status.<br>
-        If you believe you are a member but do not have an account on psfmember.org, please
-        <a href="https://psfmember.org/wp-login.php?action=register">create an account</a> and verify your
-        email, then email <a href="mailto:[email protected]">[email protected]</a> to get your account linked to your membership.
-      </p>
-      <p>For more information and to sign up for other kinds of PSF membership, visit our <a href="https://www.python.org/psf/membership/">Membership Page</a>.</p>
-    </div>
+    {% include 'users/_membership_detail.html' %}
 
     {% if form.errors %}
     <div class="user-feedback level-error">

templates/users/nominations_view.html

@@ -15,11 +15,13 @@
 {% block user_content %}
 
 <div>
+  <h1>Your History of PSF Board Nominations</h1>
+
   {% for election, nominations in elections.items %}
-  <h1><a href="{% url 'nominations:nominees_list' election=election.slug %}">{{ election.name }} Election</a></h1>
+  <h2><a href="{% url 'nominations:nominees_list' election=election.slug %}">{{ election.name }} Election</a></h2>
 
   {% if nominations.nominations_recieved|length > 0 %}
-  <h2>Nominations Received</h2>
+  <h3>Nominations Received</h3>
   <ul>
     {% for nomination in nominations.nominations_recieved %}
     <li>
@@ -45,7 +47,7 @@ <h2>Nominations Received</h2>
   {% endif %}
 
   {% if nominations.nominations_made|length > 0 %}
-  <h2>Nominations Made</h2>
+  <h3>Nominations Made</h3>
   <ul>
     {% for nomination in nominations.nominations_made %}
     <li>

templates/users/user_detail.html

@@ -24,20 +24,9 @@
                 <p><span class="profile-label"><span class="icon-python" aria-hidden="true"></span>PSF Basic Member?</span> {{ object.has_membership|yesno|capfirst }}</p>
                 {% if object.has_membership %}
                 <div style="margin-left: 1em;">
-                  <p>
-                    Basic membership is <b>not a voting membership class</b>.<br>For more information see Article IV
-                    of the <a href="https://www.python.org/psf/bylaws/">PSF Bylaws</a>.
-                  </p>
-                  <p>
-                    All other membership classes are recorded on <a href="https://psfmember.org">psfmember.org</a>.<br>
-                    Please log in there and review your <a href="https://psfmember.org/user-information/">user profile</a>
-                    to see your membership status.<br>
-                    If you believe you are a member but do not have an account on psfmember.org, please
-                    <a href="https://psfmember.org/wp-login.php?action=register">create an account</a> and verify your
-                    email, then email <a href="mailto:[email protected]">[email protected]</a> to get your account linked to your membership.
-                  </p>
+                  {% include 'users/_membership_detail.html' %}
                 </div>
-              {% endif %}
+                {% endif %}
             </div>
             {% comment %}
             <div class="user-profile-location">