diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss index 668a6ace6..1d936a255 100644 --- a/src/registrar/assets/sass/_theme/_base.scss +++ b/src/registrar/assets/sass/_theme/_base.scss @@ -37,9 +37,9 @@ body { @include typeset('sans', 'xl', 2); color: color('primary-darker'); } - + .usa-nav__primary { - margin-top: units(1); + margin-top:units(1); } .section--outlined { diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index caecee9f3..b4aeba704 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -1,5 +1,7 @@ {# keep this on the first line #} {% load i18n static %} +{% load static url_helpers %} + @@ -144,13 +146,13 @@
- {% block logo %} - - {% endblock %} + {% block logo %} + + {% endblock %}
{% block usa_nav %} diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html index b5f70d341..90c730028 100644 --- a/src/registrar/templates/domain_base.html +++ b/src/registrar/templates/domain_base.html @@ -5,17 +5,15 @@ {% block content %}
-
- {% if not is_analyst_or_superuser or not analyst_action or analyst_action_location != domain.pk %} -

- Domain name: {{ domain.name }} -

- {% endif %} -
+
+

+ Domain name: {{ domain.name }} +

+ {% if domain.domain_info %} {% include 'domain_sidebar.html' %} {% endif %} @@ -42,16 +40,6 @@

- {% else %} - - - -

- Back to manage your domains -

- {% endif %} {# messages block is under the back breadcrumb link #} {% if messages %} diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 47d4836f1..303c0ef74 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -26,6 +26,10 @@ >
+
+ Manage your domains +
+ |
Help
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index 32c24817c..a71f85697 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -1083,7 +1083,7 @@ class DomainApplicationTests(TestWithUser, WebTest): home_page = self.app.get("/") self.assertContains(home_page, "city.gov") # click the "Edit" link - detail_page = home_page.click("Manage") + detail_page = home_page.click("Manage", index=0) self.assertContains(detail_page, "Federal: an agency of the U.S. government") @@ -2123,7 +2123,7 @@ class TestApplicationStatus(TestWithUser, WebTest): home_page = self.app.get("/") self.assertContains(home_page, "city.gov") # click the "Manage" link - detail_page = home_page.click("Manage") + detail_page = home_page.click("Manage", index=0) self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city1.gov") self.assertContains(detail_page, "Chief Tester") @@ -2143,7 +2143,7 @@ class TestApplicationStatus(TestWithUser, WebTest): home_page = self.app.get("/") self.assertContains(home_page, "city.gov") # click the "Manage" link - detail_page = home_page.click("Manage") + detail_page = home_page.click("Manage", index=0) self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "Chief Tester") self.assertContains(detail_page, "testy@town.com") @@ -2158,7 +2158,7 @@ class TestApplicationStatus(TestWithUser, WebTest): home_page = self.app.get("/") self.assertContains(home_page, "city.gov") # click the "Manage" link - detail_page = home_page.click("Manage") + detail_page = home_page.click("Manage", index=0) self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city1.gov") self.assertContains(detail_page, "Chief Tester")