From fb40943489a5f7a92d714fea19a6bb0c0cdd43d9 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 16:39:36 -0700 Subject: [PATCH 01/44] Update external link in domain_security_email.html to open in new tab --- src/registrar/templates/domain_security_email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html index 8fb0ccfb0..7958d7ac1 100644 --- a/src/registrar/templates/domain_security_email.html +++ b/src/registrar/templates/domain_security_email.html @@ -7,7 +7,7 @@

Security email

-

We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain. Security emails are made public and included in the .gov domain data we provide.

+

We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain. Security emails are made public and included in the .gov domain data we provide.

A security contact should be capable of evaluating or triaging security reports for your entire domain. Use a team email address, not an individual’s email. We recommend using an alias, like security@domain.gov.

From 497c957863b159b8de17a83962d5a32f08a4513f Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 16:44:36 -0700 Subject: [PATCH 02/44] Update external link in domain_authorizing_official.html to open in new tab --- src/registrar/templates/domain_authorizing_official.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_authorizing_official.html b/src/registrar/templates/domain_authorizing_official.html index c12f1f290..93b4b1b50 100644 --- a/src/registrar/templates/domain_authorizing_official.html +++ b/src/registrar/templates/domain_authorizing_official.html @@ -10,7 +10,7 @@

Authorizing official

Your authorizing official is the person within your organization who can - authorize domain requests. This person must be in a role of significant, executive responsibility within the organization. Read more about who can serve as an authorizing official.

+ authorize domain requests. This person must be in a role of significant, executive responsibility within the organization. Read more about who can serve as an authorizing official.

{% include "includes/required_fields.html" %} From 833b6f1b443c11c5f8277ed000c27924a2df9848 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:12:22 -0700 Subject: [PATCH 03/44] Update external link in application_tribal_government.html so that it has the external link icon --- src/registrar/templates/application_tribal_government.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_tribal_government.html b/src/registrar/templates/application_tribal_government.html index 3c2a8999f..f69002344 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -7,7 +7,7 @@ {% with sublabel_text="Please include the entire name of your tribe as recognized by the Bureau of Indian Affairs." %} {% with link_text="Bureau of Indian Affairs" %} {% with link_href="https://www.federalregister.gov/documents/2023/01/12/2023-00504/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of" %} - {% with target_blank="true" %} + {% with class="usa-link usa-link--external", rel="noopener noreferrer", target_blank="true" %} {% input_with_errors forms.0.tribe_name %} {% endwith %} {% endwith %} From 030be7275aa66fd124cd4261ce76c2aef46c9b0e Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:16:14 -0700 Subject: [PATCH 04/44] Update external link in application_purpose.html to open in new tab --- src/registrar/templates/application_purpose.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_purpose.html b/src/registrar/templates/application_purpose.html index ca2ff7287..5135e6678 100644 --- a/src/registrar/templates/application_purpose.html +++ b/src/registrar/templates/application_purpose.html @@ -8,7 +8,7 @@ domain name or for mainly internal use.

Describe the reason for your domain request. Explain how you plan to use this domain. Who is your intended audience? 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 activities that are prohibited on .gov domains.

+Read about activities that are prohibited on .gov domains.

{% endblock %} From 5abeef900b4f28f6be0aac30681f5e8598a42561 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:19:24 -0700 Subject: [PATCH 05/44] Update external link in application_dotgov_domain.html to open in new tab --- src/registrar/templates/application_dotgov_domain.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html index fd6ce9604..0d11203ad 100644 --- a/src/registrar/templates/application_dotgov_domain.html +++ b/src/registrar/templates/application_dotgov_domain.html @@ -2,7 +2,7 @@ {% load static field_helpers url_helpers %} {% block form_instructions %} -

Before requesting a .gov domain, please make sure it +

Before requesting a .gov domain, please make sure it meets our naming requirements. Your domain name must:

  • Be available
    • From 32ea94e313a32ed3e44cb8e74529674ddd967384 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:22:00 -0700 Subject: [PATCH 06/44] Update external link in application_authorizing_official.html to open in new tab --- src/registrar/templates/application_authorizing_official.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html index 2ac99be80..859a47520 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -12,7 +12,7 @@ {% include "includes/ao_example.html" %} -

    We typically don’t reach out to the authorizing official, but if contact is necessary, our practice is to coordinate first with you, the requestor. Read more about who can serve as an authorizing official.

    +

    We typically don’t reach out to the authorizing official, but if contact is necessary, our practice is to coordinate first with you, the requestor. Read more about who can serve as an authorizing official.

    {% endblock %} From 4d7c85978757221a6964c1b5f3df1c129d3230d7 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:34:50 -0700 Subject: [PATCH 07/44] Update external links in domain_example.html to open in new tabs --- src/registrar/templates/includes/domain_example.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/includes/domain_example.html b/src/registrar/templates/includes/domain_example.html index 8f803aa24..3b34b8e80 100644 --- a/src/registrar/templates/includes/domain_example.html +++ b/src/registrar/templates/includes/domain_example.html @@ -55,7 +55,7 @@
{% elif organization_type == 'county' %} -

Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the Census Bureau’s National Places Gazetteer Files to determine if county names are unique.

