j1-template 2021.1.4 → 2021.1.5

data/assets/themes/j1/modules/util/js/gtag-opt-in.js

@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.GTagOptIn=t():e.GTagOptIn=t()}(window,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";n.r(t),n.d(t,"register",(function(){return i})),n.d(t,"optIn",(function(){return f})),n.d(t,"optOut",(function(){return a}));let r=!1,o=void 0;const i=e=>{u(e),o=e},u=e=>{if(!e)throw new Error("gtag-opt-in: invalid value passed to `register` method. Make sure to use a valid Analytics ID.")},a=()=>{d(),window["ga-disable-"+o]=!0},f=()=>{d(),c(),window["ga-disable-"+o]=!1},d=()=>{if(!o)throw new Error("gtag-opt-in: no value found for Analytics ID. Make sure to register before by calling the `register` method.")},c=()=>{r||(l(),r=!0)},l=()=>{const e=s();p(e)},s=()=>(window.dataLayer=window.dataLayer||[],function(){dataLayer.push(arguments)}),p=e=>{e("js",new Date),e("config",o,{anonymize_ip:!0})}}])}));

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
-module J1
-  VERSION = '2021.1.4'
-end
+module J1
+  VERSION = '2021.1.5'
+end

data/lib/starter_web/Gemfile

@@ -54,7 +54,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2021.1.4'
+gem 'j1-template', '~> 2021.1.5'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            production
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2021.1.4
+version:                                2021.1.5
 
 # version
 # ------------------------------------------------------------------------------
@@ -520,6 +520,7 @@ whitelist:
 # EXCERPT settings
 #
 excerpt_separator:                      excerpt__end
+excerpt_truncate_words:                 100
 
 # ------------------------------------------------------------------------------
 # COLLECTION settings

data/lib/starter_web/_data/_defaults/resources.yml

@@ -549,13 +549,13 @@ resources:
         init_function:                  [ j1.adapter.back2top.init ]
 
   # ----------------------------------------------------------------------------
-  # CookieBar
+  #  GDPR compatible Cookie Consent for J1 Template
   #
-  - name:                               CookieBar
+  - name:                               J1 CookieConsent
     resource:
-      id:                               cookiebar
+      id:                               cookieConsent
       enabled:                          true
-      comment:                          module cookiebar
+      comment:                          module cookieConsent
       region:                           head
       layout:                           [ all ]
       required:                         always
@@ -565,9 +565,9 @@ resources:
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ adapter/js/cookiebar.js ]
-        js:                             []
-        init_function:                  [ j1.adapter.cookiebar.init ]
+        files:                          [ adapter/js/cookieConsent.js ]
+        js:                             [ modules/cookieConsent/js/cookieConsent ]
+        init_function:                  [ j1.adapter.cookieConsent.init ]
 
   # ----------------------------------------------------------------------------
   # jqMouseWheel, jQuery plugin to add cross-browser mouse wheel support
@@ -1170,7 +1170,10 @@ resources:
       enabled:                          true
       comment:                          Floating Button Menu
       region:                           head
-      layout:                           [ home, page, post, collection ]        # TODO: check if FAM makes sense for layout app
+      layout:                           [                                       # TODO: check if FAM makes sense for layout app
+                                          home, page, post, collection,
+                                          blog_archive
+                                        ]
       required:                         always
       preload:                          false                                   # property currently unused
       script_load:                      sync

data/lib/starter_web/_data/modules/{cookiebar.yml → cookieconsent.yml}

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
-#  ~/_data/modules/j1_cookiebar.yml
-#  User configuration settings for J1 Cookiebar module
+#  ~/_data/modules/j1_cookieconsent.yml
+#  User configuration settings for J1 Cookie Consent module
 #
 #  Product/Info:
 #  https://jekyll.one
@@ -16,9 +16,9 @@
 #
 description:
 
-  title:                                Cookiebar
+  title:                                CookieConsent
   scope:                                User settings
-  location:                             _data/modules/cookiebar.yml
+  location:                             _data/modules/cookieconsent.yml
 
 # ------------------------------------------------------------------------------
 # User configuration settings

data/lib/starter_web/_data/modules/defaults/cookieconsent.yml

