Merge pull request #1353 from uktrade/develop

UAT Release

CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 
 ## Pre-release changes - please put everything in the appropriate category below
+### Enhancements
+- NOTICKET - update changelog, post-release
+### Fixed bugs
+- GP2-2835 - Disable caching on homepage
+- GP2-2889 - DAC Decorative_Images_01 - clear alt tags on decorative images
+- GP2-2888 - DAC Dialog_01 - aria-modal on confirmation dialogues.
+- GP2-2831 - fix typo on 404 page
+- GP2-2881 - Accessibility fix - alert screen readers for text updates
+- GP2-2883 - Accessibility fix - fix sign out menu button keyboard issues
+
+## [1.10.0](https://github.com/uktrade/great-cms/releases/tag/1.10.0)
+
+MAGNA RELEASE
+
+[Full Changelog](https://github.com/uktrade/great-cms/compare/1.9.0...1.10.0)
 
 ### Enhancements
 - GP2-2816 - Set Wagtaildocs serve method to 'direct' to avoid denial when proxying at PaaS level

core/templates/core/404.html

@@ -15,7 +15,7 @@ <h1 class="heading-large">This page cannot be found</h1>
     </div>
     <p>If you entered a web address, check that it is correct.</p>
     <p>If you followed a link here, <a class="link link--underline" href="{% url_map 'CONTACT_URL'%}">let us know</a>.</p>
-    <p>You can <a class="link link--underline" href="/">browse from the homepage</a> or use the search box above to find the information your need.</p>
+    <p>You can <a class="link link--underline" href="/">browse from the homepage</a> or use the search box above to find the information you need.</p>
   </div>
 </section>
 {% endblock %}

domestic/models.py

@@ -16,6 +16,7 @@
 from wagtail.core.models import Page
 from wagtail.images import get_image_model_string
 from wagtail.images.edit_handlers import ImageChooserPanel
+from wagtailcache.cache import WagtailCacheMixin
 
 from core import (
     blocks as core_blocks,
@@ -135,6 +136,7 @@ class DomesticHomePage(
     mixins.EnableTourMixin,
     mixins.AnonymousUserRequired,
     DataLayerMixin,
+    WagtailCacheMixin,
     Page,
 ):
     # Note that this is was the original homepage for Magna/V2 MPV.
@@ -161,6 +163,10 @@ class DomesticHomePage(
         ImageChooserPanel('image'),
     ]
 
+    # Deliberately asking wagtail not to cache homepage
+    def cache_control(self):
+        return 'no-cache'
+
 
 class DomesticDashboard(
     mixins.WagtailAdminExclusivePageMixin,

exportplan/templates/exportplan/dashboard_page.html

@@ -28,8 +28,8 @@
             <a class="section-list__link w-1-1 link" href="{% url 'exportplan:section' slug=section.title|slugify %}"
               id="{{ section.title|slugify }}">
               <div class="bg-blue-deep-20 section-list__image-container">
-                <img class="w-full p-h-s p-t-m p-b-s" src="{% static 'images/ep-placeholder.svg' %}"
-                  alt="{{ section.title }}">
+                <img class="width-full p-h-s p-t-m p-b-s" src="{% static 'images/ep-placeholder.svg' %}"
+                  alt="">
               </div>
               <div class="p-v-s p-h-xs">
                 <h3 class="bold body-l-b text-blue-deep-80">{{ section.title }}</h3>