From 3dc72997c0e6857b50f14e2390bf1417cb268267 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Wed, 10 Jan 2024 12:26:18 -0600 Subject: [PATCH 01/10] Updated tribe label --- src/registrar/forms/application_wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index 2802b1893..394007211 100644 --- a/src/registrar/forms/application_wizard.py +++ b/src/registrar/forms/application_wizard.py @@ -170,7 +170,7 @@ class TribalGovernmentForm(RegistrarForm): ) tribe_name = forms.CharField( - label="What is the name of the tribe you represent?", + label="Name of tribe", error_messages={"required": "Enter the tribe you represent."}, ) From 7b56b82fc5dd3d71b043b68e3f9eae869f8008e4 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 10 Jan 2024 13:47:34 -0500 Subject: [PATCH 02/10] Teaks to the layout of the Tribal Gov template --- .../application_tribal_government.html | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/registrar/templates/application_tribal_government.html b/src/registrar/templates/application_tribal_government.html index bdca60907..b7fde3278 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -1,24 +1,24 @@ {% extends 'application_form.html' %} {% load field_helpers %} +{% block form_instructions %} +

To help us determine your eligibility for a .gov domain, we need to know more about your tribal government.

+{% endblock %} {% block form_fields %} - {% 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 external_link="true" target_blank="true" %} - {% input_with_errors forms.0.tribe_name %} - {% endwith %} - {% endwith %} - {% endwith %} +

What is the name of the tribe you represent?

+

Please include the full name of your tribe as recognized by the Bureau of Indian Affairs.

+ + {% with external_link="true" target_blank="true" %} + {% input_with_errors forms.0.tribe_name %} {% endwith %}
-

Is your organization a federally-recognized tribe or a state-recognized tribe? Check all that apply. - *

+

Is your organization a federally-recognized tribe or a state-recognized tribe?

 +

Check all that apply. *

{% input_with_errors forms.0.federally_recognized_tribe %} {% input_with_errors forms.0.state_recognized_tribe %}
From 6d1819fd402c99138cc70fc9d218737702ace336 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:15:39 -0600 Subject: [PATCH 03/10] Update "election" step --- src/registrar/templates/application_org_election.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/application_org_election.html b/src/registrar/templates/application_org_election.html index 04c8f2657..b2ef462b5 100644 --- a/src/registrar/templates/application_org_election.html +++ b/src/registrar/templates/application_org_election.html @@ -2,9 +2,11 @@ {% load field_helpers %} {% block form_instructions %} -

Is your organization an election office?

+ -

An election office is a government entity whose primary responsibility is overseeing elections and/or conducting voter registration.

+

An election office is a government entity whose primary responsibility is overseeing elections and/or conducting voter registration. If your organization is an election office, we'll prioritize your request.

+ +

Is your organization an election office?

Answer “yes” only if the main purpose of your organization is to serve as an election office.

From 72db5d1d897b626b74bf98824e087b219092187e Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:24:39 -0600 Subject: [PATCH 04/10] Updates to "Org mailing address" page --- .../templates/application_org_contact.html | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/registrar/templates/application_org_contact.html b/src/registrar/templates/application_org_contact.html index f5f773647..01b55d03d 100644 --- a/src/registrar/templates/application_org_contact.html +++ b/src/registrar/templates/application_org_contact.html @@ -2,15 +2,12 @@ {% load field_helpers %} {% block form_instructions %} -

- What is the name and mailing address of your organization? -

+

If your domain request is approved, the name of your organization and your city/state will be listed in .gov’s public data.

-

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.

+

What is the name and mailing address of the organization you represent?

+ +

Your organization might be part of a larger entity. If so, enter the name of your part of the larger entity.

-

If your domain request is approved, the name of your organization will be publicly - listed as the domain registrant.

{% endblock %} @@ -43,4 +40,4 @@ {% input_with_errors forms.0.urbanization %} -{% endblock %} \ No newline at end of file +{% endblock %} From 272f5e1544bb797b3d00ac99dd7207ba6aee6b9e Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:50:19 -0600 Subject: [PATCH 05/10] Updated BIA link --- 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 b7fde3278..3e79a4524 100644 --- a/src/registrar/templates/application_tribal_government.html +++ b/src/registrar/templates/application_tribal_government.html @@ -8,7 +8,7 @@ {% block form_fields %}