@@ -0,0 +1,135 @@
+# ------------------------------------------------------------------------------
+#  ~/_data/modules/defaults/cookieconsent.yml
+#  Default configuration settings for J1 Cookie Consent module
+#
+#  Product/Info:
+#  https://jekyll.one
+#
+#  Copyright (C) 2021 Juergen Adams
+#
+#  J1 Template is licensed under the MIT License.
+#  See: https://github.com/jekyll-one/J1 Template/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# About this configuration (used for J1 CC only)
+#
+about_config:
+  title:                                CookieConsent
+  scope:                                Default settings
+  location:                             _data/modules/defaults/cookieconsent.yml
+
+# ------------------------------------------------------------------------------
+# Default settings
+#
+defaults:
+
+  enabled:                              false
+
+  autoShowDialog:                       true                                    # disable autoShowModal on the privacy policy and legal notice pages, to make these pages readable
+  language:                             en                                      # the language, in which the modal is shown. Default navigator.language
+  languages:                            [en, de]                                # supported languages, defaults to first language in array (en)
+  contentURL:                           /assets/data/cookieconsent              # this URL must contain the dialogs content in the needed languages
+  cookieName:                           j1.user.consent                         # the name of the cookie in which the configuration is stored as JSON
+  cookieStorageDays:                    365                                     # the duration the cookie configuration is stored on the client
+
+  reloadPageOnChange:                   false                                   # reload current page if any user settings has been changed
+  xhr_data_element:                     consent-data                            # container for the language-specific consent modal taken from /assets/data/cookieconsent.html
+  whitelisted:                          [ "/pages/public/legal/en/privacy" ]    # pages no consent issued
+
+  consent_modal_title:
+    de:                                 Ihre Privatsphäre
+    en:                                 Your Privacy
+
+  body_text:
+    en: >
+                                        This website is using cookies and similar technologies that
+                                        are required for operation. You are free to decide to give,
+                                        refuse or withdraw your consent at any time by clicking
+                                        the <code>My Settings</code> button. Subsequent changes are
+                                        possible at any time by clicking on the <code>cookie icon</code>
+                                        in the menu bar.
+                                        <br><br>
+                                        Extended cookies are only used with your consent. Additional
+                                        cookies are used to analyze the usage of this website.
+                                        Analysis of the use of this website help gives you a better
+                                        user experience of the website to offer. More information
+                                        about what data is collected and how they may be passed on
+                                        to partners can be found in the <code>Privacy Policy</code>.
+                                        <br><br>
+                                        Visiting this website, you consent to the use of by clicking the
+                                        <code>I agree</code> button.
+    de: >
+                                        Diese Website nutzt Cookies und ähnliche Technologien, die
+                                        zum Betrieb erforderlich sind. Es steht Ihnen frei, Ihre
+                                        Zustimmung jederzeit zu geben, zu verweigern oder zurückzuziehen,
+                                        indem Sie auf die Schaltfläche <code>Meine Einstellungen</code>
+                                        klicken. Nachträgliche Änderungen sind jederzeit möglich, indem Sie
+                                        auf das <code>Cookie-Icon</code> in der Menüleiste klicken.
+                                        <br><br>
+                                        Erweiterte Cookies werden nur mit Ihrer Zustimmung verwendet.
+                                        Zusätzliche Cookies werden eingesetzt, um Analysen der Nutzung
+                                        dieser Website durchzuführen. Analysen der Nutzung dieser Website
+                                        helfen dabei, Ihnen ein besseres Nutzungserlebnis der Website
+                                        zu bieten. Weitere Informationen welche Daten gesammelt und
+                                        wie sie ggf. an Partner weitergegeben werden finden Sie in der
+                                        <code>Datenschutzerklärung</code>.
+                                        <br><br>
+                                        Für den Besuch dieser Webseite stimmen Sie der Verwendung zu,
+                                        indem Sie auf die Schaltfläche <code>Einverstanden</code> klicken.
+
+  privacy_notice:
+    en: >
+                                        The operators of this website take the protection of your personal data
+                                        seriously. We treat your data confidential and comply with the
+                                        General Data Protection Regulation (GDPR) of the European Union to
+                                        protect your privacy.
+                                        A small set of data is stored in persistent cookies, e.g. what data
+                                        you agree to be stored in cookies. Persistent cookies have a lifespan
+                                        of 365 days (a year). We and our partners make use of persistent cookies.
+                                        Those additional cookies are only used with your consent.
+                                        <br><br>
+                                        <code>Necessary</code> data is stored to run base services of this site.
+                                        This website is based on static content, and no database is used behind it.
+                                        All information (data) needed to control this site is stored in
+                                        so-called session cookies. Session cookies are automatically removed by your
+                                        browser if you close all windows.
+                                        <br><br>
+                                        <code>Analysis</code> of the use of this website helps us to optimize your
+                                        user experience of the website. For analysis, Google Analytics (GA) is used.
+                                        This website does <b>not</b> transfer any personal data to GA. Implicit
+                                        personal information, like IP addresses, is anonymized to protect your privacy.
+                                        <br><br>
+                                        <code>Personalization</code> is used e.g. to collect user feedback or running
+                                        advertising campaigns to provide you a website free of charge. Partners like
+                                        Disqus or Google enables us to provide you excellent personalized services and
+                                        enables us to finance the costs for running this site.
+    de: >
+                                        Die Betreiber dieser Website nehmen den Schutz Ihrer persönlichen Daten ernst.
+                                        Wir behandeln Ihre Daten vertraulich und halten uns zum Schutz Ihrer Privatsphäre
+                                        an die Datenschutz-Grundverordnung (DSGVO) der Europäischen Union. In persistenten
+                                        Cookies wird ein kleiner Datensatz gespeichert, z.B. mit welchen Daten Sie
+                                        einverstanden sind, in Cookies gespeichert zu werden. Dauerhafte Cookies haben
+                                        eine Lebensdauer von 365 Tagen (ein Jahr). Wir und unsere Partner verwenden
+                                        dauerhafte Cookies. Diese zusätzlichen Cookies werden nur mit Ihrer Zustimmung
+                                        verwendet.
+                                        <br><br>
+                                        <code>Notwendige</code> Daten werden gespeichert, um Basisdienste dieser Site zu
+                                        betreiben. Diese Website basiert auf statischen Inhalten und es wird keine
+                                        Datenbank dahinter verwendet. Alle Informationen (Daten), die zur Steuerung dieser
+                                        Seite benötigt werden, werden in sogenannten Session-Cookies gespeichert. Sitzungscookies
+                                        werden von Ihrem Browser automatisch entfernt, wenn Sie alle Fenster schließen.
+                                        <br><br>
+                                        <code>Analysen</code> der Nutzung dieser Website hilft uns, Ihr Nutzungserlebnis der
+                                        Website zu optimieren. Zur Analyse wird Google Analytics (GA) verwendet. Diese Website
+                                        übermittelt keine personenbezogenen Daten an GA. Implizite personenbezogene Daten wie
+                                        IP-Adressen werden zum Schutz Ihrer Privatsphäre anonymisiert.
+                                        <br><br>
+                                        <code>Personalisierung</code> wird z.B. um Benutzerfeedback zu sammeln oder
+                                        Werbekampagnen durchzuführen, um Ihnen eine Website kostenlos zur Verfügung zu
+                                        stellen. Partner wie Disqus oder Google ermöglichen es uns, Ihnen exzellente
+                                        personalisierte Dienste anzubieten und die Kosten für den Betrieb dieser Website
+                                        zu finanzieren.
+
+# ------------------------------------------------------------------------------
+# END config

