Quick commit before pulling latest

app/assets/sass/uswds/_uswds-theme-custom-styles.scss

@@ -22,16 +22,23 @@ i.e.
 
 @use "uswds-core" as *;
 
-.usa-header--extended .usa-logo {
-   font-family: family("sans");
-   margin: units(4) 0;
-   @include at-media-max('mobile-lg') {
-      margin: units(4) 0 units(4) units(2);
+.usa-header--extended {
+   .usa-logo {
+      font-family: family("sans");
+      margin: units(4) 0;
+      @include at-media-max('mobile-lg') {
+         margin: units(4) 0 units(4) units(2);
+      }
+      img {
+         @include at-media($theme-header-min-width) {
+            width: 80px;
+            height: 70px;
+         }
+      }
    }
-   img {
-      @include at-media($theme-header-min-width) {
-         width: 80px;
-         height: 70px;
+   .usa-nav__secondary {
+      .usa-nav__link {
+        padding: 0;
       }
    }
 }
@@ -44,15 +51,12 @@ i.e.
    &> .usa-nav__primary-item > a {
       font-size: size("body", 4);
    }
-   &> .usa-nav__primary-item:last-child {
-      margin-left: auto;
-      @include u-margin-right(-4);
-   }
+   // &> .usa-nav__primary-item:last-child {
+   //    margin-left: auto;
+   //    @include u-margin-right(-4);
+   // }
 }
 
-.usa-nav__primary
-
-
 h1 {
    font-weight: bold !important;
 }

app/templates/admin_template.html

@@ -58,26 +58,32 @@
           "text": "Features",
           "active": header_navigation.is_selected('features')
         },
-        {
-          "href": url_for('main.user_profile'),
-          "text": current_user.name,
-          "active": header_navigation.is_selected('user-profile')
-        },
         {
           "href": url_for('main.platform_admin_splash_page'),
           "text": "Platform admin",
           "active": header_navigation.is_selected('platform-admin')
         },
-        {
-          "href": url_for('main.sign_out'),
-          "text": "Sign out"
-        },
         {
           "href": url_for('main.support'),
           "text": "Contact us",
           "active": header_navigation.is_selected('support')
         }
       ] %}
+      {% set secondaryNavigation = [
+        {
+          "href": url_for('main.user_profile'),
+          "text": current_user.name,
+          "active": header_navigation.is_selected('user-profile')
+        },
+        {
+          "href": url_for('.service_settings', service_id=current_service.id),
+          "text": "Settings"
+        },
+        {
+          "href": url_for('main.sign_out'),
+          "text": "Sign out"
+        }
+      ] %}
     {% else %}
       {% set navigation = [
         {
@@ -104,10 +110,17 @@
           "href": url_for('main.user_profile'),
           "text": "User profile",
           "active": header_navigation.is_selected('user-profile')
+        }
+      ] %}
+      {% set secondaryNavigation = [
+        {
+        "href": url_for('main.user_profile'),
+        "text": current_user.name,
+        "active": header_navigation.is_selected('user-profile')
         },
         {
-          "href": url_for('main.sign_out'),
-          "text": "Sign out"
+        "href": url_for('main.sign_out'),
+        "text": "Sign out"
         }
       ] %}
     {% endif %}
@@ -142,6 +155,7 @@
     "productName": "Notify",
     "navigation": navigation,
     "navigationClasses": "govuk-header__navigation--end",
+    "secondaryNavigation": secondaryNavigation,
     "assetsPath": asset_path + "images"
   }) }}
 {% endblock %}
@@ -236,7 +250,7 @@
             <span class="usa-sr-only">Please choose to extend your session or sign out. Your session will expire in 5 minutes or less.</span>
           </h2>
           <div class="usa-prose">
-            <p>You have been inactive for too long. 
+            <p>You have been inactive for too long.
               Your session will expire in <span id="timeLeft" role="timer"></span>.
             </p>
           </div>
@@ -273,5 +287,3 @@
   <!--<![endif]-->
 
 {% endblock %}
-
-

app/templates/components/components/header/template.njk

@@ -76,18 +76,18 @@
           {% endif %}
         {% endfor %}
       </ul>
-      <div class="usa-nav__secondary">
+      <div class="usa-nav__secondary margin-bottom-2">
         <ul class="usa-nav__secondary-links">
           {% for item in params.secondaryNavigation %}
             {% if item.href and item.text %}
-            <li class="usa-nav__secondary-item{{ ' is-current' if item.active }}">
-              <a class="usa-nav__link {{ ' usa-current' if item.active }}" href="{{ item.href }}" {% for attribute, value
-                in item.attributes %} {{attribute}}="{{value}}" {% endfor %}>
-                <span>{{ item.text }}</span>
-              </a>
-            </li>
-            {% endif %}
-          {% endfor %}
+              <li class="usa-nav__secondary-item{{ ' is-current' if item.active }}">
+                <a class="usa-nav__link {{ ' usa-current' if item.active }}" href="{{ item.href }}" {% for attribute, value in
+                  item.attributes %} {{attribute}}="{{value}}" {% endfor %}>
+                  <span>{{ item.text }}</span>
+                </a>
+              </li>
+          {% endif %}
+        {% endfor %}
           <!-- <li class="usa-nav__secondary-item">
             <a href="javascript:void(0)">
               Sign in

app/templates/main_nav.html

@@ -17,9 +17,9 @@
     {% if current_user.has_permissions('manage_service', allow_org_user=True) %}
       <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('usage') }}" href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li>
     {% endif %}
-    {% if current_user.has_permissions('manage_api_keys', 'manage_service') %}
+    <!-- {% if current_user.has_permissions('manage_api_keys', 'manage_service') %}
       <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('settings') }}" href="{{ url_for('.service_settings', service_id=current_service.id) }}">Settings</a></li>
-    {% endif %}
+    {% endif %} -->
     {% if current_user.has_permissions('manage_api_keys') %}
       <!-- <li><a class="usa-link{{ main_navigation.is_selected('api-integration') }}" href="{{ url_for('.api_integration', service_id=current_service.id) }}">API integration</a></li> -->
     {% endif %}

app/templates/settings_nav.html

@@ -0,0 +1,20 @@
+{% if help %}
+  {% include 'partials/tour.html' %}
+{% else %}
+<nav class="nav">
+  {% if current_user.has_permissions() %}
+    {% if current_user.has_permissions('view_activity') %}
+      <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('dashboard') }}" href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">Dashboard</a></li>
+    {% endif %}
+    {% if current_user.has_permissions('manage_service', allow_org_user=True) %}
+      <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('usage') }}" href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li>
+    {% endif %}
+    {% if current_user.has_permissions('manage_api_keys', 'manage_service') %}
+      <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('settings') }}" href="{{ url_for('.service_settings', service_id=current_service.id) }}">Settings</a></li>
+    {% endif %}
+  {% elif current_user.has_permissions(allow_org_user=True) %} -->
+    <li class="usa-sidenav__item"><a class="usa-link{{ main_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
+  {% endif %}
+  </ul>
+</nav>
+{% endif %}