j1-template 2021.0.16 → 2021.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4659d3d3e7e2ac9d5d2cec9f6a3fcfc1506f4c352353a11e46c64d782122ba3c
-  data.tar.gz: ba613e2cf7c07e5e21647630858ea418c476f4e08f9bb4d1d86713ab5a2b38a1
+  metadata.gz: 78a543ac0d0dee3dad1e4bd534637503a9a34c4b893b27a5a14846e4b063cd81
+  data.tar.gz: 8da8a6fc202db91f1ca1df24ab26d19af1b9b17993d29e6c2f1b6953b0d0e9cf
 SHA512:
-  metadata.gz: 8c6766374c1cbb1e73ebecdc2fe62df4837009cc001a475aefd1936af2f86739ef36916a6454155cdc0b8ab15810be5ead5e92c8eda8e6d2f7c9e73fb3f4a1b0
-  data.tar.gz: 0fe00a99304f4b51827568a00a57f6c58495ba57588a412587a846437db7c42056644591c70e0d84e519c9b95204dcce36e2d433331bd8294746d857e37f14c4
+  metadata.gz: d9982f9b90952982a3a6ecd547cdc6d8fe9fa61601b0c08b06d866c1325351d1ad430ccb6e1def9642d56efacbfbc63df0ea06ff614421c39d7303e2ac0b2cdc
+  data.tar.gz: 1bb2db102b7454c7668055f5a61b0fad09db6322736b07568dc4b3fe6d0a39f33662024f83cf119327246637adac63e276ae0df643b4f1c7729b8ce9adb8194b

data/_includes/themes/j1/blocks/footer/boxes/legal_statements.proc

@@ -59,5 +59,9 @@
     <li><a href="{{legal_item.legal.href}}">{{legal_item.legal.statement}}</a></li>
   {% endif %}
 
+  {% if legal_item.legal.enabled and legal_item.legal.type == 'comments' %}
+    <li><a href="{{legal_item.legal.href}}">{{legal_item.legal.statement}}</a></li>
+  {% endif %}
+
 {% endfor %}
 </ul>

data/_includes/themes/j1/modules/connectors/ad/google-adsense.html

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/procedures/provider/ad/google-adsense.html
- #  Support of advertising provider Google Adsense for J1 Template
+ #  Support of Advertising Provider Google Adsense for J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one

data/_includes/themes/j1/modules/connectors/ads

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/procedures/provider/ads
- #  Liquid CONNECTOR for advertising providers supported by J1 Template
+ #  Liquid CONNECTOR for Advertising Providers supported by J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one

data/_includes/themes/j1/modules/connectors/analytic/google-analytics-legacy.html

@@ -0,0 +1,36 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ #  ~/_includes/themes/j1/modules/connectors/analytic/google-analytics.html
+ #  Support of analytics provider Google Analytics for J1 Template
+ #
+ #  Product/Info:
+ #  http://jekyll.one
+ #
+ #  Copyright (C) 2021 Juergen Adams
+ #
+ #  J1 Template is licensed under the MIT License.
+ #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id }} %}
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<!-- Google Analytics: provide global site tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', '{{tracking_id}}');
+</script>

data/_includes/themes/j1/modules/connectors/analytic/google-analytics.html

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/modules/connectors/analytic/google-analytics.html
- #  Support of analytics provider Google Analytics for J1 Template
+ #  Support of Analytics Provider Google Analytics (V4) for J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one

data/_includes/themes/j1/modules/connectors/analytics

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/modules/connectors/analytics
- #  Liquid CONNECTOR for analytic providers supported by J1 Template
+ #  Liquid CONNECTOR for Analytic Providers supported by J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one
@@ -28,7 +28,7 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ start processing load region head, layout: {{page.layout}} ] -->              
+<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ start processing load region head, layout: {{page.layout}} ] -->
 {% if analytics and page.analytics %}
 
   {% case analytics_provider %}
@@ -42,4 +42,3 @@
 
 {% endif %}
 <!-- [INFO   ] [j1.modules.connectors.analytics       ] [ end processing ] -->
-

data/_includes/themes/j1/modules/connectors/comment/disqus.html

@@ -27,7 +27,7 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-<div id="disqus" class="container mt-5 mb-5">
+<div id="disqus" class="container mb-5">
 
   <div id="disqus_thread" class="disqus-thread">
     <script>

data/_layouts/default.html

@@ -315,8 +315,18 @@ layout:                                 compress
     {% endif %}
     });
   </script>
