Merge pull request #29 from daveytyke/main

various changes
JiscSD · Dec 20, 2024 · 5954a7f · 5954a7f
2 parents 67eb647 + e0c5a4f
commit 5954a7f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/ckanext/ukdstheme/plugin.py b/ckanext/ukdstheme/plugin.py
@@ -24,7 +24,7 @@ def update_config(self, config):
         toolkit.add_template_directory(config, 'templates')
         toolkit.add_public_directory(config, 'public')
         toolkit.add_resource('assets', 'ukdstheme')
-        toolkit.add_resource('assets', 'civic')
+        toolkit.add_resource('assets', 'cookie-banner-js')
 
     # ITemplateHelpers
 

diff --git a/ckanext/ukdstheme/templates/base.html b/ckanext/ukdstheme/templates/base.html
@@ -4,5 +4,9 @@
 {% block custom_styles %}
   {{ super() }}
   <link rel="stylesheet" href="/bg-{{bg_image_no}}.css" /> 
-{% endblock %}
 
+{% endblock %}
+{% block cookie_banner %}
+      <script src="https://cc.cdn.civiccomputing.com/9/cookieControl-9.x.min.js"></script>
+      {% asset 'ukdstheme/cookie-banner-js' %}
+{% endblock %}
diff --git a/ckanext/ukdstheme/templates/header.html b/ckanext/ukdstheme/templates/header.html
@@ -1,5 +1,5 @@
 {% ckan_extends %}
     {% block header_content %}
       <script src="https://cc.cdn.civiccomputing.com/9/cookieControl-9.x.min.js"></script>
-      {% asset 'ukdstheme/cookie-banner-js' %}
+
     {% endblock %}
diff --git a/ckanext/ukdstheme/templates/page.html b/ckanext/ukdstheme/templates/page.html
@@ -11,9 +11,6 @@
   making sitewide header changes it is preferable to override the header.html
   file.
   #}
-  {%- block footer %}
-    {% include "header.html" %}
-  {% endblock -%}
 
   {# The content block allows you to replace the content of the page if needed #}
   {%- block content %}