j1-template 2022.0.2 → 2022.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c31477f87609e60552f0ffa76b8f36daab38d8915affbef9fca29e185a13dbd
-  data.tar.gz: 65f2a6293c1f9f05e31c8576f528d30e397b4a790236e0a25a7672b0b3adb705
+  metadata.gz: fa9b2f1b29b6e4875eec6816f91adb606ba0094f1157d9959792618c065a727e
+  data.tar.gz: cf47cba9bbd587ce4101b1925609b7c146f583712bf232cc98282a5761c34c2a
 SHA512:
-  metadata.gz: eff73da4fb89bb43588bfe63bae111e880693ecf423c34051251b4fce2e2014b4de5c392b7dc9161d2bbe7342a1ce52d46f704c2ce5fac526dfc98a9ad4fd3f6
-  data.tar.gz: 7425d1165d8e388f640cf8d0cdbcf78b9ba7f48d1dd98a5943b446a1e197b35a7555af4086c4ac7d788a27343493b4a35bd30a1affdc843b208efe9e6e66dcb4
+  metadata.gz: 9b56d12a6e1b05d37900b1ef121f761fc3adaabac028a355b980d2d3ac41094d91a520350d2d2bab721bb60d76fa69618388bbb45e4190cb933bf18505219c9e
+  data.tar.gz: e2694227b059a9f5c52da1c46da80e29d3315b2dda0a87a3442adb70d301835090b0436a1ce516669001285744a468c3b2a85e49429dff2effcf47abc8d34f04

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

@@ -25,16 +25,6 @@
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-
-<!-- load the GA library -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>
-
-<!-- GA depends on the cookie consent and is enabled/disabled on OptIn/Out-->
-<!--
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-  gtag('config', '{{tracking_id}}');
-</script>
--->
+<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ GA depends on the cookie consent and is enabled/disabled dynamically on OptIn/Out ] -->
+<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ if analytics enabled, load the GA library statically by default ] -->
+<script async id="google-tag-manager" src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>

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

@@ -23,11 +23,10 @@
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 
-
 {% comment %} Main
+<!-- thread container places dynamically by j1 adapter
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ place the thread container: start ] -->
-<div id="hyvor-talk-view"></div>
 <!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ connector depends on the cookie consent (personalization) ] -->
-<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ connector (dynamic) JS is enabled/disabled on OptIn/Out ] -->
-<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ place the thread container: end ] -->
+<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ connector is enabled/disabled dynamically by j1 adapter on OptIn/Out ] -->
+<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ thread container disabled, placed dynamically by j1 adapter ] -->
+<!-- div id="hyvor-talk-view"></div -->

data/_includes/themes/j1/procedures/global/create_bs_button.proc

@@ -79,7 +79,7 @@
     {% if button_tagline %}
       {% if button_href and button_target %}
         {% capture bs_button_html %}
-          <a id="#{{button_id}}" href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
+          <a id="{{button_id}}" href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
             <i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-3"></i>
             <span class="float-right text-left mt-2">
               {{button_title}}
@@ -89,7 +89,7 @@
         {% endcapture %}
       {% elsif button_href %}
         {% capture bs_button_html %}
-          <a id="#{{button_id}}" href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
+          <a id="{{button_id}}" href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
             <i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-3"></i>
             <span class="float-right text-left mt-2">
               {{button_title}}
@@ -103,7 +103,7 @@
     {% else %}
       {% if button_href and button_target %}
         {% capture bs_button_html %}
-          <a id="#{{button_id}}" href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
+          <a id="{{button_id}}" href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
             <i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i>
             <span class="float-right text-left">
               {{button_title}}
@@ -112,7 +112,7 @@
         {% endcapture %}
       {% elsif button_href %}
         {% capture bs_button_html %}
-          <a id="#{{button_id}}" href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
+          <a id="{{button_id}}" href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
             <i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i>
             <span class="float-right text-left">
               {{button_title}}

data/assets/data/private.json

@@ -45,9 +45,5 @@ exclude_from_search:                    true
 {{ private_settings | json }}
 
 {% endcapture %}
-{% if production %}
-  {{ cache | minifyJSON }}
-{% else %}
-  {{ cache | strip_empty_lines }}
-{% endif %}
+{{ cache | encodeBase64 }}
 {% assign cache = nil %}

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

@@ -267,15 +267,18 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
         $('#quickLinksCookieButton').css('display', 'block');
       }
 
-      logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
-      j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
-      logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
-      gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
-
-      if (user_agent.includes('iPad'))  {
-        logger.warn('\n' + 'product detected : ' + platform.product);
-        logger.warn('\n' + 'skip deleting (unwanted) cookies for this platform');
-      }
+      // jadams, 2021-11-29: disabled additional logs to verify the existance
+      // of J1 and GA cookies (testing only)
+      //
+      // logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+      // j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+      // logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+      // gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
+      //
+      // if (user_agent.includes('iPad'))  {
+      //   logger.warn('\n' + 'product detected : ' + platform.product);
+      //   logger.warn('\n' + 'skip deleting (unwanted) cookies for this platform');
+      // }
 
       // Manage Google Analytics OptIn/Out
       // See: https://github.com/luciomartinez/gtag-opt-in/wiki

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

