From f5edd64c92d89801b87cb6afd84d090deaa3709c Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Mon, 4 Dec 2023 11:35:31 -0800 Subject: [PATCH 1/9] Move manage your domain --- src/registrar/templates/base.html | 12 +++++++++++- src/registrar/templates/domain_base.html | 10 ---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index caecee9f3..6179798b8 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -148,8 +148,18 @@ + + + + Manage your domains + + + + + + {% endblock %} diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html index b5f70d341..530f97e66 100644 --- a/src/registrar/templates/domain_base.html +++ b/src/registrar/templates/domain_base.html @@ -42,16 +42,6 @@

- {% else %} - - - -

- Back to manage your domains -

- {% endif %} {# messages block is under the back breadcrumb link #} {% if messages %} From b0d95be7a27269afdb103cc13219cf8e605ee453 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Mon, 4 Dec 2023 15:28:31 -0500 Subject: [PATCH 2/9] layout and CSS for the back to manage domains button --- src/registrar/assets/sass/_theme/_base.scss | 4 --- .../assets/sass/_theme/_buttons.scss | 11 ++++++++ .../assets/sass/_theme/_nav-primary.scss | 9 +++++++ src/registrar/assets/sass/_theme/styles.scss | 1 + src/registrar/templates/base.html | 27 ++++++++----------- 5 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 src/registrar/assets/sass/_theme/_nav-primary.scss diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss index 668a6ace6..b5efc63bd 100644 --- a/src/registrar/assets/sass/_theme/_base.scss +++ b/src/registrar/assets/sass/_theme/_base.scss @@ -37,10 +37,6 @@ body { @include typeset('sans', 'xl', 2); color: color('primary-darker'); } - -.usa-nav__primary { - margin-top: units(1); -} .section--outlined { background-color: color('white'); diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss index 02089ec6d..8e6aeef56 100644 --- a/src/registrar/assets/sass/_theme/_buttons.scss +++ b/src/registrar/assets/sass/_theme/_buttons.scss @@ -7,6 +7,17 @@ a[href$="todo"]::after { content: " [link TBD]"; font-style: italic; } + +a.manage_domain_back { + // Slight vertical and horizontal alignment fixes + position: relative; + top: -2px; + left: -5px; + font-weight: bold; + &:visited { + color: color('primary'); + } +} a.breadcrumb__back { display:flex; diff --git a/src/registrar/assets/sass/_theme/_nav-primary.scss b/src/registrar/assets/sass/_theme/_nav-primary.scss new file mode 100644 index 000000000..754abfa2e --- /dev/null +++ b/src/registrar/assets/sass/_theme/_nav-primary.scss @@ -0,0 +1,9 @@ +@use "uswds-core" as *; + +.usa-nav__primary { + margin-top: units(1); +} + +.usa-logo-group { + flex: 1 1 0%; +} diff --git a/src/registrar/assets/sass/_theme/styles.scss b/src/registrar/assets/sass/_theme/styles.scss index 8a2e1d2d3..32681f379 100644 --- a/src/registrar/assets/sass/_theme/styles.scss +++ b/src/registrar/assets/sass/_theme/styles.scss @@ -9,6 +9,7 @@ /*-------------------------------------------------- --- Custom Styles ---------------------------------*/ @forward "base"; +@forward "nav-primary"; @forward "typography"; @forward "buttons"; @forward "forms"; diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index 6179798b8..03eec88ac 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -144,23 +144,18 @@
- {% block logo %} - - - - +
+ {% block logo %} + + {% endblock %} + Manage your domains - - - - - - - {% endblock %} + +
{% block usa_nav %} From 61e05a438b6a793651ea8a6f9f4bfdaf19d5a940 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Mon, 4 Dec 2023 15:33:46 -0500 Subject: [PATCH 3/9] Move manage button CSS from buttons to nav partial --- src/registrar/assets/sass/_theme/_buttons.scss | 11 ----------- src/registrar/assets/sass/_theme/_nav-primary.scss | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss index 8e6aeef56..02089ec6d 100644 --- a/src/registrar/assets/sass/_theme/_buttons.scss +++ b/src/registrar/assets/sass/_theme/_buttons.scss @@ -7,17 +7,6 @@ a[href$="todo"]::after { content: " [link TBD]"; font-style: italic; } - -a.manage_domain_back { - // Slight vertical and horizontal alignment fixes - position: relative; - top: -2px; - left: -5px; - font-weight: bold; - &:visited { - color: color('primary'); - } -} a.breadcrumb__back { display:flex; diff --git a/src/registrar/assets/sass/_theme/_nav-primary.scss b/src/registrar/assets/sass/_theme/_nav-primary.scss index 754abfa2e..72cf35b42 100644 --- a/src/registrar/assets/sass/_theme/_nav-primary.scss +++ b/src/registrar/assets/sass/_theme/_nav-primary.scss @@ -7,3 +7,14 @@ .usa-logo-group { flex: 1 1 0%; } + +a.manage_domain_back { + // Slight vertical and horizontal alignment fixes + position: relative; + top: -2px; + left: -5px; + font-weight: bold; + &:visited { + color: color('primary'); + } +} From bf3f9e67fc97d371ccdc819ebcd5f6936aa8fdcc Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Mon, 4 Dec 2023 14:43:06 -0800 Subject: [PATCH 4/9] Only have Manage Your Domains show up on Domain Overview page --- src/registrar/templates/base.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index 03eec88ac..aad526f37 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 %} + @@ -148,13 +150,16 @@ {% block logo %} {% endblock %} - + {% url 'domain' pk=domain.id as url %} + {% if request.path == url %} + Manage your domains - + + {% endif %}
From 4386218f462630e97290cd422908f6c1bc5d6270 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 14:48:53 -0800 Subject: [PATCH 5/9] Changes per designers request of updating naming to .gov registrar, moving the breadcrumb to the footer and fixing column grid alignment --- src/registrar/templates/base.html | 9 ++------- src/registrar/templates/domain_base.html | 18 +++++++++--------- src/registrar/templates/includes/footer.html | 4 ++++ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index aad526f37..df22da7ba 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -150,16 +150,11 @@ {% block logo %} {% endblock %} - {% url 'domain' pk=domain.id as url %} - {% if request.path == url %} - - Manage your domains - - {% endif %} + diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html index 530f97e66..9d23e4abd 100644 --- a/src/registrar/templates/domain_base.html +++ b/src/registrar/templates/domain_base.html @@ -5,17 +5,17 @@ {% block content %}
-
- {% if not is_analyst_or_superuser or not analyst_action or analyst_action_location != domain.pk %} -

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

- {% endif %} -
+
+ {% if not is_analyst_or_superuser or not analyst_action or analyst_action_location != domain.pk %} +

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

+ {% endif %} + {% if domain.domain_info %} {% include 'domain_sidebar.html' %} {% endif %} diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 47d4836f1..74d61c7cb 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -26,6 +26,10 @@ >
+
+ Manage your domains +
+ |
Help
From 71c3baf13fee7db3e0e8e9e539d33def695cf06b Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 15:40:02 -0800 Subject: [PATCH 6/9] Fix tests to the right index --- src/registrar/tests/test_views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index 6599a2436..840ea278e 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -1071,7 +1071,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") @@ -2111,7 +2111,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") @@ -2131,7 +2131,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") @@ -2146,7 +2146,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") From 2247585f6aa7c9ada2625e8067351fd52d451907 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 15:45:30 -0800 Subject: [PATCH 7/9] Remove prev scss changes --- src/registrar/assets/sass/_theme/_base.scss | 4 ++++ .../assets/sass/_theme/_nav-primary.scss | 20 ------------------- src/registrar/assets/sass/_theme/styles.scss | 1 - 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 src/registrar/assets/sass/_theme/_nav-primary.scss diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss index b5efc63bd..1d936a255 100644 --- a/src/registrar/assets/sass/_theme/_base.scss +++ b/src/registrar/assets/sass/_theme/_base.scss @@ -38,6 +38,10 @@ body { color: color('primary-darker'); } +.usa-nav__primary { + margin-top:units(1); +} + .section--outlined { background-color: color('white'); border: 1px solid color('base-lighter'); diff --git a/src/registrar/assets/sass/_theme/_nav-primary.scss b/src/registrar/assets/sass/_theme/_nav-primary.scss deleted file mode 100644 index 72cf35b42..000000000 --- a/src/registrar/assets/sass/_theme/_nav-primary.scss +++ /dev/null @@ -1,20 +0,0 @@ -@use "uswds-core" as *; - -.usa-nav__primary { - margin-top: units(1); -} - -.usa-logo-group { - flex: 1 1 0%; -} - -a.manage_domain_back { - // Slight vertical and horizontal alignment fixes - position: relative; - top: -2px; - left: -5px; - font-weight: bold; - &:visited { - color: color('primary'); - } -} diff --git a/src/registrar/assets/sass/_theme/styles.scss b/src/registrar/assets/sass/_theme/styles.scss index 32681f379..8a2e1d2d3 100644 --- a/src/registrar/assets/sass/_theme/styles.scss +++ b/src/registrar/assets/sass/_theme/styles.scss @@ -9,7 +9,6 @@ /*-------------------------------------------------- --- Custom Styles ---------------------------------*/ @forward "base"; -@forward "nav-primary"; @forward "typography"; @forward "buttons"; @forward "forms"; From eea806e64aec4e529dee595bec46f2efd2f08e02 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 16:36:51 -0800 Subject: [PATCH 8/9] Manage your domains will not open in a new tab --- src/registrar/templates/includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 74d61c7cb..303c0ef74 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -27,7 +27,7 @@
- Manage your domains + Manage your domains
|
From e4c4dc76144c340b09e44ed07735de4145038164 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 17:37:16 -0800 Subject: [PATCH 9/9] Remove extraneous if statement and logo group css --- src/registrar/templates/base.html | 3 --- src/registrar/templates/domain_base.html | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index df22da7ba..b4aeba704 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -146,7 +146,6 @@
-
{% block logo %} {% endblock %} - -
{% block usa_nav %} diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html index 9d23e4abd..90c730028 100644 --- a/src/registrar/templates/domain_base.html +++ b/src/registrar/templates/domain_base.html @@ -8,14 +8,12 @@
- {% if not is_analyst_or_superuser or not analyst_action or analyst_action_location != domain.pk %}

Domain name: {{ domain.name }}

- {% endif %} - + {% if domain.domain_info %} {% include 'domain_sidebar.html' %} {% endif %}