+

Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the Census Bureau’s National Places Gazetteer Files to determine if county names are unique.

Examples:

  • AdamsCountyMS.gov
    • @@ -68,7 +68,7 @@

    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.

    Cities that meet one of the criteria below don’t have to refer to their state in the domain name.

      -
    • 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 Census Bureau’s National Places Gazetteer Files to determine if names are unique.
      • +
    • 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 Census Bureau’s National Places Gazetteer Files to determine if names are unique.
    • 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.
    • 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.
    @@ -81,7 +81,7 @@

    {% elif organization_type == 'special_district' %} -

    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 county or city exceptions apply.

    +

    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 county or city exceptions apply.

    Examples:

    • ElectionsShelbyTN.gov
      • From 28fc18bd75a90691b7346f2aad85938d155e021f Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:54:08 -0700 Subject: [PATCH 08/44] Update external link in ao_example.html to open in new tab --- src/registrar/templates/includes/ao_example.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html index 8a9d22915..13af78d3e 100644 --- a/src/registrar/templates/includes/ao_example.html +++ b/src/registrar/templates/includes/ao_example.html @@ -44,7 +44,7 @@

      Domain requests from state legislatures and courts must be authorized by an agency’s Chief Information Officer or highest-ranking executive.

      {% elif organization_type == 'tribal' %} -

      Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the Bureau of Indian Affairs.

      +

      Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the Bureau of Indian Affairs.

      Domain requests from state-recognized tribal governments must be authorized by the leader of the tribe, as determined by the state’s tribal recognition initiative.

      {% endif %} From 789813d4823162ae9fb94762ceed86334914a934 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 16:39:36 -0700 Subject: [PATCH 09/44] Update external link in domain_security_email.html to open in new tab --- src/registrar/templates/domain_security_email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html index 8fb0ccfb0..7958d7ac1 100644 --- a/src/registrar/templates/domain_security_email.html +++ b/src/registrar/templates/domain_security_email.html @@ -7,7 +7,7 @@

      Security email

      -

      We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain. Security emails are made public and included in the .gov domain data we provide.

      +

      We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain. Security emails are made public and included in the .gov domain data we provide.

      A security contact should be capable of evaluating or triaging security reports for your entire domain. Use a team email address, not an individual’s email. We recommend using an alias, like security@domain.gov.

      From 1774b8d840fecc92dc4ab5936b03f55b28dbc271 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 16:44:36 -0700 Subject: [PATCH 10/44] Update external link in domain_authorizing_official.html to open in new tab --- src/registrar/templates/domain_authorizing_official.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_authorizing_official.html b/src/registrar/templates/domain_authorizing_official.html index c12f1f290..93b4b1b50 100644 --- a/src/registrar/templates/domain_authorizing_official.html +++ b/src/registrar/templates/domain_authorizing_official.html @@ -10,7 +10,7 @@

      Authorizing official

      Your authorizing official is the person within your organization who can - authorize domain requests. This person must be in a role of significant, executive responsibility within the organization. Read more about who can serve as an authorizing official.

      + authorize domain requests. This person must be in a role of significant, executive responsibility within the organization. Read more about who can serve as an authorizing official.

      {% include "includes/required_fields.html" %} From b5bb9653d78d790eaa7a1cbbff9f0cb383faf701 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:12:22 -0700 Subject: [PATCH 11/44] Update external link in application_tribal_government.html so that it has the external link icon --- src/registrar/templates/application_tribal_government.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_tribal_government.html b/src/registrar/templates/application_tribal_government.html index 3c2a8999f..f69002344 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -7,7 +7,7 @@ {% with sublabel_text="Please include the entire name of your tribe as recognized by the Bureau of Indian Affairs." %} {% with link_text="Bureau of Indian Affairs" %} {% with link_href="https://www.federalregister.gov/documents/2023/01/12/2023-00504/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of" %} - {% with target_blank="true" %} + {% with class="usa-link usa-link--external", rel="noopener noreferrer", target_blank="true" %} {% input_with_errors forms.0.tribe_name %} {% endwith %} {% endwith %} From 9b1e9c45989812043bc7ffe260743ecb9321edfa Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:16:14 -0700 Subject: [PATCH 12/44] Update external link in application_purpose.html to open in new tab --- src/registrar/templates/application_purpose.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_purpose.html b/src/registrar/templates/application_purpose.html index ca2ff7287..5135e6678 100644 --- a/src/registrar/templates/application_purpose.html +++ b/src/registrar/templates/application_purpose.html @@ -8,7 +8,7 @@ domain name or for mainly internal use.

      Describe the reason for your domain request. Explain how you plan to use this domain. Who is your intended audience? 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 activities that are prohibited on .gov domains.

      +Read about activities that are prohibited on .gov domains.

      {% endblock %} From 1eb5ce5cfa90dcd6f6452262a5f68e1b1bf96a2e Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:19:24 -0700 Subject: [PATCH 13/44] Update external link in application_dotgov_domain.html to open in new tab --- src/registrar/templates/application_dotgov_domain.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html index fd6ce9604..0d11203ad 100644 --- a/src/registrar/templates/application_dotgov_domain.html +++ b/src/registrar/templates/application_dotgov_domain.html @@ -2,7 +2,7 @@ {% load static field_helpers url_helpers %} {% block form_instructions %} -

      Before requesting a .gov domain, please make sure it +

      Before requesting a .gov domain, please make sure it meets our naming requirements. Your domain name must:

      • Be available
        • From cc8bcf69675153b857189ca3ee6328c230840387 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:22:00 -0700 Subject: [PATCH 14/44] Update external link in application_authorizing_official.html to open in new tab --- src/registrar/templates/application_authorizing_official.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html index 2ac99be80..859a47520 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -12,7 +12,7 @@ {% include "includes/ao_example.html" %} -

        We typically don’t reach out to the authorizing official, but if contact is necessary, our practice is to coordinate first with you, the requestor. Read more about who can serve as an authorizing official.

        +

        We typically don’t reach out to the authorizing official, but if contact is necessary, our practice is to coordinate first with you, the requestor. Read more about who can serve as an authorizing official.

        {% endblock %} From a01b2040b8936c1bdb065f30ba12fbe81e5826b8 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:34:50 -0700 Subject: [PATCH 15/44] Update external links in domain_example.html to open in new tabs --- src/registrar/templates/includes/domain_example.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/includes/domain_example.html b/src/registrar/templates/includes/domain_example.html index 8f803aa24..3b34b8e80 100644 --- a/src/registrar/templates/includes/domain_example.html +++ b/src/registrar/templates/includes/domain_example.html @@ -55,7 +55,7 @@
      {% elif organization_type == 'county' %} -

      Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the Census Bureau’s National Places Gazetteer Files to determine if county names are unique.

      +

      Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the Census Bureau’s National Places Gazetteer Files to determine if county names are unique.

      Examples:

      • AdamsCountyMS.gov
        • @@ -68,7 +68,7 @@

        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.

        Cities that meet one of the criteria below don’t have to refer to their state in the domain name.

          -
        • 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 Census Bureau’s National Places Gazetteer Files to determine if names are unique.
          • +
        • 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 Census Bureau’s National Places Gazetteer Files to determine if names are unique.
        • 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.
        • 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.
        @@ -81,7 +81,7 @@

        {% elif organization_type == 'special_district' %} -

        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 county or city exceptions apply.

        +

        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 county or city exceptions apply.

        Examples:

        • ElectionsShelbyTN.gov
          • From 0bd12be2b69f5e7621dbf20ff2dbd909875d678f Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:54:08 -0700 Subject: [PATCH 16/44] Update external link in ao_example.html to open in new tab --- src/registrar/templates/includes/ao_example.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html index 8a9d22915..13af78d3e 100644 --- a/src/registrar/templates/includes/ao_example.html +++ b/src/registrar/templates/includes/ao_example.html @@ -44,7 +44,7 @@

          Domain requests from state legislatures and courts must be authorized by an agency’s Chief Information Officer or highest-ranking executive.

          {% elif organization_type == 'tribal' %} -

          Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the Bureau of Indian Affairs.

          +

          Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the Bureau of Indian Affairs.

          Domain requests from state-recognized tribal governments must be authorized by the leader of the tribe, as determined by the state’s tribal recognition initiative.

          {% endif %} From 7a27083a8eaf39afa5ebdd8d3ee04e93845d345f Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 10:44:44 -0700 Subject: [PATCH 17/44] Updated Help and Contact us links in footer to open in new tab --- src/registrar/templates/includes/footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 869d6007b..29a14c37c 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -27,11 +27,11 @@
          - Help + Help
          |
          - Contact us + Contact us
          From 310d363d314b13abf3c538bd5aca854279b7781e Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 10:52:08 -0700 Subject: [PATCH 18/44] Updated error pages so that links to other sites open in new tab --- src/registrar/templates/401.html | 2 +- src/registrar/templates/403.html | 2 +- src/registrar/templates/404.html | 2 +- src/registrar/templates/500.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/registrar/templates/401.html b/src/registrar/templates/401.html index a419dab53..21ac9db35 100644 --- a/src/registrar/templates/401.html +++ b/src/registrar/templates/401.html @@ -26,7 +26,7 @@ Would you like to try logging in again?

          - If you'd like help with this error contact us . + If you'd like help with this error contact us.

          {% if log_identifier %} diff --git a/src/registrar/templates/403.html b/src/registrar/templates/403.html index 93d32f65a..08057dfba 100644 --- a/src/registrar/templates/403.html +++ b/src/registrar/templates/403.html @@ -26,7 +26,7 @@ Would you like to try logging in again?

          - If you'd like help with this error contact us . + If you'd like help with this error contact us.

          {% if log_identifier %} diff --git a/src/registrar/templates/404.html b/src/registrar/templates/404.html index deec71ce2..cf6983c60 100644 --- a/src/registrar/templates/404.html +++ b/src/registrar/templates/404.html @@ -15,7 +15,7 @@ {% translate "Status 404" %} -

          Try going to the homepage. If you can’t find what you’re looking for, contact us . +

          Try going to the homepage. If you can’t find what you’re looking for, contact us.

          diff --git a/src/registrar/templates/500.html b/src/registrar/templates/500.html index 5749c0ad3..3c95900b2 100644 --- a/src/registrar/templates/500.html +++ b/src/registrar/templates/500.html @@ -19,7 +19,7 @@ {% else %}

          Sorry! Try waiting a few minutes and then reloading the page. - contact us if you need help. + Contact us if you need help.

          {% endif %} From 4763d625dbebc4a030be112dbc1ccc4df7b92b70 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 10:44:44 -0700 Subject: [PATCH 19/44] Updated Help and Contact us links in footer to open in new tab --- src/registrar/templates/includes/footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 869d6007b..29a14c37c 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -27,11 +27,11 @@
          - Help + Help
          |
          - Contact us + Contact us
          From f27ded8e69734a94e9a2b218cac2560f6399ae4d Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 10:52:08 -0700 Subject: [PATCH 20/44] Updated error pages so that links to other sites open in new tab --- src/registrar/templates/401.html | 2 +- src/registrar/templates/403.html | 2 +- src/registrar/templates/404.html | 2 +- src/registrar/templates/500.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/registrar/templates/401.html b/src/registrar/templates/401.html index a419dab53..21ac9db35 100644 --- a/src/registrar/templates/401.html +++ b/src/registrar/templates/401.html @@ -26,7 +26,7 @@ Would you like to try logging in again?

          - If you'd like help with this error contact us . + If you'd like help with this error contact us.

          {% if log_identifier %} diff --git a/src/registrar/templates/403.html b/src/registrar/templates/403.html index 93d32f65a..08057dfba 100644 --- a/src/registrar/templates/403.html +++ b/src/registrar/templates/403.html @@ -26,7 +26,7 @@ Would you like to try logging in again?

          - If you'd like help with this error contact us . + If you'd like help with this error contact us.

          {% if log_identifier %} diff --git a/src/registrar/templates/404.html b/src/registrar/templates/404.html index deec71ce2..cf6983c60 100644 --- a/src/registrar/templates/404.html +++ b/src/registrar/templates/404.html @@ -15,7 +15,7 @@ {% translate "Status 404" %} -

          Try going to the homepage. If you can’t find what you’re looking for, contact us . +

          Try going to the homepage. If you can’t find what you’re looking for, contact us.

          diff --git a/src/registrar/templates/500.html b/src/registrar/templates/500.html index 5749c0ad3..3c95900b2 100644 --- a/src/registrar/templates/500.html +++ b/src/registrar/templates/500.html @@ -19,7 +19,7 @@ {% else %}

          Sorry! Try waiting a few minutes and then reloading the page. - contact us if you need help. + Contact us if you need help.

          {% endif %} From f9486a200257fe9d0c5d727ce687f363cab47d5e Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 11:15:49 -0700 Subject: [PATCH 21/44] Following Django template formatting --- .../templates/application_tribal_government.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/application_tribal_government.html b/src/registrar/templates/application_tribal_government.html index f69002344..48eb79f18 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -7,8 +7,12 @@ {% with sublabel_text="Please include the entire name of your tribe as recognized by the Bureau of Indian Affairs." %} {% with link_text="Bureau of Indian Affairs" %} {% with link_href="https://www.federalregister.gov/documents/2023/01/12/2023-00504/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of" %} - {% with class="usa-link usa-link--external", rel="noopener noreferrer", target_blank="true" %} - {% input_with_errors forms.0.tribe_name %} + {% with class="usa-link usa-link--external" %} + {% with rel="noopener noreferrer" %} + {% with target_blank="true" %} + {% input_with_errors forms.0.tribe_name %} + {% endwith %} + {% endwith %} {% endwith %} {% endwith %} {% endwith %} From 183163819c7d818c91c7cf814c5e522eaeefcb9a Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 11:15:49 -0700 Subject: [PATCH 22/44] Following Django template formatting --- .../templates/application_tribal_government.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/application_tribal_government.html b/src/registrar/templates/application_tribal_government.html index f69002344..48eb79f18 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -7,8 +7,12 @@ {% with sublabel_text="Please include the entire name of your tribe as recognized by the Bureau of Indian Affairs." %} {% with link_text="Bureau of Indian Affairs" %} {% with link_href="https://www.federalregister.gov/documents/2023/01/12/2023-00504/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of" %} - {% with class="usa-link usa-link--external", rel="noopener noreferrer", target_blank="true" %} - {% input_with_errors forms.0.tribe_name %} + {% with class="usa-link usa-link--external" %} + {% with rel="noopener noreferrer" %} + {% with target_blank="true" %} + {% input_with_errors forms.0.tribe_name %} + {% endwith %} + {% endwith %} {% endwith %} {% endwith %} {% endwith %} From b06bd0309c4981607be9e72d2cdd0884eed63d85 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 16:39:36 -0700 Subject: [PATCH 23/44] Update external link in domain_security_email.html to open in new tab --- src/registrar/templates/domain_security_email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html index 8fb0ccfb0..7958d7ac1 100644 --- a/src/registrar/templates/domain_security_email.html +++ b/src/registrar/templates/domain_security_email.html @@ -7,7 +7,7 @@

          Security email

          -

          We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain. Security emails are made public and included in the .gov domain data we provide.

          +

          We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain. Security emails are made public and included in the .gov domain data we provide.

          A security contact should be capable of evaluating or triaging security reports for your entire domain. Use a team email address, not an individual’s email. We recommend using an alias, like security@domain.gov.

          From 479669fb7525b2fd3a17f70058d25efd619fcaea Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 16:44:36 -0700 Subject: [PATCH 24/44] Update external link in domain_authorizing_official.html to open in new tab --- src/registrar/templates/domain_authorizing_official.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_authorizing_official.html b/src/registrar/templates/domain_authorizing_official.html index c12f1f290..93b4b1b50 100644 --- a/src/registrar/templates/domain_authorizing_official.html +++ b/src/registrar/templates/domain_authorizing_official.html @@ -10,7 +10,7 @@

          Authorizing official

          Your authorizing official is the person within your organization who can - authorize domain requests. This person must be in a role of significant, executive responsibility within the organization. Read more about who can serve as an authorizing official.

          + authorize domain requests. This person must be in a role of significant, executive responsibility within the organization. Read more about who can serve as an authorizing official.

          {% include "includes/required_fields.html" %} From dbc0eeddf3bcb9509ffeb5a11830f8b625eb7c37 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:12:22 -0700 Subject: [PATCH 25/44] Update external link in application_tribal_government.html so that it has the external link icon --- src/registrar/templates/application_tribal_government.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_tribal_government.html b/src/registrar/templates/application_tribal_government.html index 3c2a8999f..f69002344 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -7,7 +7,7 @@ {% with sublabel_text="Please include the entire name of your tribe as recognized by the Bureau of Indian Affairs." %} {% with link_text="Bureau of Indian Affairs" %} {% with link_href="https://www.federalregister.gov/documents/2023/01/12/2023-00504/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of" %} - {% with target_blank="true" %} + {% with class="usa-link usa-link--external", rel="noopener noreferrer", target_blank="true" %} {% input_with_errors forms.0.tribe_name %} {% endwith %} {% endwith %} From b08d750a8e6efc3b09bbac7d4f9d686c0a321575 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:16:14 -0700 Subject: [PATCH 26/44] Update external link in application_purpose.html to open in new tab --- src/registrar/templates/application_purpose.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_purpose.html b/src/registrar/templates/application_purpose.html index ca2ff7287..5135e6678 100644 --- a/src/registrar/templates/application_purpose.html +++ b/src/registrar/templates/application_purpose.html @@ -8,7 +8,7 @@ domain name or for mainly internal use.

          Describe the reason for your domain request. Explain how you plan to use this domain. Who is your intended audience? 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 activities that are prohibited on .gov domains.

          +Read about activities that are prohibited on .gov domains.

          {% endblock %} From 659dae4817e49fec353549a512311cfea6a6ef38 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:19:24 -0700 Subject: [PATCH 27/44] Update external link in application_dotgov_domain.html to open in new tab --- src/registrar/templates/application_dotgov_domain.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html index fd6ce9604..0d11203ad 100644 --- a/src/registrar/templates/application_dotgov_domain.html +++ b/src/registrar/templates/application_dotgov_domain.html @@ -2,7 +2,7 @@ {% load static field_helpers url_helpers %} {% block form_instructions %} -

          Before requesting a .gov domain, please make sure it +

          Before requesting a .gov domain, please make sure it meets our naming requirements. Your domain name must:

          • Be available
            • From 21aa75f5919ae7b3cb0b837ca803c5435113d7c3 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:22:00 -0700 Subject: [PATCH 28/44] Update external link in application_authorizing_official.html to open in new tab --- src/registrar/templates/application_authorizing_official.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html index 2ac99be80..859a47520 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -12,7 +12,7 @@ {% include "includes/ao_example.html" %} -

            We typically don’t reach out to the authorizing official, but if contact is necessary, our practice is to coordinate first with you, the requestor. Read more about who can serve as an authorizing official.

            +

            We typically don’t reach out to the authorizing official, but if contact is necessary, our practice is to coordinate first with you, the requestor. Read more about who can serve as an authorizing official.

            {% endblock %} From fb5aa950a91de4f1e6c72b16e520a6f46229ec31 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:34:50 -0700 Subject: [PATCH 29/44] Update external links in domain_example.html to open in new tabs --- src/registrar/templates/includes/domain_example.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/includes/domain_example.html b/src/registrar/templates/includes/domain_example.html index 8f803aa24..3b34b8e80 100644 --- a/src/registrar/templates/includes/domain_example.html +++ b/src/registrar/templates/includes/domain_example.html @@ -55,7 +55,7 @@
          {% elif organization_type == 'county' %} -

          Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the Census Bureau’s National Places Gazetteer Files to determine if county names are unique.

          +

          Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the Census Bureau’s National Places Gazetteer Files to determine if county names are unique.

          Examples:

          • AdamsCountyMS.gov
            • @@ -68,7 +68,7 @@

            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.

            Cities that meet one of the criteria below don’t have to refer to their state in the domain name.

              -
            • 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 Census Bureau’s National Places Gazetteer Files to determine if names are unique.
              • +
            • 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 Census Bureau’s National Places Gazetteer Files to determine if names are unique.
            • 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.
            • 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.
            @@ -81,7 +81,7 @@

            {% elif organization_type == 'special_district' %} -

            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 county or city exceptions apply.

            +

            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 county or city exceptions apply.

            Examples:

            • ElectionsShelbyTN.gov
              • From d0f6e25c9db8c28f0d0abf8519ac567693e9fee4 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:54:08 -0700 Subject: [PATCH 30/44] Update external link in ao_example.html to open in new tab --- src/registrar/templates/includes/ao_example.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html index 8a9d22915..13af78d3e 100644 --- a/src/registrar/templates/includes/ao_example.html +++ b/src/registrar/templates/includes/ao_example.html @@ -44,7 +44,7 @@

              Domain requests from state legislatures and courts must be authorized by an agency’s Chief Information Officer or highest-ranking executive.

              {% elif organization_type == 'tribal' %} -

              Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the Bureau of Indian Affairs.

              +

              Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the Bureau of Indian Affairs.

              Domain requests from state-recognized tribal governments must be authorized by the leader of the tribe, as determined by the state’s tribal recognition initiative.

              {% endif %} From e8a31f5ec9388f41a413e81983c8a083aa86ab69 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 10:44:44 -0700 Subject: [PATCH 31/44] Updated Help and Contact us links in footer to open in new tab --- src/registrar/templates/includes/footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 869d6007b..29a14c37c 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -27,11 +27,11 @@
              - Help + Help
              |
              - Contact us + Contact us
              From 07fe08cbf36fab2f85e4cd47d2abae2bdae3db1c Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 10:52:08 -0700 Subject: [PATCH 32/44] Updated error pages so that links to other sites open in new tab --- src/registrar/templates/401.html | 2 +- src/registrar/templates/403.html | 2 +- src/registrar/templates/404.html | 2 +- src/registrar/templates/500.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/registrar/templates/401.html b/src/registrar/templates/401.html index a419dab53..21ac9db35 100644 --- a/src/registrar/templates/401.html +++ b/src/registrar/templates/401.html @@ -26,7 +26,7 @@ Would you like to try logging in again?

              - If you'd like help with this error contact us . + If you'd like help with this error contact us.

              {% if log_identifier %} diff --git a/src/registrar/templates/403.html b/src/registrar/templates/403.html index 93d32f65a..08057dfba 100644 --- a/src/registrar/templates/403.html +++ b/src/registrar/templates/403.html @@ -26,7 +26,7 @@ Would you like to try logging in again?

              - If you'd like help with this error contact us . + If you'd like help with this error contact us.

              {% if log_identifier %} diff --git a/src/registrar/templates/404.html b/src/registrar/templates/404.html index deec71ce2..cf6983c60 100644 --- a/src/registrar/templates/404.html +++ b/src/registrar/templates/404.html @@ -15,7 +15,7 @@ {% translate "Status 404" %} -

              Try going to the homepage. If you can’t find what you’re looking for, contact us . +

              Try going to the homepage. If you can’t find what you’re looking for, contact us.

              diff --git a/src/registrar/templates/500.html b/src/registrar/templates/500.html index 5749c0ad3..3c95900b2 100644 --- a/src/registrar/templates/500.html +++ b/src/registrar/templates/500.html @@ -19,7 +19,7 @@ {% else %}

              Sorry! Try waiting a few minutes and then reloading the page. - contact us if you need help. + Contact us if you need help.

              {% endif %} From 34d28267d4cbaf01f928b8d520f947246c7636d1 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 11:15:49 -0700 Subject: [PATCH 33/44] Following Django template formatting --- .../templates/application_tribal_government.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/application_tribal_government.html b/src/registrar/templates/application_tribal_government.html index f69002344..48eb79f18 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -7,8 +7,12 @@ {% with sublabel_text="Please include the entire name of your tribe as recognized by the Bureau of Indian Affairs." %} {% with link_text="Bureau of Indian Affairs" %} {% with link_href="https://www.federalregister.gov/documents/2023/01/12/2023-00504/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of" %} - {% with class="usa-link usa-link--external", rel="noopener noreferrer", target_blank="true" %} - {% input_with_errors forms.0.tribe_name %} + {% with class="usa-link usa-link--external" %} + {% with rel="noopener noreferrer" %} + {% with target_blank="true" %} + {% input_with_errors forms.0.tribe_name %} + {% endwith %} + {% endwith %} {% endwith %} {% endwith %} {% endwith %} From 8701f5f26705eaa78ef36ea615fa3e3bc7b3b9c2 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 16:39:36 -0700 Subject: [PATCH 34/44] Update external link in domain_security_email.html to open in new tab --- src/registrar/templates/domain_security_email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html index 8fb0ccfb0..7958d7ac1 100644 --- a/src/registrar/templates/domain_security_email.html +++ b/src/registrar/templates/domain_security_email.html @@ -7,7 +7,7 @@

              Security email

              -

              We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain. Security emails are made public and included in the .gov domain data we provide.

              +

              We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain. Security emails are made public and included in the .gov domain data we provide.

              A security contact should be capable of evaluating or triaging security reports for your entire domain. Use a team email address, not an individual’s email. We recommend using an alias, like security@domain.gov.

              From 99b26c5e6f07aaeca5e45b161581f9a125303a57 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 16:44:36 -0700 Subject: [PATCH 35/44] Update external link in domain_authorizing_official.html to open in new tab --- src/registrar/templates/domain_authorizing_official.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/domain_authorizing_official.html b/src/registrar/templates/domain_authorizing_official.html index c12f1f290..93b4b1b50 100644 --- a/src/registrar/templates/domain_authorizing_official.html +++ b/src/registrar/templates/domain_authorizing_official.html @@ -10,7 +10,7 @@

              Authorizing official

              Your authorizing official is the person within your organization who can - authorize domain requests. This person must be in a role of significant, executive responsibility within the organization. Read more about who can serve as an authorizing official.

              + authorize domain requests. This person must be in a role of significant, executive responsibility within the organization. Read more about who can serve as an authorizing official.

              {% include "includes/required_fields.html" %} From 9e4d873c20ec0530da8fc2fc498b57e312880b8f Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:12:22 -0700 Subject: [PATCH 36/44] Update external link in application_tribal_government.html so that it has the external link icon --- src/registrar/templates/application_tribal_government.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_tribal_government.html b/src/registrar/templates/application_tribal_government.html index 3c2a8999f..f69002344 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -7,7 +7,7 @@ {% with sublabel_text="Please include the entire name of your tribe as recognized by the Bureau of Indian Affairs." %} {% with link_text="Bureau of Indian Affairs" %} {% with link_href="https://www.federalregister.gov/documents/2023/01/12/2023-00504/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of" %} - {% with target_blank="true" %} + {% with class="usa-link usa-link--external", rel="noopener noreferrer", target_blank="true" %} {% input_with_errors forms.0.tribe_name %} {% endwith %} {% endwith %} From 67198218291ab25758b6544f0eb39da5922bc4bf Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:16:14 -0700 Subject: [PATCH 37/44] Update external link in application_purpose.html to open in new tab --- src/registrar/templates/application_purpose.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_purpose.html b/src/registrar/templates/application_purpose.html index ca2ff7287..5135e6678 100644 --- a/src/registrar/templates/application_purpose.html +++ b/src/registrar/templates/application_purpose.html @@ -8,7 +8,7 @@ domain name or for mainly internal use.

              Describe the reason for your domain request. Explain how you plan to use this domain. Who is your intended audience? 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 activities that are prohibited on .gov domains.

              +Read about activities that are prohibited on .gov domains.

              {% endblock %} From aa6797ae3cc126d5e1fc0e6e269639a4584733c8 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:19:24 -0700 Subject: [PATCH 38/44] Update external link in application_dotgov_domain.html to open in new tab --- src/registrar/templates/application_dotgov_domain.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html index fd6ce9604..0d11203ad 100644 --- a/src/registrar/templates/application_dotgov_domain.html +++ b/src/registrar/templates/application_dotgov_domain.html @@ -2,7 +2,7 @@ {% load static field_helpers url_helpers %} {% block form_instructions %} -

              Before requesting a .gov domain, please make sure it +

              Before requesting a .gov domain, please make sure it meets our naming requirements. Your domain name must:

              • Be available
                • From f9c3bfb64208b97d4744effea4e68cb3aad533b2 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:22:00 -0700 Subject: [PATCH 39/44] Update external link in application_authorizing_official.html to open in new tab --- src/registrar/templates/application_authorizing_official.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html index 2ac99be80..859a47520 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -12,7 +12,7 @@ {% include "includes/ao_example.html" %} -

                We typically don’t reach out to the authorizing official, but if contact is necessary, our practice is to coordinate first with you, the requestor. Read more about who can serve as an authorizing official.

                +

                We typically don’t reach out to the authorizing official, but if contact is necessary, our practice is to coordinate first with you, the requestor. Read more about who can serve as an authorizing official.

                {% endblock %} From c3e4ee26be8bae5e159c5a01ee4a28043c7cd0c4 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:34:50 -0700 Subject: [PATCH 40/44] Update external links in domain_example.html to open in new tabs --- src/registrar/templates/includes/domain_example.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/includes/domain_example.html b/src/registrar/templates/includes/domain_example.html index 8f803aa24..3b34b8e80 100644 --- a/src/registrar/templates/includes/domain_example.html +++ b/src/registrar/templates/includes/domain_example.html @@ -55,7 +55,7 @@
              {% elif organization_type == 'county' %} -

              Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the Census Bureau’s National Places Gazetteer Files to determine if county names are unique.

              +

              Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the Census Bureau’s National Places Gazetteer Files to determine if county names are unique.

              Examples:

              • AdamsCountyMS.gov
                • @@ -68,7 +68,7 @@

                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.

                Cities that meet one of the criteria below don’t have to refer to their state in the domain name.

                  -
                • 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 Census Bureau’s National Places Gazetteer Files to determine if names are unique.
                  • +
                • 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 Census Bureau’s National Places Gazetteer Files to determine if names are unique.
                • 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.
                • 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.
                @@ -81,7 +81,7 @@

                {% elif organization_type == 'special_district' %} -

                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 county or city exceptions apply.

                +

                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 county or city exceptions apply.

                Examples:

                • ElectionsShelbyTN.gov
                  • From 7672f97a29e3d7da1b5ba15626ac27409b8859d8 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Thu, 26 Oct 2023 17:54:08 -0700 Subject: [PATCH 41/44] Update external link in ao_example.html to open in new tab --- src/registrar/templates/includes/ao_example.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html index 8a9d22915..13af78d3e 100644 --- a/src/registrar/templates/includes/ao_example.html +++ b/src/registrar/templates/includes/ao_example.html @@ -44,7 +44,7 @@

                  Domain requests from state legislatures and courts must be authorized by an agency’s Chief Information Officer or highest-ranking executive.

                  {% elif organization_type == 'tribal' %} -

                  Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the Bureau of Indian Affairs.

                  +

                  Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the Bureau of Indian Affairs.

                  Domain requests from state-recognized tribal governments must be authorized by the leader of the tribe, as determined by the state’s tribal recognition initiative.

                  {% endif %} From c89f7cdc43b4422da2f2ede90c54bc2e6dfce2f0 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 10:44:44 -0700 Subject: [PATCH 42/44] Updated Help and Contact us links in footer to open in new tab --- src/registrar/templates/includes/footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 869d6007b..29a14c37c 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -27,11 +27,11 @@
                  - Help + Help
                  |
                  - Contact us + Contact us
                  From 4885d74103ef9dbcfacbaaba256a9532aa966173 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 10:52:08 -0700 Subject: [PATCH 43/44] Updated error pages so that links to other sites open in new tab --- src/registrar/templates/401.html | 2 +- src/registrar/templates/403.html | 2 +- src/registrar/templates/404.html | 2 +- src/registrar/templates/500.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/registrar/templates/401.html b/src/registrar/templates/401.html index a419dab53..21ac9db35 100644 --- a/src/registrar/templates/401.html +++ b/src/registrar/templates/401.html @@ -26,7 +26,7 @@ Would you like to try logging in again?

                  - If you'd like help with this error contact us . + If you'd like help with this error contact us.

                  {% if log_identifier %} diff --git a/src/registrar/templates/403.html b/src/registrar/templates/403.html index 93d32f65a..08057dfba 100644 --- a/src/registrar/templates/403.html +++ b/src/registrar/templates/403.html @@ -26,7 +26,7 @@ Would you like to try logging in again?

                  - If you'd like help with this error contact us . + If you'd like help with this error contact us.

                  {% if log_identifier %} diff --git a/src/registrar/templates/404.html b/src/registrar/templates/404.html index deec71ce2..cf6983c60 100644 --- a/src/registrar/templates/404.html +++ b/src/registrar/templates/404.html @@ -15,7 +15,7 @@ {% translate "Status 404" %} -

                  Try going to the homepage. If you can’t find what you’re looking for, contact us . +

                  Try going to the homepage. If you can’t find what you’re looking for, contact us.

                  diff --git a/src/registrar/templates/500.html b/src/registrar/templates/500.html index 5749c0ad3..3c95900b2 100644 --- a/src/registrar/templates/500.html +++ b/src/registrar/templates/500.html @@ -19,7 +19,7 @@ {% else %}

                  Sorry! Try waiting a few minutes and then reloading the page. - contact us if you need help. + Contact us if you need help.

                  {% endif %} From 39719b285f176e7d7dd854752e37873d8cb277d2 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Fri, 27 Oct 2023 11:15:49 -0700 Subject: [PATCH 44/44] Following Django template formatting --- .../templates/application_tribal_government.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/application_tribal_government.html b/src/registrar/templates/application_tribal_government.html index f69002344..48eb79f18 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -7,8 +7,12 @@ {% with sublabel_text="Please include the entire name of your tribe as recognized by the Bureau of Indian Affairs." %} {% with link_text="Bureau of Indian Affairs" %} {% with link_href="https://www.federalregister.gov/documents/2023/01/12/2023-00504/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of" %} - {% with class="usa-link usa-link--external", rel="noopener noreferrer", target_blank="true" %} - {% input_with_errors forms.0.tribe_name %} + {% with class="usa-link usa-link--external" %} + {% with rel="noopener noreferrer" %} + {% with target_blank="true" %} + {% input_with_errors forms.0.tribe_name %} + {% endwith %} + {% endwith %} {% endwith %} {% endwith %} {% endwith %}