j1-template 2021.1.4 → 2021.1.9

data/assets/themes/j1/modules/util/js/domready.js

@@ -0,0 +1,146 @@
+(function(){
+
+    var DomReady = window.DomReady = {};
+
+	// Everything that has to do with properly supporting our document ready event. Brought over from the most awesome jQuery. 
+
+    var userAgent = navigator.userAgent.toLowerCase();
+
+    // Figure out what browser is being used
+    var browser = {
+    	version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1],
+    	safari: /webkit/.test(userAgent),
+    	opera: /opera/.test(userAgent),
+    	msie: (/msie/.test(userAgent)) && (!/opera/.test( userAgent )),
+    	mozilla: (/mozilla/.test(userAgent)) && (!/(compatible|webkit)/.test(userAgent))
+    };    
+
+	var readyBound = false;	
+	var isReady = false;
+	var readyList = [];
+
+	// Handle when the DOM is ready
+	function domReady() {
+		// Make sure that the DOM is not already loaded
+		if(!isReady) {
+			// Remember that the DOM is ready
+			isReady = true;
+        
+	        if(readyList) {
+	            for(var fn = 0; fn < readyList.length; fn++) {
+	                readyList[fn].call(window, []);
+	            }
+            
+	            readyList = [];
+	        }
+		}
+	};
+
+	// From Simon Willison. A safe way to fire onload w/o screwing up everyone else.
+	function addLoadEvent(func) {
+	  var oldonload = window.onload;
+	  if (typeof window.onload != 'function') {
+	    window.onload = func;
+	  } else {
+	    window.onload = function() {
+	      if (oldonload) {
+	        oldonload();
+	      }
+	      func();
+	    }
+	  }
+	};
+
+	// does the heavy work of working through the browsers idiosyncracies (let's call them that) to hook onload.
+	function bindReady() {
+		if(readyBound) {
+		    return;
+	    }
+	
+		readyBound = true;
+
+		// Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
+		if (document.addEventListener && !browser.opera) {
+			// Use the handy event callback
+			document.addEventListener("DOMContentLoaded", domReady, false);
+		}
+
+		// If IE is used and is not in a frame
+		// Continually check to see if the document is ready
+		if (browser.msie && window == top) (function(){
+			if (isReady) return;
+			try {
+				// If IE is used, use the trick by Diego Perini
+				// http://javascript.nwbox.com/IEContentLoaded/
+				document.documentElement.doScroll("left");
+			} catch(error) {
+				setTimeout(arguments.callee, 0);
+				return;
+			}
+			// and execute any waiting functions
+		    domReady();
+		})();
+
+		if(browser.opera) {
+			document.addEventListener( "DOMContentLoaded", function () {
+				if (isReady) return;
+				for (var i = 0; i < document.styleSheets.length; i++)
+					if (document.styleSheets[i].disabled) {
+						setTimeout( arguments.callee, 0 );
+						return;
+					}
+				// and execute any waiting functions
+	            domReady();
+			}, false);
+		}
+
+		if(browser.safari) {
+		    var numStyles;
+			(function(){
+				if (isReady) return;
+				if (document.readyState != "loaded" && document.readyState != "complete") {
+					setTimeout( arguments.callee, 0 );
+					return;
+				}
+				if (numStyles === undefined) {
+	                var links = document.getElementsByTagName("link");
+	                for (var i=0; i < links.length; i++) {
+	                	if(links[i].getAttribute('rel') == 'stylesheet') {
+	                	    numStyles++;
+	                	}
+	                }
+	                var styles = document.getElementsByTagName("style");
+	                numStyles += styles.length;
+				}
+				if (document.styleSheets.length != numStyles) {
+					setTimeout( arguments.callee, 0 );
+					return;
+				}
+			
+				// and execute any waiting functions
+				domReady();
+			})();
+		}
+
+		// A fallback to window.onload, that will always work
+	    addLoadEvent(domReady);
+	};
+
+	// This is the public function that people can use to hook up ready.
+	DomReady.ready = function(fn, args) {
+		// Attach the listeners
+		bindReady();
+    
+		// If the DOM is already ready
+		if (isReady) {
+			// Execute the function immediately
+			fn.call(window, []);
+	    } else {
+			// Add the function to the wait list
+	        readyList.push( function() { return fn.call(window, []); } );
+	    }
+	};
+    
+	bindReady();
+	
+})();

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.9'
+end

data/lib/j1_app/j1_auth_manager/auth_manager.rb

@@ -154,10 +154,9 @@ module J1App
     # --------------------------------------------------------------------------
     j1_mw_auth_mgr.info 'initialize web session cookie'
     use Rack::Session::Cookie,
-        http_only: true,   # if set to 'true', make session cookie visible to the browser (document) for HTTP
+        http_only: true,
         key: 'j1.app.session',
-#       same_site: 'None',
-        same_site: 'Lax',
+        same_site: 'Strict',
         secret: ENV['J1_SESSION_SECRET'] || SecureRandom.hex
 
     # use Rack::Cache do |config|

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.9'
 
 # ------------------------------------------------------------------------------
 # 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.9
 
 # version
 # ------------------------------------------------------------------------------
