update Basic Membership forms (python#2207)

* update Basic Membership forms

- Removes email related fields/notes since we do not use this membership for any mailing lists.
- Adds note/link regarding other membership types

* makes more sense this way...

* clarify that delete is for Basic Membership only

templates/users/membership_form.html

@@ -2,7 +2,7 @@
 {% load boxes %}
 {% load honeypot %}
 
-{% block page_title %}Edit Membership | Our Users & Members | {{ SITE_INFO.site_name }}{% endblock %}
+{% block page_title %}Edit Basic Membership | Our Users & Members | {{ SITE_INFO.site_name }}{% endblock %}
 
 {% block body_attributes %}class="psf signup default-page"{% endblock %}
 
@@ -13,11 +13,15 @@
 
 <article class="text">
     {% if request.user.has_membership %}
-    <h1 class="default-title">Edit your PSF Membership</h1>
+    <h1 class="default-title">Edit your PSF Basic Membership</h1>
     {% else %}
-    <h1 class="default-title">Register to become a PSF Member</h1>
+    <h1 class="default-title">Register to become a PSF Basic Member</h1>
     {% endif %}
 
+    <div class="info">
+      <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>
+
     {% if form.errors %}
     <div class="user-feedback level-error">
         <p role="alert"><span class="icon-alert" aria-hidden="true"><span class="larger">&#9888; </span></span>Please correct the errors <b>noted in red</b> below:</p>
@@ -104,12 +108,7 @@ <h1 class="default-title">Register to become a PSF Member</h1>
           class="deletion-form"
           onsubmit="return confirm('Are you sure?');">
         {% csrf_token %}
-        <p>
-            <label for="id_delete_membership">
-                You can delete your PSF membership if you don't want to get emails from the PSF.
-            </label>
-            <button type="submit" id="id_delete_membership">Delete your PSF membership</button>
-        </p>
+        <button type="submit" id="id_delete_membership">Delete your PSF Basic Membership</button>
     </form>
     {% endif %}
 

users/forms.py

@@ -68,10 +68,6 @@ def __init__(self, *args, **kwargs):
         code_of_conduct = self.fields['psf_code_of_conduct']
         code_of_conduct.widget = forms.Select(choices=self.COC_CHOICES)
 
-        announcements = self.fields['psf_announcements']
-        announcements.widget = forms.CheckboxInput()
-        announcements.initial = False
-
     class Meta:
         model = Membership
         fields = [
@@ -83,7 +79,6 @@ class Meta:
             'country',
             'postal_code',
             'psf_code_of_conduct',
-            'psf_announcements',
         ]
 
     def clean_psf_code_of_conduct(self):
@@ -105,4 +100,3 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         del(self.fields['psf_code_of_conduct'])
-        del(self.fields['psf_announcements'])