Update public v10.0.0 pre-release (#128)

* Update public v10.0.0 pre-release

* Update footer params

* Add missing error summary attributes

* Use notification banner from NHS.UK frontend

Author: colinrotherham

app/assets/sass/components/_dark-mode.scss

@@ -232,7 +232,7 @@ $app-dark-mode-link-visited-color: #89b;
     border-left-color: $app-dark-mode-text-colour-secondary;
   }
 
-  .app-notification-banner__content {
+  .nhsuk-notification-banner__content {
     color: $app-dark-mode-text-colour;
     background: $app-dark-mode-background-secondary;
   }

app/assets/sass/components/_notification-banner.scss

@@ -10,7 +10,6 @@
 @forward 'components/secondary-navigation';
 @forward 'components/count';
 @forward 'components/forward-link';
-@forward 'components/notification-banner';
 @forward 'components/status';
 @forward 'components/reading';
 

app/assets/sass/main.scss

@@ -110,20 +110,20 @@
     {% if flash.success %}
       {% set flashSuccess = flash.success[0] %}
       {% if flashSuccess | isString %}
-        {{ appNotificationBanner({
+        {{ notificationBanner({
           text: flashSuccess,
           type: "success"
         }) }}
       {% else %}
         {% set html = flashSuccess.html %}
         {% if flashSuccess.wrapWithHeading %}
           {% set html %}
-            <p class="app-notification-banner__heading">
+            <p class="nhsuk-notification-banner__heading">
               {{ flashSuccess.wrapWithHeading | safe }}
             </p>
           {% endset %}
         {% endif %}
-        {{ appNotificationBanner({
+        {{ notificationBanner({
           title: flashSuccess.title,
           html: html,
           text: flashSuccess.text,
@@ -133,14 +133,14 @@
     {% endif %}
 
     {% if flash.info %}
-      {{ appNotificationBanner({
+      {{ notificationBanner({
         html: flash.info,
         type: "info"
       }) }}
     {% endif %}
 
     {% if flash.warning %}
-      {{ appNotificationBanner({
+      {{ notificationBanner({
         html: flash.warning,
         type: "warning"
       }) }}

app/views/_components/notification-banner/macro.njk

@@ -13,7 +13,6 @@
 {%- from '_components/hidden-input/macro.njk' import appHiddenInput %}
 {%- from '_components/modal/macro.njk' import appModal %}
 {%- from '_components/modal/macro.njk' import appConfirmationModal %}
-{%- from '_components/notification-banner/macro.njk' import appNotificationBanner %}
 {%- from '_components/secondary-navigation/macro.njk' import appSecondaryNavigation %}
 {%- from '_components/button-menu/macro.njk' import buttonMenu %}
 {%- from '_components/summary-list/macro.njk' import appSummaryListRow %}
@@ -47,25 +46,27 @@
 <!-- Footer code examples can be found at https://service-manual.nhs.uk/design-system/components/footer -->
 {% block footer %}
   {{ footer({
-    "links": [
-      {
-        "URL": "/",
-        "label": "Home"
-      },
-      {
-        "URL": "/settings",
-        "label": "Settings"
-      },
-      {
-        "URL": "/clear-data",
-        "label": "Clear data"
-      },
-      {
-        "URL": "https://github.com/NHSDigital/manage-screening-events-prototype",
-        "label": "Github"
-      }
-    ]
-  })}}
+    meta: {
+      links: [
+        {
+          href: "/",
+          text: "Home"
+        },
+        {
+          href: "/settings",
+          text: "Settings"
+        },
+        {
+          href: "/clear-data",
+          text: "Clear data"
+        },
+        {
+          href: "https://github.com/NHSDigital/manage-screening-events-prototype",
+          text: "Github"
+        }
+      ]
+    }
+  }) }}
 {% endblock %}
 
 {% block bodyEnd %}

app/views/_components/notification-banner/template.njk

@@ -75,7 +75,7 @@ <h3 class="nhsuk-notification-banner__heading">
         </h3>
       {% endset %}
 
-      {{ appNotificationBanner({
+      {{ notificationBanner({
         html: notificationBannerHtml,
         type: "success"
       }) }}

app/views/_templates/layout-app.html

@@ -19,8 +19,8 @@ <h1>
 {{ data.settings | log("Settings")}}
 
 {% if flash.error %}
-  <div class="nhsuk-error-summary" role="alert">
-    <h2 class="nhsuk-error-summary__title">Error</h2>
+  <div class="nhsuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="nhsuk-error-summary">
+    <h2 class="nhsuk-error-summary__title" id="error-summary-title">Error</h2>
     <div class="nhsuk-error-summary__body">
       <p>{{ flash.error }}</p>
     </div>

app/views/_templates/layout.html

@@ -28,7 +28,7 @@
 {% endblock %}
 
 {% block footer %}
-  {{ footer({ }) }}
+  {{ footer() }}
 {% endblock %}
 
 {% block bodyEnd %}