uktrade · boxadesign · Apr 18, 2024 · Apr 17, 2024 · Apr 17, 2024 · Apr 18, 2024
@@ -2,37 +2,20 @@
 {% load wagtailcore_tags %}
 {% language lang|default:"en-gb" %}
     <div id="header-cookie-notice"
-         class="cookie-notice"
+         class="great great-cookie-notice"
          dir="ltr"
          data-ga-section="cookieNotice"
          role="region"
-         aria-label="Cookie acceptance banner">
-        <div class="great container cookie-notice-container">
-            <div class="grid-row">
-                <div class="cookie-initial">
-                    <h2 class="heading-medium margin-top-0 margin-bottom-30 column-full">
-                        {% translate 'Tell us whether you accept cookies' %}
-                    </h2>
-                    <div class="column-half">
-                        <p>
-                            {% translate 'We use ' %}<a class="link" href='{% slugurl "privacy-and-cookies" %}'>{% translate 'cookies to collect information' %}</a> {% translate 'about how you use great.gov.uk. We use this information to make the website work as well as possible and improve government services.' %}
-                        </p>
-                    </div>
-                    <div class="column-half">
-                        <a href="#"
-                           id="cookie-notice-accept-all"
-                           class="govuk-button margin-top-30 margin-top-0-m  margin-right-15-m margin-bottom-30 margin-bottom-15-m button-accept">{% translate 'Accept all cookies' %}</a>
-                        <a href="{% url 'core:cookie-preferences' %}" id="cookie-notice-set-preferences" class="govuk-button">{% translate 'Set cookie preferences' %}</a>
-                    </div>
-                </div>
-                <div class="cookie-confirmation">
-                    <div class="column-full padding-right-30">
-                        <p>
-                            {% translate "You've accepted all cookies. You can " %}<a class="link" id="cookie-notice-change-preferences" href="{% url 'core:cookie-preferences' %}">{% translate 'change your settings' %}</a> {% translate 'at any time.' %}
-                        </p>
-                    </div>
-                </div>
-            </div>
+         aria-label="Cookies on great.gov.uk"
+         aria-live="polite">
+        <div class="great great-overflow-visible great-container cookie-notice-container">
+            <h2 aria-hidden="true" class="govuk-heading-m">{% translate "Cookies on great.gov.uk" %}</h2>
+            <p>
+                You've <span id="cookie-action">accepted</span> additional cookies. You can <a class="link"
+    id="cookie-notice-change-preferences"
+    href="{% url 'core:cookie-preferences' %}">change your cookie settings</a> at any time.
+            </p>
+            <button class="govuk-button govuk-!-margin-top-1 cookie-close">{% translate "Hide cookies message" %}</button>
         </div>
     </div>
 {% endlanguage %}
@@ -3,11 +3,6 @@
 {% load url_map %}
 {% load get_digital_entry_point_enabled from content_tags %}
 <header class="great-header" id="header" dir="ltr" data-ga-section="header">
-    {% if not hide_cookie_notice %}
-        {% block cookie_notice %}
-            {% include 'components/cookie_notice.html' %}
-        {% endblock %}
-    {% endif %}
     {% if not request.user.is_authenticated %}
         {% include 'components/header_footer/global_header.html' with header_class="domestic" %}
     {% endif %}
@@ -188,7 +183,8 @@
                             </li>
                         {% else %}
                             <li class="great">
-                                <a id="sign-in" class="govuk-button govuk-!-margin-top-3 govuk-!-margin-bottom-3"
+                                <a id="sign-in"
+                                   class="govuk-button govuk-!-margin-top-3 govuk-!-margin-bottom-3"
                                    href="{% url 'core:login' %}">Sign in</a>
                             </li>
                         {% endif %}

@@ -19,16 +19,24 @@
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1">
         {% block sharing_description %}
-        <meta name="description"
-                content="{% block meta_description %}{% firstof self.seo_description page.search_description content_snippet.search_description page.teaser page.featured_description page.seo_title page.title content_snippet.search_description %}{% endblock %}">
+            <meta name="description"
+                  content="{% block meta_description %}{% firstof self.seo_description page.search_description content_snippet.search_description page.teaser page.featured_description page.seo_title page.title content_snippet.search_description %}{% endblock %}">
         {% endblock %}
