Merge pull request #348 from cisagov/mr/domain-request-form-text-updates

Mr/domain request form text updates

src/registrar/forms/application_wizard.py

@@ -281,7 +281,10 @@ class AnythingElseForm(RegistrarForm):
 
 class RequirementsForm(RegistrarForm):
     is_policy_acknowledged = forms.BooleanField(
-        label="I read and agree to the .gov domain requirements."
+        label=(
+            "I read and agree to the requirements for registering "
+            "and operating .gov domains."
+        )
     )
 
 

src/registrar/models/domain_application.py

@@ -93,21 +93,28 @@ class DomainApplication(TimeStampedModel):
         ARMED_FORCES_AP = "AP", "Armed Forces Pacific (AP)"
 
     class OrganizationChoices(models.TextChoices):
-        FEDERAL = "federal", "Federal: a federal agency"
+        FEDERAL = (
+            "federal",
+            "Federal: an agency of the U.S. government's executive, legislative, "
+            "or judicial branches",
+        )
         INTERSTATE = "interstate", "Interstate: an organization of two or more states"
         STATE_OR_TERRITORY = "state_or_territory", (
-            "State or Territory: One of the 50 U.S. states, the District of "
+            "State or territory: one of the 50 U.S. states, the District of "
             "Columbia, American Samoa, Guam, Northern Mariana Islands, "
             "Puerto Rico, or the U.S. Virgin Islands"
         )
         TRIBAL = "tribal", (
             "Tribal: a tribal government recognized by the federal or "
-            "state government"
+            "a state government"
         )
         COUNTY = "county", "County: a county, parish, or borough"
         CITY = "city", "City: a city, town, township, village, etc."
         SPECIAL_DISTRICT = "special_district", (
-            "Special District: an independent organization within a single state"
+            "Special district: an independent organization within a single state"
+        )
+        SCHOOL_DISTRICT = "school_district", (
+            "School district: a school district that is not part of a local government"
         )
 
     class BranchChoices(models.TextChoices):
