fix Organization page headers

This commit is contained in:
Rachid Mrad 2024-09-11 20:12:12 -04:00
parent da0487b0f2
commit 4a5213aeb1
No known key found for this signature in database
8 changed files with 9 additions and 9 deletions

View file

@ -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 %} {% 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 %} {% else %}
{% url 'domain-org-name-address' pk=domain.id as url %} {% 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 %} {% 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 %} {% include "includes/summary_item.html" with title='Senior official' value=domain.domain_info.senior_official contact='true' edit_link=url editable=is_editable %}

View file

@ -7,7 +7,7 @@
{# this is right after the messages block in the parent template #} {# this is right after the messages block in the parent template #}
{% include "includes/form_errors.html" with form=form %} {% include "includes/form_errors.html" with form=form %}
<h1>Organization name</h1> <h1>Organization</h1>
<p>The name of your organization will be publicly listed as the domain registrant.</p> <p>The name of your organization will be publicly listed as the domain registrant.</p>

View file

@ -82,7 +82,7 @@
{% endif %} {% endif %}
{% if DomainRequest.organization_name %} {% 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 %} {% endif %}
{% if DomainRequest.about_your_organization %} {% if DomainRequest.about_your_organization %}

View file

@ -15,7 +15,7 @@ State-recognized tribe
Election office: Election office:
{{ domain_request.is_election_board|yesno:"Yes,No,Incomplete" }} {{ domain_request.is_election_board|yesno:"Yes,No,Incomplete" }}
{% endif %} {% endif %}
Organization name: Organization:
{% spaceless %}{{ domain_request.federal_agency }} {% spaceless %}{{ domain_request.federal_agency }}
{{ domain_request.organization_name }} {{ domain_request.organization_name }}
{{ domain_request.address_line1 }}{% if domain_request.address_line2 %} {{ domain_request.address_line1 }}{% if domain_request.address_line2 %}

View file

@ -37,7 +37,7 @@
{% include "includes/required_fields.html" %} {% include "includes/required_fields.html" %}
<form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate> <form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate>
{% csrf_token %} {% csrf_token %}
<h4 class="read-only-label">Organization name</h4> <h4 class="read-only-label">Organization</h4>
<p class="read-only-value"> <p class="read-only-value">
{{ portfolio.federal_agency }} {{ portfolio.federal_agency }}
</p> </p>

View file

@ -1301,7 +1301,7 @@ class TestDomainOrganization(TestDomainOverview):
"""Can load domain's org name and mailing address page.""" """Can load domain's org name and mailing address page."""
page = self.client.get(reverse("domain-org-name-address", kwargs={"pk": self.domain.id})) 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 # 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 @less_console_noise_decorator
def test_domain_org_name_address_content(self): def test_domain_org_name_address_content(self):
@ -1610,7 +1610,7 @@ class TestDomainSuborganization(TestDomainOverview):
# Test for the title change # Test for the title change
self.assertContains(page, "Suborganization") self.assertContains(page, "Suborganization")
self.assertNotContains(page, "Organization name") self.assertNotContains(page, "Organization")
# Test for the good value # Test for the good value
self.assertContains(page, "Ice Cream") self.assertContains(page, "Ice Cream")

View file

@ -226,7 +226,7 @@ class TestPortfolio(WebTest):
self.assertContains(response, '<h4 class="read-only-label">Organization name</h4>') self.assertContains(response, '<h4 class="read-only-label">Organization name</h4>')
# The read only label for city will be a h4 # The read only label for city will be a h4
self.assertNotContains(response, '<h4 class="read-only-label">City</h4>') self.assertNotContains(response, '<h4 class="read-only-label">City</h4>')
self.assertNotContains(response, '<p class="read-only-value">Los Angeles</p>>') self.assertNotContains(response, '<p class="read-only-value">Los Angeles</p>')
self.assertContains(response, 'for="id_city"') self.assertContains(response, 'for="id_city"')
@less_console_noise_decorator @less_console_noise_decorator

View file

@ -206,7 +206,7 @@ class DomainView(DomainBaseView):
class DomainOrgNameAddressView(DomainFormBaseView): class DomainOrgNameAddressView(DomainFormBaseView):
"""Organization name view""" """Organization view"""
model = Domain model = Domain
template_name = "domain_org_name_address.html" template_name = "domain_org_name_address.html"