-  <!-- [INFO   ] [j1.layout.default.html                ] [ end page processing ] -->
 
+  {% comment %} Initialize Window History (back on <ESC>)
+  ------------------------------------------------------------------------------ {% endcomment %}
+  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize window.history.back ] -->
+  <script>
+  // Redirect on KEY <ESC>
+  window.onkeyup = function (e)
+  {
+   if (e.keyCode == 27) window.history.back();
+  }
+  </script>
+  <!-- [INFO   ] [j1.layout.default.html                ] [ end page processing ] -->
 </html>
 
 {% endcapture %}

data/assets/data/galleries.json

@@ -50,8 +50,8 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment         = site.environment %}
 
-{% assign jg_config_defaults  = apps.defaults.justified_gallery.defaults %}
-{% assign jg_config_settings  = apps.justified_gallery.settings %}
+{% assign jg_config_defaults  = apps.defaults.justifiedGallery.defaults %}
+{% assign jg_config_settings  = apps.justifiedGallery.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}

data/assets/data/gallery_customizer.html

@@ -35,8 +35,8 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment         = site.environment %}
 
-{% assign customizer_defaults = apps.defaults.gallery_customizer.defaults %}
-{% assign customizer_settings = apps.gallery_customizer.settings %}
+{% assign customizer_defaults = apps.defaults.justifiedGalleryCustomizer.defaults %}
+{% assign customizer_settings = apps.justifiedGalleryCustomizer.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}

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

@@ -0,0 +1,166 @@
+---
+regenerate:                             true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/asciidoctor.js
+ # Liquid template to adapt Asciidoctor
+ #
+ # Product/Info:
+ # https://jekyll.one
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/asciidoctor.js
+ # J1 Adapter for Asciidoctor
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ #  Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
+'use strict';
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+j1.adapter['asciidoctor'] = (function (j1, window) {
+
+  {% comment %} Set global variables
+  ------------------------------------------------------------------------------ {% endcomment %}
+  var environment   = '{{environment}}';
+  var moduleOptions = {};
+  var _this;
+  var logger;
+  var logText;
+
+  // ---------------------------------------------------------------------------
+  // Helper functions
+  // ---------------------------------------------------------------------------
+
+  // ---------------------------------------------------------------------------
+  // Main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // Initializer
+    // -------------------------------------------------------------------------
+    init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.asciidoctor;
+      logger  = log4javascript.getLogger('j1.adapter.asciidoctor');
+
+      // initialize state flag
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
+
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.rtable',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // asciidoctor initializer
+      // -----------------------------------------------------------------------
+      var log_text = 'asciidoctor is being initialized';
+      logger.info(log_text);
+
+
+      var dependencies_met_j1_finished = setInterval(function() {
+        if (j1.getState() == 'finished') {
+
+        	j1.core.asciidoctor.init();
+
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+
+          clearInterval(dependencies_met_j1_finished);
+        } // END dependencies_met_j1_finished
+      }, 25);
+
+    }, // END init
+
+    // -------------------------------------------------------------------------
+    // messageHandler: MessageHandler for J1 CookieConsent module
+    // Manage messages send from other J1 modules
+    // -------------------------------------------------------------------------
+    messageHandler: function (sender, message) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
+      logText = 'received message from ' + sender + ': ' + json_message;
+      logger.debug(logText);
+
+      // -----------------------------------------------------------------------
+      //  Process commands|actions
+      // -----------------------------------------------------------------------
+      if (message.type === 'command' && message.action === 'module_initialized') {
+        //
+        // Place handling of command|action here
+        //
+        logger.info(message.text);
+      }
+
+      //
+      // Place handling of other command|action here
+      //
+
+      return true;
+    }, // END messageHandler
+
+    // -------------------------------------------------------------------------
+    // setState()
+    // Sets the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    setState: function (stat) {
+      _this.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState()
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: function () {
+      return _this.state;
+    } // END getState
+
+  }; // END return
+})(j1, window);
+
+{% endcapture %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

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

@@ -191,6 +191,30 @@ j1.adapter['carousel'] = (function (j1, window) {
                 // set space between the slides
                 $('head').append('<style>.{{slider_id}}-item{margin: {{slide_space}}px;}</style>');
 
+                // place additional text carousel styles (border/margin)
+                {% unless parallax %} {% if slider_type == 'text' %}
+                  $('head').append('<style>#{{slider_id}}{border-left: 3px solid #0072ff;}</style>');
+                  // wait until carousel has been initialized
+                  var dependency_met_owl_initialized = setInterval (function () {
+                    if ($('#{{slider_id}} > .owl-wrapper-outer').length) {
+                      {% if font_size %}
+                      $('head').append('<style>#{{slider_id}}{font-size:{{font_size}}}</style>');
+                      {% else %}
+                      $('head').append('<style>#{{slider_id}}{font-size:1.5rem}</style>');
+                      {% endif %}
+
+                      {% if font_weight %}
+                      $('head').append('<style>#{{slider_id}}{font-weight:{{font_weight}}}</style>');
+                      {% else %}
+                      $('head').append('<style>#{{slider_id}}{font-weight:400}</style>');
+                      {% endif %}
+
+                      $('#{{slider_id}} > .owl-wrapper-outer').addClass('ml-3');
+                      clearInterval(dependency_met_owl_initialized);
+                    }
+                  }, 25); // END dependency_met_owl_initialized
+                {% endif %} {% endunless %}
+
                 // place additional parallax styles if enabled
                 {% if parallax %}
 

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

@@ -669,11 +669,6 @@ j1.adapter['fam'] = (function (j1, window) {
   }; // END return
 })(j1, window);
 
-{% comment %} process adapter COMPRESSED for production DISABLED
-NOTE: for unknown reason, minifyJS detect JS/ES6 code
-      SyntaxError: Unexpected token: punc ())
---------------------------------------------------------------------------------
-{% assign production = true %}
 {% endcapture %}
 {% if production %}
   {{ cache | minifyJS }}
@@ -681,10 +676,3 @@ NOTE: for unknown reason, minifyJS detect JS/ES6 code
   {{ cache | strip_empty_lines }}
 {% endif %}
 {% assign cache = nil %}
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} process adapter UNCOMPRESSED
--------------------------------------------------------------------------------- {% endcomment %}
-{% endcapture %}
-{{ cache | strip_empty_lines }}
-{% assign cache = nil %}

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