data/lib/starter_web/_data/pages/builder.yml

@@ -75,13 +75,13 @@ generators:
       title:                        Mansonry grid layout of Justified Gallery
       tagline:
 
-        css:                        [
-                                      {
-                                        local:  "modules/cookiebar/css/cookiebar",
-                                        remote: "https://cdnjs.cloudflare.com/ajax/libs/jquery-cookiebar/1.0.5/jquery.cookiebar"
-                                      }
-                                    ]
+        # css:                        [
+        #                               {
+        #                                 local:  "modules/cookiebar/css/cookiebar",
+        #                                 remote: "https://cdnjs.cloudflare.com/ajax/libs/jquery-cookiebar/1.0.5/jquery.cookiebar"
+        #                               }
+        #                             ]
 
 
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/private.yml

@@ -64,8 +64,8 @@ util_srv:
       strategy:                       members
       members:                        all
 
-    site_url:                         http://localhost:40010
-    site_redirect_url:                http://localhost:40010/auth/github/callback
+    site_url:                         http://localhost:41010
+    site_redirect_url:                http://localhost:41010/auth/github/callback
     client_scope:                     repo, user
     client_id:                        <your-client-id>
     client_secret:                    <your-client-secret>
@@ -91,8 +91,8 @@ middleware:
         name:                           <your-disqus-config-name>
         user:                           <your-disqus-user>
 
