Skip to content

Commit

Permalink
Merge f10524e into e9fd6b3
Browse files Browse the repository at this point in the history
  • Loading branch information
yannickkuypers committed Nov 29, 2021
2 parents e9fd6b3 + f10524e commit abe8cb3
Show file tree
Hide file tree
Showing 9 changed files with 205 additions and 9 deletions.
43 changes: 43 additions & 0 deletions atramhasis/static/css/app.css
Expand Up @@ -14077,3 +14077,46 @@ ul.downloadtop {
word-break: break-word;
}
}
@media only screen and (max-device-width: 640px) {
/* Styles */
/* line 6, ../scss/atramhasis/_oe-cookie-banner.scss */
.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 {
padding-left: 1.8em !important;
padding-right: 1.8em !important;
}
}
/* line 12, ../scss/atramhasis/_oe-cookie-banner.scss */
.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 {
flex-wrap: wrap;
padding-right: 20%;
padding-left: 20%;
justify-content: center;
border-top: solid 2px #914f9a;
box-shadow: 0 -2px 2px 0px rgba(2, 23, 16, 0.1);
font-size: 15px;
}

/* line 22, ../scss/atramhasis/_oe-cookie-banner.scss */
.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 a {
text-decoration: underline;
color: #0075DB;
font-weight: 400;
font-size: 15px;
}

/* line 29, ../scss/atramhasis/_oe-cookie-banner.scss */
.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 a:hover {
text-decoration: none;
}

/* line 33, ../scss/atramhasis/_oe-cookie-banner.scss */
.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 a.cc-btn.cc-allow {
text-decoration: none !important;
color: #fff !important;
margin-left: 1rem;
}

/* line 39, ../scss/atramhasis/_oe-cookie-banner.scss */
span#cookieconsent:desc {
margin-bottom: 0.5rem;
}
3 changes: 2 additions & 1 deletion atramhasis/static/scss/app.scss
Expand Up @@ -9,4 +9,5 @@
@import "atramhasis/atramhasis-icons";
@import "atramhasis/atramhasis-article";
//@import "atramhasis/atramhasis-topbar";
@import "atramhasis/atramhasis-mquery";
@import "atramhasis/atramhasis-mquery";
@import "atramhasis/oe-cookie-banner";
41 changes: 41 additions & 0 deletions atramhasis/static/scss/atramhasis/_oe-cookie-banner.scss
@@ -0,0 +1,41 @@
@charset "UTF-8";

@media only screen and (max-device-width: 640px) {

/* Styles */
.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 {
padding-left: 1.8em !important;
padding-right: 1.8em !important
}
}

.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 {
flex-wrap: wrap;
padding-right: 20%;
padding-left: 20%;
justify-content: center;
border-top: solid 2px #914f9a;
box-shadow: 0 -2px 2px 0px rgba(2, 23, 16, 0.1);
font-size: 15px;
}

.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 a {
text-decoration: underline;
color: #0075DB;
font-weight: 400;
font-size: 15px;
}

.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 a:hover {
text-decoration: none;
}

.cc-window.cc-banner.cc-type-opt-out.cc-theme-classic.cc-bottom.cc-color-override-1025685691 a.cc-btn.cc-allow {
text-decoration: none !important;
color: #fff !important;
margin-left: 1rem;
}

span#cookieconsent:desc {
margin-bottom: 0.5rem;
}
4 changes: 4 additions & 0 deletions atramhasis/templates/admin.jinja2
@@ -1,4 +1,6 @@
{% set app_package = app_package|default('atramhasis', true) -%}
{% set plausible_data_domain = request.registry.settings["plausible.data_domain"] %}
{% set plausible_omgeving = request.registry.settings["plausible.omgeving"] %}
{% if request.registry.settings['dojo.mode'] == 'dist' %}
{% set release_dir = app_package + ':static/admin/dist' %}
{% set modules_dir = app_package + ':static/admin/dist' %}
Expand All @@ -20,6 +22,8 @@
{{ ga_tracker(ga_key) }}
{% endif %}
{% endblock %}
{% from 'macros.jinja2' import add_plausible_code %}
{{add_plausible_code(plausible_data_domain, plausible_omgeving)}}
</head>

<body class="claro">
Expand Down
12 changes: 12 additions & 0 deletions atramhasis/templates/home.jinja2
Expand Up @@ -33,5 +33,17 @@
{% endwith %}
{% endblock %}

{% block cookiebanner %}
{% set ga_key = ga_key|default(request.registry.settings["ga.tracker_key"]) %}
{% set show_cookie_banner = show_cookie_banner|default(request.registry.settings["cookie_banner"]) %}
{% if show_cookie_banner == 'True' %}
{% from 'macros.jinja2' import cookie_banner %}
{{ cookie_banner(request, app_package, ga_key) }}
{% else %}
{% from 'macros.jinja2' import ga_tracker %}
{{ ga_tracker(ga_key) }}
{% endif %}
{% endblock %}

{% block custom_js %}{% endblock %}

2 changes: 1 addition & 1 deletion atramhasis/templates/layout.jinja2
@@ -1,3 +1,3 @@
{% extends "staticlayout-page.jinja2" %}

{% set copyright_year = '2014-2020' %}
{% set copyright_year = '2014-2021' %}
70 changes: 70 additions & 0 deletions atramhasis/templates/macros.jinja2
Expand Up @@ -158,3 +158,73 @@
{% endif %}
{% endfor %}
{% endmacro %}

{% macro plausible_tracker(plausible_data_domain, omgeving) %}
<!-- Plausible Analytics -->
<script async defer data-domain="{{ plausible_data_domain }}" src="https://{{ omgeving }}webstats.onroerenderfgoed.be/js/plausible.js"></script>
<!-- End Plausible Analytics -->
{% endmacro %}

