Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

various changes #29

Merged
merged 5 commits into from
Dec 20, 2024
+7 −6
Merged

various changes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d22624a
Update plugin.py
daveytyke Dec 20, 2024
3387d54
Update header.html
daveytyke Dec 20, 2024
e64a634
Update base.html
daveytyke Dec 20, 2024
eae80d5
Update base.html
daveytyke Dec 20, 2024
e0c5a4f
Update page.html
daveytyke Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ckanext/ukdstheme/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 5 additions & 1 deletion ckanext/ukdstheme/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
2 changes: 1 addition & 1 deletion ckanext/ukdstheme/templates/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
3 changes: 0 additions & 3 deletions ckanext/ukdstheme/templates/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Loading