-      client_url:                       http://localhost:40010
-      client_redirect_url:              http://localhost:40010/auth/disqus/callback
+      client_url:                       http://localhost:41010
+      client_redirect_url:              http://localhost:41010/auth/disqus/callback
       client_id:                        <your-disqus-client-id>
       client_secret:                    <your-disqus-client-secret>
 
@@ -110,8 +110,8 @@ middleware:
         strategy:                       members
         members:                        all
 
-      client_url:                       http://localhost:40010
-      client_redirect_url:              http://localhost:40010/auth/github/callback
+      client_url:                       http://localhost:41010
+      client_redirect_url:              http://localhost:41010/auth/github/callback
       client_id:                        <your-gh-client-id>
       client_secret:                    <your-gh-client-secret>
 

data/lib/starter_web/_data/resources.yml

@@ -365,6 +365,8 @@ resources:
                                           modules/util/js/js.cookie.js,
                                           modules/util/js/lite-url.js,
                                           modules/util/js/platform.js,
+                                          modules/util/js/domready.js,
+                                          modules/util/js/gtag-opt-in.js,
                                           adapter/js/j1.js
                                         ]
         js:                             [
@@ -549,13 +551,13 @@ resources:
         init_function:                  [ j1.adapter.back2top.init ]
 
   # ----------------------------------------------------------------------------
-  # CookieBar
+  #  GDPR compatible Cookie Consent for J1 Template
   #
-  - name:                               CookieBar
+  - name:                               J1 CookieConsent
     resource:
-      id:                               cookiebar
+      id:                               cookieConsent
       enabled:                          true
-      comment:                          module cookiebar
+      comment:                          module cookieConsent
       region:                           head
       layout:                           [ all ]
       required:                         always
@@ -565,9 +567,9 @@ resources:
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ adapter/js/cookiebar.js ]
-        js:                             []
-        init_function:                  [ j1.adapter.cookiebar.init ]
+        files:                          [ adapter/js/cookieConsent.js ]
+        js:                             [ modules/cookieConsent/js/cookieConsent ]
+        init_function:                  [ j1.adapter.cookieConsent.init ]
 
   # ----------------------------------------------------------------------------
   # jqMouseWheel, jQuery plugin to add cross-browser mouse wheel support

data/lib/starter_web/_includes/attributes.asciidoc

@@ -113,6 +113,9 @@ tag::urls[]
 
 :url-execjs--gh-repo:                             https://github.com/rails/execjs
 
+:url-facebook--privacy-policy-en:                 https://www.facebook.com/policy.php
+:url-facebook--privacy-policy-de:                 https://de-de.facebook.com/policy.php
+
 :url-filamentgroup--home:                         https://www.filamentgroup.com/
 
 :url-fontawesome--home:                           https://fontawesome.com/
@@ -137,6 +140,8 @@ tag::urls[]
 :url-gdpr-eu--home:                               https://gdpr.eu/
 
 :url-google-material-design-icons--gh-repo:       https://github.com/google/material-design-icons
+:url-google--deactivate-ga-en:                    http://tools.google.com/dlpage/gaoptout?hl=en
+:url-google--privacy-policy-en:                   https://www.google.de/intl/en/policies/privacy
 
 :url-heroku--home:                                https://www.heroku.com/home
 
@@ -145,6 +150,8 @@ tag::urls[]
 :url-iconify--medical-icons:                      https://iconify.design/icon-sets/medical-icon/
 :url-iconify--brand-icons:                        https://iconify.design/icon-sets/logos/
 
+:url-instagram--privacy-policy:                   http://instagram.com/about/legal/privacy/
+
 :url-iframe-resizer--gh-repo:                     https://github.com/davidjbradshaw/iframe-resizer
 
 :url-j1--home:                                    https://jekyll.one/
@@ -304,6 +311,8 @@ tag::urls[]
 
 :url-twitter-emoji--gh-repo:                      https://github.com/twitter/twemoji
 :url-twitter-emoji-picker--gh-repo:               https://github.com/xLs51/Twemoji-Picker
+:url-twitter--privacy-en:                         https://twitter.com/en/privacy
+:url-twitter--login:                              https://twitter.com/login
 
 :url-uglifier--gh-repo:                           https://github.com/lautis/uglifier
 