@@ -238,6 +238,7 @@ var j1 = (function () {
       var logger        = log4javascript.getLogger('j1.init');
       var url           = new liteURL(window.location.href);
       var baseUrl       = url.origin;
+//    moment not used anymore
 //    var epoch         = Math.floor(Date.now()/1000);
 //    var timestamp_now = moment.unix(epoch).format('YYYY-MM-DD HH:mm:ss');
       var date          = new Date();
@@ -275,6 +276,7 @@ var j1 = (function () {
         var cookie_names              = j1.getCookieNames();
         var cookie_user_state_name    = cookie_names.user_state;
         var cookie_user_session_name  = cookie_names.user_session;
+//      moment not used anymore
 //      var epoch                     = Math.floor(Date.now()/1000);
 //      var timestamp_now             = moment.unix(epoch).format('YYYY-MM-DD HH:mm:ss');
         var date                      = new Date();
@@ -284,14 +286,19 @@ var j1 = (function () {
         var url;
         var baseUrl;
 
-        user_state.session_active     = false;
-        user_state.last_session_ts    = timestamp_now;
+        // update cookie only, if (already) exists
+        //
+        if (user_state) {
+          user_state.session_active     = false;
+          user_state.last_session_ts    = timestamp_now;
+
+          j1.writeCookie({
+            name: cookie_user_state_name,
+            data: user_state,
+            expires: 365
+          });
+        }
 
-        j1.writeCookie({
-          name: cookie_user_state_name,
-          data: user_state,
-          expires: 365
-        });
       });
 
       // -----------------------------------------------------------------------
@@ -502,7 +509,7 @@ var j1 = (function () {
       var cb_load_closure = function(banner_id) {
         return function ( responseTxt, statusTxt, xhr ) {
           if ( statusTxt ==  'success' ) {
-            var logger = log4javascript.getLogger('j1.xhrData');
+            var logger = log4javascript.getLogger('j1.adapter.xhrData');
             logText = 'loading banner completed on id: ' +banner_id;
             logger.info(logText);
             j1.setXhrDataState(banner_id, statusTxt);
@@ -612,7 +619,7 @@ var j1 = (function () {
       -------------------------------------------------------------------------- {% endcomment %}
       var cb_load_closure = function(panel_id) {
         return function ( responseTxt, statusTxt, xhr ) {
-          var logger = log4javascript.getLogger('j1.xhrData');
+          var logger = log4javascript.getLogger('j1.adapter.xhrData');
           if ( statusTxt == 'success' ) {
             logText = 'loading panel completed on id: ' +panel_id;
             logger.info(logText);
@@ -708,7 +715,7 @@ var j1 = (function () {
 
       var cb_load_closure = function(footer_id) {
         return function ( responseTxt, statusTxt, xhr ) {
-          var logger = log4javascript.getLogger('j1.xhrData');
+          var logger = log4javascript.getLogger('j1.adapter.xhrData');
           if ( statusTxt ==  'success' ) {
             logText = 'footer loaded successfully on id: ' + footer_id;
             logger.info(logText);
@@ -765,7 +772,7 @@ var j1 = (function () {
     //  to load the current state from the middleware (skipped in WEB mode)
     // -------------------------------------------------------------------------
     displayPage: function (options) {
-      var logger              = log4javascript.getLogger('j1.displayPage');
+      var logger              = log4javascript.getLogger('j1.adapter.displayPage');
       var flickerTimeout      = {{template_config.flicker_timeout}};
       var url                 = new liteURL(window.location.href);
       var baseUrl             = url.origin;
@@ -1110,7 +1117,7 @@ var j1 = (function () {
     // specified by xhr_container_id, xhr_data_path (options)
     // -------------------------------------------------------------------------
     xhrData: function (options, mod, status) {
-      var logger            = log4javascript.getLogger('j1.xhrData');
+      var logger            = log4javascript.getLogger('j1.adapter.xhrData');
       var selector          = $('#' + options.xhr_container_id);
       var state             = status;
       var observer_options  = {
@@ -1124,7 +1131,7 @@ var j1 = (function () {
 
       var cb_load_closure = function(mod, id) {
         return function (responseTxt, statusTxt, xhr) {
-          var logger = log4javascript.getLogger('j1.xhrData');
+          var logger = log4javascript.getLogger('j1.adapter.xhrData');
           if ( statusTxt === 'success' ) {
             // jadams, 2020-07-21: intermediate state should DISABLED
             // if (state) {
@@ -1246,6 +1253,12 @@ var j1 = (function () {
     //    Config to use this attribute should be configurable
     //    (what config file?).
     //    Disabled use for now in general.
+    //
+    //    The SameSite attribute of the Set-Cookie HTTP response header
+    //    allows you to declare if your cookie should be restricted to a
+    //    first-party or same-site context. Cookies with SameSite=None
+    //    must now also specify the Secure attribute (they require a secure
+    //    context/HTTPS).
     // -------------------------------------------------------------------------
     //
     writeCookie: function (options /*name, data, [path, expires, SameSite, secure]*/) {
@@ -1255,10 +1268,12 @@ var j1 = (function () {
           expires: 0,
           path: '/',
 //        SameSite: 'Strict',
+          SameSite: 'Lax',
+          http_only: false,
           secure: false
       };
       var settings = $.extend(defaults, options);
-
+//    moment not used anymore
 //    var epoch         = Math.floor(Date.now()/1000);
 //    var timestamp_now = moment.unix(epoch).format('YYYY-MM-DD HH:mm:ss');
       var date          = new Date();
@@ -1277,11 +1292,11 @@ var j1 = (function () {
         if (settings.expires > 0) {
           Cookies.set(settings.name, data_encoded, {
             expires: settings.expires,
-//          SameSite: settings.SameSite
+            SameSite: settings.SameSite
           });
         } else {
           Cookies.set(settings.name, data_encoded, {
-//          SameSite: settings.SameSite
+          SameSite: settings.SameSite
           });
         }
       } else {
@@ -1291,11 +1306,11 @@ var j1 = (function () {
         if (settings.expires > 0) {
           Cookies.set(settings.name, data_encoded, {
             expires: settings.expires,
-//          SameSite: settings.SameSite
+            SameSite: settings.SameSite
           });
         } else {
           Cookies.set(settings.name, data_encoded, {
-//          SameSite: settings.SameSite
+            SameSite: settings.SameSite
           });
         }
       }
@@ -1793,8 +1808,8 @@ var j1 = (function () {
     }, // END checkUserAgent
 
     // -------------------------------------------------------------------------
-    // checkUserAgent()
-    // Returns the name (UA) of the web browser
+    // generateId()
+    // Generate a unique (thread) id used by the logger
     // -------------------------------------------------------------------------
     generateId: function (length) {
      var result           = '';
@@ -1804,7 +1819,7 @@ var j1 = (function () {
         result += characters.charAt(Math.floor(Math.random() * charactersLength));
      }
    return result;
-    }, // END checkUserAgent
+    }, // END generateId
 
     // -------------------------------------------------------------------------
     // getTrue()