4239: UI legacy header nav and dashboard base background updates like EM.

src/registrar/assets/src/sass/_theme/_base.scss

@@ -37,13 +37,8 @@ body {
 }
 
 #wrapper.dashboard {
-  background-color: color('primary-lightest');
-  padding-top: units(5)!important;
-}
-
-#wrapper.dashboard--grey-1,
-.bg-gray-1 {
   background-color: color('gray-1');
+  padding-top: units(5)!important;
 }
 
 .section-outlined {

src/registrar/assets/src/sass/_theme/_header.scss

@@ -69,43 +69,6 @@ button {
     outline-offset: 0;
 }
 
-.usa-header--basic {
-    .usa-logo__text {
-        color: color('primary-darker');
-    }
-    .usa-nav__username {
-        padding: units(1) units(2);
-        @include at-media(desktop) {
-            padding: units(2);
-        }
-    }
-    .usa-nav__primary {
-        margin-top:units(1);
-    }
-    @include at-media(desktop) {
-        .usa-nav__primary-item:not(:first-child) {
-            position: relative;
-        }
-        .usa-nav__primary-item:not(:first-child)::before {
-            content: '';
-            position: absolute;
-            top: 50%;
-            left: 0;
-            width: 0; /* No width since it's a border */
-            height: 40%;
-            border-left: solid 1px color('base-light');
-            transform: translateY(-50%);
-        }
-    }
-
-    button {
-        padding-top: 0;
-        padding-bottom: 0;
-        padding-left: 0;
-        color: #{$dhs-blue};
-    }
-}
-
 .usa-header--extended {
     @include at-media(desktop) {
         background-color: color('primary-darker');

src/registrar/context_processors.py

@@ -63,28 +63,42 @@ def portfolio_permissions(request):
         "has_view_members_portfolio_permission": False,
         "has_edit_members_portfolio_permission": False,
         "portfolio": None,
+        "is_org_user": False,
         "is_portfolio_user": False,
         "is_portfolio_admin": False,
         "has_multiple_portfolios": False,
     }
     try:
-        portfolio = request.session.get("portfolio")
-        if portfolio:
-            return {
-                "has_view_portfolio_permission": request.user.has_view_portfolio_permission(portfolio),
-                "has_edit_portfolio_permission": request.user.has_edit_portfolio_permission(portfolio),
-                "has_edit_request_portfolio_permission": request.user.has_edit_request_portfolio_permission(portfolio),
-                "has_any_domains_portfolio_permission": request.user.has_any_domains_portfolio_permission(portfolio),
-                "has_any_requests_portfolio_permission": request.user.has_any_requests_portfolio_permission(portfolio),
-                "has_view_members_portfolio_permission": request.user.has_view_members_portfolio_permission(portfolio),
-                "has_edit_members_portfolio_permission": request.user.has_edit_members_portfolio_permission(portfolio),
-                "portfolio": portfolio,
-                "is_portfolio_user": True,
-                "is_portfolio_admin": request.user.is_portfolio_admin(portfolio),
-                "has_multiple_portfolios": request.user.is_multiple_orgs_user(request),
-            }
+        user = request.user
+        if not getattr(user, "is_authenticated", False):
+            return portfolio_context
+
+        session_portfolio = request.session.get("portfolio")
         # Active portfolio may not be set yet, but indicate if user is a member of multiple portfolios
-        portfolio_context["has_multiple_portfolios"] = request.user.is_multiple_orgs_user(request)
+        portfolio_context["has_multiple_portfolios"] = user.is_multiple_orgs_user(request)
+
+        if not session_portfolio:
+            return portfolio_context
+
+        # Check min privilege to view portfolio
+        can_view = user.has_view_portfolio_permission(session_portfolio)
+        if not can_view:
+            return portfolio_context
+
+        # Basic User is an org user flags
+        portfolio_context["is_org_user"] = True
+        portfolio_context["is_portfolio_user"] = True
+        portfolio_context["portfolio"] = session_portfolio
+
+        # Now to compute the rest of the permissions
+        portfolio_context["has_edit_portfolio_permission"] = user.has_edit_portfolio_permission(session_portfolio)
+        portfolio_context["has_any_domains_portfolio_permission"] = user.has_any_domains_portfolio_permission(session_portfolio)
+        portfolio_context["has_any_requests_portfolio_permission"] = user.has_any_requests_portfolio_permission(session_portfolio)
+        portfolio_context["has_edit_request_portfolio_permission"] = user.has_edit_request_portfolio_permission(session_portfolio)
+        portfolio_context["has_view_members_portfolio_permission"] = user.has_view_members_portfolio_permission(session_portfolio)
+        portfolio_context["has_edit_members_portfolio_permission"] = user.has_edit_members_portfolio_permission(session_portfolio)
+        portfolio_context["is_portfolio_admin"] = user.is_portfolio_admin(session_portfolio)
+
         return portfolio_context
 
     except AttributeError:

src/registrar/templates/includes/header_selector.html

@@ -1,7 +1,7 @@
 {% url 'your-portfolios' as your_portfolios_url %}
 <!-- Display extended header on Select organization page which displays when no active portfolio -->
 {% if not is_org_user and request.path != your_portfolios_url %}
-    {% include "includes/header_basic.html" with logo_clickable=logo_clickable %}
+    {% include "includes/header_extended.html" with logo_clickable=True hide_portfolio_navbar=True %}
 {% else %}
     {% include "includes/header_extended.html" with logo_clickable=logo_clickable hide_portfolio_navbar=hide_portfolio_navbar %}
 {% endif %}

src/registrar/templates/portfolio_domains.html

@@ -5,7 +5,7 @@
 {% block title %} Domains | {% endblock %}
 
 {% block wrapper_class %}
-  {{ block.super }} dashboard--grey-1
+  {{ block.super }} dashboard
 {% endblock %}
 
 {% block portfolio_content %}

src/registrar/templates/portfolio_member_permissions.html

@@ -5,7 +5,7 @@
 {% block title %}Organization member{% endblock %}
 
 {% block wrapper_class %}
-  {{ block.super }} dashboard--grey-1
+  {{ block.super }} dashboard
 {% endblock %}
 
 {% block portfolio_content %}

src/registrar/templates/portfolio_members.html

@@ -5,7 +5,7 @@
 {% block title %} Members | {% endblock %}
 
 {% block wrapper_class %}
-  {{ block.super }} dashboard--grey-1
+  {{ block.super }} dashboard
 {% endblock %}
 
 {% block portfolio_content %}

src/registrar/templates/portfolio_members_add_new.html

@@ -5,7 +5,7 @@
 {% block title %} Members | New Member {% endblock %}
 
 {% block wrapper_class %}
-  {{ block.super }} dashboard--grey-1
+  {{ block.super }} dashboard
 {% endblock %}
 
 {% block portfolio_content %}

src/registrar/templates/portfolio_requests.html

@@ -5,7 +5,7 @@
 {% block title %} Domain requests | {% endblock %}
 
 {% block wrapper_class %}
-  {{ block.super }} dashboard--grey-1
+  {{ block.super }} dashboard
 {% endblock %}
 
 {% block portfolio_content %}

src/registrar/tests/test_views.py

@@ -871,10 +871,7 @@ def test_new_user(self):
 
         # We need to assert that links to manage your domain are not present (in both body and footer)
         self.assertNotContains(user_profile_page, "Manage your domains")
-        # Assert the tooltip on the logo, indicating that the logo is not clickable
-        self.assertContains(
-            user_profile_page, 'title="Before you can manage your domains, we need you to add contact information."'
-        )
+
         # Assert that modal does not appear on subsequent submits
         self.assertNotContains(user_profile_page, "domain registrants must maintain accurate contact information")