j1-template 2022.0.5 → 2022.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e99fcdcc2fd19d7b3b98a3ac755a3019658826fc89e2f2b59db12650446c4a08
-  data.tar.gz: 5a2782ef6d1c8df28aa9002844656a2270186269f71af0ce68120179dbbdf05c
+  metadata.gz: 2cc23d49ab79488234bcc11d52989a1114159fd3d075e1b74db6c8122e430885
+  data.tar.gz: b4e92ca4f3b66f2682a1299ceb0fc9b5a0381f03705936ab1d75e5ec25dc5eb8
 SHA512:
-  metadata.gz: 3da14ace9c6a7cd4280bf6eceba1996c802965e305ad4ebebc1ee4549d6d33736d5288b4d0fa73a1a616914ed55445ae815eed1d08ba41775de791332793a8db
-  data.tar.gz: 3672d113986fd765b84fa3b6146aa32d38b734d787afcafa5b61f81d3fd9fd44f4fdaaf7336a1c05b587bfe8a24329290f43e6471fb21ac228149996f124c497
+  metadata.gz: a0e18887bb26c831f49560b3f46dc140a0aa200b871a6b952066361ae6fae306e3591bdeb18c994b49a9e0022533042d1efa6b64d620622c746888f0d8e64af6
+  data.tar.gz: 483b7805c69ffdeb8e2ee16e10b971ded5a801f796facb25965fb05c9b8ff8052a23bae381789e1047a02d02d13fe23792fd2274bfaeff696b1ae2f9ef7309e9

data/_layouts/default.html

@@ -74,11 +74,6 @@ layout:                                 compress
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign tooltips_options     = template_config.bootstrap.tooltips %}
 {% assign popovers_options     = template_config.bootstrap.popovers %}
-{% assign smoothscroll_options = template_config.smoothScroll %}
-
-
-{% comment %} tooltips_options: {{ tooltips_options | debug }}{% endcomment %}
-
 
 {% comment %} Webhooks disabled
 --------------------------------------------------------------------------------
@@ -89,20 +84,12 @@ layout:                                 compress
 {% assign logon_client         = data.modules.j1_sign_in_up %}
 {% assign body_scrollbar       = data.j1_config.body.scrollbar %}
 
-{% if smoothscroll_options.enabled and smoothscroll_options.scrollInPageHashes %}
-  {% assign scroll_inpage_hashes = true %}
-{% endif %}
-
 {% comment %} Overload properties from page options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if page.scrollbar %}
   {% assign body_scrollbar = page.scrollbar %}
 {% endif %}
 
-{% if page.scrollInPageHashes != nil %}
-  {% assign scroll_inpage_hashes = page.scrollInPageHashes %}
-{% endif %}
-
 {% comment %} main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!DOCTYPE {{ site.doctype }}>
@@ -259,50 +246,6 @@ layout:                                 compress
         return new bootstrap.Popover(popoverTriggerEl)
       });
     {% endif %}
-
-    {% comment %} Update cookie for lastpage
-    ---------------------------------------------------------------------------- {% endcomment %}
-      // save the current page to userstate cookie
-      var dependencies_met_page_ready = setInterval (function (options) {
-        if (j1.getState() === 'finished') {
-          var logger = log4javascript.getLogger('j1.layout.default');
-
-          function setLastPage() {
-            var cookie_names                = j1.getCookieNames();
-            const user_state_cookie_name    = cookie_names.user_session;
-            var user_state                  = j1.readCookie(user_state_cookie_name);
-            var user_state_last_page        = window.location.pathname;
-            user_state.last_page            = user_state_last_page;
-
-            j1.writeCookie({
-              name: user_state_cookie_name,
-              data: user_state,
-              samesite: 'Strict'
-            });
-            logger.debug('\n' + 'saved current page to cookie :' + user_state_last_page);
-          }
-          setLastPage();
-          clearInterval(dependencies_met_page_ready);
-        }
-      });
-
-      {% if scroll_inpage_hashes %}
-      // In-page HASH anchor links on click based on Chris Coyier's solution
-      // See: https://css-tricks.com/snippets/jquery/smooth-scrolling/
-      $('a[href^="#"]:not([href="#"])').click(function(e) {
-        if (location.hostname == this.hostname) {
-          var target = $(this.hash);
-          target = target.length ? target : $('[name=' + this.hash.slice(1) +']');
-          if (target.length) {
-            $('html, body').animate({
-              scrollTop: target.offset().top - 100 + 'px'
-            }, 200);
-            return false;
-          }
-        }
-      });
-      {% endif %}
-
     });
   </script>
   <!-- [INFO   ] [j1.layout.default.html                ] [ end page processing ] -->

