j1-template 2021.0.13 → 2021.1.1

data/assets/error_pages/HTTP521.html

@@ -1,7 +1,7 @@
 ---
 regenerate:                             false
 permalink:                              /521.html
-exclude_from_search:                    true
+sitemap:                                false
 ---
 {% capture j1_cache %}
 
@@ -45,6 +45,7 @@ exclude_from_search:                    true
     <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}}</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>

data/assets/error_pages/HTTP533.html

@@ -1,7 +1,7 @@
 ---
 regenerate:                             false
 permalink:                              /533.html
-exclude_from_search:                    true
+sitemap:                                false
 ---
 {% capture j1_cache %}
 
@@ -45,6 +45,7 @@ exclude_from_search:                    true
     <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}}</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>

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 %}
 
@@ -289,7 +313,12 @@ j1.adapter['carousel'] = (function (j1, window) {
                         }
                         content += '\t\t' + '</div>' + '\n';
                       } else {
-                        content += '<a class="item" href="' +img+ '" ' + 'data-lightbox="{{slider_id}}"> <img class="lazyOwl" data-src="' +img+ '" alt="' +alt+ '">' + ' </a>';
+                        // jadams, 2021-03-06: added link text (alt) for search engine optimization (SEO|Google)
+                        // content += '<a class="item" href="' +img+ '" ' + 'data-lightbox="{{slider_id}}"> <img class="lazyOwl" data-src="' +img+ '" alt="' +alt+ '">' + ' </a>';
+                        //
+                        content += '<a class="item" href="' + img + '" ';
+                        content += 'data-lightbox="{{slider_id}}"> <img class="lazyOwl" data-src="' + img;
+                        content += '" alt="' +alt+ '">' +alt+ ' </a>';
                       }
                     } else if (href) {
                         content += '<div class="item">' + '<img src="' +img+ '" alt="' +alt+ '">' + '</div>';

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

@@ -226,6 +226,14 @@ j1.adapter['fam'] = (function (j1, window) {
       var floatingActionOptions = famOptions.menu_options;
       var famButtons            = document.querySelectorAll('.fam-btn');
 
+      // bind click event to all links with "#void" to suppress default action
+      // See: https://stackoverflow.com/questions/134845/which-href-value-should-i-use-for-javascript-links-or-javascriptvoid0
+      //
+      $('a[href="#void"]').click(function(e) {
+        e.preventDefault ? e.preventDefault() : e.returnValue = false;
+        logger.info('bound click event to "#void", suppress default action');
+      });
+
       // check if multiple buttons detected
       if ( famButtons.length == 1 ) {
         _this.setState('processing');
@@ -661,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 }}
@@ -673,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);
@@ -742,7 +749,7 @@ var j1 = (function () {
       var id = '#' + '{{footer_id}}';
       var selector = $(id);
       if ( selector.length ) {
-        var footer_data_path = '{{footer_data_path}}';
+        var footer_data_path = '{{footer_data_path}}' + id + ' > *';
         selector.load(footer_data_path, cb_load_closure(id));
       } else {
         logText = 'data not loaded';
@@ -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;
@@ -1022,13 +1029,40 @@ var j1 = (function () {
       var anchor_id = '#' + anchor;
       var selector;
 
-      if (anchor && anchor_id) {
+      var logger        = log4javascript.getLogger('j1.scrollTo');
+
+      var toccerScrollDuration = {{toccer_options.scrollSmoothDuration}};
+      var toccerScrollOffset   = {{toccer_options.scrollSmoothOffset}};
+
+      // calculate offset for correct (smooth) scroll position
+      //
+      var $pagehead       = $('.attic');
+      var $navbar         = $('nav.navbar');
+      var $adblock        = $('#adblock');
+
+      var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+      var fontSize        = $('body').css('font-size').replace('px','');
+      var start           = window.pageYOffset;
+
+      var l               = parseInt(fontSize);
+
+      var h               = $pagehead.length ? $pagehead.height() : 0;
+      var n               = $navbar.length ? $navbar.height() : 0;
+      var a               = $adblock.length ? $adblock.height() : 0;
+
+      var scrollOffset    = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
+
+      // static offset, to be checked why this is needed
+      //
+      scrollOffset        = scrollOffset + toccerScrollOffset;
+
+      if (anchor_id && anchor_id !== '#') {
         // scroll only, if an anchor is given with URL
         selector = $(anchor_id);
         if (selector.length) {
           j1.core.scrollSmooth.scroll( anchor_id, {
-            duration: {{toccer_options.scrollSmoothDuration}},
-            offset: {{toccer_options.scrollSmoothOffset}},
+            duration: toccerScrollDuration,
+            offset: scrollOffset,
             callback: null
           });
         } else {
@@ -1039,6 +1073,11 @@ var j1 = (function () {
           $(window).scrollTop($(window).scrollTop()+1);
           $(window).scrollTop($(window).scrollTop()-1);
         } // END if anchor_id
+      } else if (anchor_id === '#') {
+        logger.info('bound click event to "#", suppress default action');
+        $(window).scrollTop($(window).scrollTop()+1);
+        $(window).scrollTop($(window).scrollTop()-1);
+        return false;
       }
     }, // END scrollTo
 
@@ -1078,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  = {
@@ -1092,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) {
@@ -1214,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]*/) {
@@ -1223,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();
@@ -1245,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 {
@@ -1259,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
           });
         }
       }
@@ -1761,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           = '';
@@ -1772,7 +1819,7 @@ var j1 = (function () {
         result += characters.charAt(Math.floor(Math.random() * charactersLength));
      }
    return result;
-    }, // END checkUserAgent
+    }, // END generateId
 
     // -------------------------------------------------------------------------
     // getTrue()