Merge branch 'main' of https://github.com/GSA/notifications-admin into 1043-move-account-info-into-utility-nav

This commit is contained in:
Jonathan Bobel
2024-01-03 13:51:11 -05:00
14 changed files with 162 additions and 84 deletions

View File

@@ -69,21 +69,26 @@
"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"
}
{% if current_service %}
{% set secondaryNavigation = [
{
"href": url_for('.service_settings', service_id=current_service.id),
"text": "Settings",
"active": secondary_navigation.is_selected('settings')
},
{
"href": url_for('main.sign_out'),
"text": "Sign out"
}
] %}
{% else %}
{% set secondaryNavigation = [
{
"href": url_for('main.sign_out'),
"text": "Sign out"
}
] %}
{% endif %}
{% else %}
{% set navigation = [
{
@@ -114,13 +119,13 @@
] %}
{% 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",
"active": secondary_navigation.is_selected('settings')
},
{
"href": url_for('main.sign_out'),
"text": "Sign out"
"href": url_for('main.sign_out'),
"text": "Sign out"
}
] %}
{% endif %}