Skip to content

Commit 32da5fa

Browse files
jakecosgrovemark-r-bjssemmagiffordRossBugginsNHS
authored
Changes requested from Alex review (#75)
* Added mention of 'message cascades' in routing plan content for 'parallel send' feature mention. * 'or' replaced with 'and' * Message status page created - changes to /using-nhs-notify/mesh to match MESH guidance - sender IDs changed to sender names * Emma 2i requested changes * Added /using-nhs-notify/nhs-app-templates, /using-nhs-notify/email-templates, /using-nhs-notify/text-message-templates and /using-nhs-notify/letter-templates. These are based on the Confluence pages https://nhsd-confluence.digital.nhs.uk/pages/viewpage.action?spaceKey=RIS&title=3.8+Creating+letter+templates onwards, with some minor tweaks to word ordering. Romy has approved this content now. Uploaded the standardised Word doc templates for all 4 channels to /assets/worddocs, and linked to these. Craig in cyber security approved this approach (see ticket for screenshot). Updated /using-nhs-notify/personalisation in line with the Confluence page. The FAQs from onboarding indicated there's a user need to provide the PDS personalisation fields. I also added content on how users provide their own personalisation data, in line with Tan's Confluence page https://nhsd-confluence.digital.nhs.uk/display/RIS/NHS+Notify+%7C+Personalisation+Fields. In /pricing/text-messages, I replaced 'it will count as more than one message' with 'it will be charged as more than one message'. This was prompted by a comment from Romy on the text message template content. I tweaked the content to match the later version of the UI prototype, which we based on findings from user research. * Removed mention of bank holidays from emails and text message delivery times. * Removed unnecessary bullets and headings anchor links in Text message templates. Updated link text for the 4 template pages in the Using NHS Notify parent page - removed 'Creating...' from the start of each link. * Fixed typo in /text-message-templates. Removed 'Creating...' from links on /using-nhs-notify. * Updated names of Word docs to replace spaces with hyphens and make all lower case. Updated downloadable links to follow the approach Jake researched, for example [letter template]({% link assets/worddocs/letter-template-nhs-notify.docx %}) * Removed unnecessary space from line 26 on docs/pages/using-nhs-notify/letter-templates. * Update accept.txt Includes: - Noto - URL - ctrl - pending_enrichment - unnotified - permanent_failure - temporary_failure - technical_failure - precompiled - validation_failed - fullName - namePrefix - clientRef * In /using-nhs-notify/delivery-times#letters, replaced the sentence 'Once your letter has been sent, it can take...' with 'Once you've provided us with recipients' NHS numbers, it can take up to 2 working days for our suppliers to dispatch your letter'. I also added anchor links to the top of the same page, /using-nhs-notify/delivery-times, to make navigation easier. * Added content on what users need to do in order to use recipient contact details that are outside of PDS. * Emma recommendations * Removed address_line_x, clientRef, recipientContactValue and template from the bulleted list of personalisation fields from PDS as these are for internal use only. Restructured the first paragraph under ### Personal Demographics Service (PDS) personalisation fields. This was based off a conversation with Jake and it aims to clarify the link between PDS, NHS numbers and personalisation fields. * In /workspaces/nhs-notify-web-cms-dev/docs/_sass/_nhsnotify.scss I added the line 'flex-wrap: wrap;' in the following code: .nhsuk-header__navigation-list { justify-content: flex-start; flex-wrap: wrap; } This is an interim step to make the main nav list items wrap correctly when the site is viewed on a mobile device. It's not our ultimate solution but it makes the site more mobile responsive and accessible. * Removed mentions of date of birth from failed message status descriptions. Removed date of birth as as an example of a column header in a MESH request. * Added link to NHS Notify MESH documentation in /using-nhs-notify/mesh * Squashed commit of the following: commit 7b904fc Author: Ross Buggins <[email protected]> Date: Tue Nov 19 17:02:42 2024 +0000 Quick and easy js to auto hide. commit 8aed356 Author: Jake Cosgrove <[email protected]> Date: Tue Nov 19 16:05:22 2024 +0000 Developer banner and new site banner commit a3d47d2 Author: Jake Cosgrove <[email protected]> Date: Mon Nov 11 15:47:17 2024 +0000 removed phase banner and underlines from primary nav list items when hovered commit 3a30f41 Author: Jake Cosgrove <[email protected]> Date: Mon Nov 11 13:50:40 2024 +0000 removed border from phase banner commit fc61be5 Author: Jake Cosgrove <[email protected]> Date: Fri Nov 8 16:32:05 2024 +0000 Added phase banner component and related sass. Added new template for including pages of content that does not need a side-navigation. commit 45d34e6 Author: Jake Cosgrove <[email protected]> Date: Tue Nov 5 21:59:47 2024 +0000 two-third column tests * Changed first subheading to a h2 from h3 * Removed the other phase banners from Ross' test * removed phase banner includes due to component not being tested or released by developer * Alex review changes --------- Co-authored-by: Mark R <[email protected]> Co-authored-by: emmagifford <[email protected]> Co-authored-by: Ross Buggins <[email protected]>
1 parent 383fcc6 commit 32da5fa

16 files changed

+126
-52
lines changed

docs/Gemfile.lock

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,10 @@ GEM
9595
rbs (>= 3, < 4)
9696
sorbet-runtime (>= 0.5.10782)
9797
safe_yaml (1.0.5)
98-
sass-embedded (1.69.5-arm64-darwin)
98+
sass-embedded (1.69.5)
9999
google-protobuf (~> 3.23)
100-
sass-embedded (1.69.5-x86_64-linux-gnu)
100+
rake (>= 13.0.0)
101+
sass-embedded (1.69.5-arm64-darwin)
101102
google-protobuf (~> 3.23)
102103
sorbet-runtime (0.5.11466)
103104
strscan (3.1.0)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<div class="nhsuk-phase-banner" id="{{include.phase_id}}">
2+
<div class="nhsuk-width-container">
3+
<p class="nhsuk-phase-banner__content">
4+
<strong class="nhsuk-tag">{{include.phase_tag}}</strong>
5+
<span class="nhsuk-phase-banner__text">{{include.phase_text}}</span>
6+
</p>
7+
</div>
8+
</div>
9+
<script>
10+
console.log("{{include.auto_hide}}")
11+
if ("{{include.auto_hide}}" == 'true' && (window.location.hostname.startsWith('notify.nhs.uk') || window.location.hostname.startsWith('127.0.0.2'))) {
12+
document.getElementById("{{ include.phase_id }}").style.visibility = 'hidden';
13+
}
14+
</script>

docs/_layouts/no-nav-page.html

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
layout: default
3+
---
4+
5+
{% assign current_dir = page.dir %}
6+
{% assign paths = page.dir | split: "/" %}
7+
{% assign parent_dir = paths[1] %}
8+
9+
{%-
10+
assign nav_pages = site.pages
11+
| where_exp: "item", "item.dir contains parent_dir"
12+
-%}
13+
14+
{% assign first_level_dir = parent_dir | prepend: '/' | append: '/' %}
15+
{%-
16+
assign first_level = nav_pages
17+
| where_exp: "item", "item.dir == first_level_dir"
18+
| group_by: "section"
19+
| sort: 'name', 'last'
20+
-%}
21+
22+
<div class="nhsuk-width-container">
23+
<main class="nhsuk-main-wrapper" id="maincontent" role="main">
24+
<div class="nhsuk-grid-row">
25+
<div class="nhsnotify-pane__main-content nhsuk-grid-column-three-quarters">
26+
{% if page.section != undefined %}
27+
<heading class="nhsuk-heading-s" style="margin-bottom: 0; color: #4c6272">{{ page.section }}</heading>
28+
{% endif %}
29+
<h1>{{ page.title }}</h1>
30+
{{ content }}
31+
</div>
32+
</div>
33+
</main>
34+
</div>

docs/_layouts/page.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
---
44

55
{% assign current_dir = page.dir %}
6-
{% assign paths = page.dir | split: "/" %}
6+
{% assign paths = page.dir | split: "/" %}
77
{% assign parent_dir = paths[1] %}
88

99
{%-
10-
assign nav_pages = site.pages
11-
| where_exp: "item", "item.dir contains parent_dir"
10+
assign nav_pages = site.pages
11+
| where_exp: "item", "item.dir contains parent_dir"
1212
-%}
1313

1414
{% assign first_level_dir = parent_dir | prepend: '/' | append: '/' %}
1515
{%-
16-
assign first_level = nav_pages
17-
| where_exp: "item", "item.dir == first_level_dir"
18-
| group_by: "section"
19-
| sort: 'name', 'last'
16+
assign first_level = nav_pages
17+
| where_exp: "item", "item.dir == first_level_dir"
18+
| group_by: "section"
19+
| sort: 'name', 'last'
2020
-%}
2121
<div class="nhsuk-width-container">
2222
<main class="nhsuk-main-wrapper" id="maincontent" role="main">
@@ -26,21 +26,21 @@
2626
<div class="nhsnotify-pane__side-bar nhsuk-grid-column-one-quarter">
2727
<nav class="nhsnotify-side-nav">
2828
<ul class="nhsuk-list nhsnotify-side-nav__list">
29-
{% for section in first_level %}
29+
{% for section in first_level %}
3030
{% if section.name != "" %}
31-
<p class="nhsuk-u-font-weight-bold nhsnotify-side-nav__list-section">{{ section.name }}</p>
31+
<p class="nhsuk-u-font-weight-bold nhsnotify-side-nav__list-section">{{ section.name }}</p>
3232
{% endif %}
33-
{% assign sorted = section.items | sort: 'nav_order' %}
34-
{% for post in sorted %}
35-
<li class="
33+
{% assign sorted = section.items | sort: 'nav_order' %}
34+
{% for post in sorted %}
35+
<li class="
3636
nhsnotify-side-nav__item
3737
{% if post.url == page.url %}
3838
nhsnotify-side-nav__item--current
3939
{% endif %}
4040
">
41-
<a class="nhsnotify-side-nav__link" href="{{ site.baseurl | append: post.url }}">{{ post.title }}</a>
42-
</li>
43-
{% endfor %}
41+
<a class="nhsnotify-side-nav__link" href="{{ site.baseurl | append: post.url }}">{{ post.title }}</a>
42+
</li>
43+
{% endfor %}
4444
{% endfor %}
4545
</ul>
4646

docs/_sass/_nhsnotify.scss

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
width: unset;
33
background-color: unset;
44
border-bottom: 0;
5-
margin:unset;
5+
margin: unset;
66
}
77