-        {% firstof page.seo_title page.title  as seo_title %}
+        {% firstof page.seo_title page.title as seo_title %}
         {% block sharing_title %}
-        <meta name="title"
-            content="{% block meta_title %}{% if seo_title %}{{ seo_title }}{% else %}Welcome to great.gov.uk{% endif %} - great.gov.uk{% endblock %}">
-        {% endblock %}
-
-        <title>{% block head_title %}{% if seo_title %}{{ seo_title }}{% else %}Welcome to great.gov.uk{% endif %} - great.gov.uk{% endblock %}</title>
+            <meta name="title"
+                  content="{% block meta_title %}{% if seo_title %}{{ seo_title }}{% else %}Welcome to great.gov.uk{% endif %} - great.gov.uk{% endblock %}">
+        {% endblock %}
+        <title>
+            {% block head_title %}
+                {% if seo_title %}
+                    {{ seo_title }}
+                {% else %}
+                    Welcome to great.gov.uk
+                {% endif %}
+                - great.gov.uk
+            {% endblock %}
+        </title>
         {% block meta_tags %}{% endblock %}
         {% with is_wagtail_page=page %}
             {% if is_wagtail_page %}
@@ -123,12 +131,12 @@
             {% include 'components/google_tag_manager_body.html' %}
         {% endblock %}
         <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled')</script>
-        {% block skip_link %}
-            <a id="skip-link" href="#content">{% translate "Skip to main content" %}</a>
-        {% endblock %}
         {% block cookie_notice %}
             {% include 'components/cookie_notice.html' with lang=page.locale.language_code %}
         {% endblock %}
+        {% block skip_link %}
+            <a class="govuk-skip-link" href="#content">{% translate "Skip to main content" %}</a>
+        {% endblock %}
         {% block body_content_container %}
             {% block content %}{% endblock %}
             {% block feedback_reporter %}

@@ -15,17 +15,24 @@
         <meta name="msvalidate.01" content="76D322F181AE9F91C43419E5CD511BBC" />
         <meta name="viewport" content="width=device-width, initial-scale=1">
         {% block sharing_description %}
-        <meta name="description"
-                content="{% block meta_description %}{% firstof self.seo_description page.search_description content_snippet.search_description page.teaser page.featured_description page.seo_title page.title content_snippet.search_description %}{% endblock %}">
+            <meta name="description"
+                  content="{% block meta_description %}{% firstof self.seo_description page.search_description content_snippet.search_description page.teaser page.featured_description page.seo_title page.title content_snippet.search_description %}{% endblock %}">
         {% endblock %}
-
-        {% firstof page.seo_title page.title  as seo_title %}
+        {% firstof page.seo_title page.title as seo_title %}
         {% block sharing_title %}
-        <meta name="title"
-            content="{% block meta_title %}{% if seo_title %}{{ seo_title }}{% else %}Welcome to great.gov.uk{% endif %} - great.gov.uk{% endblock %}">
-        {% endblock %}
-
-        <title>{% block head_title %}{% if seo_title %}{{ seo_title }}{% else %}Welcome to great.gov.uk{% endif %} - great.gov.uk{% endblock %}</title>
+            <meta name="title"
+                  content="{% block meta_title %}{% if seo_title %}{{ seo_title }}{% else %}Welcome to great.gov.uk{% endif %} - great.gov.uk{% endblock %}">
+        {% endblock %}
+        <title>
+            {% block head_title %}
+                {% if seo_title %}
+                    {{ seo_title }}
+                {% else %}
+                    Welcome to great.gov.uk
+                {% endif %}
+                - great.gov.uk
+            {% endblock %}
+        </title>
         {% block meta_tags %}{% endblock %}
         {% with is_wagtail_page=page %}
             {% if is_wagtail_page %}
@@ -77,7 +84,7 @@
             </style>
         </noscript>
         {% block vendor_js %}