@@ -288,7 +295,7 @@ class DomainApplication(TimeStampedModel):
     federal_agency = models.TextField(
         null=True,
         blank=True,
-        help_text="Top level federal agency",
+        help_text="Federal agency",
     )
 
     federal_type = models.CharField(
@@ -296,7 +303,7 @@ class DomainApplication(TimeStampedModel):
         choices=BranchChoices.choices,
         null=True,
         blank=True,
-        help_text="Branch of federal government",
+        help_text="Federal government branch",
     )
 
     is_election_board = models.BooleanField(
@@ -314,13 +321,13 @@ class DomainApplication(TimeStampedModel):
     address_line1 = models.TextField(
         null=True,
         blank=True,
-        help_text="Address line 1",
+        help_text="Street address",
     )
     address_line2 = models.CharField(
         max_length=15,
         null=True,
         blank=True,
-        help_text="Address line 2",
+        help_text="Street address line 2",
     )
     city = models.TextField(
         null=True,
@@ -331,19 +338,19 @@ class DomainApplication(TimeStampedModel):
         max_length=2,
         null=True,
         blank=True,
-        help_text="State/Territory",
+        help_text="State, territory, or military post",
     )
     zipcode = models.CharField(
         max_length=10,
         null=True,
         blank=True,
-        help_text="ZIP code",
+        help_text="Zip code",
         db_index=True,
     )
     urbanization = models.TextField(
         null=True,
         blank=True,
-        help_text="Urbanization",
+        help_text="Urbanization (Puerto Rico only)",
     )
 
     authorizing_official = models.ForeignKey(
@@ -388,7 +395,7 @@ class DomainApplication(TimeStampedModel):
     purpose = models.TextField(
         null=True,
         blank=True,
-        help_text="Purpose of the domain",
+        help_text="Purpose of your domain",
     )
 
     other_contacts = models.ManyToManyField(

src/registrar/templates/application_authorizing_official.html

@@ -5,7 +5,7 @@
 
 {% block form_content %}
 
-<h2>Who is the authorizing official for your organization</h2>
+<h2>Who is the authorizing official for your organization?</h2>
 
 <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>.
@@ -26,7 +26,7 @@
 
   <fieldset class="usa-fieldset">
     <legend class="usa-sr-only">
-      Who is the authorizing official for your organization
+      Who is the authorizing official for your organization?
     </legend>
     {{ wizard.form.first_name|add_label_class:"usa-label" }}
     {{ wizard.form.first_name|add_class:"usa-input"}}

src/registrar/templates/application_done.html

@@ -14,7 +14,7 @@ your authorizing official, and any contacts you added.</p>
 <ul>
 
     <li> We'll review your request. This could take up to two weeks. During
-        this review we'll verify that you're eligible for a .gov domain, that
+        this review we'll verify that your organization is eligible for a .gov domain, that
         your authorizing official approves your request, and that your domain
         meets our naming requirements.
     </li>

src/registrar/templates/application_dotgov_domain.html

@@ -23,7 +23,7 @@
 
 <form id="step__{{wizard.steps.current}}" class="usa-form usa-form--large" method="post">
   <h2> What .gov domain do you want? </h2>
-  <p class="domain_instructions"> After you enter your domain, we’ll make sure it’s available and that it meets some of our naming requirements. If your domain passes these initial checks, we’ll verify that it meets all of our requirements once you complete and submit the rest of the domain request form. </p>
+  <p class="domain_instructions"> After you enter your domain, we’ll make sure it’s available and that it meets some of our naming requirements. If your domain passes these initial checks, we’ll verify that it meets all of our requirements once you complete and submit the rest of this form. </p>
 
   {{ wizard.management_form }}
   {% csrf_token %}

src/registrar/templates/application_org_contact.html

@@ -8,10 +8,10 @@
 <h2>What is the name and mailing address of your organization?</h2>
 
 <div id="instructions">
-  <p>Enter the name of the organization your represent. Your organization might be part
+  <p>Enter the name of the organization you 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>If your domain request 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>

src/registrar/templates/application_org_type.html

@@ -13,7 +13,7 @@
 
   <fieldset id="organization_type__fieldset" class="usa-fieldset">
     <legend class="usa-legend">
-      <h2> What kind of government organization do you represent?</h2>
+      <h2> What kind of U.S.-based government organization do you represent?</h2>
     </legend>
     {{ wizard.form.organization_type.errors }}
     {% for choice in choices.values %}

src/registrar/templates/application_other_contacts.html

@@ -5,7 +5,7 @@
 
 {% block form_content %}
 
-<p id="instructions">We strongly encourage you to have at least two points of contact for your domain. Many organizations have an administrative point of contact and a technical point of contact. We recommend that you add at least one more contact.</p>
+<p id="instructions">We’d like to contact other employees with administrative or technical responsibilities in your organization. For example, they could be involved in managing your organization or its technical infrastructure. This information will help us assess your eligibility and understand the purpose of the .gov domain. These contacts should be in addition to you and your authorizing official. </p>
 <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_purpose.html

@@ -4,7 +4,9 @@
 
 {% block form_content %}
 
-<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 id="instructions">.Gov domain names are intended for use on the internet. They should be registered with an intent to deploy services, not simply to reserve a name. .Gov domains should not be registered for primarily internal use.</p>
+  
+<p id="instructions">Describe 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>
 
 <form id="step__{{wizard.steps.current}}" class="usa-form usa-form--large" method="post">
   <div class="usa-form-group">

src/registrar/templates/application_requirements.html

@@ -4,9 +4,7 @@
 
 {% block form_content %}
 
-<p>The .gov domain exists to support a broad diversity of government missions and public initiatives. Generally, the .gov registry does not review or audit how government organizations use their domains.</p>
-
-<p>However, misuse of an individual .gov domain can reflect upon the integrity of the entire .gov space. There are categories of misuse that are statutorily prohibited or abusive in nature.</p>
+<p>The .gov domain exists to support a broad diversity of government missions and public initiatives. Generally, the .gov registry does not review or audit how government organizations use their domains. However, misuse of an individual .gov domain can reflect upon the integrity of the entire .gov space. There are categories of misuse that are statutorily prohibited or abusive in nature.</p>
 
 <h2>Prohibited activities for .gov domains</h2>
 
@@ -20,12 +18,12 @@
 <p>A .gov domain must not be used to distribute or promote material whose distribution violates applicable law.</p>
 
 <h3>Malicious cyber activity </h3>
-<p>.gov is a trusted and safe space. .gov domains must not distribute malware, host open redirects, or otherwise engage in malicious cyber activity.</p>
+<p>.Gov is a trusted and safe space. .Gov domains must not distribute malware, host open redirects, or otherwise engage in malicious cyber activity.</p>
 
 
 <h2>Required activities for .gov domain registrants </h2>
 
-<h3>Keep your contact information update</h3>
+<h3>Keep your contact information updated</h3>
 <p>As a .gov domain registrant, maintain current and accurate contact information in the .gov registrar. We strongly recommend that you create and use a security contact.</p>
 
 <h3>Be responsive if we contact you</h3>
@@ -39,12 +37,87 @@
   <li>Emails to domain contacts </li>
   <li>Phone calls to domain contacts</li>
   <li>Email or phone call to the authorizing official</li>
-  <li>Email or phone call to the government organization, a parent organization, or affiliated entities</li>
+  <li>Emails or phone calls to the government organization, a parent organization, or affiliated entities</li>
 </ul>
 </p>
 
 <p>We understand the critical importance of the availability of .gov domains. Suspending or terminating a .gov domain is reserved only for prolonged, unresolved serious violations where the registrant is non-responsive. We will make extensive efforts to contact registrants and to identify potential solutions, and will make reasonable accommodations for remediation timelines proportional to the severity of the issue.</p>
 
+<h2>Requirements for authorizing officials</h2>
+
+<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.</p>
+
+<h3>Executive branch federal agencies</h3>
+
+<p>Domain requests from executive branch agencies must be authorized by CIOs or agency heads.</p> 
+
+<p>Domain requests from executive branch agencies are subject to guidance issued by the U.S. Office of Management and Budget.</p>
+
+<h3>Judicial branch federal agencies</h3>
+
+<p>Domain requests for judicial branch agencies, except the U.S. Supreme Court, must be authorized by the director or CIO of the Administrative Office (AO) of the United States Courts.</p>
+
+<p>Domain requests from the U.S. Supreme Court must be authorized by the director of information technology for the U.S. Supreme Court.</p>
+
+<h3>Legislative branch federal agencies</h3>
+
+<h4>U.S. Senate</h4>
+
+<p>Domain requests from the U.S. Senate must come from the Senate Sergeant at Arms.</p>
+
+<h4>U.S. House of Representatives</h4>
+
+<p>Domain requests from the U.S. House of Representatives must come from the House Chief Administrative Officer.</p>
+
+<h4>Other legislative branch agencies</h4>
+
+<p>Domain requests from legislative branch agencies must come from the agency’s head or CIO.</p>
+
+<p>Domain requests from legislative commissions must come from the head of the commission, or the head or CIO of the parent agency, if there is one.</p>
+
+<h3>Interstate</h3>
+
+<p>Domain requests from interstate organizations must be authorized by the highest-ranking executive (president, director, chair, or equivalent) or one of the state’s governors or CIOs.</p>
+
+<h3>U.S. states and territories</h3>
+
+<h4>States and territories: executive branch</h4>
+
+<p>Domain requests from states and territories must be authorized by the governor or the state CIO.</p>
+
+<h4>States and territories: judicial and legislative branches</h4>
+
+<p>Domain requests from state legislatures and courts must be authorized by an agency’s CIO or highest-ranking executive.</p>
+
+<h3>Tribal governments</h3>
+
+<p>Domain requests from federally-recognized tribal governments must be authorized by tribal chiefs as noted by the <a href="https://www.bia.gov/service/tribal-leaders-directory">Bureau of Indian Affairs</a>.</p>
+
+<h3>Counties</h3>
+
+<p>Domain requests from counties must be authorized by the chair of the county commission or the equivalent highest elected official.</p>
+
+<h3>Cities</h3>
+
+<p>Domain requests from cities must be authorized by the mayor or the equivalent highest elected official.</p>
+
+<h3>Special districts</h3>
+
+<p>Domain requests from special districts must be authorized by the highest-ranking executive (president, director, chair, or equivalent) or state CIOs for state-based organizations.</p>
+
+<h3>School districts</h3>
+
+<p>Domain requests from school district governments must be authorized by the highest-ranking executive (the chair of a school district’s board or a superintendent).</p>
+
+<h2>Requirements for .gov domain names</h2>
+<p>.Gov domains must:</p>
+<ul class="usa-list"> 
+  <li>Be available</li>
+  <li>Be unique</li>
+  <li>Relate to your organization’s name, location, and/or services</li>
+  <li>Be clear to the general public. Your domain name must not be easily confused with other organizations.</li>
+</ul>
+
 
 <h2>HSTS preloading</h2>
 <p>The .gov program will preload all newly registered .gov domains for HTTP Strict Transport Security (HSTS).</p> 

src/registrar/tests/test_views.py

@@ -85,7 +85,8 @@ class LoggedInTests(TestWithUser):
     def test_application_form_view(self):
         response = self.client.get("/register/", follow=True)
         self.assertContains(
-            response, "What kind of government organization do you represent?"
+            response,
+            "What kind of U.S.-based government organization do you represent?",
         )
 
 
@@ -111,7 +112,9 @@ class DomainApplicationTests(TestWithUser, WebTest):
         page = self.app.get(reverse("application")).follow()
         # submitting should get back the same page if the required field is empty
         result = page.form.submit()
-        self.assertIn("What kind of government organization do you represent?", result)
+        self.assertIn(
+            "What kind of U.S.-based government organization do you represent?", result
+        )
 
     def test_application_form_submission(self):
         """Can fill out the entire form and submit.