data/assets/error_pages/HTTP444.html

@@ -18,8 +18,8 @@ sitemap:                                false
 
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/assets/http_error_pages/HTTP404.html
- # Liquid TEMPLATE to generate customized HTML error pages: 404 - Page not found
+ # ~/assets/http_error_pages/HTTP444.html
+ # Liquid TEMPLATE to generate customized HTML error pages: 444 - Blocked Content
  #
  # Product/Info:
  # https://jekyll.one
@@ -65,14 +65,14 @@ sitemap:                                false
 {% if language == 'en' %}
   {% assign title             = "Blocked Content" %}
   {% assign back_url_text     = "Back Home" %}
-  {% assign reason            = "This page has been disabled for technical reasons. <br/> Because your privacy settings disabled personalization, this page cannot be presented." %}
+  {% assign reason            = "Access to the page has been disabled for technical reasons. <br/> Because your privacy settings disabled personalization, this page cannot be presented." %}
   {% assign contact_issue     = "Technical Contact" %}
 {% endif %}
 
 {% if language == 'de' %}
   {% assign title             = "Gesperrter Inhalt" %}
   {% assign back_url_text     = "Zurück zur Startseite" %}
-  {% assign reason            = "Diese Seite ist aus technischen Gründen nicht verfügbar. <br/>Die Einstellungen zu Ihrer Privatsphäre erlauben keine Personalisierung. Diese Seite kann daher nicht angezeigt werden." %}
+  {% assign reason            = "Die Anzeige dieser Seite ist aus technischen Gründen gesperrt. <br/>Die Einstellungen zu Ihrer Privatsphäre erlauben keine Personalisierung. Diese Seite kann daher nicht angezeigt werden." %}
   {% assign contact_issue     = "Technischer Kontakt" %}
 {% endif %}
 

data/assets/error_pages/HTTP445.html

@@ -18,8 +18,8 @@ sitemap:                                false
 
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/assets/http_error_pages/HTTP404.html
- # Liquid TEMPLATE to generate customized HTML error pages: 445 - Page not found
+ # ~/assets/http_error_pages/HTTP445.html
+ # Liquid TEMPLATE to generate customized HTML error pages: 445 - Blocked Content
  #
  # Product/Info:
  # https://jekyll.one
@@ -65,7 +65,7 @@ sitemap:                                false
 {% if language == 'en' %}
   {% assign title             = "Site Blocked" %}
   {% assign back_url_text     = "Back Home" %}
-  {% assign reason            = "This site has been disabled for technical reasons. <br/> Because your cookie settings are disabled for this website, the content cannot be presented." %}
+  {% assign reason            = "Access to the site has been disabled for technical reasons. <br/> Because your cookie settings are disabled for this website, the content cannot be presented." %}
   {% assign contact_issue     = "Technical Contact" %}
 {% endif %}
 

data/assets/error_pages/HTTP446.html