88
.nhsnotify-banner--blue {
@@ -68,13 +68,42 @@
6868
}
6969

7070
.nhsuk-header__navigation-list {
71-
justify-content: flex-start;
71+
justify-content: flex-centre;
7272
}
7373

7474
.nhsuk-header__navigation-link {
75-
text-decoration: none;
75+
text-decoration: underline;
7676

7777
&:hover {
78-
text-decoration: underline;
78+
text-decoration: none;
7979
}
8080
}
81+
82+
.nhsuk-phase-banner {
83+
padding-top: 10px;
84+
padding-bottom: 10px;
85+
background-color: #fff;
86+
}
87+
88+
.nhsuk-phase-banner__content {
89+
font-size: 1rem;
90+
line-height: 1.25;
91+
margin-bottom: 0px;
92+
}
93+
94+
.nhsuk-tag {
95+
outline: 2px solid transparent;
96+
outline-offset: -2px;
97+
color: #fff;
98+
background-color: #005eb8;
99+
letter-spacing: 1px;
100+
text-decoration: none;
101+
text-transform: uppercase;
102+
font-weight: 700;
103+
}
104+
105+
.nhsuk-phase-banner__text {
106+
font-size: 1rem;
107+
line-height: 1.25;
108+
padding-left: 0.5em;
109+
}

docs/pages/get-started/get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Feel free to add content and custom Front Matter to this file.
33
# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
44

5-
layout: page
5+
layout: no-nav-page
66
title: Get started
77
nav_order: 6
88
has_children: true

docs/pages/support/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Feel free to add content and custom Front Matter to this file.
33
# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
44

5-
layout: page
5+
layout: no-nav-page
66
title: Support
77
nav_order: 5
88
has_children: true

docs/pages/using-nhs-notify/editing-and-formatting.md renamed to docs/pages/using-nhs-notify/(draft)editing-and-formatting.md

File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)