@@ -520,6 +520,7 @@ whitelist:
 # EXCERPT settings
 #
 excerpt_separator:                      excerpt__end
+excerpt_truncate_words:                 100
 
 # ------------------------------------------------------------------------------
 # COLLECTION settings
@@ -592,9 +593,9 @@ defaults:
       layout:                           page
       author:                           J1 Team
 
-#     robots:
-#       index:                          true
-#       follow:                         true
+      robots:
+        index:                          false
+        follow:                         false
 
       analytics:                        false
       advertising:                      false
@@ -631,9 +632,9 @@ defaults:
       layout:                           post
       author:                           J1 Team
 
-#     robots:
-#       index:                          true
-#       follow:                         true
+      robots:
+        index:                          false
+        follow:                         false
 
       analytics:                        false
       advertising:                      false
@@ -670,9 +671,9 @@ defaults:
       layout:                           post
       author:                           J1 Team
 
-#     robots:
-#       index:                          true
-#       follow:                         true
+      robots:
+        index:                          false
+        follow:                         false
 
       analytics:                        false
       advertising:                      false
@@ -705,6 +706,10 @@ defaults:
       layout:                           post
       author:                           Wikipedia
 
+      robots:
+        index:                          false
+        follow:                         false
+
       analytics:                        false
       advertising:                      false
       comments:                         false
@@ -740,6 +745,10 @@ defaults:
       layout:                           page
       sitemap:                          false
 
+      robots:
+        index:                          false
+        follow:                         false
+
 # ==============================================================================
 # 6. LAYOUT configuration
 #

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/j1_config.yml

@@ -140,6 +140,7 @@ cookies:
   app_session:                          j1.app.session
   user_session:                         j1.user.session
   user_state:                           j1.user.state
+  user_consent:                         j1.user.consent
 
 
 # ==============================================================================
@@ -161,7 +162,7 @@ cookies:
 #   NOTE: Used for developent mode ONLY
 #   NOTE: See ~/packages/300_template_src/_layouts/default.html
 # ------------------------------------------------------------------------------
-flicker_timeout:                        250
+flicker_timeout:                        150
 
 # ------------------------------------------------------------------------------
 # HTML PrettyPrint
@@ -386,15 +387,15 @@ comments:
   provider:                             disqus
 
   disqus:
-    short_name:                         '<your-site-short-name>'
+    short_name:                         '<your-site-id>'
 
-# facebook:
+# facebook:                                                                     # currently NOT supported
 #   appid:                              123
 #   num_posts:                          5
 #   width:                              580
 #   colorscheme:                        light
 
-# custom:
+# custom:                                                                       # currently NOT supported
 #   custom_data:
 
 # ------------------------------------------------------------------------------
@@ -410,8 +411,8 @@ analytics:
   google:
     tracking_id:                        '<your-tracking-id>'
 
-  custom:
-    custom_data:
+# custom:                                                                       # currently NOT supported
+#   custom_data:
 
 # ------------------------------------------------------------------------------
 # ADVERTISING settings
@@ -422,26 +423,28 @@ analytics:
 advertising:
   enabled:                              false
   provider:                             google
+
   google:
     publisher_id:                       '<your-publisher-id>'
-  custom:
-    custom_data:
+
+# custom:                                                                       # currently NOT supported
+#   custom_data:
 
 # ------------------------------------------------------------------------------
-# TRANSLATOR settings
+# TRANSLATOR settings (currently NOT supported)
 #
 # Set 'enabled' to false to turn translators off globally
 # Set 'provider' to the translation provider you want to use
 #
-translation:
-  enabled:                              false
-  provider:                             google
-
-  google:
-    layout:                             default
-    meta_data:                          [google-translate-customization]
-    page_language:                      en
-    translation_languages:              [all]
+# translation:
+#   enabled:                              false
+#   provider:                             google
+#
+#   google:
+#     layout:                             default
+#     meta_data:                          [google-translate-customization]
+#     page_language:                      en
+#     translation_languages:              [all]
 
 # ------------------------------------------------------------------------------
 # SHARING settings (currently NOT supported)

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
@@ -27,6 +27,7 @@ settings:
 
   enabled:                            true
   show_cookie_icon:                   true
+  reloadPageOnChange:                 true
 
 # ------------------------------------------------------------------------------
 # END config

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

@@ -0,0 +1,136 @@
+# ------------------------------------------------------------------------------
+#  ~/_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                                    # show consent dialog if NO consent cookie found
+  language:                             de                                      # language of the modal is shown. Default: navigator.language
+  languages:                            [en, de]                                # supported languages, defaults to FIRST language defined by languages
+  contentURL:                           /assets/data/cookieconsent              # dialogs content for all languages
+  cookieName:                           j1.user.consent                         # name of the consent cookie
+  cookieStorageDays:                    365                                     # duration the consent cookie is stored
+  postSelectionCallback:                j1.adapter.cookieConsent.cbCookie       # currently hardcoded
+
+  reloadPageOnChange:                   false                                   # reload current page if 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, currently NOT supported
+
+  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