Skip to content

Commit f843345

Browse files
Merge pull request #862 from NHSDigital/DTOSS-11866-header-updates
Header updates
2 parents 7fb2fc4 + 0cac32c commit f843345

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

manage_breast_screening/config/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ def list_env(key):
125125
"APP_DIRS": True,
126126
"OPTIONS": {
127127
"environment": "manage_breast_screening.config.jinja2_env.environment",
128+
"context_processors": [
129+
"manage_breast_screening.core.context_processors.nav_active",
130+
],
128131
"undefined": ChainableUndefined,
129132
},
130133
},
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
def nav_active(request):
2+
if request.path.startswith("/clinics/"):
3+
active = "clinics"
4+
else:
5+
active = "home"
6+
return {"navActive": active}

manage_breast_screening/core/jinja2/layout-app.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{% block header %}
1616
{{ header({
1717
"service": {
18-
"name": "Manage breast screening"
18+
"text": "Manage breast screening"
1919
},
2020
"account": {
2121
"items": header_account_items(request.user)
@@ -29,7 +29,7 @@
2929
},
3030
{
3131
"href": "/clinics/",
32-
"text": "Clinics",
32+
"text": "Screening",
3333
'current': true if navActive == "clinics"
3434
}
3535
]

manage_breast_screening/core/template_helpers.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ def _user_name_and_role_item(user):
130130

131131
def header_account_items(user):
132132
items = []
133+
if user.is_authenticated:
134+
if user.current_provider:
135+
items.append({"text": user.current_provider.name, "icon": False})
133136

134137
user_name_and_role = _user_name_and_role_item(user)
135138
if user_name_and_role:

0 commit comments

Comments
 (0)