j1-template 2021.1.28 → 2021.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d149f9e04f389fc677449fe654ff144b8536834de7cb6bc9f61c806df4ca858
-  data.tar.gz: 95ee34bd117d6c2b6a49274d21048be1cb5e530a6474d3055f006aa8e2197f34
+  metadata.gz: 1dea149afebef9dd59d1a3c57c11c49529f276a14b45cd23233c329c15241832
+  data.tar.gz: 49d03803cbb2b25b16bcca736824eff674d275ae5fd43e981e390c36b6d640f3
 SHA512:
-  metadata.gz: 2fa157e83398f1cb9fb4f1307706acc3e1a003566e8b07ff963cac9031846798bc4fc3f667e669678fe4ced86bd07e593ac7c166e0c4ff25662be7c98e27e9fe
-  data.tar.gz: f89a9f07ffccf9f204d2aac60fdb386deac13b1bf018e9e12fe5a6ad7b06e1df20c62c00999c4c2a9f82552e191f8b9ef8b173e01bc74ad28ff675e0ee57f75a
+  metadata.gz: 68d532d58db2ea87b11911fdec65f1b038567c4f3984198a4c739806f232b057f660c79d5f7d8d1c9a5262a3ad25631e78581ca18dea30eae8dcd2dae175d81e
+  data.tar.gz: '05359dea7e854aad8a78e75ed863b60df4f547637da8d9b0276d31f6959195d2854ddc5fa4e348a2c3a62e9b170a9b80bb2a8521af2f4f7927fb9e36d7b5614a'

data/_includes/themes/j1/modules/navigator/generator.html

@@ -87,7 +87,7 @@
 
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign nav_bar_id                  = navigator_defaults.nav_bar.xhr_container_id %}
+{% assign nav_bar_id                  = navigator_defaults.nav_bar.container_id %}
 {% assign nav_menu_id                 = navigator_defaults.nav_menu.xhr_container_id %}
 {% assign nav_mmenu_id                = navigator_defaults.nav_mmenu.xhr_container_id %}
 {% assign nav_sidebar_id              = navigator_defaults.nav_sidebar.xhr_container_id %}

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

@@ -1000,7 +1000,7 @@ var j1 = (function () {
               }
             } else {
               if (comments) {
-                logger.warn('\n' + 'enable comment provider: ' + comment_provider);
+                logger.info('\n' + 'enable comment provider: ' + comment_provider);
                 $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
                 if (comment_provider === 'disqus') {
                   logger.info('\n' + 'load comment provider code: ' + comment_provider);
@@ -1042,9 +1042,9 @@ var j1 = (function () {
               if (tracking_enabled && !tracking_id_valid) {
                 logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
               } else if (tracking_enabled && tracking_id_valid) {
-                logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
+                logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
               } else {
-                logger.warn('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
+                logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
               }
             } else {
               logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);
@@ -1150,7 +1150,7 @@ var j1 = (function () {
             }
           } else {
             if (comments) {
-              logger.warn('\n' + 'enable comment provider: ' + comment_provider);
+              logger.info('\n' + 'enable comment provider: ' + comment_provider);
               $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
               if (comment_provider === 'disqus') {
                 logger.info('\n' + 'load comment provider code: ' + comment_provider);
@@ -1203,9 +1203,9 @@ var j1 = (function () {
             if (tracking_enabled && !tracking_id_valid) {
               logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
             } else if (tracking_enabled && tracking_id_valid) {
-              logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
+              logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
             } else {
-              logger.warn('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
+              logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
             }
           } else {
             logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);

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

@@ -27,7 +27,6 @@ regenerate:                             true
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment       = site.environment %}
-{% assign template_version  = site.version %}
 {% assign asset_path        = "/assets/themes/j1" %}
 
 {% comment %} Process YML config data
@@ -83,9 +82,11 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
+  var language      = '{{site.language}}';
   var user_agent    = platform.ua;
   var moduleOptions = {};
   var _this;
+  var lastPageInfo;
   var logger;
   var logText;
 
@@ -173,6 +174,8 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
           {% assign scrollOffset    = item.scroller.scrollOffset %}
           {% assign lastPage        = item.scroller.lastPage %}
           {% assign infoLastPage    = item.scroller.infoLastPage %}
+          {% assign lastPageInfo_en = item.scroller.lastPageInfo_en %}
+          {% assign lastPageInfo_de = item.scroller.lastPageInfo_de %}
 
           // scroller_id: {{ scroller_id }}
           var log_text = '\n' + 'j1Scroll is being initialized on: ' + '{{scroller_id}}';
@@ -190,6 +193,20 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
           var container = '#' + '{{container}}';
           var pagePath  = '{{path}}';
 
+          if (language === 'en') {
+            lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
+            lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
+            lastPageInfo += '</p></div>';
+          } else if (language === 'de') {
+            lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
+            lastPageInfo += '{{lastPageInfo_de|strip_newlines}}';
+            lastPageInfo += '</p></div>';
+          } else {
+            lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
+            lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
+            lastPageInfo += '</p></div>';
+          }
+
           // Create an j1Scroll instance if container exists
           if ($(container).length) {
             $(container).j1Scroll({
@@ -198,6 +215,7 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
               scrollOffset:         {{scrollOffset}},
               lastPage:             {{lastPage}},
               infoLastPage:         {{infoLastPage}},
+              lastPageInfo:         lastPageInfo,
             });
           }