From b824ebfa0584f78188575c969cdd572195876ae0 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Mon, 9 Sep 2024 12:27:18 -0400 Subject: [PATCH 01/14] manin nav active state when senior-official --- src/registrar/templates/includes/header_extended.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html index 5084b1a3d..34f72db48 100644 --- a/src/registrar/templates/includes/header_extended.html +++ b/src/registrar/templates/includes/header_extended.html @@ -70,7 +70,7 @@
  • {% url 'organization' as url %} - + {{ portfolio.organization_name }} From a08e51813de67ea46666e5b7235f2c769653666d Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Mon, 9 Sep 2024 15:25:10 -0400 Subject: [PATCH 02/14] margin tweak, message positionning change --- src/registrar/templates/no_portfolio_domains.html | 6 ++++++ src/registrar/templates/portfolio_base.html | 3 --- src/registrar/templates/portfolio_domains.html | 4 ++++ src/registrar/templates/portfolio_organization.html | 6 +++++- src/registrar/templates/portfolio_requests.html | 4 ++++ src/registrar/templates/portfolio_senior_official.html | 4 ++++ 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/registrar/templates/no_portfolio_domains.html b/src/registrar/templates/no_portfolio_domains.html index e9b0da306..75ff3a91f 100644 --- a/src/registrar/templates/no_portfolio_domains.html +++ b/src/registrar/templates/no_portfolio_domains.html @@ -5,6 +5,12 @@ {% block title %} Domains | {% endblock %} {% block portfolio_content %} + +{% block messages %} + {% include "includes/form_messages.html" %} +{% endblock %} + +

    Domains

    diff --git a/src/registrar/templates/portfolio_base.html b/src/registrar/templates/portfolio_base.html index f6b97afbc..d39a44879 100644 --- a/src/registrar/templates/portfolio_base.html +++ b/src/registrar/templates/portfolio_base.html @@ -9,9 +9,6 @@ {# the entire logged in page goes here #}
    - {% block messages %} - {% include "includes/form_messages.html" %} - {% endblock %} {% block portfolio_content %}{% endblock %} diff --git a/src/registrar/templates/portfolio_domains.html b/src/registrar/templates/portfolio_domains.html index 51011a1a6..dde51ea59 100644 --- a/src/registrar/templates/portfolio_domains.html +++ b/src/registrar/templates/portfolio_domains.html @@ -9,6 +9,10 @@ {% endblock %} {% block portfolio_content %} +{% block messages %} + {% include "includes/form_messages.html" %} +{% endblock %} +

    Domains

    {% include "includes/domains_table.html" with portfolio=portfolio user_domain_count=user_domain_count %} diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html index 4ae035ad4..523b036ae 100644 --- a/src/registrar/templates/portfolio_organization.html +++ b/src/registrar/templates/portfolio_organization.html @@ -19,6 +19,10 @@
    + {% block messages %} + {% include "includes/form_messages.html" %} + {% endblock %} +

    Organization

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

    @@ -31,7 +35,7 @@ {% include "includes/form_errors.html" with form=form %} {% include "includes/required_fields.html" %} -
    + {% csrf_token %}

    Federal agency

    diff --git a/src/registrar/templates/portfolio_requests.html b/src/registrar/templates/portfolio_requests.html index 9f97a25aa..96d4856b5 100644 --- a/src/registrar/templates/portfolio_requests.html +++ b/src/registrar/templates/portfolio_requests.html @@ -9,6 +9,10 @@ {% endblock %} {% block portfolio_content %} +{% block messages %} + {% include "includes/form_messages.html" %} +{% endblock %} +

    Domain requests

    diff --git a/src/registrar/templates/portfolio_senior_official.html b/src/registrar/templates/portfolio_senior_official.html index 51ef83be5..631db0206 100644 --- a/src/registrar/templates/portfolio_senior_official.html +++ b/src/registrar/templates/portfolio_senior_official.html @@ -6,6 +6,10 @@ {% load static %} {% block portfolio_content %} +{% block messages %} + {% include "includes/form_messages.html" %} +{% endblock %} +

    + {% csrf_token %} {% input_with_errors form.first_name %} {% input_with_errors form.last_name %} @@ -35,15 +35,17 @@ {% elif not form.full_name.value and not form.title.value and not form.email.value %}

    No senior official was found.

    {% else %} - {% if form.full_name.value is not None %} - {% include "includes/input_read_only.html" with field=form.full_name %} - {% endif %} +
    + {% if form.full_name.value is not None %} + {% include "includes/input_read_only.html" with field=form.full_name %} + {% endif %} - {% if form.title.value is not None %} - {% include "includes/input_read_only.html" with field=form.title %} - {% endif %} + {% if form.title.value is not None %} + {% include "includes/input_read_only.html" with field=form.title %} + {% endif %} - {% if form.email.value is not None %} - {% include "includes/input_read_only.html" with field=form.email %} - {% endif %} + {% if form.email.value is not None %} + {% include "includes/input_read_only.html" with field=form.email %} + {% endif %} +
    {% endif %} From 7242594e04dd013dabc10a5fffbc9a9f110039d9 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 11 Sep 2024 15:40:00 -0400 Subject: [PATCH 04/14] Change fed agency label to org name --- src/registrar/templates/portfolio_organization.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html index 523b036ae..c8d839f9b 100644 --- a/src/registrar/templates/portfolio_organization.html +++ b/src/registrar/templates/portfolio_organization.html @@ -25,11 +25,11 @@

    Organization

    -

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

    +

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

    {% if has_edit_org_portfolio_permission %}

    - The federal agency for your organization can’t be updated here. + Your organization name can’t be updated here. To suggest an update, email help@get.gov.

    @@ -37,7 +37,7 @@ {% include "includes/required_fields.html" %} {% csrf_token %} -

    Federal agency

    +

    Organization name

    {{ portfolio.federal_agency }}

    @@ -53,7 +53,7 @@ {% else %} -

    Federal agency

    +

    Organization name

    {{ portfolio.federal_agency }}

    From 6c5f566155a58eca953b971242e8eea8072a354c Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 11 Sep 2024 17:01:15 -0400 Subject: [PATCH 05/14] org name compoenents title change, State / territory lbel change --- ...aininformation_state_territory_and_more.py | 229 ++++++++++++++++++ src/registrar/models/domain_information.py | 2 +- src/registrar/models/domain_request.py | 2 +- src/registrar/models/portfolio.py | 2 +- src/registrar/templates/domain_detail.html | 2 +- .../templates/domain_org_name_address.html | 2 +- .../templates/domain_request_status.html | 2 +- src/registrar/templates/domain_sidebar.html | 2 +- .../includes/domain_request_summary.txt | 2 +- .../templates/portfolio_organization.html | 2 +- src/registrar/tests/test_views_domain.py | 2 +- src/registrar/views/domain.py | 2 +- src/registrar/views/domain_request.py | 2 +- 13 files changed, 241 insertions(+), 12 deletions(-) create mode 100644 src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py diff --git a/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py b/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py new file mode 100644 index 000000000..62a84d570 --- /dev/null +++ b/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py @@ -0,0 +1,229 @@ +# Generated by Django 4.2.10 on 2024-09-11 21:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("registrar", "0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="domaininformation", + name="state_territory", + field=models.CharField( + blank=True, + choices=[ + ("AL", "Alabama (AL)"), + ("AK", "Alaska (AK)"), + ("AS", "American Samoa (AS)"), + ("AZ", "Arizona (AZ)"), + ("AR", "Arkansas (AR)"), + ("CA", "California (CA)"), + ("CO", "Colorado (CO)"), + ("CT", "Connecticut (CT)"), + ("DE", "Delaware (DE)"), + ("DC", "District of Columbia (DC)"), + ("FL", "Florida (FL)"), + ("GA", "Georgia (GA)"), + ("GU", "Guam (GU)"), + ("HI", "Hawaii (HI)"), + ("ID", "Idaho (ID)"), + ("IL", "Illinois (IL)"), + ("IN", "Indiana (IN)"), + ("IA", "Iowa (IA)"), + ("KS", "Kansas (KS)"), + ("KY", "Kentucky (KY)"), + ("LA", "Louisiana (LA)"), + ("ME", "Maine (ME)"), + ("MD", "Maryland (MD)"), + ("MA", "Massachusetts (MA)"), + ("MI", "Michigan (MI)"), + ("MN", "Minnesota (MN)"), + ("MS", "Mississippi (MS)"), + ("MO", "Missouri (MO)"), + ("MT", "Montana (MT)"), + ("NE", "Nebraska (NE)"), + ("NV", "Nevada (NV)"), + ("NH", "New Hampshire (NH)"), + ("NJ", "New Jersey (NJ)"), + ("NM", "New Mexico (NM)"), + ("NY", "New York (NY)"), + ("NC", "North Carolina (NC)"), + ("ND", "North Dakota (ND)"), + ("MP", "Northern Mariana Islands (MP)"), + ("OH", "Ohio (OH)"), + ("OK", "Oklahoma (OK)"), + ("OR", "Oregon (OR)"), + ("PA", "Pennsylvania (PA)"), + ("PR", "Puerto Rico (PR)"), + ("RI", "Rhode Island (RI)"), + ("SC", "South Carolina (SC)"), + ("SD", "South Dakota (SD)"), + ("TN", "Tennessee (TN)"), + ("TX", "Texas (TX)"), + ("UM", "United States Minor Outlying Islands (UM)"), + ("UT", "Utah (UT)"), + ("VT", "Vermont (VT)"), + ("VI", "Virgin Islands (VI)"), + ("VA", "Virginia (VA)"), + ("WA", "Washington (WA)"), + ("WV", "West Virginia (WV)"), + ("WI", "Wisconsin (WI)"), + ("WY", "Wyoming (WY)"), + ("AA", "Armed Forces Americas (AA)"), + ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"), + ("AP", "Armed Forces Pacific (AP)"), + ], + max_length=2, + null=True, + verbose_name="state, territory, or military post", + ), + ), + migrations.AlterField( + model_name="domainrequest", + name="state_territory", + field=models.CharField( + blank=True, + choices=[ + ("AL", "Alabama (AL)"), + ("AK", "Alaska (AK)"), + ("AS", "American Samoa (AS)"), + ("AZ", "Arizona (AZ)"), + ("AR", "Arkansas (AR)"), + ("CA", "California (CA)"), + ("CO", "Colorado (CO)"), + ("CT", "Connecticut (CT)"), + ("DE", "Delaware (DE)"), + ("DC", "District of Columbia (DC)"), + ("FL", "Florida (FL)"), + ("GA", "Georgia (GA)"), + ("GU", "Guam (GU)"), + ("HI", "Hawaii (HI)"), + ("ID", "Idaho (ID)"), + ("IL", "Illinois (IL)"), + ("IN", "Indiana (IN)"), + ("IA", "Iowa (IA)"), + ("KS", "Kansas (KS)"), + ("KY", "Kentucky (KY)"), + ("LA", "Louisiana (LA)"), + ("ME", "Maine (ME)"), + ("MD", "Maryland (MD)"), + ("MA", "Massachusetts (MA)"), + ("MI", "Michigan (MI)"), + ("MN", "Minnesota (MN)"), + ("MS", "Mississippi (MS)"), + ("MO", "Missouri (MO)"), + ("MT", "Montana (MT)"), + ("NE", "Nebraska (NE)"), + ("NV", "Nevada (NV)"), + ("NH", "New Hampshire (NH)"), + ("NJ", "New Jersey (NJ)"), + ("NM", "New Mexico (NM)"), + ("NY", "New York (NY)"), + ("NC", "North Carolina (NC)"), + ("ND", "North Dakota (ND)"), + ("MP", "Northern Mariana Islands (MP)"), + ("OH", "Ohio (OH)"), + ("OK", "Oklahoma (OK)"), + ("OR", "Oregon (OR)"), + ("PA", "Pennsylvania (PA)"), + ("PR", "Puerto Rico (PR)"), + ("RI", "Rhode Island (RI)"), + ("SC", "South Carolina (SC)"), + ("SD", "South Dakota (SD)"), + ("TN", "Tennessee (TN)"), + ("TX", "Texas (TX)"), + ("UM", "United States Minor Outlying Islands (UM)"), + ("UT", "Utah (UT)"), + ("VT", "Vermont (VT)"), + ("VI", "Virgin Islands (VI)"), + ("VA", "Virginia (VA)"), + ("WA", "Washington (WA)"), + ("WV", "West Virginia (WV)"), + ("WI", "Wisconsin (WI)"), + ("WY", "Wyoming (WY)"), + ("AA", "Armed Forces Americas (AA)"), + ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"), + ("AP", "Armed Forces Pacific (AP)"), + ], + max_length=2, + null=True, + verbose_name="state, territory, or military post", + ), + ), + migrations.AlterField( + model_name="portfolio", + name="state_territory", + field=models.CharField( + blank=True, + choices=[ + ("AL", "Alabama (AL)"), + ("AK", "Alaska (AK)"), + ("AS", "American Samoa (AS)"), + ("AZ", "Arizona (AZ)"), + ("AR", "Arkansas (AR)"), + ("CA", "California (CA)"), + ("CO", "Colorado (CO)"), + ("CT", "Connecticut (CT)"), + ("DE", "Delaware (DE)"), + ("DC", "District of Columbia (DC)"), + ("FL", "Florida (FL)"), + ("GA", "Georgia (GA)"), + ("GU", "Guam (GU)"), + ("HI", "Hawaii (HI)"), + ("ID", "Idaho (ID)"), + ("IL", "Illinois (IL)"), + ("IN", "Indiana (IN)"), + ("IA", "Iowa (IA)"), + ("KS", "Kansas (KS)"), + ("KY", "Kentucky (KY)"), + ("LA", "Louisiana (LA)"), + ("ME", "Maine (ME)"), + ("MD", "Maryland (MD)"), + ("MA", "Massachusetts (MA)"), + ("MI", "Michigan (MI)"), + ("MN", "Minnesota (MN)"), + ("MS", "Mississippi (MS)"), + ("MO", "Missouri (MO)"), + ("MT", "Montana (MT)"), + ("NE", "Nebraska (NE)"), + ("NV", "Nevada (NV)"), + ("NH", "New Hampshire (NH)"), + ("NJ", "New Jersey (NJ)"), + ("NM", "New Mexico (NM)"), + ("NY", "New York (NY)"), + ("NC", "North Carolina (NC)"), + ("ND", "North Dakota (ND)"), + ("MP", "Northern Mariana Islands (MP)"), + ("OH", "Ohio (OH)"), + ("OK", "Oklahoma (OK)"), + ("OR", "Oregon (OR)"), + ("PA", "Pennsylvania (PA)"), + ("PR", "Puerto Rico (PR)"), + ("RI", "Rhode Island (RI)"), + ("SC", "South Carolina (SC)"), + ("SD", "South Dakota (SD)"), + ("TN", "Tennessee (TN)"), + ("TX", "Texas (TX)"), + ("UM", "United States Minor Outlying Islands (UM)"), + ("UT", "Utah (UT)"), + ("VT", "Vermont (VT)"), + ("VI", "Virgin Islands (VI)"), + ("VA", "Virginia (VA)"), + ("WA", "Washington (WA)"), + ("WV", "West Virginia (WV)"), + ("WI", "Wisconsin (WI)"), + ("WY", "Wyoming (WY)"), + ("AA", "Armed Forces Americas (AA)"), + ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"), + ("AP", "Armed Forces Pacific (AP)"), + ], + max_length=2, + null=True, + verbose_name="state, territory, or military post", + ), + ), + ] diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py index 774dba897..19b1cdba1 100644 --- a/src/registrar/models/domain_information.py +++ b/src/registrar/models/domain_information.py @@ -160,7 +160,7 @@ class DomainInformation(TimeStampedModel): choices=StateTerritoryChoices.choices, null=True, blank=True, - verbose_name="state / territory", + verbose_name="state, territory, or military post", ) zipcode = models.CharField( max_length=10, diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index b80e063cd..091f63dca 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -424,7 +424,7 @@ class DomainRequest(TimeStampedModel): choices=StateTerritoryChoices.choices, null=True, blank=True, - verbose_name="state / territory", + verbose_name="state, territory, or military post", ) zipcode = models.CharField( max_length=10, diff --git a/src/registrar/models/portfolio.py b/src/registrar/models/portfolio.py index fadcf8cac..61d4f7a30 100644 --- a/src/registrar/models/portfolio.py +++ b/src/registrar/models/portfolio.py @@ -89,7 +89,7 @@ class Portfolio(TimeStampedModel): choices=StateTerritoryChoices.choices, null=True, blank=True, - verbose_name="state / territory", + verbose_name="state, territory, or military post", ) zipcode = models.CharField( diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html index d7bc277b3..8e25b1c9f 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 and mailing address' value=domain.domain_info address='true' edit_link=url editable=is_editable %} + {% include "includes/summary_item.html" with title='Organization name' 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 a7eb02b59..ee586a41d 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 and mailing address

    +

    Organization name

    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 183a8be81..ef5e9db59 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 and mailing address' value=DomainRequest address='true' heading_level=heading_level %} + {% include "includes/summary_item.html" with title='Organization name' value=DomainRequest address='true' heading_level=heading_level %} {% endif %} {% if DomainRequest.about_your_organization %} diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html index 24f92bf16..b6a46ca31 100644 --- a/src/registrar/templates/domain_sidebar.html +++ b/src/registrar/templates/domain_sidebar.html @@ -12,7 +12,7 @@ {% if not portfolio %} {% with url_name="domain-org-name-address" %} - {% include "includes/domain_sidenav_item.html" with item_text="Organization name and mailing address" %} + {% include "includes/domain_sidenav_item.html" with item_text="Organization name" %} {% endwith %} {% endif %} diff --git a/src/registrar/templates/emails/includes/domain_request_summary.txt b/src/registrar/templates/emails/includes/domain_request_summary.txt index 9294420c4..ee8feaa42 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 and mailing address: +Organization name: {% 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 c8d839f9b..2e6a1f488 100644 --- a/src/registrar/templates/portfolio_organization.html +++ b/src/registrar/templates/portfolio_organization.html @@ -1,7 +1,7 @@ {% extends 'portfolio_base.html' %} {% load static field_helpers%} -{% block title %}Organization mailing address | {{ portfolio.name }}{% endblock %} +{% block title %}Organization name and mailing address | {{ portfolio.name }}{% endblock %} {% load static %} diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py index b096527f9..277d1dc5c 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 and mailing address", count=4) + self.assertContains(page, "Organization name", count=4) @less_console_noise_decorator def test_domain_org_name_address_content(self): diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 003f8dd0d..3dd02876a 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 and mailing address view""" + """Organization name view""" model = Domain template_name = "domain_org_name_address.html" diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index b691549cd..9bb78bbc2 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -85,7 +85,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView): Step.TRIBAL_GOVERNMENT: _("Tribal government"), Step.ORGANIZATION_FEDERAL: _("Federal government branch"), Step.ORGANIZATION_ELECTION: _("Election office"), - Step.ORGANIZATION_CONTACT: _("Organization name and mailing address"), + Step.ORGANIZATION_CONTACT: _("Organization name"), Step.ABOUT_YOUR_ORGANIZATION: _("About your organization"), Step.SENIOR_OFFICIAL: _("Senior official"), Step.CURRENT_SITES: _("Current websites"), From da0487b0f2eac5889cc62e3219c5c8e40be14e2f Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 11 Sep 2024 17:07:11 -0400 Subject: [PATCH 06/14] fix unit tests --- src/registrar/tests/test_views_portfolio.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index 807c66cf7..993e7ae5e 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -198,7 +198,7 @@ class TestPortfolio(WebTest): # Assert the response is a 200 self.assertEqual(response.status_code, 200) # The label for Federal agency will always be a h4 - self.assertContains(response, '

    Federal agency

    ') + self.assertContains(response, '

    Organization name

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

    City

    ') self.assertNotContains(response, 'for="id_city"') @@ -223,7 +223,7 @@ class TestPortfolio(WebTest): # Assert the response is a 200 self.assertEqual(response.status_code, 200) # The label for Federal agency will always be a h4 - self.assertContains(response, '

    Federal agency

    ') + self.assertContains(response, '

    Organization name

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

    City

    ') self.assertNotContains(response, '

    Los Angeles

    >') From 4a5213aeb1aa199ea8b46cb956861e5fce145cbe Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 11 Sep 2024 20:12:12 -0400 Subject: [PATCH 07/14] fix Organization page headers --- src/registrar/templates/domain_detail.html | 2 +- src/registrar/templates/domain_org_name_address.html | 2 +- src/registrar/templates/domain_request_status.html | 2 +- .../templates/emails/includes/domain_request_summary.txt | 2 +- src/registrar/templates/portfolio_organization.html | 2 +- src/registrar/tests/test_views_domain.py | 4 ++-- src/registrar/tests/test_views_portfolio.py | 2 +- src/registrar/views/domain.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) 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" From 71e46c79257479a104e23f9dd0a3ed11ad39ff2c Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 11 Sep 2024 20:17:25 -0400 Subject: [PATCH 08/14] fix Organization sidenav links --- src/registrar/templates/domain_sidebar.html | 2 +- src/registrar/views/domain_request.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html index b6a46ca31..0942e5751 100644 --- a/src/registrar/templates/domain_sidebar.html +++ b/src/registrar/templates/domain_sidebar.html @@ -12,7 +12,7 @@ {% if not portfolio %} {% with url_name="domain-org-name-address" %} - {% include "includes/domain_sidenav_item.html" with item_text="Organization name" %} + {% include "includes/domain_sidenav_item.html" with item_text="Organization" %} {% endwith %} {% endif %} diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index 9bb78bbc2..e681d92cb 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -85,7 +85,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView): Step.TRIBAL_GOVERNMENT: _("Tribal government"), Step.ORGANIZATION_FEDERAL: _("Federal government branch"), Step.ORGANIZATION_ELECTION: _("Election office"), - Step.ORGANIZATION_CONTACT: _("Organization name"), + Step.ORGANIZATION_CONTACT: _("Organization"), Step.ABOUT_YOUR_ORGANIZATION: _("About your organization"), Step.SENIOR_OFFICIAL: _("Senior official"), Step.CURRENT_SITES: _("Current websites"), From e16dd2ea93128165657c426347c810ca01b902b0 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 11 Sep 2024 21:50:58 -0400 Subject: [PATCH 09/14] Fix unit tests --- src/registrar/templates/portfolio_organization.html | 2 +- src/registrar/tests/test_views_domain.py | 4 +++- src/registrar/tests/test_views_portfolio.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html index bc3f23d43..2e6a1f488 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

    +

    Organization name

    {{ portfolio.federal_agency }}

    diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py index 7b4374212..10ba808af 100644 --- a/src/registrar/tests/test_views_domain.py +++ b/src/registrar/tests/test_views_domain.py @@ -1301,7 +1301,9 @@ 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", count=4) + self.assertContains(page, "Organization
    ") + self.assertContains(page, "Organization name and mailing address") + self.assertContains(page, "Organization") @less_console_noise_decorator def test_domain_org_name_address_content(self): diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index 976ca2c46..f73b48b30 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -341,7 +341,7 @@ class TestPortfolio(WebTest): ) page = self.app.get(reverse("organization")) self.assertContains( - page, "The name of your federal agency will be publicly listed as the domain registrant." + page, "The name of your organization will be publicly listed as the domain registrant." ) @less_console_noise_decorator From 71a69fa9955e6fa96115decd7f1123714af58cff Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Thu, 12 Sep 2024 01:06:26 -0400 Subject: [PATCH 10/14] cleanup --- src/registrar/tests/test_views_domain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py index 10ba808af..288ddda84 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") + self.assertContains(page, "Organization ") self.assertContains(page, "Organization name and mailing address") self.assertContains(page, "Organization") From f4e746b4be2639a8d99c0ec03fe1369b44313e4f Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Mon, 16 Sep 2024 18:52:51 -0400 Subject: [PATCH 11/14] design tweaks, unit test fix, linting --- .../assets/sass/_theme/_buttons.scss | 89 ++++++++++++------- .../templates/includes/senior_official.html | 2 +- src/registrar/tests/test_views_domain.py | 2 +- src/registrar/tests/test_views_portfolio.py | 4 +- 4 files changed, 61 insertions(+), 36 deletions(-) diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss index 12eee9926..2e4469e12 100644 --- a/src/registrar/assets/sass/_theme/_buttons.scss +++ b/src/registrar/assets/sass/_theme/_buttons.scss @@ -1,7 +1,8 @@ @use "uswds-core" as *; @use "cisa_colors" as *; -/* Make "placeholder" links visually obvious */ +// Used on: TODO links +// Used on: NONE a[href$="todo"]::after { background-color: yellow; color: color(blue-80v); @@ -9,10 +10,14 @@ a[href$="todo"]::after { font-style: italic; } +// Used on: profile +// Note: Is this needed? a.usa-link.usa-link--always-blue { color: #{$dhs-blue}; } +// Used on: breadcrumbs +// Note: This could potentially be simplified and use usa-button--with-icon a.breadcrumb__back { display:flex; align-items: center; @@ -28,10 +33,18 @@ a.breadcrumb__back { } } +// Remove anchor buttons' underline a.usa-button { text-decoration: none; } +// Unstyled anchor buttons +a.usa-button--unstyled:visited { + color: color('primary'); +} + +// Disabled anchor buttons +// NOTE: Not used a.usa-button.disabled-link { background-color: #ccc !important; color: #454545 !important @@ -58,6 +71,8 @@ a.usa-button--unstyled.disabled-link:focus { text-decoration: none !important; } +// Disabled buttons +// Used on: Domain managers, disabled logo on profile .usa-button--unstyled.disabled-button, .usa-button--unstyled.disabled-button:hover, .usa-button--unstyled.disabled-button:focus { @@ -66,6 +81,16 @@ a.usa-button--unstyled.disabled-link:focus { text-decoration: none !important; } +// Unstyled variant for reverse out? +// Used on: NONE +.usa-button--unstyled--white, +.usa-button--unstyled--white:hover, +.usa-button--unstyled--white:focus, +.usa-button--unstyled--white:active { + color: color('white'); +} + +// Solid anchor buttons a.usa-button:not(.usa-button--unstyled, .usa-button--outline) { color: color('white'); } @@ -76,7 +101,8 @@ a.usa-button:not(.usa-button--unstyled, .usa-button--outline):focus, a.usa-button:not(.usa-button--unstyled, .usa-button--outline):active { color: color('white'); } - + +// Outline anchor buttons a.usa-button--outline, a.usa-button--outline:visited { box-shadow: inset 0 0 0 2px color('primary'); @@ -94,10 +120,22 @@ a.usa-button--outline:active { color: color('primary-darker'); } +// Used on: Domain request withdraw confirmation a.withdraw { background-color: color('error'); } + +a.withdraw:hover, +a.withdraw:focus { + background-color: color('error-dark'); +} +a.withdraw:active { + background-color: color('error-darker'); +} + +// Used on: Domain request status +//NOTE: Revise to BEM convention usa-button--outline-secondary a.withdraw_outline, a.withdraw_outline:visited { box-shadow: inset 0 0 0 2px color('error'); @@ -115,19 +153,8 @@ a.withdraw_outline:active { color: color('error-darker'); } -a.withdraw:hover, -a.withdraw:focus { - background-color: color('error-dark'); -} - -a.withdraw:active { - background-color: color('error-darker'); -} -a.usa-button--unstyled:visited { - color: color('primary'); -} - +// Used on: Domain request submit .dotgov-button--green { background-color: color('success-dark'); @@ -140,15 +167,8 @@ a.usa-button--unstyled:visited { } } -.usa-button--unstyled--white, -.usa-button--unstyled--white:hover, -.usa-button--unstyled--white:focus, -.usa-button--unstyled--white:active { - color: color('white'); -} - -// Cancel button used on the -// DNSSEC main page +// Cancel button +// Used on: DNSSEC main page // We want to center this button on mobile // and add some extra left margin on tablet+ .usa-button--cancel { @@ -175,6 +195,8 @@ a.usa-button--unstyled:visited { } } +// Used on: Profile page, toggleable fields +// Note: Could potentially be cleaned up by using usa-button--with-icon // We need to deviate from some default USWDS styles here // in this particular case, so we have to override this. .usa-form .usa-button.readonly-edit-button { @@ -186,6 +208,7 @@ a.usa-button--unstyled:visited { } } +//Used on: Domains and Requests tables .usa-button--filter { width: auto; // For mobile stacking @@ -201,6 +224,8 @@ a.usa-button--unstyled:visited { } } +// Buttons with nested icons +// Note: Can be simplified by adding usa-link--icon to anchors in tables .dotgov-table a, .usa-link--icon, .usa-button--with-icon { @@ -211,14 +236,7 @@ a.usa-button--unstyled:visited { align-items: center; } - -.dotgov-table a, -.usa-link--icon { - &:visited { - color: color('primary'); - } -} - +.dotgov-table a a .usa-icon, .usa-button--with-icon .usa-icon { height: 1.3em; @@ -230,3 +248,12 @@ a .usa-icon, height: 1.5em; width: 1.5em; } + +// Red, for delete buttons +// Used on: All delete buttons +// Note: Can be simplified by adding text-secondary to delete anchors in tables +button.text-secondary, +button.text-secondary:hover, +.dotgov-table a.text-secondary { + color: $theme-color-error; +} diff --git a/src/registrar/templates/includes/senior_official.html b/src/registrar/templates/includes/senior_official.html index da6c0ac36..bb47a9167 100644 --- a/src/registrar/templates/includes/senior_official.html +++ b/src/registrar/templates/includes/senior_official.html @@ -33,7 +33,7 @@ {% elif not form.full_name.value and not form.title.value and not form.email.value %} -

    No senior official was found.

    +

    No senior official was found.

    {% else %}
    {% if form.full_name.value is not None %} diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py index 288ddda84..e481a8eba 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 ") + self.assertContains(page, "/org-name-address") self.assertContains(page, "Organization name and mailing address") self.assertContains(page, "Organization") diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index f73b48b30..9e942164d 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -340,9 +340,7 @@ class TestPortfolio(WebTest): user=self.user, portfolio=self.portfolio, additional_permissions=portfolio_additional_permissions ) page = self.app.get(reverse("organization")) - self.assertContains( - page, "The name of your organization will be publicly listed as the domain registrant." - ) + self.assertContains(page, "The name of your organization will be publicly listed as the domain registrant.") @less_console_noise_decorator def test_domain_org_name_address_content(self): From d3b5ee03613921a32054a9f3490caf07d1be49da Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Mon, 16 Sep 2024 19:02:16 -0400 Subject: [PATCH 12/14] migrations --- ...=> 0128_alter_domaininformation_state_territory_and_more.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/registrar/migrations/{0124_alter_domaininformation_state_territory_and_more.py => 0128_alter_domaininformation_state_territory_and_more.py} (99%) diff --git a/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py b/src/registrar/migrations/0128_alter_domaininformation_state_territory_and_more.py similarity index 99% rename from src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py rename to src/registrar/migrations/0128_alter_domaininformation_state_territory_and_more.py index 62a84d570..a6b8d0519 100644 --- a/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py +++ b/src/registrar/migrations/0128_alter_domaininformation_state_territory_and_more.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ("registrar", "0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more"), + ("registrar", "0127_remove_domaininformation_submitter_and_more"), ] operations = [ From fc8239956918dfe7c21c36a77d0105393a770551 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Tue, 17 Sep 2024 14:16:07 -0400 Subject: [PATCH 13/14] change color on the labels for read only inputs --- src/registrar/assets/sass/_theme/_forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/assets/sass/_theme/_forms.scss b/src/registrar/assets/sass/_theme/_forms.scss index 0aedfcdba..44c224aad 100644 --- a/src/registrar/assets/sass/_theme/_forms.scss +++ b/src/registrar/assets/sass/_theme/_forms.scss @@ -85,7 +85,7 @@ legend.float-left-tablet + button.float-right-tablet { .read-only-label { font-size: size('body', 'sm'); - color: color('primary'); + color: color('primary-dark'); margin-bottom: units(0.5); } From 847ab047d2c181a12b08694eb1118cc75b05aad4 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Tue, 17 Sep 2024 17:48:05 -0400 Subject: [PATCH 14/14] SO html tweaks --- .../templates/includes/senior_official.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/registrar/templates/includes/senior_official.html b/src/registrar/templates/includes/senior_official.html index bb47a9167..0302bc71f 100644 --- a/src/registrar/templates/includes/senior_official.html +++ b/src/registrar/templates/includes/senior_official.html @@ -16,14 +16,6 @@ {% if can_edit %} {% include "includes/required_fields.html" %} -{% else %} -

    - The senior official for your organization can’t be updated here. - To suggest an update, email help@get.gov. -

    -{% endif %} - -{% if can_edit %}
    {% csrf_token %} {% input_with_errors form.first_name %} @@ -33,8 +25,15 @@
    {% elif not form.full_name.value and not form.title.value and not form.email.value %} -

    No senior official was found.

    +

    + Your senior official is a person within your organization who can authorize domain requests. + We don't have information about your organization's senior official. To suggest an update, email help@get.gov. +

    {% else %} +

    + The senior official for your organization can’t be updated here. + To suggest an update, email help@get.gov. +

    {% if form.full_name.value is not None %} {% include "includes/input_read_only.html" with field=form.full_name %}