From 13a3a85880bdd6a7f3e0742f05ff636aba141e98 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 15 May 2018 12:04:15 +0200 Subject: [PATCH] add cookies banner, refactor whole GA loading flow --- _src/_assets/javascripts/bigchain.js | 5 +- _src/_includes/cookie-banner.html | 6 ++ _src/_includes/scripts.html | 129 +++++++++++---------------- _src/_layouts/base.html | 2 + package.json | 1 + 5 files changed, 61 insertions(+), 82 deletions(-) create mode 100644 _src/_includes/cookie-banner.html diff --git a/_src/_assets/javascripts/bigchain.js b/_src/_assets/javascripts/bigchain.js index b4c46d1..f7c16f1 100644 --- a/_src/_assets/javascripts/bigchain.js +++ b/_src/_assets/javascripts/bigchain.js @@ -2,6 +2,7 @@ //=include svg4everybody/dist/svg4everybody.js //=include jquery/dist/jquery.js //=include smooth-scroll/dist/js/smooth-scroll.js +//=include cookies-eu-banner/dist/cookies-eu-banner.js //=include bigchain/analytics.js //=include bigchain/dnt.js @@ -15,10 +16,6 @@ jQuery(function($) { // Forms.init() - if (!_dntEnabled()) { - GoogleAnalytics.init(); - } - // // init Smooth Scroll diff --git a/_src/_includes/cookie-banner.html b/_src/_includes/cookie-banner.html new file mode 100644 index 0000000..7eca46f --- /dev/null +++ b/_src/_includes/cookie-banner.html @@ -0,0 +1,6 @@ + diff --git a/_src/_includes/scripts.html b/_src/_includes/scripts.html index 860b721..c2d407f 100644 --- a/_src/_includes/scripts.html +++ b/_src/_includes/scripts.html @@ -1,17 +1,11 @@ - - - - -{% if page.js %} - -{% elsif layout.js %} - -{% endif %} + {% if page.js %} + {% elsif layout.js %} + {% endif %} - -{% if jekyll.environment == "production" %} - -{% else %} - -{% endif%} - - - -{% if page.comments %} - - -{% endif %} diff --git a/_src/_layouts/base.html b/_src/_layouts/base.html index 7a046a5..25f04d9 100644 --- a/_src/_layouts/base.html +++ b/_src/_layouts/base.html @@ -19,6 +19,8 @@ {% include footer.html %} + {% include cookie-banner.html %} + {% include scripts.html %} diff --git a/package.json b/package.json index 6b2c739..d30088f 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "bigchaindb-driver": "^4.0.0", "bootstrap": "^4.1.0", "clipboard": "^2.0.0", + "cookies-eu-banner": "^1.2.10", "gumshoe": "github:cferdinandi/gumshoe", "is-in-viewport": "^3.0.0", "jquery": "^3.3.1",