Merge pull request #725 from cisagov/mr/update-domain-example-section

Mr/update domain example section
cisagov · Jun 21, 2023 · 9e0c111 · 9e0c111
2 parents ac34ada + 2e46cb0
commit 9e0c111
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html
@@ -20,7 +20,7 @@
   meets our requirements. We’ll work with you to find the best domain for your
   organization.</p>
 
-  <p>Here are domain examples and more guidance for your type of organization.</p>
+  <h2 class="margin-top-3">Domain examples for your type of organization</h2>
   <div class="domain_example">
     {% include "includes/domain_example.html" %}
   </div>
@@ -36,13 +36,13 @@
 
   {{ forms.0.management_form }}
 
-  <fieldset class="usa-fieldset">
+  <fieldset class="usa-fieldset margin-top-2">
     <legend>
       <h2>What .gov domain do you want?&nbsp;<abbr class="usa-hint usa-hint--required
           text-super" title="required">*</abbr></h2>
     </legend>
 
-    <p id="domain_instructions">After you enter your domain, we’ll make sure it’s
+    <p id="domain_instructions" class="margin-top-05">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>
@@ -64,12 +64,12 @@ <h2>What .gov domain do you want?&nbsp;<abbr class="usa-hint usa-hint--required
 
   {{ forms.1.management_form }}
 
-  <fieldset class="usa-fieldset">
+  <fieldset class="usa-fieldset margin-top-1">
     <legend>
       <h2>Alternative domains</h2>
     </legend>
 
-    <p id="alt_domain_instructions">Are there other domains you’d like if we can’t give
+    <p id="alt_domain_instructions" class="margin-top-05">Are there other domains you’d like if we can’t give
     you your first choice? Entering alternative domains is optional.</p>
 
     {% with attr_aria_describedby="alt_domain_instructions" %}

diff --git a/src/registrar/templates/includes/domain_example.html b/src/registrar/templates/includes/domain_example.html
@@ -1,22 +1,24 @@
+{% load field_helpers url_helpers %}
+
 {% if is_federal %}
   {% if federal_type == 'executive' %}
-    <p><strong>Examples:</strong></p>
+
     <ul class="usa-list">
       <li>fema.gov</li>
       <li>medicare.gov</li>
       <li>usda.gov</li>
     </ul>
 
   {% elif federal_type == 'judicial' %}
-    <p><strong>Examples:</strong></p>
+
     <ul class="usa-list">
       <li>uscourts.gov</li>
       <li>ustaxcourt.gov</li>
       <li>ussc.gov</li>
     </ul>
 
   {% elif federal_type == 'legislative' %}
-    <p><strong>Examples:</strong></p>
+
     <ul class="usa-list">
       <li>gao.gov</li>
       <li>gpo.gov</li>
@@ -25,7 +27,7 @@
 {% endif %}
 
 {% elif organization_type == 'interstate' %}
-  <p><strong>Examples:</strong></p>
+
   <ul class="usa-list">
     <li>EMScompact.gov</li>
     <li>wmataOIG.gov</li>
@@ -63,23 +65,23 @@
   </ul>
 
 {% elif organization_type == 'city' %}
-  <p>Most city domains must include the two-letter state abbreviation or clearly spell out the state name unless city or county exceptions apply. Using phrases like “City of” or “Town of” is optional.</p>
-  <p><strong>Examples:</strong></p>
-    <ul class="usa-list">
-      <li>CityofEudoraKS.gov</li>
-      <li>Pocatello.gov</li>
-      <li>WallaWallaWA.gov</li>
-    </ul>
-  <p>Some cities don’t have to refer to their state.
+  <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>Cities that meet one of the criteria below don’t have to refer to their state in the domain name.
     <ul class="usa-list">
       <li>City names that are not shared by any other U.S. city, town, or village can be requested without referring to the state. We use the <a href="https://www.census.gov/geographies/reference-files/time-series/geo/gazetteer-files.html">Census Bureau’s National Places Gazetteer Files</a> to determine if names are unique.</li>
       <li>Certain cities are so well-known that they may not require a state reference to communicate location. We use the list of U.S. “dateline cities” in the Associated Press Stylebook to make this determination.</li>
       <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><strong>Examples:</strong></p>
+    <ul class="usa-list">
+      <li>CityofEudoraKS.gov</li>
+      <li>Pocatello.gov</li>
+      <li>WallaWallaWA.gov</li>
+    </ul>
   </p>
 
 {% elif organization_type == 'special_district' %}
-  <p>Domain names must represent your organization or institutional name, not solely the services you provide. It also needs to include your two-letter state abbreviation or clearly spell out the state name unless <a href="{% url 'todo' %}">city or county exceptions apply</a>.</p>
+  <p>Domain names must represent your organization or institutional name, not solely the services you provide. It also needs to include your two-letter state abbreviation or clearly spell out the state name unless <a href="{% public_site_url 'domains/choosing/#counties' %}">county or city exceptions apply</a>.</p>
   <p><strong>Examples:</strong></p>
   <ul class="usa-list">
     <li>ElectionsShelbyTN.gov</li>