From 35f836e5d6f7bc0e8850d4a116b0a3a6b493ba5e Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 9 Apr 2024 15:57:15 -0700
Subject: [PATCH 1/2] service_navigation.html moved to components

---
 .../new/components/service_navigation.html    | 19 +++++++++++++++++++
 .../new/layouts/withnav_template.html         |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 app/templates/new/components/service_navigation.html

diff --git a/app/templates/new/components/service_navigation.html b/app/templates/new/components/service_navigation.html
new file mode 100644
index 000000000..4cd23f252
--- /dev/null
+++ b/app/templates/new/components/service_navigation.html
@@ -0,0 +1,19 @@
+{% macro navigation_service_name(service) %}
+  <div class="font-body-2xl text-bold">
+    {{ service.name }}
+    {% if not service.active %}
+      <span class="navigation-service-name navigation-service-type--suspended">Suspended</span>
+    {% endif %}
+  </div>
+{% endmacro %}
+
+<div class="navigation-service margin-top-5 display-flex flex-align-end flex-justify border-bottom padding-bottom-1">
+  {% if current_service.organization_id %}
+    {% if current_user.platform_admin or
+      (current_user.belongs_to_organization(current_service.organization_id) and current_service.live) %}
+      <a href="{{ url_for('.organization_dashboard', org_id=current_service.organization_id) }}" class="usa-link navigation-organization-link">{{ current_service.organization_name }}</a>
+    {% endif %}
+  {% endif %}
+  {{ navigation_service_name(current_service) }}
+  <a href="{{ url_for('main.choose_account') }}" class="usa-link">Switch service</a>
+</div>
diff --git a/app/templates/new/layouts/withnav_template.html b/app/templates/new/layouts/withnav_template.html
index 412a004d0..7846513a9 100644
--- a/app/templates/new/layouts/withnav_template.html
+++ b/app/templates/new/layouts/withnav_template.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "/new/base.html" %}
 
 {% block per_page_title %}
   {% block service_page_title %}{% endblock %} – {{ current_service.name }}
@@ -7,7 +7,7 @@
 {% block main %}
   <div class="grid-container">
     {% block serviceNavigation %}
-      {% include "service_navigation.html" %}
+      {% include "new/components/service_navigation.html" %}
     {% endblock %}
     <!-- The withnav_template can be used to replace the settings_template. when it comes to setting_template and withnav_template, this service_navigation.html is only used in withnav_template and in settings_template, it was not used. That is one out of the two differences between settings template and withnav template. Child templates that extends settings_template, include the block serviceNavigation but leave it empty. Within the app, the only pages settings_template.html is used: manage-users.html, service-settings.html, and user-profile.html  -->
     <div class="grid-row margin-top-5">

From d250542b7f8cdf00c68d8cafcc9f7e1562cc02d6 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 9 Apr 2024 16:07:56 -0700
Subject: [PATCH 2/2] converted and moved service_navigation.html to
 /components

---
 .../new/components/service_navigation.html       | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/templates/new/components/service_navigation.html b/app/templates/new/components/service_navigation.html
index 4cd23f252..e3826d279 100644
--- a/app/templates/new/components/service_navigation.html
+++ b/app/templates/new/components/service_navigation.html
@@ -1,12 +1,3 @@
-{% macro navigation_service_name(service) %}
-  <div class="font-body-2xl text-bold">
-    {{ service.name }}
-    {% if not service.active %}
-      <span class="navigation-service-name navigation-service-type--suspended">Suspended</span>
-    {% endif %}
-  </div>
-{% endmacro %}
-
 <div class="navigation-service margin-top-5 display-flex flex-align-end flex-justify border-bottom padding-bottom-1">
   {% if current_service.organization_id %}
     {% if current_user.platform_admin or
@@ -14,6 +5,11 @@
       <a href="{{ url_for('.organization_dashboard', org_id=current_service.organization_id) }}" class="usa-link navigation-organization-link">{{ current_service.organization_name }}</a>
     {% endif %}
   {% endif %}
-  {{ navigation_service_name(current_service) }}
+  <div class="font-body-2xl text-bold">
+    {{ current_service.name }}
+    {% if not current_service.active %}
+      <span class="navigation-service-name navigation-service-type--suspended">Suspended</span>
+    {% endif %}
+  </div>
   <a href="{{ url_for('main.choose_account') }}" class="usa-link">Switch service</a>
 </div>