Skip to content

Commit 2d76ad5

Browse files
MatMooreMatMoore
authored
Merge pull request #55 from NHSDigital/update-design-system
Update design system
2 parents 6d9ee60 + aedfc7c commit 2d76ad5

11 files changed

Lines changed: 84 additions & 172 deletions

File tree

‎manage_breast_screening/assets/sass/components/_count.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.app-count {
2-
@include nhsuk-typography-responsive(16);
2+
@include nhsuk-font-size(16);
33

44
& {
55
background-color: rgba($color_nhsuk-grey-4, 0.5);

‎manage_breast_screening/config/jinja2_env.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import re
22

3+
from django.conf import settings
34
from django.templatetags.static import static
45
from django.urls import reverse
56
from jinja2 import ChoiceLoader, Environment, PackageLoader
@@ -77,13 +78,19 @@ def format_age(value: int) -> str:
7778
def environment(**options):
7879
env = Environment(**options, extensions=["jinja2.ext.do"])
7980
if env.loader:
80-
env.loader = ChoiceLoader([PackageLoader("nhsuk_frontend_jinja"), env.loader])
81+
env.loader = ChoiceLoader(
82+
[
83+
env.loader,
84+
PackageLoader(
85+
"nhsuk_frontend_jinja", package_path="templates/components"
86+
),
87+
PackageLoader("nhsuk_frontend_jinja", package_path="templates/macros"),
88+
PackageLoader("nhsuk_frontend_jinja"),
89+
]
90+
)
8191

8292
env.globals.update(
83-
{
84-
"static": static,
85-
"url": reverse,
86-
}
93+
{"static": static, "url": reverse, "STATIC_URL": settings.STATIC_URL}
8794
)
8895
env.filters["noWrap"] = no_wrap
8996
env.filters["asHint"] = as_hint

‎manage_breast_screening/templates/clinics/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% extends 'layout-app.html' %}
22

3-
{% from 'components/tag/macro.jinja' import tag %}
3+
{% from 'tag/macro.jinja' import tag %}
44
{% from '_components/count/macro.jinja' import appCount %}
55
{% from '_components/secondary-navigation/macro.jinja' import appSecondaryNavigation %}
66

‎manage_breast_screening/templates/layout-app.html‎

Lines changed: 45 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,49 @@
1-
{% from 'components/header/macro.jinja' import header %}
2-
{% from 'components/footer/macro.jinja' import footer %}
3-
{% from 'components/skip-link/macro.jinja' import skipLink %}
4-
<!DOCTYPE html>
5-
<html lang="en">
6-
<head>
7-
<meta charset="utf-8">
8-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
10-
<meta name="description" content="">
11-
12-
<title>{% block pageTitle %}Manage breast screening{% endblock %}</title>
13-
14-
<link rel="preload" as="font" href="https://assets.nhs.uk/fonts/FrutigerLTW01-55Roman.woff2" type="font/woff2"
15-
crossorigin>
16-
<link rel="preload" as="font" href="https://assets.nhs.uk/fonts/FrutigerLTW01-65Bold.woff2" type="font/woff2"
17-
crossorigin>
18-
<link rel="preconnect dns-prefetch" href="https://www.nhs.uk/">
19-
<link rel="preconnect dns-prefetch" href="https://assets.nhs.uk/" crossorigin>
20-
21-
<link rel="stylesheet" href="{{ static('css/main.css' )}}">
22-
<script type="module" src="{{ static('js/bundle.js' )}}"></script>
23-
24-
<link rel="shortcut icon" href="{{ static('assets/favicons/favicon.ico' )}}" type="image/x-icon">
25-
<link rel="apple-touch-icon" href="{{ static('assets/favicons/apple-touch-icon-180x180.png' )}}">
26-
<link rel="mask-icon" href="{{ static('assets/favicons/favicon.svg' )}}" color="#005eb8">
27-
<link rel="icon" sizes="192x192" href="{{ static('assets/favicons/favicon-192x192.png' )}}">
28-
<meta name="msapplication-TileImage" content="{{ static('assets/favicons/mediumtile-144x144.png' )}}">
29-
<meta name="msapplication-TileColor" content="#005eb8">
30-
<meta name="msapplication-square70x70logo" content="{{ static('assets/favicons/smalltile-70x70.png' )}}">
31-
<meta name="msapplication-square150x150logo" content="{{ static('assets/favicons/mediumtile-150x150.png' )}}">
32-
<meta name="msapplication-wide310x150logo" content="{{ static('assets/favicons/widetile-310x150.png' )}}">
33-
<meta name="msapplication-square310x310logo" content="{{ static('assets/favicons/largetile-310x310.png' )}}">
34-
{% block head %}{% endblock %}
35-
</head>
36-
37-
<body>
38-
<script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
39-
{% block bodyStart %}{% endblock %}
40-
41-
{% block skipLink %}
42-
{{ skipLink({
43-
"href": '#maincontent',
44-
"text": 'Skip to main content'
45-
}) }}
46-
{% endblock %}
47-
48-
{% block header %}
49-
{{ header({
50-
"showNav": "true",
51-
"service": {
52-
"name": "Manage breast screening"
1+
{% from 'header/macro.jinja' import header %}
2+
{% set assetPath = STATIC_URL ~ "/assets" %}
3+
{% extends "template.jinja" %}
4+
5+
{% block head %}
6+
<link rel="stylesheet" href="{{ static('css/main.css' )}}">
7+
<script type="module" src="{{ static('js/bundle.js' )}}"></script>
8+
{% endblock %}
9+
10+
{% block header %}
11+
{{ header({
12+
"showNav": "true",
13+
"service": {
14+
"name": "Manage breast screening"
15+
},
16+
"primaryLinks": [
17+
{
18+
"url": "#",
19+
"label": "Home",
20+
"current": true if navActive == "home"
5321
},
54-
"primaryLinks": [
55-
{
56-
"url": "#",
57-
"label": "Home",
58-
"current": true if navActive == "home"
59-
},
60-
{
61-
"url": "/clinics/",
62-
"label": "Clinics",
63-
'current': true if navActive == "clinics"
64-
},
65-
{
66-
"url": "#",
67-
"label": "Image reading",
68-
"current": true if navActive == "reading"
69-
},
70-
{
71-
"url": "#",
72-
"label": "Participants",
73-
"current": true if navActive == "participants"
74-
},
75-
{
76-
"url": "#",
77-
"label": "Messages",
78-
"current": true if navActive == "messages"
79-
}, {
80-
"url": "#",
81-
"label": "Help and support",
82-
"current": true if navActive == "help"
83-
}
84-
]
85-
}) }}
86-
{% endblock %}
87-
88-
{% block main %}
89-
<div class="nhsuk-width-container {{ containerClasses }}">
90-
{% block beforeContent %}{% endblock %}
91-
<main class="nhsuk-main-wrapper {{ mainClasses }}" id="maincontent" role="main">
92-
{% block content %}
93-
<div class="nhsuk-grid-row">
94-
<div class="nhsuk-grid-column-two-thirds">
95-
{% block messages %}
96-
{#- TODO: show messages from django.contrib.messages -#}
97-
{% endblock messages %}
98-
</div>
99-
</div>
100-
101-
<div class="nhsuk-grid-row">
102-
<div class="nhsuk-grid-column-full">
103-
{% block pageNavigation %}
104-
{% endblock pageNavigation %}
105-
</div>
106-
</div>
107-
108-
{% block pageContent %}
109-
{% endblock pageContent %}
110-
{% endblock content %}
111-
</main>
22+
{
23+
"url": "/clinics/",
24+
"label": "Clinics",
25+
'current': true if navActive == "clinics"
26+
}
27+
]
28+
}) }}
29+
{% endblock %}
30+
31+
{% block content %}
32+
<div class="nhsuk-grid-row">
33+
<div class="nhsuk-grid-column-two-thirds">
34+
{% block messages %}
35+
{#- TODO: show messages from django.contrib.messages -#}
36+
{% endblock messages %}
11237
</div>
113-
{% endblock %}
38+
</div>
11439

115-
{% block footer %}
116-
{{ footer({
117-
"links": [
118-
{
119-
"URL": "/",
120-
"label": "Home"
121-
},
122-
{
123-
"URL": "/settings",
124-
"label": "Settings"
125-
},
126-
{
127-
"URL": "/clear-data",
128-
"label": "Clear data"
129-
},
130-
{
131-
"URL": "https://github.com/NHSDigital/manage-screening-events-prototype",
132-
"label": "Github"
133-
}
134-
]
135-
})}}
136-
{% endblock %}
40+
<div class="nhsuk-grid-row">
41+
<div class="nhsuk-grid-column-full">
42+
{% block pageNavigation %}
43+
{% endblock pageNavigation %}
44+
</div>
45+
</div>
13746

138-
{% block bodyEnd %}{% endblock %}
139-
</body>
140-
</html>
47+
{% block pageContent %}
48+
{% endblock pageContent %}
49+
{% endblock content %}

‎manage_breast_screening/templates/record_a_mammogram/appointment_cannot_go_ahead.jinja‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "wizard_step.jinja" %}
2-
{% from "components/checkboxes/macro.jinja" import checkboxes %}
3-
{% from "components/input/macro.jinja" import input %}
4-
{% from "components/radios/macro.jinja" import radios %}
2+
{% from "checkboxes/macro.jinja" import checkboxes %}
3+
{% from "input/macro.jinja" import input %}
4+
{% from "radios/macro.jinja" import radios %}
55

66
{% set title = "Appointment cannot go ahead" %}
77
{% set caption = participant.full_name %}
@@ -73,4 +73,4 @@
7373

7474
{% set decision_legend = "Does the appointment need to be rescheduled?" %}
7575

76-
{% endblock form %}
76+
{% endblock form %}

‎manage_breast_screening/templates/record_a_mammogram/start_screening.jinja‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% extends "wizard_step.jinja" %}
2-
{% from 'components/card/macro.jinja' import card %}
3-
{% from 'components/warning-callout/macro.jinja' import warningCallout %}
2+
{% from 'card/macro.jinja' import card %}
3+
{% from 'warning-callout/macro.jinja' import warningCallout %}
44
{% from '_components/appointment-status/macro.jinja' import appointmentStatus %}
55
{% from '_components/appointment-header/macro.jinja' import appointmentHeader %}
66
{% from '_components/participant-details/macro.jinja' import participantDetails %}

‎manage_breast_screening/templates/wizard_step.jinja‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% extends 'layout-app.html' %}
2-
{% from 'components/radios/macro.jinja' import radios %}
3-
{% from 'components/button/macro.jinja' import button %}
4-
{% from 'components/fieldset/macro.jinja' import fieldset %}
5-
{% from 'components/back-link/macro.jinja' import backLink %}
6-
{% from 'components/error-summary/macro.jinja' import errorSummary %}
2+
{% from 'radios/macro.jinja' import radios %}
3+
{% from 'button/macro.jinja' import button %}
4+
{% from 'fieldset/macro.jinja' import fieldset %}
5+
{% from 'back-link/macro.jinja' import backLink %}
6+
{% from 'error-summary/macro.jinja' import errorSummary %}
77

88
{% block beforeContent %}
99
{# Using javascript temporarily - this should be replaced with proper URLs #}

‎package-lock.json‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"nhsuk-frontend": "^9.4.1"
3+
"nhsuk-frontend": "^9.5.2"
44
},
55
"engines": {
66
"node": "^20.9.0 || ^22.11.0"

‎poetry.lock‎

Lines changed: 7 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)