From e303d7ea4c16007205b8c8c4640470715a28a62e Mon Sep 17 00:00:00 2001 From: Adam Chrimes Date: Tue, 6 Aug 2019 10:16:11 +0100 Subject: [PATCH 01/27] Revert "hide the search bar and redirect search page until tested" --- CHANGELOG.md | 6 +++++ app/views/includes/header.njk | 2 +- app/views/includes/search.njk | 41 +++++++++++++++++++++++++++++++++++ package-lock.json | 2 +- package.json | 2 +- 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9274d5622..498e700c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # NHS digital service manual Changelog +## 2.0.0 - Unreleased + +:new: **New functionality** + +- Add search functionality to the service manual + ## 1.7.0 - 06 August 2019 :new: **New content** diff --git a/app/views/includes/header.njk b/app/views/includes/header.njk index b8f28ba51..20df68850 100755 --- a/app/views/includes/header.njk +++ b/app/views/includes/header.njk @@ -20,7 +20,7 @@ "longName": "true" }, "showNav": "false", - "showSearch": "false", + "showSearch": "true", "searchAction": "/service-manual/search/" }) }} diff --git a/app/views/includes/search.njk b/app/views/includes/search.njk index f925f4656..b4a0991ff 100644 --- a/app/views/includes/search.njk +++ b/app/views/includes/search.njk @@ -4,4 +4,45 @@ {% extends 'includes/layout.njk' %} {% block body %} +
+
+

Search

+ +
+
+
+
+
+ {% if results | length > 0 %} +
    + {% for item in results %} +
  • + {{item.title}} +

    {{item.description}}

    +
    • + {% endfor %} +
+ {% else %} + {% if query != "" %} +

Your search - {{query}} - had no matching results.

+

Improve your search results by:

+
    +
  • double-checking your spelling
    • +
  • using fewer keywords
    • +
  • searching for something less specific
    • +