@@ -403,7 +412,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2021.1.4
+:j1--version:                                     2021.1.5
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/lunr_index.rb

@@ -360,6 +360,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2021.1.4'
+    VERSION = '2021.1.5'
   end
 end

data/lib/starter_web/collections/posts/public/featured/_posts/2020-01-01-about-cookies.adoc

@@ -5,7 +5,7 @@ tagline:                                good to know
 categories:                             [ Featured, Post ]
 tags:                                   [ Cookies ]
 
-image:                                  /assets/images/modules/attics/cookies-1920x1200-bw.jpg
+image:                                  /assets/images/modules/attics/cookies-1920x1200.jpg
 
 regenerate:                             false
 
@@ -16,7 +16,7 @@ resource_options:
       padding_bottom:                   50
       opacity:                          0.5
       slides:
-        - url:                          /assets/images/modules/attics/cookies-1920x1200-bw.jpg
+        - url:                          /assets/images/modules/attics/cookies-1920x1200.jpg
           alt:                          Photo by Miroslava on Unsplash
 #         caption:
 #           text:                       Photo by Miroslava on Unsplash

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2021.1.4",
+  "version": "2021.1.5",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/pages/public/cookieConsent.adoc

@@ -0,0 +1,93 @@
+---
+title:                                  J1
+tagline:                                Cookie Consent
+date:                                   2021-06-24 00:00:00 +100
+description: >
+                                        Bootstrap Cookie Consent Module
+                                        for J1 Template
+
+categories:                             [ Software ]
+tags:                                   [ Cookie, Consent ]
+
+scrollbar:                              false
+fam_menu_id:                            default
+
+permalink:                              /pages/public/cookieConsent/
+regenerate:                             true
+
+resources:                              [ bsCookieConsent ]
+resource_options:
+  - attic:
+      padding_top:                      400
+      padding_bottom:                   50
+      opacity:                          0.5
+      slides:
+        - url:                          /assets/images/modules/attics/cookies-1920x1200.jpg
+---
+
+// Page Initializer
+// =============================================================================
+// Enable the Liquid Preprocessor
+:page-liquid:
+
+// Set (local) page attributes here
+// -----------------------------------------------------------------------------
+// :page--attr:                         <attr-value>
+:badges-enabled:                        false
+
+//  Load Liquid procedures
+// -----------------------------------------------------------------------------
+{% capture load_attributes %}themes/{{site.template.name}}/procedures/global/attributes_loader.proc{%endcapture%}
+
+// Load page attributes
+// -----------------------------------------------------------------------------
+{% include {{load_attributes}} scope="global" %}
+
+
+// Page content
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+++++
+<div class="container">
+  <h2>Usage</h2>
+  <p>Initialize the cookie consent framework with the constructor</p>
+  <p><code>var cookieSettings = new BootstrapCookieConsent()</code></p>
+  <h3>Show the Dialog</h3>
+  <p>
+    On a new visit the dialog is shown automatically. For reconfiguration
+    show the Dialog again with <code>cookieSettings.showDialog()</code>.
+  </p>
+  <p>
+    <a href="javascript:showSettingsDialog()" class="btn btn-primary btn-raised">Cookie Settings</a>
+  </p>
+  <h2>Read the settings</h2>
+  <p>Read all cookie settings with <code>cookieSettings.getSettings()</code></p>
+  <div class="card mb-4">
+    <div class="card-body">
+      <pre class="mb-0" id="settingsOutput"></pre>
+    </div>
+  </div>
+  <p>Read a specific cookie setting with <code>cookieSettings.getSettings('analyses')</code></p>
+  <div class="card">
+    <div class="card-body">
+      <pre class="mb-0" id="settingsAnalysisOutput"></pre>
+    </div>
+  </div>
+</div>
+
+<script>
+
+    function showSettingsDialog() {
+      j1.cookieConsent.showDialog();
+    }
+
+    var dependencies_met_cookie_consent_ready = setInterval (function (options) {
+      if ( typeof j1.cookieConsent !== 'undefined' ) {
+        $("#settingsOutput").text(JSON.stringify(j1.cookieConsent.getSettings()))
+        $("#settingsAnalysisOutput").text(j1.cookieConsent.getSettings('analyses'))
+        clearInterval(dependencies_met_cookie_consent_ready);
+      }
+    });
+
+</script>
+++++