What is the name of the tribe you represent?

-

Please include the full name of your tribe as recognized by the Bureau of Indian Affairs.

+

Please include the full name of your tribe as recognized by the Bureau of Indian Affairs.

{% with external_link="true" target_blank="true" %} {% input_with_errors forms.0.tribe_name %} From 579a4ebb38fa52177cfd1f533ae0c8394527144d Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Thu, 11 Jan 2024 17:02:12 -0600 Subject: [PATCH 06/10] Updates to "about your org" page --- .../templates/application_about_your_organization.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/registrar/templates/application_about_your_organization.html b/src/registrar/templates/application_about_your_organization.html index 0d384b4f5..01820ac70 100644 --- a/src/registrar/templates/application_about_your_organization.html +++ b/src/registrar/templates/application_about_your_organization.html @@ -2,14 +2,16 @@ {% load field_helpers %} {% block form_instructions %} -

We’d like to know more about your organization. Include the following in your response:

+

To help us determine your eligibility for a .gov domain, we need to know more about your organization. For example:

+

What can you tell us about your organization?

{% endblock %} {% block form_required_fields_help_text %} @@ -20,4 +22,4 @@ {% with attr_maxlength=1000 add_label_class="usa-sr-only" %} {% input_with_errors forms.0.about_your_organization %} {% endwith %} -{% endblock %} \ No newline at end of file +{% endblock %} From 9e95bc270636a9f062d1ac649ba7b5ec52ade929 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Thu, 11 Jan 2024 17:07:33 -0600 Subject: [PATCH 07/10] Update last paragraph on AO page --- 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 3e33ab34e..068457373 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -14,7 +14,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 with you, the requestor, first.

{% endblock %} From 42a233a31ed0381525f0523728447c6aae4f5201 Mon Sep 17 00:00:00 2001 From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:45:36 -0600 Subject: [PATCH 08/10] Updates to "current websites" page --- src/registrar/templates/application_current_sites.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/application_current_sites.html b/src/registrar/templates/application_current_sites.html index 67343aee9..7ce357d86 100644 --- a/src/registrar/templates/application_current_sites.html +++ b/src/registrar/templates/application_current_sites.html @@ -2,9 +2,9 @@ {% load static field_helpers %} {% block form_instructions %} -

Enter your organization’s current public website, if you have one. For example, - www.city.com. We can better evaluate your domain request if we know about domains -you’re already using. If you already have any .gov domains please include them. This question is optional.

+

We can better evaluate your domain request if we know about domains you’re already using.

+

What are the current websites for your organization?

+

Enter your organization’s current public websites. If you already have a .gov domain, include that in your list. This question is optional.

{% endblock %} {% block form_required_fields_help_text %} From 4ab1549bfde288f399de856801c88be58287a8e3 Mon Sep 17 00:00:00 2001 From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com> Date: Fri, 12 Jan 2024 16:27:55 -0500 Subject: [PATCH 09/10] removed an extra space --- .../templates/application_about_your_organization.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_about_your_organization.html b/src/registrar/templates/application_about_your_organization.html index 01820ac70..02e2e2c4f 100644 --- a/src/registrar/templates/application_about_your_organization.html +++ b/src/registrar/templates/application_about_your_organization.html @@ -6,7 +6,7 @@ From 73d65e695432229f3956233e83a4c5f140be31fe Mon Sep 17 00:00:00 2001 From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com> Date: Fri, 12 Jan 2024 16:30:50 -0500 Subject: [PATCH 10/10] Removed "domain" from "We can better evaluate your domain request..." --- src/registrar/templates/application_current_sites.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/application_current_sites.html b/src/registrar/templates/application_current_sites.html index 7ce357d86..debadcfe2 100644 --- a/src/registrar/templates/application_current_sites.html +++ b/src/registrar/templates/application_current_sites.html @@ -2,7 +2,7 @@ {% load static field_helpers %} {% block form_instructions %} -

We can better evaluate your domain request if we know about domains you’re already using.

+

We can better evaluate your request if we know about domains you’re already using.

What are the current websites for your organization?

Enter your organization’s current public websites. If you already have a .gov domain, include that in your list. This question is optional.

{% endblock %}