From a6206e7e57f2001a4a334f45b10233e3747069eb Mon Sep 17 00:00:00 2001
From: Bob Meredith <bob.meredith@ntlworld.com>
Date: Wed, 2 Jun 2021 13:18:16 +0100
Subject: [PATCH 1/3] GP2-2890 - DAC NonText Content 01

---
 CHANGELOG.md                                          | 1 +
 exportplan/templates/exportplan/includes/sidebar.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c761e5af1d..80298386f3 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 ### Enhancements
 - NOTICKET - update changelog, post-release
 ### Fixed bugs
+- GP2-2890 - DAC NonText Content 01
 - 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
diff --git a/exportplan/templates/exportplan/includes/sidebar.html b/exportplan/templates/exportplan/includes/sidebar.html
index 86864a1bc1..6389a92386 100644
--- a/exportplan/templates/exportplan/includes/sidebar.html
+++ b/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="{{ request.user.company.name }}" src="{{ request.user.company.logo }}"  class="w-full" alt="Your business logo"/>
                 {% endif %}
             </div>
             <ul>

From c95017596ef12ee8655a27d73e6b15e8245f07a5 Mon Sep 17 00:00:00 2001
From: Bob Meredith <bob.meredith@ntlworld.com>
Date: Wed, 2 Jun 2021 14:44:52 +0100
Subject: [PATCH 2/3] Included GP-2891 and remove duplicate alt tag

---
 exportplan/templates/exportplan/dashboard_page.html   | 2 +-
 exportplan/templates/exportplan/includes/sidebar.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/exportplan/templates/exportplan/dashboard_page.html b/exportplan/templates/exportplan/dashboard_page.html
index 6249ac1abc..41dfc4b2b8 100644
--- a/exportplan/templates/exportplan/dashboard_page.html
+++ b/exportplan/templates/exportplan/dashboard_page.html
@@ -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">
diff --git a/exportplan/templates/exportplan/includes/sidebar.html b/exportplan/templates/exportplan/includes/sidebar.html
index 6389a92386..e21f1ec96f 100644
--- a/exportplan/templates/exportplan/includes/sidebar.html
+++ b/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" alt="Your business logo"/>
+                    <img alt="Your business logo" src="{{ request.user.company.logo }}" class="w-full" />
                 {% endif %}
             </div>
             <ul>

From 293075c8b3d0132e34abd28a91d18282effe89f7 Mon Sep 17 00:00:00 2001
From: Rizwan Mansuri <rizwan@webbyfox.co.uk>
Date: Wed, 2 Jun 2021 15:46:04 +0100
Subject: [PATCH 3/3] Reverting disable homepage cache and removed cache
 middleware

---
 config/settings.py                 |  2 --
 domestic/models.py                 |  6 ------
 tests/unit/domestic/test_models.py | 27 ---------------------------
 3 files changed, 35 deletions(-)

diff --git a/config/settings.py b/config/settings.py
index 1b54346cbe..8094f14154 100644
--- a/config/settings.py
+++ b/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',
 ]
 
diff --git a/domestic/models.py b/domestic/models.py
index 2dde09529a..6647dc6c20 100644
--- a/domestic/models.py
+++ b/domestic/models.py
@@ -16,7 +16,6 @@
 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,
@@ -136,7 +135,6 @@ class DomesticHomePage(
     mixins.EnableTourMixin,
     mixins.AnonymousUserRequired,
     DataLayerMixin,
-    WagtailCacheMixin,
     Page,
 ):
     # Note that this is was the original homepage for Magna/V2 MPV.
@@ -163,10 +161,6 @@ class DomesticHomePage(
         ImageChooserPanel('image'),
     ]
 
-    # Deliberately asking wagtail not to cache homepage
-    def cache_control(self):
-        return 'no-cache'
-
 
 class DomesticDashboard(
     mixins.WagtailAdminExclusivePageMixin,
diff --git a/tests/unit/domestic/test_models.py b/tests/unit/domestic/test_models.py
index a398b4a856..9e2f805198 100644
--- a/tests/unit/domestic/test_models.py
+++ b/tests/unit/domestic/test_models.py
@@ -1804,30 +1804,3 @@ def test_allowed_parents(self):
                 GreatDomesticHomePage,
             },
         )
-
-
-@pytest.mark.django_db
-def test_great_domestic_homepage_header_cache(root_page, client, user):
-
-    homepage = GreatDomesticHomePageFactory(
-        parent=root_page,
-        slug='root',
-    )
-
-    SiteFactory(
-        root_page=homepage,
-        hostname=client._base_environ()['SERVER_NAME'],
-    )
-
-    for user_logged_in in (False, True):
-
-        if user_logged_in:
-            client.force_login(user)
-
-        response = client.get(homepage.url)
-
-        assert response.has_header('Cache-Control') is True
-        assert response.get('Cache-Control') == 'no-cache'
-
-        assert response.has_header('X-Wagtail-Cache') is True
-        assert response.get('X-Wagtail-Cache') == 'skip'