diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss index 1b8f34290..442c5c862 100644 --- a/src/registrar/assets/sass/_theme/_base.scss +++ b/src/registrar/assets/sass/_theme/_base.scss @@ -29,8 +29,8 @@ body { padding-bottom: units(6) * 2 ; //Workaround because USWDS units jump from 10 to 15 } -#wrapper.wrapper--padding-top-4 { - padding-top: units(4); +#wrapper.wrapper--padding-top-6 { + padding-top: units(6); } #wrapper.dashboard { diff --git a/src/registrar/context_processors.py b/src/registrar/context_processors.py index 015772b9f..ae35a8865 100644 --- a/src/registrar/context_processors.py +++ b/src/registrar/context_processors.py @@ -108,7 +108,8 @@ def is_widescreen_mode(request): ] is_widescreen = any(path in request.path for path in widescreen_paths) or request.path == "/" is_portfolio_widescreen = bool( - request.user.is_org_user(request) and - any(path in request.path for path in portfolio_widescreen_paths) + hasattr(request.user, "is_org_user") + and request.user.is_org_user(request) + and any(path in request.path for path in portfolio_widescreen_paths) ) return {"is_widescreen_mode": is_widescreen or is_portfolio_widescreen} diff --git a/src/registrar/templates/domain_request_done.html b/src/registrar/templates/domain_request_done.html index 50cdc1634..0d38309d8 100644 --- a/src/registrar/templates/domain_request_done.html +++ b/src/registrar/templates/domain_request_done.html @@ -7,7 +7,7 @@ {% comment %} Same as the old wrapper implementation but with padding-top-4 {% endcomment %} {% block wrapperdiv %} -
+
{% endblock wrapperdiv %} {% block content %} diff --git a/src/registrar/templates/domain_request_requesting_entity.html b/src/registrar/templates/domain_request_requesting_entity.html index dfda5e2fb..eaf2d5a31 100644 --- a/src/registrar/templates/domain_request_requesting_entity.html +++ b/src/registrar/templates/domain_request_requesting_entity.html @@ -2,7 +2,7 @@ {% load field_helpers url_helpers %} {% block form_instructions %} -

To help with our review, we need to understand whether the domain you're requesting will be used by the Department of Energy or by one of its suborganizations.

+

To help with our review, we need to understand whether the domain you're requesting will be used by {{ portfolio }} or by one of its suborganizations.

We define a suborganization as any entity (agency, bureau, office) that falls under the overarching organization.

{% endblock %} diff --git a/src/registrar/templates/domain_request_withdraw_confirmation.html b/src/registrar/templates/domain_request_withdraw_confirmation.html index 03cb06b51..e1a5f0c2a 100644 --- a/src/registrar/templates/domain_request_withdraw_confirmation.html +++ b/src/registrar/templates/domain_request_withdraw_confirmation.html @@ -4,7 +4,7 @@ {% load static url_helpers %} {% block wrapperdiv %} -
+
{% endblock wrapperdiv %} {% block content %} diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index 402d23b70..775cb04e6 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -1658,7 +1658,7 @@ class TestRequestingEntity(WebTest): self.assertContains(response, "Add suborganization information") # We expect to see the portfolio name in two places: # the header, and as one of the radio button options. - self.assertContains(response, self.portfolio.organization_name, count=2) + self.assertContains(response, self.portfolio.organization_name, count=3) # We expect the dropdown list to contain the suborganizations that currently exist on this portfolio self.assertContains(response, self.suborganization.name, count=1)