Remove colon from field lables, update content

src/registrar/forms/application_wizard.py

@@ -11,8 +11,12 @@ from formtools.wizard.views import NamedUrlSessionWizardView  # type: ignore
 
 logger = logging.getLogger(__name__)
 
+class RegistrarForm(forms.Form):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', '')
+        super(RegistrarForm, self).__init__(*args, **kwargs)
 
-class OrganizationForm(forms.Form):
+class OrganizationForm(RegistrarForm):
     organization_type = forms.ChoiceField(
         required=True,
         choices=[
@@ -61,7 +65,7 @@ class OrganizationForm(forms.Form):
     )
 
 
-class OrgContactForm(forms.Form):
+class OrgContactForm(RegistrarForm):
     organization_name = forms.CharField(label="Organization Name")
     address_line1 = forms.CharField(label="Address line 1")
     address_line2 = forms.CharField(
@@ -74,7 +78,7 @@ class OrgContactForm(forms.Form):
             )
     zipcode = forms.CharField(label="ZIP code")
 
-class AuthorizingOfficialForm(forms.Form):
+class AuthorizingOfficialForm(RegistrarForm):
     given_name = forms.CharField(label="First name/given name")
     middle_name = forms.CharField(
             required=False,
@@ -85,22 +89,22 @@ class AuthorizingOfficialForm(forms.Form):
     email = forms.EmailField(label="Email")
     phone = forms.CharField(label="Phone")
 
-class CurrentSitesForm(forms.Form):
+class CurrentSitesForm(RegistrarForm):
     current_site = forms.CharField(
             required=False,
             label="Enter your organization’s public website, if you have one. For example, www.city.com.")
 
-class DotGovDomainForm(forms.Form):
+class DotGovDomainForm(RegistrarForm):
     dotgov_domain = forms.CharField(label="What .gov domain do you want?")
     alternative_domain = forms.CharField(
             required = False,
             label="Are there other domains you’d like if we can’t give you your first choice? Entering alternative domains is optional.",
             )
 
-class PurposeForm(forms.Form):
+class PurposeForm(RegistrarForm):
     purpose_field = forms.CharField(label="Purpose", widget=forms.Textarea())
 
-class YourContactForm(forms.Form):
+class YourContactForm(RegistrarForm):
     given_name = forms.CharField(label="First name/given name")
     middle_name = forms.CharField(
             required=False,
@@ -111,7 +115,7 @@ class YourContactForm(forms.Form):
     email = forms.EmailField(label="Email")
     phone = forms.CharField(label="Phone")
 
-class OtherContactsForm(forms.Form):
+class OtherContactsForm(RegistrarForm):
     given_name = forms.CharField(label="First name/given name")
     middle_name = forms.CharField(
             required=False,
@@ -122,23 +126,23 @@ class OtherContactsForm(forms.Form):
     email = forms.EmailField(label="Email")
     phone = forms.CharField(label="Phone")
 
-class SecurityEmailForm(forms.Form):
+class SecurityEmailForm(RegistrarForm):
     email = forms.EmailField(
             required=False,
-            label="Email",
+            label="Security email",
             )
 
-class AnythingElseForm(forms.Form):
+class AnythingElseForm(RegistrarForm):
     anything_else = forms.CharField(
             required=False,
             label="Anything else we should know", 
             widget=forms.Textarea()
             )
 
-class RequirementsForm(forms.Form):
+class RequirementsForm(RegistrarForm):
     agree_check = forms.BooleanField(label="I read and agree to the .gov domain requirements.")
 
-class ReviewForm(forms.Form):
+class ReviewForm(RegistrarForm):
     pass
 
 # List of forms in our wizard. Each entry is a tuple of a name and a form

src/registrar/templates/application_authorizing_official.html

@@ -7,9 +7,17 @@
 
 <h2>Who is the authorizing official for your organization</h2>
 
-<p id="instructions">Your authorizing official is the person within your organization who can authorize your domain request. This is generally the highest ranking or highest elected official in your organization. Read more about <a href="#">who can serve as an authorizing official</a>.
+<div id="instructions">
+  <p>Your authorizing official is the person within your organization who can authorize your domain request. This is generally the highest ranking or highest elected official in your organization. Read more about <a href="#">who can serve as an authorizing official</a>.
   </p>
 
+  <div class="ao-example">
+    <p>Domain requests from <strong>cities</strong> must be authorized by the mayor or the equivalent highest elected official.</p>
+  </div>
+
+  <p>We’ll contact your authorizing official to let them know that you made this request and to double check that they approve it.</p> 
+</div>
+
 <p>All fields are required unless they are marked optional.</p>
 
 <form class="usa-form usa-form--large" id="step__{{wizard.steps.current}}" method="post">

src/registrar/templates/application_dotgov_domain.html

@@ -12,12 +12,12 @@
   </ul>
   </p>
 
-  <p>Note that <em> only federal agencies can request generic terms </em>like vote.gov.</p> 
+  <p>Note that <strong> only federal agencies can request generic terms </strong>like vote.gov.</p> 
 
   <p>We’ll try to give you the domain you want. We first need to make sure your request meets our requirements. We’ll work with you to find the best domain for your organization.</p>
 
   <p>Here are a few domain examples for your type of organization.</p>
-
+  <div class="domain-example">
     <p> Most city domains must include the two-letter state abbreviation or clearly spell out the state name. Using phrases like “City of” or “Town of” is optional.</p>
     <p>Examples:
     <ul class="usa-list">
@@ -33,6 +33,7 @@
       <li>The 50 largest cities, as measured by population according to the Census Bureau, can have .gov domain names that don’t refer to their state.</li>
     </ul>
     </p>
+  </div>
 
 <form id="step__{{wizard.steps.current}}" class="usa-form usa-form--large" method="post">
   <h2> What .gov domain do you want? </h2>
@@ -46,6 +47,7 @@
     {{ wizard.form.dotgov_domain|add_class:"usa-input"|attr:"aria-describedby:domain_instructions" }}
     <span class="padding-top-05 padding-left-2px">.gov </span>
   </div>
+  <button type="button" class="usa-button">Check availability </button>
 
   <h2>Alternative domains</h2>
 
@@ -64,6 +66,8 @@
     </button>
   </div>
 
+  <p>If you’re not sure this is the domain you want, that’s okay. You can change it later.</p> 
+
   {{ block.super }}
   
 </form>

src/registrar/templates/application_org_contact.html

@@ -6,10 +6,14 @@
 
 <h2>What is the name and mailing address of your organization?</h2>
 
-<p id="instructions">Enter the name of the organization your represent. Your organization might be part
+<div id="instructions">
+  <p>Enter the name of the organization your represent. Your organization might be part
   of a larger entity. If so, enter information about your part of the larger entity.</p>
 
+  <p>Once your domain is approved, the name of your organization will be publicly listed as the domain registrant. </p>
+
   <p>All fields are required unless they are marked optional.</p>
+</div>
 
 <form id="step__{{wizard.steps.current}}" class="usa-form usa-form--large" method="post">
   {{ wizard.management_form }}

src/registrar/templates/application_other_contacts.html

@@ -12,6 +12,7 @@
   {{ wizard.management_form }}
   {% csrf_token %}
 
+  <h2> Contact 2 </h2>
   <fieldset class="usa-fieldset">
     {{ wizard.form.given_name|add_label_class:"usa-label" }}
     {{ wizard.form.given_name|add_class:"usa-input"|attr:"aria-describedby:instructions" }}

src/registrar/templates/application_purpose.html

@@ -4,9 +4,7 @@
 
 {% block form_content %}
 
-<p id="instructions">Explain how you plan to use this domain. Will you use it for a website and/or email? Are you moving your website from another top-level domain (like .com or .org)?Read about <a href="#">activities that are prohibited on .gov domains.</a></p>
+<p id="instructions">Describe your organization’s mission or the reason for your domain request. Explain how you plan to use this domain. Will you use it for a website and/or email? Are you moving your website from another top-level domain (like .com or .org)? Read about <a href="#">activities that are prohibited on .gov domains.</a></p>
-
-<p>All fields are required unless they are marked optional.</p>
 
 <form id="step__{{wizard.steps.current}}" class="usa-form usa-form--large" method="post">
   <div class="usa-form-group">