Merge pull request #456 from nhsuk/develop

1.13.4
nhsuk · Dec 9, 2019 · b6c685f · b6c685f
2 parents 6bfcdfd + 80b390c
commit b6c685f
Show file tree

Hide file tree

Showing 20 changed files with 869 additions and 735 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # NHS digital service manual Changelog
 
+## 1.13.4 - 09 December 2019
+
+- Add missing Details component JavaScript polyfill
+- Use https on all external links and fix broken link on the test your questions page
+- Remove the unnecessary type attribute from JavaScript resources
+- Fix broken link to the PDF page on sitemap page
+- Update accessibility footer link to accessibility statement
+- Make filter question image decorative using alt null
+
 ## 1.13.3 - 25 November 2019
 
 - Made it clear in PDF guidance that PDFs can be used for a permanent record

diff --git a/app/scripts/main.js b/app/scripts/main.js
@@ -3,9 +3,11 @@ import './polyfills';
 
 // NHS.UK frontend
 import SkipLink from '../../node_modules/nhsuk-frontend/packages/components/skip-link/skip-link';
+import Details from '../../node_modules/nhsuk-frontend/packages/components/details/details';
 import DesignExample from './design-example';
 
 // Initialise components
+Details();
 SkipLink();
 
 document.querySelectorAll(DesignExample.selector()).forEach((el) => {

diff --git a/app/views/accessibility/partials/check-colour-contrast.njk b/app/views/accessibility/partials/check-colour-contrast.njk
@@ -25,8 +25,8 @@
   <div class="nhsuk-details__text">
     <p>Use a tool to check the colour contrast:</p>
     <ul>
-      <li><a href="http://webaim.org/resources/contrastchecker/">Web Aim's colour contrast checker</a></li>
-      <li><a href="http://colororacle.org/">Color Oracle (free colour blindness simulator)</a></li>
+      <li><a href="https://webaim.org/resources/contrastchecker/">Web Aim's colour contrast checker</a></li>
+      <li><a href="https://colororacle.org/">Color Oracle (free colour blindness simulator)</a></li>
     </ul>
   </div>
 </details>

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
@@ -823,7 +823,7 @@
     <p>Please <a href="/service-manual/contribute">get in touch</a> if you have any evidence to share or changes to suggest.</p>
 
     <div class="nhsuk-review-date">
-      <p class="nhsuk-body-s">Updated: September 2019</p>
+      <p class="nhsuk-body-s">Updated: December 2019</p>
     </div>
 
 {% endblock %}
diff --git a/app/views/content/formatting-and-punctuation.njk b/app/views/content/formatting-and-punctuation.njk
@@ -57,7 +57,7 @@
     <p>Examples:</p>
     <ul>
       <li>Codeine comes mixed with paracetamol (co-codamol) or with aspirin (co-codaprin) or with ibuprofen (Nurofen Plus).</li>
-      <li>Watch these <a href="http://www.healthtalk.org/">healthtalk.org</a> videos.</li>
+      <li>Watch these <a href="https://www.healthtalk.org/">healthtalk.org</a> videos.</li>
     </ul>
     <p>Conditions are lower-case except where they start with a proper name.</p>
     <p>Examples:</p>

diff --git a/...ow-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions.njk b/...ow-to-write-good-questions-for-forms/consider-the-sensitivities-around-your-questions.njk
@@ -64,7 +64,7 @@
   </ul>
 
   <h2>Read more about sensitive topics</h2>
-  <p>The sensitive topics reflect the "protected characteristics" in the <a href="http://www.legislation.gov.uk/ukpga/2010/15/contents">Equality Act 2010</a>. It is against the law to discriminate against anyone because of these characteristics.</p>
+  <p>The sensitive topics reflect the "protected characteristics" in the <a href="https://www.legislation.gov.uk/ukpga/2010/15/contents">Equality Act 2010</a>. It is against the law to discriminate against anyone because of these characteristics.</p>
 
   <div class="nhsuk-review-date">
     <p class="nhsuk-body-s">Updated: November 2019</p>

diff --git a/app/views/content/how-to-write-good-questions-for-forms/test-your-questions.njk b/app/views/content/how-to-write-good-questions-for-forms/test-your-questions.njk
@@ -25,7 +25,7 @@
   <p>It'll also help you identify anything users need more help with.</p>
 
   <h3 id="do-a-card-sorting-exercise">Do a card sorting exercise</h3>
-  <p>Doing a card sorting exercise with users will help you <a href="http://localhost:3000/service-manual/content/how-to-write-good-questions-for-forms/get-the-questions-into-order">get the questions into order</a>. Put the topics or questions on cards or post-its. Ask users to group them in a way that makes sense to them. Get them to talk out loud while they do so, so that you can understand their reasons.</p>
+  <p>Doing a card sorting exercise with users will help you <a href="/service-manual/content/how-to-write-good-questions-for-forms/get-the-questions-into-order">get the questions into order</a>. Put the topics or questions on cards or post-its. Ask users to group them in a way that makes sense to them. Get them to talk out loud while they do so, so that you can understand their reasons.</p>
   <p>Look for themes and pay attention to the cards people leave out or cannot place.</p>
   <p>You could do this as part of a co-design workshop with users, where you card sort and sketch in groups. You could also do it as a team exercise or in a workshop with staff.</p>
 

diff --git a/...ews/content/how-to-write-good-questions-for-forms/use-filter-questions-to-route-users.njk b/...ews/content/how-to-write-good-questions-for-forms/use-filter-questions-to-route-users.njk
@@ -15,7 +15,7 @@
     <li>simplify long questions (like <a href="/service-manual/content/how-to-write-good-questions-for-forms/get-the-questions-into-order#watch-out-for-double-barrelled-questions">"double-barrelled" questions</a>) by breaking them up</li>
   </ul>
 
-  <img class="nhsuk-image__img nhsuk-u-margin-top-7 nhsuk-u-margin-bottom-7" src="/service-manual/assets/filter-question-example.png" alt="A filter question routing some users down a different journey">
+  <img class="nhsuk-image__img nhsuk-u-margin-top-7 nhsuk-u-margin-bottom-7" src="/service-manual/assets/filter-question-example.png" alt="">
 
   <p>But often you need more than a simple "Yes" or "No". In the "Are you 18 or over?" example, for instance, you should think about what your service can offer younger users as an alternative and how you can support their user journey.</p>
 

diff --git a/app/views/includes/design-example-wrapper-full.njk b/app/views/includes/design-example-wrapper-full.njk
@@ -50,7 +50,7 @@
     {{ footer({
     })}}
 
-    <script type="text/javascript" src="/service-manual/iframe-resizer/js/iframeResizer.contentWindow.min.js"></script>
+    <script src="/service-manual/iframe-resizer/js/iframeResizer.contentWindow.min.js"></script>
   </body>
 
 </html>
diff --git a/app/views/includes/design-example-wrapper.njk b/app/views/includes/design-example-wrapper.njk
@@ -28,7 +28,7 @@
   <body>
     {{ body | safe }}
 
-    <script type="text/javascript" src="/service-manual/iframe-resizer/js/iframeResizer.contentWindow.min.js"></script>
+    <script src="/service-manual/iframe-resizer/js/iframeResizer.contentWindow.min.js"></script>
   </body>
 
 </html>
diff --git a/app/views/includes/footer.njk b/app/views/includes/footer.njk
@@ -3,7 +3,7 @@
     <div class="nhsuk-width-container">
       <h2 class="nhsuk-u-visually-hidden">Support links</h2>
       <ul class="nhsuk-footer__list">
-        <li class="nhsuk-footer__list-item"><a class="nhsuk-footer__list-item-link" href="/service-manual/accessibility-statement">Accessibility</a></li>
+        <li class="nhsuk-footer__list-item"><a class="nhsuk-footer__list-item-link" href="/service-manual/accessibility-statement">Accessibility statement</a></li>
         <li class="nhsuk-footer__list-item"><a class="nhsuk-footer__list-item-link" href="https://beta.nhs.uk/our-policies/cookies-policy/">Cookie policy</a></li>
         <li class="nhsuk-footer__list-item"><a class="nhsuk-footer__list-item-link" href="/service-manual/sitemap">Sitemap</a></li>
         <li class="nhsuk-footer__list-item"><a class="nhsuk-footer__list-item-link" href="/service-manual/terms-and-conditions">Terms and conditions</a></li>

diff --git a/app/views/includes/layout.njk b/app/views/includes/layout.njk
@@ -68,7 +68,7 @@
     <meta name="msapplication-square310x310logo" content="/service-manual/nhsuk-frontend/assets/favicons/largetile-310x310.png">
 
     <!-- Cookie consent -->
-    <script src="{{ COOKIE_CONSENT_URL }}" data-policy-url="https://beta.nhs.uk/our-policies/cookies-policy/" type="text/javascript"></script>
+    <script src="{{ COOKIE_CONSENT_URL }}" data-policy-url="https://beta.nhs.uk/our-policies/cookies-policy/"></script>
 
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <script src="https://www.googletagmanager.com/gtag/js?id=UA-9510975-7" data-cookieconsent="statistics" type="text/plain" async></script>

diff --git a/app/views/prototyping-tools/index.njk b/app/views/prototyping-tools/index.njk
@@ -10,7 +10,7 @@
 {% block bodyContent %}
 
   <h2 class="nhsuk-heading-s nhsuk-u-margin-bottom-3">
-    <a href="http://nhsuk-prototype-kit.azurewebsites.net/docs">Download the NHS.UK prototype kit</a>
+    <a href="https://nhsuk-prototype-kit.azurewebsites.net/docs">Download the NHS.UK prototype kit</a>
   </h2>
   <p>Build interactive prototypes that look like the NHS website.</p>
 
@@ -22,7 +22,7 @@
   <h2>What is the prototype kit?</h2>
   <p>It’s a collection of HTML files and templates that will help you build prototypes of services with an NHS look and feel. It will help you create something quickly that you can test so you can improve your ideas.</p>
   <p>Prototyping in code will help you make realistic, accessible interactive HTML prototypes that can be accessed on multiple devices.</p>
-  <p>The <a href="http://nhsuk-prototype-kit.azurewebsites.net/docs">prototype kit</a> uses the code in the <a href="/service-manual/frontend-library">NHS.UK frontend library</a>.</p>
+  <p>The <a href="https://nhsuk-prototype-kit.azurewebsites.net/docs">prototype kit</a> uses the code in the <a href="/service-manual/frontend-library">NHS.UK frontend library</a>.</p>
 
   <h2>Sketch file</h2>
   <p><a href="https://www.sketchapp.com/">Sketch</a> is a design tool. You can use the <a href="https://github.com/nhsuk/nhsuk-sketch-file">NHS.UK Sketch file</a> to create static mockups to test with users.

diff --git a/app/views/service-standard/12-make-your-service-interoperable.njk b/app/views/service-standard/12-make-your-service-interoperable.njk
@@ -63,7 +63,7 @@
       <li><a href="https://digital.nhs.uk/about-nhs-digital/our-work/nhs-digital-data-and-technology-standards/clinical-information-standards">NHS clinical information standards</a> (NHS Digital)</li>
       <li><a href="https://digital.nhs.uk/about-nhs-digital/our-work/nhs-digital-data-and-technology-standards/framework/detailed-specification-for-nhs-digital-reference-data-registers">NHS data registers</a> (NHS Digital)</li>
       <li><a href="https://digital.nhs.uk/data-and-information/information-standards/information-standards-and-data-collections-including-extractions/publications-and-notifications/standards-and-collections/isb-0149-nhs-number">NHS number</a> (NHS Digital)</li>
-      <li><a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/">Open Government Licence</a> (The National Archives)</li>
+      <li><a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/">Open Government Licence</a> (The National Archives)</li>
       <li><a href="https://digital.nhs.uk/about-nhs-digital/our-work/nhs-digital-data-and-technology-standards/framework/beta---use-of-fhir-based-apis">Use of FHIR-based APIs</a> (NHS Digital)</li></ul>
 
     <h3>Other help</h3>

diff --git a/app/views/sitemap.njk b/app/views/sitemap.njk
@@ -95,7 +95,7 @@
         </li>
         <li><a href="/service-manual/content/numbers-measurements-dates-time">Numbers, measurements, dates and time</li>
         <li><a href="/service-manual/content/formatting-and-punctuation">Formatting and punctuation</a></li>
-        <li><a href="/service-manual/content/links-and-pdfs">Links and PDFs</a></li>
+        <li><a href="/service-manual/content/pdfs">PDFs</a></li>
       </ul>
     </li>
     <li>

diff --git a/app/views/styles-components-patterns/back-link.njk b/app/views/styles-components-patterns/back-link.njk
@@ -35,7 +35,7 @@
 
   <h2>Research</h2>
   <p>During testing, <a href="https://111.nhs.uk/">NHS 111 online</a> found that some users wanted to change their answers, so they introduced a back link and labelled it to "Change my previous answer".</p>
-  <p>The <a href="http://digitalaccessibilitycentre.org/">Digital Accessibility Centre</a> recommended that <a href="https://your-data-matters.service.nhs.uk/">Find out why your NHS data matters</a> place their back link below the primary action, because screen reader users were confused when they landed on a page and were immediately told to go back.</p>
+  <p>The <a href="https://digitalaccessibilitycentre.org/">Digital Accessibility Centre</a> recommended that <a href="https://your-data-matters.service.nhs.uk/">Find out why your NHS data matters</a> place their back link below the primary action, because screen reader users were confused when they landed on a page and were immediately told to go back.</p>
 
   <h2>Discuss</h2>
   <p><a href="https://github.com/nhsuk/nhsuk-service-manual-backlog/issues/32">Discuss back links on GitHub</a></p>

diff --git a/app/views/styles-components-patterns/care-cards.njk b/app/views/styles-components-patterns/care-cards.njk
@@ -40,7 +40,7 @@
   }) }}
 
   <p>Use this card when users need to get emergency help straight away - meaning "now". Tell them to dial 999 or go to their nearest accident and emergency (A&amp;E) department.</p>