@@ -776,7 +776,7 @@ var j1 = (function () {
         }
       }  else {
         logText = '\n' + 'no banner found in site';
-        logger.warn(logText);
+        logger.debug(logText);
         return false;
       }
       return true;
@@ -879,7 +879,7 @@ var j1 = (function () {
         }
       } else {
         logText = '\n' + 'no panel found in site';
-        logger.warn(logText);
+        logger.debug(logText);
         return false;
       }
       return true;
@@ -931,7 +931,7 @@ var j1 = (function () {
         selector.load(footer_data_path, cb_load_closure(id));
       } else {
         logText = '\n' + 'data not loaded';
-        logger.warn(logText);
+        logger.debug(logText);
         j1.setXhrDataState(id, 'not loaded');
         j1.setXhrDomState(id, 'pending');
         return false;
@@ -1041,8 +1041,8 @@ var j1 = (function () {
           setTimeout (function() {
             // Manage providers for personalization OptIn/Out (Comments|Ads)
             if (!user_consent.personalization) {
-              logger.warn('\n' + 'disable comment provider: ' + comment_provider);
-              logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
+              logger.debug('\n' + 'disable comment provider: ' + comment_provider);
+              logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
               $('#leave-a-comment').remove();
               if (comment_provider === 'disqus') {
                 $('#dsq-count-scr').remove();
@@ -1079,7 +1079,7 @@ var j1 = (function () {
            // no dropcaps if translation enabled
            if (user_translate.translationEnabled) {
              logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
-             logger.warn('\n' + 'skipped processing of dropcaps');
+             logger.debug('\n' + 'skipped processing of dropcaps');
            } else {
              // initialize dropcaps
              logger.info('\n' + 'post processing: createDropCap');
@@ -1107,7 +1107,7 @@ var j1 = (function () {
                 logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
               }
             } else {
-              logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
+              logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
             }
 
             // show|hide cookie icon (should MOVED to Cookiebar ???)
@@ -1155,8 +1155,8 @@ var j1 = (function () {
             // for GDPR compliance, themes feature may disabled on
             // privacy settings
             if (!user_consent.personalization)  {
-              logger.warn('\n' + 'disable themes feature because of privacy settings');
-              logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
+              logger.debug('\n' + 'disable themes feature because of privacy settings');
+              logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
               $("#themes_menu").hide();
             } else {
               $("#themes_menu").show();
@@ -1198,8 +1198,8 @@ var j1 = (function () {
 
           // Manage providers for personalization OptIn/Out (Comments|Ads)
           if (!user_consent.personalization) {
-            logger.warn('\n' + 'disable comment provider: ' + comment_provider);
-            logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
+            logger.debug('\n' + 'disable comment provider: ' + comment_provider);
+            logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
             $('#leave-a-comment').remove();
             if (comment_provider === 'disqus') {
               $('#dsq-count-scr').remove();
@@ -1260,7 +1260,7 @@ var j1 = (function () {
           // no dropcaps if translation enabled
           if (user_translate.translationEnabled) {
             logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
-            logger.warn('\n' + 'skipped processing of dropcaps');
+            logger.debug('\n' + 'skipped processing of dropcaps');
           } else {
             // initialize dropcaps
             logger.info('\n' + 'post processing: createDropCap');
@@ -1289,7 +1289,7 @@ var j1 = (function () {
               logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
             }
           } else {
-            logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
+            logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
           }
 
           logger.info('\n' + 'mode detected: web');
@@ -1338,8 +1338,8 @@ var j1 = (function () {
           // for GDPR compliance, themes feature may disabled on
           // privacy settings
           if (!user_consent.personalization)  {
-            logger.warn('\n' + 'disable themes feature because of privacy settings');
-            logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
+            logger.debug('\n' + 'disable themes feature because of privacy settings');
+            logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
             $("#themes_menu").hide();
           } else {
             $("#themes_menu").show();
@@ -1594,7 +1594,7 @@ var j1 = (function () {
       if (options.xhr_data_element !== '') {
         logger.info('\n' + 'XHR data element found: ' + options.xhr_data_element);
       } else  {
-        logger.warn('\n' + 'no XHR data element found, loading data aborted');
+        logger.debug('\n' + 'no XHR data element found, loading data aborted');
         return;
       }
 
@@ -1626,7 +1626,7 @@ var j1 = (function () {
         // failsafe - prevent XHR load errors
         if (id != '#undefined') {
           logText = '\n' + 'data not loaded on id:' + id;
-          logger.warn(logText);
+          logger.debug(logText);
           j1.setXhrDataState(id, 'not loaded');
           j1.setXhrDomState(id, 'not loaded');
           // Set processing state to 'finished' to complete module load

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

@@ -98,7 +98,6 @@ j1.adapter['translator'] = (function (j1, window) {
   var secure;
   var logText;
   var cookie_written;
-  var modal_language;
   var navigator_language;
   var translation_language;
   var ddSourceLanguage;
@@ -171,7 +170,6 @@ j1.adapter['translator'] = (function (j1, window) {
       domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
       cookie_domain         = (domain.includes('.')) ? '.' + domain : domain;
       secure                = (url.protocol.includes('https')) ? true : false;
-      modal_language        = "{{site.language}}";
       navigator_language    = navigator.language || navigator.userLanguage;     // userLanguage for MS IE compatibility
       translation_language  = navigator_language.split('-')[0];
       cookie_names          = j1.getCookieNames();
@@ -270,6 +268,10 @@ j1.adapter['translator'] = (function (j1, window) {
             expires:  365
           });
 
+          if (moduleOptions.dialogLanguage === 'auto') {
+            moduleOptions.dialogLanguage = '{{contentLanguage}}';
+          }
+
           j1.translator = new Translator({
             contentURL:               moduleOptions.contentURL,                 // dialog content (modals) for all supported languages
             cookieName:               moduleOptions.cookieName,                 // the name of the User State Cookie (primary data)

data/assets/themes/j1/core/js/template.js

@@ -2456,6 +2456,12 @@ module.exports = function navigator(options) {
       var defaultOptions = options;
       var logger = log4javascript.getLogger('j1.core.navigator.eventHandler');
       var $getNav = $('nav.navbar.navigator');
+      var scrollDuration = 300;
+      var page_link;
+      var classname;
+      var nav_link;
+      var anchor_id;
+      var scrollOffset;
       var json_data; // jadams: unused code (for now).: manages HTML5 server side events
       // for incoming messages from Git Server send e.g. on a 'pull request'
       // NOTE: used for ControlCenter (cc) functionality only !!!
@@ -2496,12 +2502,65 @@ module.exports = function navigator(options) {
       // 'scroll-to-top'
       // See:
       //  https://developer.mozilla.org/en-US/docs/Web/API/Event/preventDefault
+      //  https://developer.mozilla.org/en-US/docs/Web/API/Event/stopPropagation
       //  https://stackoverflow.com/questions/134845/which-href-value-should-i-use-for-javascript-links-or-javascriptvoid0
       //
 
       $('a[href="#"]').click(function (e) {
         logger.debug('\n' + 'click event on href "#" detected: prevent default action');
         e.preventDefault ? e.preventDefault() : e.returnValue = false;
+      }); // -----------------------------------------------------------------------
+      // In-page smooth scroll
+      // -----------------------------------------------------------------------
+      // bind click event to all headlines generated by AsciiDoctor
+      // for smooth-scroll (in-page)
+      //
+
+      $('.sect1, .sect2 .sect3, .sect4, .sect5, .sect6').on('click', function (e) {
+        page_link = document.querySelector('[id="' + decodeURI(anchor_id).split('#').join('') + '"]') ? true : false;
+        anchor_id = e.target.hash ? e.target.hash : false;
+        classname = e.target.className ? e.target.className : '';
+        nav_link = classname.includes('nav-link'); // skip BS nav links
+
+        scrollOffset = j1.getScrollOffset();
+
+        if (anchor_id && !nav_link || page_link) {
+          logger.debug('\n' + 'click event on headline detected: ' + anchor_id);
+          $('html, body').animate({
+            scrollTop: $(anchor_id).offset().top + scrollOffset
+          }, scrollDuration);
+          e.preventDefault ? e.preventDefault() : e.returnValue = false;
+        }
+      }); // bind click event to all HTML elements of class '.badge' (Bootstrap)
+      // for smooth-scroll (in-page) to a '<div>' element
+      //
+
+      $('.badge').on('click', function (e) {
+        anchor_id = e.target.hash ? e.target.hash : false;
+        scrollOffset = 100;
+
+        if (anchor_id) {
+          logger.debug('\n' + 'click event on badge detected: ' + anchor_id);
+          $('html, body').animate({
+            scrollTop: $(anchor_id).offset().top - scrollOffset // NOTE: diffeent scrollOffset
+
+          }, scrollDuration);
+          event.stopPropagation();
+        }
+      }); // bind click event to all HTML elements of class '.badge-tag' (j1)
+      // for smooth-scroll (in-page)
+
+      $('.badge-tag').on('click', function (e) {
+        anchor_id = e.target.hash ? e.target.hash : false;
+        scrollOffset = j1.getScrollOffset();
+
+        if (anchor_id) {
+          logger.debug('\n' + 'click event on badge-tag detected: ' + anchor_id);
+          $('html, body').animate({
+            scrollTop: $(anchor_id).offset().top + scrollOffset
+          }, scrollDuration);
+          event.stopPropagation();
+        }
       }); // jadams: test code for jQuery plugin 'regex'
       // -----------------------------------------------------------------------
       // $('a:contains("?#")').click(function(e) {