-            <script src="{% static 'javascript/vendor/details-polyfill.js' %}"></script>
+            <script src="{% static 'javascript/vendor/details-polyfill.js' %}" defer></script>
             <script src="{% static 'javascript/vendor/jquery-3.6.0.min.js' %}"></script>
         {% endblock %}
         {% block head_js %}
@@ -110,9 +117,9 @@
             </script>
         {% endblock %}
         {% block header_js %}
-            <script src="{% static 'javascript/dit.responsive.js' %}"></script>
-            <script src="{% static 'javascript/dit.utils.js' %}"></script>
-            <script src="{% static 'common.js' %}"></script>
+            <script src="{% static 'javascript/dit.responsive.js' %}" defer></script>
+            <script src="{% static 'javascript/dit.utils.js' %}" defer></script>
+            <script src="{% static 'common.js' %}" defer></script>
         {% endblock %}
         {% block head_other %}
             {% include 'components/browser_check.html' %}
@@ -123,7 +130,14 @@
             {% include 'components/google_tag_manager_body.html' %}
         {% endblock %}
         <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled')</script>
-        {% block skip_link %}<a id="skip-link" href="#content">Skip to main content</a>{% endblock %}
+        {% if not hide_cookie_notice %}
+            {% block cookie_notice %}
+                {% include 'components/cookie_notice.html' %}
+            {% endblock %}
+        {% endif %}
+        {% block skip_link %}
+            <a href="#content" class="govuk-skip-link" data-module="govuk-skip-link">Skip to main content</a>
+        {% endblock %}
         {% block body_header %}
             {% include 'core/header.html' %}
         {% endblock %}

