Merge pull request #1361 from uktrade/release

Prod Release

CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 
 ## Pre-release changes - please put everything in the appropriate category below
+### Enhancements
+- NOTICKET - update changelog, post-release
+### Fixed bugs
+- GP2-2890 - DAC NonText Content 01
+- 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

config/settings.py

@@ -79,7 +79,6 @@
 ]
 
 MIDDLEWARE = [
-    'wagtailcache.cache.UpdateCacheMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -93,7 +92,6 @@
     'core.middleware.UserSpecificRedirectMiddleware',
     'core.middleware.UserLocationStoreMiddleware',
     'core.middleware.StoreUserExpertiseMiddleware',
-    'wagtailcache.cache.FetchFromCacheMiddleware',
     'core.middleware.CheckGATags',
 ]
 

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 %}

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>
@@ -53,7 +53,7 @@ <h3 class="m-v-xs bold">Upload your logo</h3>
       </a>
     </div>
     {% else %}
-    <img alt="{{ request.user.company.name }}" src="{{ request.user.company.logo }}" class="width-full" />
+    <img alt="Your business logo" src="{{ request.user.company.logo }}" class="width-full" />
     <a id="edit-image" href="{% url 'exportplan:add-logo' %}" class="link pencil-link">Edit</a>
     {% endif %}
     <a class="button button--secondary button--full-width button--icon m-b-xs" href="{% url 'exportplan:pdf-download' %}" title="Save your plan as a PDF">

exportplan/templates/exportplan/includes/sidebar.html

@@ -8,7 +8,7 @@
                 {% if not request.user.company.logo %}
                     <img src="https://via.placeholder.com/200/dfd5c5?text=Company logo" alt="Add a business logo" class="w-1-2">
                 {% else %}
-                    <img alt="{{ request.user.company.name }}" src="{{ request.user.company.logo }}"  class="w-full"/>
+                    <img alt="Your business logo" src="{{ request.user.company.logo }}" class="w-full" />
                 {% endif %}
             </div>
             <ul>