@@ -0,0 +1,110 @@
+---
+date:                                   2021-01-01 00:00:00
+description: >
+                                        Customized HTML error page
+
+categories:                             [ Error page ]
+tags:                                   [ HTML, 446 ]
+
+exclude_from_search:                    true
+
+regenerate:                             false
+permalink:                              /446.html
+http_error:                             446
+back_url:                               "https://jekyll.one/"
+sitemap:                                false
+---
+{% capture j1_cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/http_error_pages/HTTP446.html
+ # Liquid TEMPLATE to generate customized HTML error pages: 446 - Blocked Content
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ # Copyright (C) 2020 Andi Dittrich
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # HttpErrorPages are licensed under the MIT License.
+ # See: https://github.com/AndiDittrich/HttpErrorPages
+ # -----------------------------------------------------------------------------
+ # NOTE
+ #  German translation, see: https://de.wikipedia.org/wiki/HTTP-Statuscode
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #   liquid_var: {{ liquid_var | debug }}
+ #   config: {{ config | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% assign language            = site.language %}
+{% assign webmaster_email     = site.webmaster.email %}
+{% assign copyright_info      = site.copyright %}
+{% assign favicon             = site.favicon.image %}
+{% assign images_dir          = site.asciidoc_attributes.imagesdir %}
+{% assign brand_text          = site.brand.text %}
+{% assign brand_image_source  = site.brand.image %}
+{% assign brand_image_height  = site.brand.image_height %}
+
+{% capture brand_image %}{{images_dir}}/{{brand_image_source}}{% endcapture %}
+
+{% comment %} language detection
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if site.language == "en" %}
+  {% assign language = "en" %}
+{% elsif site.language == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
+
+{% if language == 'en' %}
+  {% assign title             = "Site Blocked" %}
+  {% assign back_url_text     = "Back to J1 Template (Home)" %}
+  {% assign reason            = "Access to the site has been blocked for technical reasons. <br> Access to cookies for this site failed. Possibly, a third-party domain tries to access it." %}
+  {% assign contact_issue     = "Technical Contact" %}
+{% endif %}
+
+{% if language == 'de' %}
+  {% assign title             = "Website gesperrt" %}
+  {% assign back_url_text     = "Zurück zu J1 Template (Home)" %}
+  {% assign reason            = "Diese Webseiten sind aus technischen Gründen nicht verfügbar. <br> Der Zugriff auf Cookies ist für diese Website fehlgeschlagen. Möglicherweise versucht eine Drittanbieter-Domain darauf zuzugreifen." %}
+  {% assign contact_issue     = "Technischer Kontakt" %}
+{% endif %}
+
+<!DOCTYPE html>
+<html lang="{{language}}">
+  <head>
+    <!-- [INFO   ] [j1.error.pages                      ] [ Simple HttpErrorPages | MIT License | https://github.com/AndiDittrich/HttpErrorPages  ] -->
+    <!-- [INFO   ] [j1.error.pages                      ] [ detected language (site): {{language}} ] -->
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="robots" content="noindex, nofollow">
+    <link rel="icon" type="image/ico" href="{{favicon}}">
+    <title>{{title}} · {{page.http_error}}</title>
+    <style> .attic { background-image: -webkit-gradient(linear, left top, left bottom, from(#263238), to(#3F51B5));background-image: -webkit-linear-gradient(top, #263238 0%, #3F51B5 100%);background-image: -o-linear-gradient(top, #263238 0%, #3F51B5 100%);background-image: linear-gradient(to bottom, #263238 0%, #3F51B5 100%);filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#263238", endColorstr="#3F51B5", GradientType=0); } </style>
+    <style type="text/css">/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:.67em 0}figcaption,figure,main{display:block}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{cursor: pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{cursor: pointer ;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}template{display:none}[hidden]{display:none}body,html{width:100%;height:100%;background-color:#21232a}body{color:#fff;text-align:center;text-shadow:0 2px 4px rgba(0,0,0,.5);padding:0;min-height:100%;-webkit-box-shadow:inset 0 0 100px rgba(0,0,0,.8);box-shadow:inset 0 0 100px rgba(0,0,0,.8);display:table;font-family:"Open Sans",Arial,sans-serif}h1{font-family:inherit;font-weight:500;line-height:1.1;color:inherit;font-size:36px}h1 small{font-size:68%;font-weight:400;line-height:1;color:#777}a{text-decoration:none;color:#fff;font-size:inherit;border-bottom:dotted 1px #707070}.lead{color:silver;font-size:21px;line-height:1.4}.cover{display:table-cell;vertical-align:middle;padding:0 20px}footer{position:fixed;width:100%;height:40px;left:0;bottom:0;color:#a0a0a0;font-size:14px}</style>
+  </head>
+  <body>
+    <div style="margin-top: 1rem;">
+      <a href="/"><img src="{{brand_image}}" height="{{brand_image_height}}" alt="{{brand_text}}"></a>
+    </div>
+    <div class="cover attic">
+      <h1>{{title}} <small>{{page.http_error}}</small></h1>
+      <p class="lead">{{reason}}</p>
+      <div><a href="{{page.back_url}}" target="blank" rel="noopener">{{back_url_text}}</a></div>
+    </div>
+    <footer>
+      <p>{{copyright_info}} · {{contact_issue}}: <a href="mailto:{{webmaster_email}}?subject={{title}}"> {{webmaster_email}} </a></p>
+    </footer>
+  </body>
+</html>
+
+{% endcapture %}
+{{ j1_cache | strip_empty_lines }}
+{% assign j1_cache = nil %}

data/assets/themes/j1/adapter/js/cookieConsent.js

@@ -34,6 +34,9 @@ regenerate:                             true
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign cookie_defaults     = modules.defaults.cookies.defaults %}
+{% assign cookie_settings     = modules.cookies.settings %}
+
 {% assign consent_defaults    = modules.defaults.cookieconsent.defaults %}
 {% assign consent_settings    = modules.cookieconsent.settings %}
 {% assign tracking_enabled    = template_config.analytics.enabled %}
@@ -44,6 +47,7 @@ regenerate:                             true
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign consent_options     = consent_defaults | merge: consent_settings %}
+{% assign cookie_options      = cookie_defaults | merge: cookie_settings %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -87,18 +91,21 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
   var moduleOptions     = {};
   var _this;
   var $modal;
+  var cookie_names;
   var user_cookie;
   var logger;
   var url;
   var baseUrl;
   var hostname;
   var domain;
+  var cookie_option_domain;
   var cookie_domain;
   var secure;
   var logText;
   var cookie_written;
   var contentLanguage;
   var navigatorLanguage;
+  var domainAttribute;
 
   // NOTE: RegEx for tracking_id: ^(G|UA|YT|MO)-[a-zA-Z0-9-]+$
   // See: https://stackoverflow.com/questions/20411767/how-to-validate-google-analytics-tracking-id-using-a-javascript-function/20412153
@@ -120,22 +127,17 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // globals
       // -----------------------------------------------------------------------
-      _this             = j1.adapter.cookieConsent;
-      logger            = log4javascript.getLogger('j1.adapter.cookieConsent');
-      url               = new liteURL(window.location.href);
-      baseUrl           = url.origin;
-      hostname          = url.hostname;
-      domain            = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-      secure            = (url.protocol.includes('https')) ? true : false;
-      contentLanguage   = '{{site.language}}';
-      navigatorLanguage = navigator.language || navigator.userLanguage;
-
-      // set domain used by cookies
-      if(domain !== 'localhost') {
-        cookie_domain = '.' + hostname;
-      } else {
-        cookie_domain = hostname;
-      }
+      _this                 = j1.adapter.cookieConsent;
+      logger                = log4javascript.getLogger('j1.adapter.cookieConsent');
+      cookie_names          = j1.getCookieNames();
+      url                   = new liteURL(window.location.href);
+      baseUrl               = url.origin;
+      hostname              = url.hostname;
+      domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      cookie_option_domain  = '{{cookie_options.domain}}';
+      secure                = (url.protocol.includes('https')) ? true : false;
+      contentLanguage       = '{{site.language}}';
+      navigatorLanguage     = navigator.language || navigator.userLanguage;
 
       // initialize state flag
       _this.state = 'pending';
@@ -169,6 +171,16 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       // initializer
       // -----------------------------------------------------------------------
       var dependencies_met_page_ready = setInterval (function (options) {
+        var expires     = '{{cookie_options.expires}}';
+        var same_site   = '{{cookie_options.same_site}}';
+
+        // set domain used by cookies
+        if (cookie_option_domain == 'auto') {
+          domainAttribute = domain ;
+        } else  {
+          domainAttribute = '';
+        }
+
         if ( j1.getState() === 'finished' ) {
           _this.setState('started');
           logger.info('\n' + 'state: ' + _this.getState());
@@ -176,8 +188,11 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
 
           j1.cookieConsent = new CookieConsent ({
             contentURL:             moduleOptions.contentURL,                   // dialog content (modals) for all supported languages
-            cookieName:             moduleOptions.cookieName,                   // name of the consent cookie
-            cookieSameSite:         moduleOptions.cookieSameSite,               // restrict consent cookie
+            cookieName:             cookie_names.user_consent,                  // name of the consent cookie
+            cookieStorageDays:      expires,                                    // lifetime of a cookie [0..365], 0: session cookie
+            cookieSameSite:         same_site,                                  // restrict consent cookie
+            cookieSecure:           secure,                                     // only sent to the server with an encrypted request over HTTPS
+            cookieDomain:           domainAttribute,                            // set domain (hostname|domain)
             dialogLanguage:         moduleOptions.dialogLanguage,               // language for the dialog (modal)
             whitelisted:            moduleOptions.whitelisted,                  // pages NOt dialog is shown
             reloadPageOnChange:     moduleOptions.reloadPageOnChange,           // reload if setzings has changed
@@ -190,12 +205,9 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
           logger.info('\n' + 'state: ' + _this.getState());
           logger.debug('\n' + 'module initialized successfully');
 
-          // Click events moved to Navigator (core)
-          //
-          // $('#quickLinksCookieButton').click(function(e) {
-          //   logger.info('\n' + 'call default action');
-          //   j1.cookieConsent.showDialog();
-          // });
+          // -------------------------------------------------------------------
+          // NOTE: Click events moved to Navigator (core)
+          // -------------------------------------------------------------------
 
           clearInterval(dependencies_met_page_ready);
         }
@@ -301,23 +313,27 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
           }
         }
 
-        // Managing providers for personalization OptIn/Out (Comments|Ads)
+        // Managing providers using personalization OptIn/Out
+        // (Comments|Ads|Translation)
         //
         if (!user_consent.analysis || !user_consent.personalization) {
-          // expire consent|state cookies to session
-          j1.expireCookie({ name: cookie_names.user_state });
-          j1.expireCookie({ name: cookie_names.user_consent });
-          j1.expireCookie({ name: cookie_names.user_translate });
 
+          // overload cookie consent settings
+          user_translate.analysis         = user_consent.analysis;
+          user_translate.personalization  = user_consent.personalization;
+          // disable translation service
           user_translate.translationEnabled = false;
+
           cookie_written = j1.writeCookie({
             name:     cookie_names.user_translate,
             data:     user_translate,
-            samesite: 'Strict',
-            secure:   secure,
-            expires:  365
+            secure:   secure
           });
 
+          // expire permanent cookies to session
+          j1.expireCookie({ name: cookie_names.user_state });
+          j1.expireCookie({ name: cookie_names.user_consent });
+          j1.expireCookie({ name: cookie_names.user_translate });
         }
         if (moduleOptions.reloadPageOnChange) {
           // reload current page (skip cache)
@@ -331,14 +347,28 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
           j1.removeCookie({ name: item, domain: cookie_domain });
         });
 
-        // Managing providers for personalization OptIn/Out (Comments|Ads)
+        // Managing providers using personalization OptIn/Out
+        // (Comments|Ads|Translation)
         //
         if (!user_consent.analysis || !user_consent.personalization) {
-          // expire consent|state cookies to session
+          // overload cookie consent settings
+          user_translate.analysis         = user_consent.analysis;
+          user_translate.personalization  = user_consent.personalization;
+          // disable translation service
+          user_translate.translationEnabled = false;
+
+          cookie_written = j1.writeCookie({
+            name:     cookie_names.user_translate,
+            data:     user_translate,
+            secure:   secure
+          });
+
+          // expire permanent cookies to session
           j1.expireCookie({ name: cookie_names.user_state });
           j1.expireCookie({ name: cookie_names.user_consent });
           j1.expireCookie({ name: cookie_names.user_translate });
         }
+
         if (moduleOptions.reloadPageOnChange) {
           // reload current page (skip cache)
           location.reload(true);