@@ -18,7 +18,7 @@
         <div class="container">
             <div class="performance">
                 {# djlint:off #}
-                {% include 'components/great/notification_banner.html' with banner_title='Important' banner_heading="We're thinking of discontinuing the current publication of Official Statistics on the Great Performance Dashboard and would like your feedback." banner_body='To find out more and submit your feedback please visit <a class="govuk-notification-banner__link" href="https://www.gov.uk/government/consultations/changes-to-official-statistics-on-the-greatgovuk-performance-dashboard">https://www.gov.uk/government/consultations/changes-to-official-statistics-on-the-greatgovuk-performance-dashboard</a>. The public consultation will close on Monday 4 December.' %}
+                {% include 'components/great/notification_banner.html' with banner_title='Important' banner_heading="Following public consultation, we will be discontinuing the current publication of Official Statistics on the Great Performance Dashboard. The final monthly publication is scheduled for June 2024." banner_body='To find out more please visit <a class="govuk-notification-banner__link" href="https://www.gov.uk/government/consultations/changes-to-official-statistics-on-the-greatgovuk-performance-dashboard">https://www.gov.uk/government/consultations/changes-to-official-statistics-on-the-greatgovuk-performance-dashboard</a>.' %}
                 {# djlint:on #}
                 <p class="font-small subheading">Performance dashboard</p>
                 <h2 class="heading-large">{{ page.heading }}</h2>

@@ -2,7 +2,7 @@ module.exports = {
   ci: {
     collect: {
       numberOfRuns: 3,
-      startServerCommand: 'DEBUG=False make webserver',
+      startServerCommand: 'DEBUG=True make webserver',
       url: ['http://localhost:8020/'],
       settings: {
         onlyCategories: [
@@ -14,15 +14,15 @@ module.exports = {
         skipAudits: ['uses-http2'],
         chromeFlags: '--no-sandbox',
         extraHeaders: JSON.stringify({
-          Cookie: 'customCookie=1;foo=bar',
+          Cookie: 'customCookie=1',
         }),
       },
     },
     assert: {
       assertions: {
         'categories:performance': [
           'error',
-          { minScore: 0.55, aggregationMethod: 'pessimistic' },
+          { minScore: 0.50, aggregationMethod: 'pessimistic' },
         ],
         'categories:accessibility': [
           'error',

@@ -1,22 +1,17 @@
-.heading {
-  font-size: 24px;
-  margin: 0;
-}
-
 .synopsis {
   font-size: 19px;
   margin-bottom: 30px;
-  margin-top: 30px;
   text-align: left;
+  max-width: 800px;
 }
 
-.button {
+.greatButton {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   cursor: pointer;
   font-size: 19px;
-  margin-bottom: 0;
-  height: 50px;
-  padding: 0;
-  line-height: 44px;
+  margin-bottom: 10px;
   font-weight: normal;
 }
 
@@ -27,36 +22,37 @@
 
 :global .ReactModal__Content {
   background: #ffffff;
+  margin: 0;
   padding: 30px!important;
   bottom: auto !important;
   right: auto !important;
   top: 50% !important;
   left: 50% !important;
   transform: translate(-50%, -50%);
-  width: 95% !important;
-  max-height: fit-content;
-  max-width: 600px;
+  max-height: calc(100vh - 30px);
+  width: calc(100vw - 30px);
+}
+
+.buttonContainer {
+  display: flex;
+  justify-content: start;
+  flex-wrap: wrap;
+  align-items: baseline;
 }
 
-.buttonSeperator {
-  display: inline-block;
-  width: 20px;
+@media (max-width: 755px) {
+  .cookieLink {
+    flex: 1 1 100%;
+  }
 }
 
 @media (min-width: 500px) {
   :global .ReactModal__Content {
     padding: 52px!important;
-
   }
 
-  .buttonContainer {
-    display: flex;
-  }
-  .synopsis {
-    margin-top: 25px;
-    margin-bottom: 45px;
-  }
-  .button {
-    width: 50%;
+  .greatButton {
+    width: auto;
+    margin-right: 20px;
   }
 }
@@ -24,6 +24,12 @@ export function CookiesModal(props) {
     setIsOpen(false)
   }
 
+  function handleRejectAllCookies(event) {
+    CookieManager.rejectAllCookiesAndShowSuccess(event)
+
+    setIsOpen(false)
+  }
+
   const handleFocusChange = (evt) => {
     if (focusTrap.current) {
       const modal = evt.target.closest('.ReactModal__Content')
@@ -54,36 +60,36 @@ export function CookiesModal(props) {
   }, [])
 
   return (
-    <Modal isOpen={isOpen} contentLabel="Cookies consent manager">
-      <h2 className={`${styles.heading} heading-medium`}>
-        {translations[lang]["Tell us whether you accept cookies"]}
-      </h2>
-      <p className={`${styles.synopsis} body-text`}>
+    <Modal isOpen={isOpen} contentLabel="Cookies on great.gov.uk">
+      <div className='great'>
+        <h2 aria-hidden="true" className={`govuk-heading-m`}>
+          {translations[lang]["Cookies on great.gov.uk"]}
+        </h2>
+      </div>
+      <p className={`${styles.synopsis}`}>
         {translations[lang]["We use"]}{' '}
-        <a
-          className="link"
-          href={props.privacyCookiesUrl}
-          ref={(_firstLink) => (firstLink = _firstLink)}
-        >
-          {translations[lang]["cookies to collect information"]}
-        </a>{' '}
-          {translations[lang]["about how you use great.gov.uk. We use this information to make the website work as well as possible and improve government services."]}
       </p>
-      <div className={styles.buttonContainer}>
-        <a
-          className={`${styles.button} button primary-button`}
-          href="#"
+      <div className={`${styles.buttonContainer} great great-overflow-visible`}>
+      <button
+          className={`${styles.greatButton} govuk-button`}
           onClick={handleAcceptAllCookies}
         >
-          {translations[lang]["Accept all cookies"]}
-        </a>
-        <span className={styles.buttonSeperator} />
-        <a
-          className={`${styles.button} button primary-button`}
-          href={props.preferencesUrl + window.location.search}
+          {translations[lang]["Accept additional cookies"]}
+        </button>
+        <button
+          className={`${styles.greatButton} govuk-button`}
+          onClick={handleRejectAllCookies}
         >
-          {translations[lang]["Set cookie preferences"]}
-        </a>
+          {translations[lang]["Reject additional cookies"]}
+        </button>
+        <div className={`${styles.cookieLink}`}>
+          <a
+            className={`govuk-link govuk-!-margin-bottom-1`}
+            href={props.preferencesUrl + window.location.search}
+          >
+            {translations[lang]["View cookies"]}
+          </a>
+        </div>
       </div>
     </Modal>
   )