-  <p>Where appropriate, include a link to help users find their <a href="http://www.nhs.uk/service-search/Accident-and-emergency-services/LocationSearch/428">nearest hospital A&amp;E department</a>.</p>
+  <p>Where appropriate, include a link to help users find their <a href="https://www.nhs.uk/service-search/Accident-and-emergency-services/LocationSearch/428">nearest hospital A&amp;E department</a>.</p>
   <p>Avoid linking to more information about a condition from an emergency care card. If it's an emergency, the important thing is to dial 999 or go to A&amp;E.</p>
   <p>Only use this card for emergencies.</p>
 

diff --git a/app/views/styles-components-patterns/colour.njk b/app/views/styles-components-patterns/colour.njk
@@ -372,8 +372,8 @@
   <h3>Testing tools</h3>
   <p>Use tools like these to check contrast:</p>
   <ul>
-    <li><a href="http://webaim.org/resources/contrastchecker/">Web Aim's colour contrast checker</a></li>
-    <li><a href="http://colororacle.org/">Color Oracle (free colour blindness simulator)</a></li>
+    <li><a href="https://webaim.org/resources/contrastchecker/">Web Aim's colour contrast checker</a></li>
+    <li><a href="https://colororacle.org/">Color Oracle (free colour blindness simulator)</a></li>
   </ul>
   <p>Also test colour contrast with people of all abilities.</p>