{% macro add_plausible_code(plausible_data_domain, plausible_omgeving) %}
{% if plausible_omgeving in ('dev', 'test') %}
{% set omgeving = plausible_omgeving + '-' %}
{% else %}
{% set omgeving = '' %}
{% endif %}
{% if plausible_data_domain %}
{{ plausible_tracker(plausible_data_domain, omgeving) }}
{% endif %}
{% endmacro %}

{% macro cookie_banner(request, app_package, ga_key) %}
<link rel="stylesheet" href="{{ request.static_path(app_package + ':static/node_modules/cookieconsent/build/cookieconsent.min.css') }}" />
<link rel="stylesheet" href="{{ request.static_path(app_package + ':static/css/app.css') }}" />
<script type="text/javascript" src="{{ request.static_path(app_package + ':static/node_modules/cookieconsent/build/cookieconsent.min.js') }}"></script>

<script type="text/javascript">
var ga_key = "{{ga_key}}";
window.cookieconsent.initialise({
container: document.getElementById("content"),
palette: {
popup: {
background: "#fff"
},
button: {
background: "#aa6ab2",
text: "#fff"
}
},
theme: "classic",
type: "opt-out",
content: {
message: "Het agentschap Onroerend Erfgoed gebruikt cookies zodat de goede werking van zijn websites verzekerd is en jouw surfervaring verbetert. " +
"Meer informatie over de cookies die we gebruiken lees je in <a href=https://www.onroerenderfgoed.be/cookiebeleid>ons cookiebeleid</a>. " +
"Op deze website gebruiken we alleen functionele en analytische cookies. Voor het gebruik van analytische cookies hebben wij jouw toestemming nodig. " +
"Cookies geven een beter inzicht in het functioneren van onze websites. Ga je hiermee akkoord?",
deny: "Nee, ga verder naar de website",
allow: "Ja, ik geef toestemming"
},
revokable: true,
onStatusChange: function () {
if (this.hasConsented()) {
// Google Analytics
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', ga_key, 'auto');
ga('set', 'anonymizeIp', true);
ga('send', 'pageview');
} else {
window['ga-disable-' + ga_key] = true;
}
},
law: {
regionalLaw: false,
},
location: true,
showLink: false
});
</script>
{% endmacro %}
16 changes: 16 additions & 0 deletions atramhasis/templates/staticlayout-page.jinja2
Expand Up @@ -3,6 +3,20 @@
{% set app_name = app_name|default('Atramhasis') %}
{% set copyright_year = copyright_year|default('2014-2020') %}

{% block plausible %}
{% set plausible_data_domain = plausible_data_domain|default(request.registry.settings["plausible.data_domain"]) %}
{% set plausible_omgeving = plausible_omgeving|default('dev') %}
{% if plausible_omgeving in ('dev', 'test') %}
{% set omgeving = plausible_omgeving + '-' %}
{% else %}
{% set omgeving = '' %}
{% endif %}
{% if plausible_data_domain %}
{% from 'macros.jinja2' import plausible_tracker %}
{{ plausible_tracker(plausible_data_domain, omgeving) }}
{% endif %}
{% endblock %}

{% block js_files_head %}
<script src="{{ request.static_path(app_package + ':static/node_modules/foundation-sites/js/vendor/jquery.js') }}"></script>
<script src="{{ request.static_path(app_package + ':static/node_modules/foundation-sites/js/vendor/jquery.cookie.js') }}"></script>
Expand All @@ -26,4 +40,6 @@
{% endwith %}
{% endblock %}

{% block cookiebanner %}{% endblock %}

{% block custom_js %}{% endblock %}
23 changes: 16 additions & 7 deletions atramhasis/templates/staticlayout.jinja2
Expand Up @@ -4,8 +4,9 @@

{% set app_package = app_package|default('atramhasis', true) -%}
{% set app_name = app_name|default('Atramhasis') %}
{% set copyright_year = copyright_year|default('2014-2020') %}

{% set copyright_year = copyright_year|default('2014-2021') %}
{% set plausible_data_domain = request.registry.settings["plausible.data_domain"] %}
{% set plausible_omgeving = request.registry.settings["plausible.omgeving"] %}
<head>
{% block head %}
<meta charset="utf-8" />
Expand All @@ -29,11 +30,17 @@
<script src="{{ request.static_path(app_package + ':static/node_modules/foundation-sites/js/vendor/jquery.cookie.js') }}"></script>
{% endblock %}

{% block ga %}
{% set ga_key = ga_key|default(request.registry.settings["ga.tracker_key"]) %}
{% from 'macros.jinja2' import ga_tracker %}
{% if ga_key %}
{{ ga_tracker(ga_key) }}
{% block plausible %}
{% set plausible_data_domain = plausible_data_domain|default(request.registry.settings["plausible.data_domain"]) %}
{% set plausible_omgeving = plausible_omgeving|default('dev') %}
{% if plausible_omgeving in ('dev', 'test') %}
{% set omgeving = plausible_omgeving + '-' %}
{% else %}
{% set omgeving = '' %}
{% endif %}
{% if plausible_data_domain %}
{% from 'macros.jinja2' import plausible_tracker %}
{{ plausible_tracker(plausible_data_domain, omgeving) }}
{% endif %}
{% endblock %}
{% endblock %}
Expand Down Expand Up @@ -63,6 +70,8 @@
{% block vl_footer %}
{% endblock %}

{% block cookiebanner %}{% endblock %}

{% block custom_js %}{% endblock %}
</body>
</html>

0 comments on commit abe8cb3

Please sign in to comment.