diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html index 8e25b1c9f..13ed98663 100644 --- a/src/registrar/templates/domain_detail.html +++ b/src/registrar/templates/domain_detail.html @@ -77,7 +77,7 @@ {% include "includes/summary_item.html" with title='Suborganization' value=domain.domain_info.sub_organization edit_link=url editable=is_editable|and:has_edit_suborganization %} {% else %} {% url 'domain-org-name-address' pk=domain.id as url %} - {% include "includes/summary_item.html" with title='Organization name' value=domain.domain_info address='true' edit_link=url editable=is_editable %} + {% include "includes/summary_item.html" with title='Organization' value=domain.domain_info address='true' edit_link=url editable=is_editable %} {% url 'domain-senior-official' pk=domain.id as url %} {% include "includes/summary_item.html" with title='Senior official' value=domain.domain_info.senior_official contact='true' edit_link=url editable=is_editable %} diff --git a/src/registrar/templates/domain_org_name_address.html b/src/registrar/templates/domain_org_name_address.html index ee586a41d..78baed09e 100644 --- a/src/registrar/templates/domain_org_name_address.html +++ b/src/registrar/templates/domain_org_name_address.html @@ -7,7 +7,7 @@ {# this is right after the messages block in the parent template #} {% include "includes/form_errors.html" with form=form %} -

Organization name

+

Organization

The name of your organization will be publicly listed as the domain registrant.

diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html index ef5e9db59..2e423a6b6 100644 --- a/src/registrar/templates/domain_request_status.html +++ b/src/registrar/templates/domain_request_status.html @@ -82,7 +82,7 @@ {% endif %} {% if DomainRequest.organization_name %} - {% include "includes/summary_item.html" with title='Organization name' value=DomainRequest address='true' heading_level=heading_level %} + {% include "includes/summary_item.html" with title='Organization' value=DomainRequest address='true' heading_level=heading_level %} {% endif %} {% if DomainRequest.about_your_organization %} diff --git a/src/registrar/templates/emails/includes/domain_request_summary.txt b/src/registrar/templates/emails/includes/domain_request_summary.txt index ee8feaa42..c58aef5e1 100644 --- a/src/registrar/templates/emails/includes/domain_request_summary.txt +++ b/src/registrar/templates/emails/includes/domain_request_summary.txt @@ -15,7 +15,7 @@ State-recognized tribe Election office: {{ domain_request.is_election_board|yesno:"Yes,No,Incomplete" }} {% endif %} -Organization name: +Organization: {% spaceless %}{{ domain_request.federal_agency }} {{ domain_request.organization_name }} {{ domain_request.address_line1 }}{% if domain_request.address_line2 %} diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html index 2e6a1f488..bc3f23d43 100644 --- a/src/registrar/templates/portfolio_organization.html +++ b/src/registrar/templates/portfolio_organization.html @@ -37,7 +37,7 @@ {% include "includes/required_fields.html" %}
{% csrf_token %} -

Organization name

+

Organization

{{ portfolio.federal_agency }}

diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py index 277d1dc5c..7b4374212 100644 --- a/src/registrar/tests/test_views_domain.py +++ b/src/registrar/tests/test_views_domain.py @@ -1301,7 +1301,7 @@ class TestDomainOrganization(TestDomainOverview): """Can load domain's org name and mailing address page.""" page = self.client.get(reverse("domain-org-name-address", kwargs={"pk": self.domain.id})) # once on the sidebar, once in the page title, once as H1 - self.assertContains(page, "Organization name", count=4) + self.assertContains(page, "Organization", count=4) @less_console_noise_decorator def test_domain_org_name_address_content(self): @@ -1610,7 +1610,7 @@ class TestDomainSuborganization(TestDomainOverview): # Test for the title change self.assertContains(page, "Suborganization") - self.assertNotContains(page, "Organization name") + self.assertNotContains(page, "Organization") # Test for the good value self.assertContains(page, "Ice Cream") diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index 993e7ae5e..976ca2c46 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -226,7 +226,7 @@ class TestPortfolio(WebTest): self.assertContains(response, '

Organization name

') # The read only label for city will be a h4 self.assertNotContains(response, '

City

') - self.assertNotContains(response, '

Los Angeles

>') + self.assertNotContains(response, '

Los Angeles

') self.assertContains(response, 'for="id_city"') @less_console_noise_decorator diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 3dd02876a..f6a2ef4a9 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -206,7 +206,7 @@ class DomainView(DomainBaseView): class DomainOrgNameAddressView(DomainFormBaseView): - """Organization name view""" + """Organization view""" model = Domain template_name = "domain_org_name_address.html"