diff --git a/ckanext/ukdstheme/plugin.py b/ckanext/ukdstheme/plugin.py index d053556..8921ef3 100644 --- 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 index c6f83fc..9bb6927 100644 --- a/ckanext/ukdstheme/templates/base.html +++ b/ckanext/ukdstheme/templates/base.html @@ -4,5 +4,9 @@ {% block custom_styles %} {{ super() }} -{% endblock %} +{% endblock %} +{% block cookie_banner %} + + {% asset 'ukdstheme/cookie-banner-js' %} +{% endblock %} diff --git a/ckanext/ukdstheme/templates/header.html b/ckanext/ukdstheme/templates/header.html index 737f8e5..2a68c3c 100644 --- a/ckanext/ukdstheme/templates/header.html +++ b/ckanext/ukdstheme/templates/header.html @@ -1,5 +1,5 @@ {% ckan_extends %} {% block header_content %} - {% asset 'ukdstheme/cookie-banner-js' %} + {% endblock %} diff --git a/ckanext/ukdstheme/templates/page.html b/ckanext/ukdstheme/templates/page.html index e1fadfe..eec0664 100644 --- 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 %}