+ {% endif %} + {% endif %} +
+
+
{% endblock %} diff --git a/package-lock.json b/package-lock.json index 6bd161533..52ee3f8ed 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nhsuk-service-manual", - "version": "1.7.0", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3a337bad7..15d78cf5d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nhsuk-service-manual", - "version": "1.7.0", + "version": "2.0.0", "description": "NHS digital service manual", "main": "app.js", "directories": { From ca88abc8c4bc99bc51bcd3ab6e6a53caa4a77faa Mon Sep 17 00:00:00 2001 From: AdamChrimes Date: Tue, 6 Aug 2019 10:21:18 +0100 Subject: [PATCH 02/27] remove duplicate entry from the XML sitemap --- CHANGELOG.md | 4 ++++ app/views/sitemap.xml | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 498e700c2..a1684be88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - Add search functionality to the service manual +:wrench: **Fixes** + +- Remove duplicate entry from the XML sitemap + ## 1.7.0 - 06 August 2019 :new: **New content** diff --git a/app/views/sitemap.xml b/app/views/sitemap.xml index ed2543022..7eb1b9925 100644 --- a/app/views/sitemap.xml +++ b/app/views/sitemap.xml @@ -208,9 +208,6 @@ https://beta.nhs.uk/service-manual/contribute/work-new-thing - - https://beta.nhs.uk/service-manual/content/a-to-z-of-nhs-health-writing - https://beta.nhs.uk/service-manual/content/health-literacy/ From 74e35ccac0c3cf1fd0e461e60afe766f682c6392 Mon Sep 17 00:00:00 2001 From: AdamChrimes Date: Tue, 6 Aug 2019 10:22:01 +0100 Subject: [PATCH 03/27] temporarily remove password from the staging env --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 9cd8e89c5..83d0d8a79 100755 --- a/app.js +++ b/app.js @@ -22,7 +22,7 @@ var pageIndex = new PageIndex(config); const app = express(); // Authentication middleware -app.use(authentication); +// app.use(authentication); // Use local variables app.use(locals(config)); From d487d92d43b836d83e8dab9c1a0ea04754c709e1 Mon Sep 17 00:00:00 2001 From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com> Date: Tue, 6 Aug 2019 14:55:07 +0100 Subject: [PATCH 04/27] Correct apostrophe in look-after-your-team.njk Bring apostrophe into line with our recommended style. --- app/views/accessibility/partials/look-after-your-team.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/accessibility/partials/look-after-your-team.njk b/app/views/accessibility/partials/look-after-your-team.njk index 18b6cda17..088161639 100644 --- a/app/views/accessibility/partials/look-after-your-team.njk +++ b/app/views/accessibility/partials/look-after-your-team.njk @@ -1,6 +1,6 @@

Look after your team

For: User research

It's important that the team supports one another. User research in health can be tiring and emotional. Sometimes users might tell you stories that are hard to hear or you might see them struggle.

-

It’s OK to take some time out during a day of research or, as a user researcher, to ask for someone to stand in for you.

+

It's OK to take some time out during a day of research or, as a user researcher, to ask for someone to stand in for you.

Check in with your team mates during and after research and take time to reflect together.

From 560c81c231f1154394b908d5c2078bc78a867fc0 Mon Sep 17 00:00:00 2001 From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com> Date: Tue, 6 Aug 2019 15:14:33 +0100 Subject: [PATCH 05/27] Correct apostrophe in design-principles/index.njk to match style guide Make apostrophe straight in principle 4 of design principles --- app/views/design-principles/index.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/design-principles/index.njk b/app/views/design-principles/index.njk index 1af77147c..1dcd87cbd 100644 --- a/app/views/design-principles/index.njk +++ b/app/views/design-principles/index.njk @@ -58,7 +58,7 @@
4
Design for context -

Don’t just design your part of a service. Consider people's entire experience, and the infrastructure and processes involved. Think about how people begin and end their time with what you are designing.

+

Don't just design your part of a service. Consider people's entire experience, and the infrastructure and processes involved. Think about how people begin and end their time with what you are designing.

From 6db9fc3954aa57e57fa8f577969360c02e121d27 Mon Sep 17 00:00:00 2001 From: Sara Wilcox Date: Tue, 6 Aug 2019 16:24:42 +0100 Subject: [PATCH 06/27] Update A to Z with entries for health record and medical record --- app/views/content/a-to-z-of-nhs-health-writing.njk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/content/a-to-z-of-nhs-health-writing.njk b/app/views/content/a-to-z-of-nhs-health-writing.njk index be5f9fcfa..970d42b09 100644 --- a/app/views/content/a-to-z-of-nhs-health-writing.njk +++ b/app/views/content/a-to-z-of-nhs-health-writing.njk @@ -357,6 +357,9 @@

haemorrhage

We often use the words "a very heavy bleed" instead of "haemorrhage".

If you need to use the word "haemorrhage", for example, in the name of a condition like a subarachnoid haemorrhage, explain what it is.

+

health record

+

We use "health record" rather than "medical record". "Health record" is more accurate as someone's record may cover social care as well as medical content. In our user research, we haven’t seen anyone confused by "health record". People see it as the same as a "medical record".

+

In some contexts, for example in forms, rather than asking about someone's "health record", we ask about "your health, and any health problems or treatments you've had in the past".

healthcare

One word.

home help

@@ -426,6 +429,8 @@

We use "CJD".

measurement

See our guidance on numbers, measurement, dates and time.

+

medical record

+

We prefer "health record".

medication

We use "medicine".

metric measurements

From a45346b20c5320c9676a6f1d5dcc54a6eee5b19f Mon Sep 17 00:00:00 2001 From: davidhunter08 Date: Tue, 6 Aug 2019 20:26:26 +0100 Subject: [PATCH 07/27] added hotjar tracking code --- app/views/includes/layout.njk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/views/includes/layout.njk b/app/views/includes/layout.njk index b4195ca0e..5264b401d 100755 --- a/app/views/includes/layout.njk +++ b/app/views/includes/layout.njk @@ -51,6 +51,19 @@ + + + + From c8dbacabec351bbdcd84da5a382b509c8efe2f47 Mon Sep 17 00:00:00 2001 From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com> Date: Wed, 7 Aug 2019 09:45:36 +0100 Subject: [PATCH 08/27] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1684be88..8e055f0eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ :new: **New functionality** - Add search functionality to the service manual +- Add entries to A to Z of NHS health writing, including health records :wrench: **Fixes** From f8caaf969dde26de3bebd0a74feaf547312223af Mon Sep 17 00:00:00 2001 From: davidhunter08 Date: Wed, 7 Aug 2019 10:23:52 +0100 Subject: [PATCH 09/27] updated hotjar code --- app/views/includes/layout.njk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/includes/layout.njk b/app/views/includes/layout.njk index 5264b401d..205a67f58 100755 --- a/app/views/includes/layout.njk +++ b/app/views/includes/layout.njk @@ -52,11 +52,11 @@ - + + From a84bfc5c729b1b1674ee668ad006d6dd46f617de Mon Sep 17 00:00:00 2001 From: SusieWd <53823853+SusieWd@users.noreply.github.com> Date: Wed, 7 Aug 2019 14:45:52 +0100 Subject: [PATCH 13/27] Amend apostrophes so they're straight Please. Old apostrophes were curly, we need straight ones. --- .../accessibility/how-to-make-digital-services-accessible.njk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/accessibility/how-to-make-digital-services-accessible.njk b/app/views/accessibility/how-to-make-digital-services-accessible.njk index 9868d650d..202b3d7f2 100644 --- a/app/views/accessibility/how-to-make-digital-services-accessible.njk +++ b/app/views/accessibility/how-to-make-digital-services-accessible.njk @@ -30,12 +30,12 @@

Consider accessibility at every stage

Think about how you are going to address accessibility at the beginning and at every stage of your project.

-

It’s much harder to make a service accessible if you only address it later on.

+

It's much harder to make a service accessible if you only address it later on.

-

Make it the whole team’s responsibility

+

Make it the whole team's responsibility

Every member of the team should contribute to making your service inclusive.

You should all:

    From d0fb1756c1cded171fa32b3521f5db21e579e749 Mon Sep 17 00:00:00 2001 From: Nao Pattem <53821027+NaoPattem@users.noreply.github.com> Date: Wed, 7 Aug 2019 14:45:54 +0100 Subject: [PATCH 14/27] Add 'summary care record' to A Z page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Please 😇 👩‍⚕ --- app/views/content/a-to-z-of-nhs-health-writing.njk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/content/a-to-z-of-nhs-health-writing.njk b/app/views/content/a-to-z-of-nhs-health-writing.njk index 970d42b09..c53eb3ee4 100644 --- a/app/views/content/a-to-z-of-nhs-health-writing.njk +++ b/app/views/content/a-to-z-of-nhs-health-writing.njk @@ -633,6 +633,8 @@

    suffering from

    We don’t use "suffering from". We talk about people having or living with a disability or condition.

    See the section on disabilities and conditions in Inclusive language.

    +

    summary care record

    +

    Lower case.

    surgery

    When we’re writing for the public, we use "GP surgery" or "surgery" rather than "practice", because our research shows us that this is the word patients are more likely to search for and use.

    When we’re writing for healthcare staff, we may use the word "practice". For example, for "practice managers".

    From ed4b3be430f456039f01aa681c7d52672c7ec165 Mon Sep 17 00:00:00 2001 From: Jean-Elg <53821192+Jean-Elg@users.noreply.github.com> Date: Wed, 7 Aug 2019 14:45:54 +0100 Subject: [PATCH 15/27] Update A-Z style guide Add new entry to P on personal health records. --- app/views/content/a-to-z-of-nhs-health-writing.njk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/content/a-to-z-of-nhs-health-writing.njk b/app/views/content/a-to-z-of-nhs-health-writing.njk index 970d42b09..7f4809eb3 100644 --- a/app/views/content/a-to-z-of-nhs-health-writing.njk +++ b/app/views/content/a-to-z-of-nhs-health-writing.njk @@ -538,6 +538,8 @@

    See our guidance on numbers, measurement, dates and time.

    persist

    We use "carry on" or "keep going".

    +

    personal child health record (red book)

    +

    We include the phrase "red book" in brackets the first time we mention "personal child health record". We usually call it the "red book" after the first mention.

    poo

    We mostly use "poo", rather than "stool". We know that everyone can understand "poo", including people who find reading difficult.

    We don’t use "opening your bowels" or "bowel movements".

    From 35bc6552456cdfe92572cda102fe6e8d935777d6 Mon Sep 17 00:00:00 2001 From: Kimb0D <53854975+Kimb0D@users.noreply.github.com> Date: Wed, 7 Aug 2019 14:46:07 +0100 Subject: [PATCH 16/27] Update slack address It refers to an old address --- app/views/content/index.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/content/index.njk b/app/views/content/index.njk index c889033f4..e7f60492e 100644 --- a/app/views/content/index.njk +++ b/app/views/content/index.njk @@ -59,7 +59,7 @@

    It's meant as a guide, not a rulebook. You're welcome to adapt a style pattern if it does not meet your users' needs.

    In progress

    The guide will grow and change as we learn more about the language and writing styles that work best for our users.

    -

    Join the NHS.UK service manual Slack workspace or email service-manual@nhs.net to hear about and discuss changes.

    +

    Join the service manual Slack workspace or email service-manual@nhs.net to hear about and discuss changes.

    Check the GOV.UK A to Z style guide and GOV.UK content design guide for any points of style that you do not find here. If it's not there, we recommend using the Oxford Dictionary for Writers and Editors.

    Contribute

    From 48b03d52c9fe0a438a1c0f3632cec041d376f259 Mon Sep 17 00:00:00 2001 From: SusieWd <53823853+SusieWd@users.noreply.github.com> Date: Wed, 7 Aug 2019 14:59:06 +0100 Subject: [PATCH 17/27] Change curly apostrophes to straight ones We need straight apostrophes please. --- app/views/content/how-we-write.njk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/content/how-we-write.njk b/app/views/content/how-we-write.njk index d1d400039..8d9e5703e 100644 --- a/app/views/content/how-we-write.njk +++ b/app/views/content/how-we-write.njk @@ -32,9 +32,9 @@

    Accurate

    Qualified clinicians check our clinical information and check that it is accurate, clinically safe and has been developed using relevant evidence-based guidance.

    Our content is factual, neutral and unambiguous. We do not use metaphors - we say what we mean.

    -

    We avoid making subjective statements. Use words like "good", "bad", or "easy" with care. For example, don’t talk about "a good chance of recovery".

    +

    We avoid making subjective statements. Use words like "good", "bad", or "easy" with care. For example, don't talk about "a good chance of recovery".

    We do use "good" and "bad" where our users do to describe their symptoms, for example "bad pain" or "bad breath".

    -

    We also use them when there’s a good evidence base. For example, we talk about "a good source of iron" or "lack of sleep is bad for your health".

    +

    We also use them when there's a good evidence base. For example, we talk about "a good source of iron" or "lack of sleep is bad for your health".

    {{ table({ panel: false, firstCellIsHeader: false, @@ -92,7 +92,7 @@

    Research insight

    Research has shown that most people prefer to read plain English, and that the more specialist a person's knowledge is, the greater their preference." }) }} -

    Read our guidance on health literacy to see why it’s important to create content that’s simple to read.

    +

    Read our guidance on health literacy to see why it's important to create content that’s simple to read.

    Concise

    We keep content to the point.

    We use short words. For example, we prefer "have" or "get" to "experience" in phrases like "if you experience headaches".

    From 39faff446f498d50e4539dd4172284496c30c421 Mon Sep 17 00:00:00 2001 From: davidhunter08 Date: Thu, 8 Aug 2019 10:02:51 +0100 Subject: [PATCH 18/27] removed inspectlet code --- app/views/includes/layout.njk | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/views/includes/layout.njk b/app/views/includes/layout.njk index a1387c995..9de1caa95 100755 --- a/app/views/includes/layout.njk +++ b/app/views/includes/layout.njk @@ -52,18 +52,6 @@ - - - - From 19f3702064057eadc1efac0cc90912905f5d57e9 Mon Sep 17 00:00:00 2001 From: Sara Wilcox Date: Thu, 8 Aug 2019 16:25:40 +0100 Subject: [PATCH 19/27] Make small changes to 2 content files after training --- app/views/content/a-to-z-of-nhs-health-writing.njk | 9 +++++---- app/views/content/how-we-write.njk | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/content/a-to-z-of-nhs-health-writing.njk b/app/views/content/a-to-z-of-nhs-health-writing.njk index d765f6861..423d1e425 100644 --- a/app/views/content/a-to-z-of-nhs-health-writing.njk +++ b/app/views/content/a-to-z-of-nhs-health-writing.njk @@ -538,8 +538,9 @@

    See our guidance on numbers, measurement, dates and time.

    persist

    We use "carry on" or "keep going".

    -

    personal child health record (red book)

    -

    We include the phrase "red book" in brackets the first time we mention "personal child health record". We usually call it the "red book" after the first mention. +

    personal child health record (red book)

    +

    All lower case. We include the phrase "red book" in brackets the first time we mention "personal child health record". Then we usually call it the "red book" after the first mention.

    +

    Also see health record.

    poo

    We mostly use "poo", rather than "stool". We know that everyone can understand "poo", including people who find reading difficult.

    We don’t use "opening your bowels" or "bowel movements".

    @@ -635,8 +636,8 @@

    suffering from

    We don’t use "suffering from". We talk about people having or living with a disability or condition.

    See the section on disabilities and conditions in Inclusive language.

    -

    summary care record

    -

    Lower case.

    +

    summary care record

    +

    Lower case. Also see health record.

    surgery

    When we’re writing for the public, we use "GP surgery" or "surgery" rather than "practice", because our research shows us that this is the word patients are more likely to search for and use.

    When we’re writing for healthcare staff, we may use the word "practice". For example, for "practice managers".

    diff --git a/app/views/content/how-we-write.njk b/app/views/content/how-we-write.njk index 8d9e5703e..0d5305152 100644 --- a/app/views/content/how-we-write.njk +++ b/app/views/content/how-we-write.njk @@ -92,7 +92,7 @@

    Research insight

    Research has shown that most people prefer to read plain English, and that the more specialist a person's knowledge is, the greater their preference." }) }} -

    Read our guidance on health literacy to see why it's important to create content that’s simple to read.

    +

    Read our guidance on health literacy to see why it's important to create content that's simple to read.

    Concise

    We keep content to the point.

    We use short words. For example, we prefer "have" or "get" to "experience" in phrases like "if you experience headaches".

    From 991bdc74cde1e5d1e263f10858be9c9e11a603f4 Mon Sep 17 00:00:00 2001 From: davidhunter08 Date: Thu, 8 Aug 2019 10:59:24 +0100 Subject: [PATCH 20/27] Updated home link aria label text --- CHANGELOG.md | 1 + app/views/includes/header.njk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b065b8768..ba0eeadde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ :wrench: **Fixes** - Remove duplicate entry from the XML sitemap +- Accessibility: Updated home link aria label, it now reads as "NHS digital service manual homepage" ## 1.7.0 - 06 August 2019 diff --git a/app/views/includes/header.njk b/app/views/includes/header.njk index 20df68850..fba9c522e 100755 --- a/app/views/includes/header.njk +++ b/app/views/includes/header.njk @@ -3,6 +3,7 @@ {%- if pageTitle == 'Search' %} {{ header({ "homeHref": "/service-manual/", + "ariaLabel": "NHS digital service manual homepage", "service": { "name": "Digital service manual", "longName": "true" @@ -15,6 +16,7 @@ {% else %} {{ header({ "homeHref": "/service-manual/", + "ariaLabel": "NHS digital service manual homepage", "service": { "name": "Digital service manual", "longName": "true" From 10ce53b7f6e7841caaa2b42d9ff3f859debede3f Mon Sep 17 00:00:00 2001 From: AdamChrimes Date: Fri, 9 Aug 2019 10:00:56 +0100 Subject: [PATCH 21/27] add password auth back to the staging environment --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 83d0d8a79..9cd8e89c5 100755 --- a/app.js +++ b/app.js @@ -22,7 +22,7 @@ var pageIndex = new PageIndex(config); const app = express(); // Authentication middleware -// app.use(authentication); +app.use(authentication); // Use local variables app.use(locals(config)); From 1b22744dcf119cdf96c33bd676b1d9e237bbc4b1 Mon Sep 17 00:00:00 2001 From: theonlymojo <49315683+theonlymojo@users.noreply.github.com> Date: Thu, 8 Aug 2019 10:51:16 +0100 Subject: [PATCH 22/27] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba0eeadde..f3acc2666 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ - Remove duplicate entry from the XML sitemap - Accessibility: Updated home link aria label, it now reads as "NHS digital service manual homepage" +- Remove curly apostrophes and replace with straight apostrophes +- Update the description of the Slack workspace from NHS.UK to service manual ## 1.7.0 - 06 August 2019 From d0d37e7ee55835fea2f18ad06aac5862d8beb7bb Mon Sep 17 00:00:00 2001 From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com> Date: Fri, 9 Aug 2019 11:26:27 +0100 Subject: [PATCH 23/27] Update CHANGELOG.md --- CHANGELOG.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3acc2666..abe3560e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,13 @@ :new: **New functionality** -- Add search functionality to the service manual -- Add more guidance for content designers to care card page -- Add entries to A to Z of NHS health writing, including health records +- Add entries to A to Z of NHS health writing: health record and related terms :wrench: **Fixes** - Remove duplicate entry from the XML sitemap - Accessibility: Updated home link aria label, it now reads as "NHS digital service manual homepage" -- Remove curly apostrophes and replace with straight apostrophes -- Update the description of the Slack workspace from NHS.UK to service manual +- Fix a few minor content formatting issues, like apostrophes ## 1.7.0 - 06 August 2019 From c72bb2bd7c235e7847ac8d6f762d6c11df5538f3 Mon Sep 17 00:00:00 2001 From: AdamChrimes Date: Fri, 9 Aug 2019 11:33:22 +0100 Subject: [PATCH 24/27] populate the release date for 1.8.0 --- CHANGELOG.md | 4 ++-- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abe3560e3..d4b9ab072 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # NHS digital service manual Changelog -## 2.0.0 - Unreleased +## 1.8.0 - 09 August 2019 -:new: **New functionality** +:new: **New content** - Add entries to A to Z of NHS health writing: health record and related terms diff --git a/package-lock.json b/package-lock.json index 52ee3f8ed..53f940e87 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nhsuk-service-manual", - "version": "2.0.0", + "version": "1.8.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 15d78cf5d..283c74077 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nhsuk-service-manual", - "version": "2.0.0", + "version": "1.8.0", "description": "NHS digital service manual", "main": "app.js", "directories": { From 65fb28869cb25dbfa82499a18fd3d7da988246e1 Mon Sep 17 00:00:00 2001 From: AdamChrimes Date: Fri, 9 Aug 2019 11:33:57 +0100 Subject: [PATCH 25/27] update package dependencies to latest versions --- CHANGELOG.md | 1 + package-lock.json | 6 +++--- package.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4b9ab072..00a371d3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove duplicate entry from the XML sitemap - Accessibility: Updated home link aria label, it now reads as "NHS digital service manual homepage" - Fix a few minor content formatting issues, like apostrophes +- Update package dependencies to latest versions ## 1.7.0 - 06 August 2019 diff --git a/package-lock.json b/package-lock.json index 53f940e87..97fbb5148 100755 --- a/package-lock.json +++ b/package-lock.json @@ -8093,9 +8093,9 @@ "dev": true }, "js-beautify": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.1.tgz", - "integrity": "sha512-4y8SHOIRC+/YQ2gs3zJEKBUraQerq49FJYyXRpdzUGYQzCq8q9xtIh0YXial1S5KmonVui4aiUb6XaGyjE51XA==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz", + "integrity": "sha512-ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==", "dev": true, "requires": { "config-chain": "^1.1.12", diff --git a/package.json b/package.json index 283c74077..312a0eeb3 100755 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "highlight.js": "^9.15.9", "iframe-resizer": "^3.6.6", "jest": "^24.8.0", - "js-beautify": "^1.10.1", + "js-beautify": "^1.10.2", "nhsuk-frontend": "^2.3.0", "node-sass": "^4.12.0", "nodemon": "^1.19.1", From 9882c6d8af67a73e622754a675b438ac6fe466e7 Mon Sep 17 00:00:00 2001 From: AdamChrimes Date: Fri, 9 Aug 2019 11:39:09 +0100 Subject: [PATCH 26/27] Revert "Update care cards info for content designers" This reverts commit 93803cac79dd4684764826d7ec6738e6d657b0fe. --- .../styles-components-patterns/care-cards.njk | 36 +++++-------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/app/views/styles-components-patterns/care-cards.njk b/app/views/styles-components-patterns/care-cards.njk index f33af199d..e24150561 100644 --- a/app/views/styles-components-patterns/care-cards.njk +++ b/app/views/styles-components-patterns/care-cards.njk @@ -84,10 +84,10 @@

    When to use care cards

    Use care cards to tell users to take action to get medical advice or help.

    When not to use care cards

    -

    Do not use care cards:

    +

    Don't use care cards:

    • in forms or transactions
      • -
    • for actions which do not help users get 1 of the 3 levels of care
      • +
    • for actions which don't help users get one of the 3 levels of care

    If you want:

      @@ -102,30 +102,10 @@

      If you use more than 1 care card - or a care card and a warning callout close to each other, be aware that users often overlook text between them.

      Care card content

      -

      Give the card a short heading using "if"

      -

      The heading should be 1 clear call to action. Use the format: "Call 111 if:" or "Speak to a GP if:" followed by a bulleted list in the body of the card.

      -

      Put the detail in the body of the card

      -

      Do not overload the header. Use the space in the body of the card but keep it concise.

      -

      It's OK to use a single bullet point after the "if" in the header. It's clearer than including a stand-alone sentence in the card.

      -

      It's also OK to have 2 colons (1 in the header and 1 in the body of the card), for example:

      -
      -
      -

      Urgent advice: Get advice from 111 now if:

      - -
      -
      -

      you take too much furosemide and you: -

        -
      • are over 65 (even if you feel well)
        • -
      • have kidney, heart or liver failure (even if you feel well)
        • -
      -
      -
      +

      Give the card a short heading. It should be 1 clear call to action, for example "Speak to a GP".

      +

      If the card includes more than one condition, use the format: "Call 111 if:" or "Speak to a GP if:" followed by a bulleted list.

      +

      Make sure the care card is concise, specific and self-contained. Don't say: "Contact your GP if this happens." Explain in the care card in what circumstances users should contact their GP.

      -

      Make the care card self-contained

      -

      Care cards should be specific and include the information the user needs. Do not say: "Contact your GP if this happens." Explain in the care card in what circumstances users should contact their GP.

      -

      Keep signposting simple

      -

      Ideally you should signpost to just 1 service in the header but you can signpost to 2 (the top 2 services). If you need to, add more services at the end of the body of the care card.

      Accessibility

      People with visual disabilities may not be able to recognise care cards by their colour. Use clearly worded headings to help them.

      We also add hidden text to the care card header to make the level of urgency clear to people who use screen readers. This also helps people who use headings to navigate the page as the text is part of the heading.

      @@ -135,7 +115,7 @@

      Research

      The care card design has tested well in long content pages. We've tested it in content in lots of labs and users scanning the page have stopped to read the cards.

      We haven't tested care cards in transactional services and do not recommend using them. If you use a care card in a transactional service, please test it with users and let us know what you find.

      -

      We've tested care cards with 1 call to action, for example "Speak to a GP if:". If you use more than 1 action, please test it and share your research findings with us.

      +

      We've tested care cards with 1 call to action, for example "Speak to a GP". If you use more than 1 action, please test it and share your research findings with us.

      We found that users overlook text between care cards, or between care cards and warning callouts, when they are close to each other.

      Accessibility testing showed up some issues around communicating the importance of the cards with hidden text, which we've dealt with. See the Accessibility section.

      @@ -145,12 +125,12 @@

      Get in touch

      If you have a question:

      -

      Updated: August 2019

      +

      Updated: January 2019

      {{ panel({ From 8e5975cfe2f868f2f6ad9d77492858e03c6399df Mon Sep 17 00:00:00 2001 From: AdamChrimes Date: Fri, 9 Aug 2019 11:40:17 +0100 Subject: [PATCH 27/27] hide the search functionality until it is fully tested --- app.js | 2 ++ app/views/includes/header.njk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app.js b/app.js index 9cd8e89c5..1cfdf0f35 100755 --- a/app.js +++ b/app.js @@ -75,6 +75,7 @@ app.get('/service-manual/design-example/:example', (req, res) => { res.render('includes/design-example-wrapper.njk', { body: exampleHtml }); }); +/* app.get('/service-manual/search', (req, res) => { var query = req.query['search-field'] || ''; res.render('includes/search.njk', { results: pageIndex.search(query), query: query }); @@ -84,6 +85,7 @@ app.get('/service-manual/suggestions', (req, res) => { res.set({ 'Content-Type': 'application/json' }); res.send(JSON.stringify(pageIndex.search(req.query.search))); }); +*/ app.get('/', (req, res) => { res.redirect('/service-manual'); diff --git a/app/views/includes/header.njk b/app/views/includes/header.njk index fba9c522e..0af0c8d7e 100755 --- a/app/views/includes/header.njk +++ b/app/views/includes/header.njk @@ -22,7 +22,7 @@ "longName": "true" }, "showNav": "false", - "showSearch": "true", + "showSearch": "false", "searchAction": "/service-manual/search/" }) }}