From 07236143bf0afa1f1c06e7b12acb6c0e0bb1e44f Mon Sep 17 00:00:00 2001
From: Chris Daly <chris.daly@jisc.ac.uk>
Date: Thu, 9 Jan 2025 16:02:45 +0000
Subject: [PATCH 1/2] Replaced removed function

Replaced function that no longer exists in latest version of CKAN.
---
 ckanext/ukdstheme/templates/page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/ukdstheme/templates/page.html b/ckanext/ukdstheme/templates/page.html
index 8aac09f..e64d8da 100644
--- a/ckanext/ukdstheme/templates/page.html
+++ b/ckanext/ukdstheme/templates/page.html
@@ -23,7 +23,7 @@
           {% block flash %}
             <div class="flash-messages">
               {% block flash_inner %}
-                {% for message in h.flash.pop_messages() | list %}
+                {% for message in h.get_flashed_messages() | list %}
                   <div class="alert fade in {{ message.category }}">
                     {{ h.literal(message) }}
                   </div>

From 8a233a566f5e5d0b022b9c4184af37f2b0062323 Mon Sep 17 00:00:00 2001
From: Chris Daly <chris.daly@jisc.ac.uk>
Date: Fri, 10 Jan 2025 11:40:29 +0000
Subject: [PATCH 2/2] Updated templates to co-inside with CKAN upgrade changes

---
 ckanext/ukdstheme/templates/footer.html |  6 ++++--
 ckanext/ukdstheme/templates/page.html   | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ckanext/ukdstheme/templates/footer.html b/ckanext/ukdstheme/templates/footer.html
index da649f2..1636515 100644
--- a/ckanext/ukdstheme/templates/footer.html
+++ b/ckanext/ukdstheme/templates/footer.html
@@ -1,4 +1,5 @@
-{% ckan_extends %}
+<footer class="site-footer">
+  <div class="container">
     {% block footer_content %}
     <div class="row">
       <div class="col-md-8 footer-links">
@@ -30,4 +31,5 @@
       </div>
     </div>
     {% endblock %}
-
+  </div>
+</footer>
diff --git a/ckanext/ukdstheme/templates/page.html b/ckanext/ukdstheme/templates/page.html
index e64d8da..507ee17 100644
--- a/ckanext/ukdstheme/templates/page.html
+++ b/ckanext/ukdstheme/templates/page.html
@@ -3,7 +3,7 @@
 {%- block page -%}
 
   {% block skip %}
-    <div class="sr-only sr-only-focusable"><a href="#content">{{ _('Skip over header') }}</a><a href="#mainblock">{{ _('Skip to main section') }}</a></div>
+    <div class="visually-hidden-focusable"><a href="#content">{{ _('Skip to main content') }}</a></div>
   {% endblock %}
 
   {#
@@ -23,8 +23,8 @@
           {% block flash %}
             <div class="flash-messages">
               {% block flash_inner %}
-                {% for message in h.get_flashed_messages() | list %}
-                  <div class="alert fade in {{ message.category }}">
+                {% for category, message in h.get_flashed_messages(with_categories=true) %}
+                  <div class="alert alert-dismissible fade show {{ category }}">
                     {{ h.literal(message) }}
                   </div>
                 {% endfor %}
@@ -54,7 +54,7 @@
             {% endblock %}
 
             {% block secondary %}
-              <aside class="secondary col-sm-3">
+              <aside class="secondary col-md-3">
                 {#
                 The secondary_content block can be used to add content to the
                 sidebar of the page. This is the main block that is likely to be
@@ -72,7 +72,7 @@ <h2>A sidebar item</h2>
             {% endblock %}
 
             {% block primary %}
-              <div class="primary col-sm-9 col-xs-12" role="main" id="mainblock">
+              <div class="primary col-md-9 col-xs-12" role="main">
                 {#
                 The primary_content block can be used to add content to the page.
                 This is the main block that is likely to be used within a template.