Merge branch 'master' into Contextual-links-#1000-#1001

nhsuk · Apr 7, 2021 · 42e5473 · 42e5473
2 parents a4d6a5e + a2b2ffe
commit 42e5473
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,22 +1,16 @@
 # NHS digital service manual Changelog
 
-## 3.14.3 - 07 April 2021
+## 3.14.3 - Unreleased
+
+:new: **New features**
+
+- Update A to Z of NHS health writing with a link to new GOV.UK coronavirus (COVID-19) A to Z
 
 :wrench: **Fixes**
 
-- Update `includes/_contact-panel.njk` to host new contextual contribution links
-- Refactor context links within `includes/app-layout.njk`
-- Fix context links within `content/how-to-write-good-questions-for-forms`
-- Update all context links within `app/views/content`
-- Update all context links within `app/views/design-system`
-- Update all context links within `app/views/accessibility`
-- Update all context links within `app/views/service-standard`
-- Remove 'other help' contact section under 'guidance' on all service standard guidance pages `app/views/service-standard`
-- Remove 'id="talk-to-other-people-with-an-interest-in-accessibility' in `app/views/accessibility/getting-started.njk`
-- Remove ./partials/share-your-research.njk in `app/views/accessibility/user-research.njk`
+- Add contribution links to pages across the service manual [Issue 1000](https://github.com/nhsuk/nhsuk-service-manual/issues/1000)
 - Find and replace all non-closing `<p>` tags - [Issue 1092](https://github.com/nhsuk/nhsuk-service-manual/issues/1092)
 
-
 ## 3.14.2 - 18 March 2021
 
 :wrench: **Fixes**

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
@@ -245,8 +245,7 @@
       <h3 id="contractions">contractions</h3>
       <p>To find out how we use contractions, like "we're" and "don't", see the guidance on <a href="/content/formatting-and-punctuation#contractions">contractions on the Formatting and punctuation page</a>.</p>
       <h3 id="coronavirus-(covid-19)">coronavirus (COVID-19)</h3>
-      <p>Coronavirus is the virus that causes the illness COVID-19. Write "coronavirus" in lower case.</p>
-      <p>We use the full term "coronavirus (COVID-19)" when we first mention the illness but after that we use "coronavirus" as that is what most people call it and search for.</p>
+      <p>Follow the <a href="https://www.gov.uk/guidance/style-guide/coronavirus-covid-19-a-to-z">coronavirus (COVID-19) A to Z on GOV.UK</a>.</p>
       <h3 id="CT-scan">CT scan</h3>
       <p>You don’t need to spell it out. The abbreviation is fine.</p>
       <a class="nhsuk-back-to-top__link" href="#nhsuk-a-z-list">

diff --git a/app/views/index.njk b/app/views/index.njk
@@ -22,7 +22,7 @@
           <div class="nhsuk-card app-card--transparent nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-0">
             <div class="nhsuk-card__content">
               <h2 class="nhsuk-card__heading nhsuk-heading-m"><a href="/whats-new">What's new</a></h2>
-              <p class="nhsuk-card__description">In March 2021 we removed the review date component and replaced it with the "<a href="/design-system/patterns/reassure-users-that-a-page-is-up-to-date">Reassure users that a page is up to date</a>" pattern</p>
+              <p class="nhsuk-card__description">In April 2021 we linked from our content style guide to the new <a href="https://www.gov.uk/guidance/style-guide/coronavirus-covid-19-a-to-z">coronavirus (COVID-19) A to Z on GOV.UK</a></p>
             </div>
           </div>
         </div>

diff --git a/app/views/whats-new/index.njk b/app/views/whats-new/index.njk
@@ -9,39 +9,31 @@
 
   <h2>Latest updates</h2>
 
-  <h3>March 2021</h3>
+  <h3>April 2021</h3>
 
   <table class="nhsuk-table">
-    <caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Updates to the service manual in March 2021</caption>
+    <caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Updates to the service manual in April 2021</caption>
     <thead class="nhsuk-table__head">
       <tr class="nhsuk-table__row">
         <th class="nhsuk-table__header" scope="col" style="width: 25%;">Section</th>
         <th class="nhsuk-table__header" scope="col">Update</th>
       </tr>
     </thead>
     <tbody class="nhsuk-table__body">
-      
+
       <tr class="nhsuk-table__row">
-        <td class="nhsuk-table__cell">Accessibility guidance</td>
+        <td class="nhsuk-table__cell">Service manual</td>
         <td class="nhsuk-table__cell">
-          <p>Updated guidance on accessibility statements within the <a href="/accessibility/product-and-delivery">product and delivery page</a></p>
+          <p>Added content in the design system, content style guide, accessibility guidance and service standard to encourage people to contribute and improve the service manual</p>
         </td>
       </tr>
 
       <tr>
-        <td class="nhsuk-table__cell">Design system</td>
+        <td class="nhsuk-table__cell">Content style guide</td>
         <td class="nhsuk-table__cell">
-          <p>Removed the review date component and replaced it with the "<a href="/design-system/patterns/reassure-users-that-a-page-is-up-to-date">Reassure users that a page is up to date</a>" pattern</p>
+          <p>Linked from our A to Z entry for coronavirus (COVID-19) to the new <a href="https://www.gov.uk/guidance/style-guide/coronavirus-covid-19-a-to-z">coronavirus (COVID-19) A to Z on GOV.UK</a></p>
         </td>
       </tr>
-
-      <tr class="nhsuk-table__row">
-        <td class="nhsuk-table__cell">Team page</td>
-        <td class="nhsuk-table__cell">
-          <p>Added a new "<a href="/service-manual-team">service manual team</a>" page</p>
-        </td>
-      </tr>
-
     </tbody>
   </table>
 

diff --git a/app/views/whats-new/updates.njk b/app/views/whats-new/updates.njk
@@ -10,6 +10,35 @@
 
 {% block bodyContent %}
 
+<h2>April 2021</h2>
+
+  <table class="nhsuk-table">
+    <caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Updates to the service manual in April 2021</caption>
+    <thead class="nhsuk-table__head">
+      <tr class="nhsuk-table__row">
+        <th class="nhsuk-table__header" scope="col" style="width: 25%;">Section</th>
+        <th class="nhsuk-table__header" scope="col">Update</th>
+      </tr>
+    </thead>
+    <tbody class="nhsuk-table__body">
+
+      <tr class="nhsuk-table__row">
+        <td class="nhsuk-table__cell">Service manual</td>
+        <td class="nhsuk-table__cell">
+          <p>Added content in the design system, content style guide, accessibility guidance and service standard to encourage people to contribute and improve the service manual</p>
+        </td>
+      </tr>
+
+      <tr>
+        <td class="nhsuk-table__cell">Content style guide</td>
+        <td class="nhsuk-table__cell">
+          <p>Linked from our A to Z entry for coronavirus (COVID-19) to the new <a href="https://www.gov.uk/guidance/style-guide/coronavirus-covid-19-a-to-z">coronavirus (COVID-19) A to Z on GOV.UK</a></p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+
   <h2>March 2021</h2>
 
   <table class="nhsuk-table">
@@ -21,14 +50,14 @@
       </tr>
     </thead>
     <tbody class="nhsuk-table__body">
-      
+
       <tr class="nhsuk-table__row">
         <td class="nhsuk-table__cell">Accessibility guidance</td>
         <td class="nhsuk-table__cell">
           <p>Updated guidance on accessibility statements within the <a href="/accessibility/product-and-delivery">product and delivery page</a></p>
         </td>
       </tr>
-      
+
 
       <tr>
         <td class="nhsuk-table__cell">Design system</td>
@@ -44,7 +73,7 @@
           <p>Added a new "<a href="/service-manual-team">service manual team</a>" page</p>
         </td>
       </tr>
-      
+
     </tbody>
   </table>