j1-template 2023.2.7 → 2023.3.0

data/assets/themes/j1/modules/scroller/js/scroller.js

@@ -6,9 +6,9 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2023 Juergen Adams
+ # Copyright (C) 2022 Juergen Adams
  #
- # J1 Theme is licensed under the MIT License.
+ # J1 Template is licensed under the MIT License.
  # For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  # -----------------------------------------------------------------------------
  # NOTE: Based on https://github.com/jquery-boilerplate/jquery-boilerplate
@@ -23,7 +23,8 @@
 ;(function($, window, document, undefined) {
   'use strict';
 
-  // Create the defaults
+  // create the defaults
+  //
   var pluginName = 'scroller',
   defaults = {
     type:                 'infiniteScroll',
@@ -38,25 +39,29 @@
     onAfterLoad:          function (){}                                         // callback after new items are loaded
   };
 
-  // Plugin constructor
+  // plugin constructor
+  //
   function Plugin (element, options) {
     this.element            = element;
     this.settings           = $.extend( {}, defaults, options);
     this.settings.elementID = '#' + this.element.id;
 
     // call the initializer
+    //
     this.init(this.settings);
   }
 
-  // Avoid plugin prototype conflicts
+  // avoid plugin prototype conflicts
+  //
   $.extend(Plugin.prototype, {
-    // -----------------------------------------------------------------------
+
+    // -------------------------------------------------------------------------
     // init()
     // plugin initializer
-    // -----------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     init: function(options) {
+      var logger = log4javascript.getLogger('j1.scroller.core');
       var _this  = this;
-      var logger = log4javascript.getLogger('j1.scroller.core.init');
 
       logger.info('\n' + 'initializing plugin: started');
       logger.info('\n' + 'state: started');
@@ -67,22 +72,13 @@
         _this.scroller = window;
       }
 
-      if (options.loadStatus) {
-        var spinner = '<div class="loader-ellips" style="display: none"> <span class="loader-ellips__dot"></span> <span class="loader-ellips__dot"></span> <span class="loader-ellips__dot"></span> <span class="loader-ellips__dot"></span> </div>';
-        $(spinner).insertAfter(options.elementID);
-      }
-
-      if (options.infoLastPage) {
-        var message = options.lastPageInfo;
-        $(message).insertAfter(options.elementID);
-      }
-
-      // jadams, 2021-11-08: for testing reason, registerScrollEvent delayed
-      // until page_ready state
+      // registerScrollEvent delayed until page_ready state
+      //
       var dependencies_met_page_ready = setInterval (function () {
         if (j1.getState() === 'finished') {
 
           // initialize infinite scroll
+          //
           if ( options.type === 'infiniteScroll') {
             logger.info('\n' + 'processing mode: ' + options.type);
             logger.info('\n' + 'loading items from path: ' + options.pagePath);
@@ -90,6 +86,7 @@
             _this.registerScrollEvent(options);
           }
           // initialize show on scroll
+          //
           if ( options.type === 'showOnScroll') {
             logger.info('\n' + 'processing mode: ' + options.type);
             logger.info('\n' + 'loading items from path: ' + options.pagePath);
@@ -109,17 +106,18 @@
     // -------------------------------------------------------------------------
     isInViewport: function (elm, offset) {
       // if the element doesn't exist, abort
+      //
     	if( elm.length == 0 ) {
     		return;
     	}
-    	var $window = jQuery(window);
-    	var viewport_top = $window.scrollTop();
-    	var viewport_height = $window.height();
-    	var viewport_bottom = viewport_top + viewport_height;
-    	var $elm = jQuery(elm);
-    	var top = $elm.offset().top + offset;
-    	var height = $elm.height();
-    	var bottom = top + height;
+    	var $window          = jQuery(window);
+    	var viewport_top     = $window.scrollTop();
+    	var viewport_height  = $window.height();
+    	var viewport_bottom  = viewport_top + viewport_height;
+    	var $elm             = jQuery(elm);
+    	var top              = $elm.offset().top + offset;
+    	var height           = $elm.height();
+    	var bottom           = top + height;
 
     	return (top >= viewport_top && top < viewport_bottom) ||
     	(bottom > viewport_top && bottom <= viewport_bottom) ||
@@ -144,20 +142,22 @@
 
       if (_this.settings.elementScroll) {
         // check scroll position of the container items are to be added
-        var $window = $(window);
-        var viewport_top = $window.scrollTop();
+        //
+        var $window         = $(window);
+        var viewport_top    = $window.scrollTop();
         var viewport_height = $window.height();
         var viewport_bottom = viewport_top + viewport_height - options.scrollOffset;
-        var $elm = $(options.elementID);
-        var top = $elm.offset().top + clientHeight;
-        var height = $elm.height();
-        bottom = top + height;
+        var $elm            = $(options.elementID);
+        var top             = $elm.offset().top + clientHeight;
+        var height          = $elm.height();
+        bottom              = top + height;
 
         return (top >= viewport_top && top < viewport_bottom) ||
         (bottom > viewport_top && bottom <= viewport_bottom) ||
         (height > viewport_height && top <= viewport_top && bottom >= viewport_bottom);
       } else {
         // check scroll position of the (overall) window
+        //
         return (window.innerHeight + window.pageYOffset + options.scrollOffset >= document.body.offsetHeight);
       }
     },
@@ -168,49 +168,52 @@
     // position reached
     // -------------------------------------------------------------------------
     registerScrollEvent: function (options) {
-      var _this = this;
-      var logger = log4javascript.getLogger('j1.scroller.core.registerScrollEvent');
+      var logger = log4javascript.getLogger('j1.scroller.core');
+      var _this  = this;
 
-      // scroller type infiniteScroll
+      // scroller type 'infiniteScroll'
+      //
       if (options.type === 'infiniteScroll') {
-        logger.info('\n' + 'register scroll event of type: ' + options.type);
-
         // register event function DYNAMICALLY
+        //
         _this[options.id] = function (event) {
           var options = _this.settings;
 
           if (_this.isBottomReached(options)) {
             if (options.firstPage > options.lastPage ) {
-              logger.info('\n' + 'last page detected on: ' + options.lastPage);
               window.removeEventListener('scroll', _this[options.id]);
-              logger.info('\n' + 'scroll event: removed');
+              logger.debug('\n' + 'scroll event removed: ' + options.type);
 
               if (options.infoLastPage ) {
-                  _this.infoLastPage(options);
+                logger.debug('\n' + 'show last page info');
+                _this.infoLastPage(options);
               }
               return false;
             }
             _this.getNewPost(options);
           }
         };
+
         window.addEventListener('scroll', _this[options.id]);
-        logger.info('\n' + 'scroll event: registered');
+        logger.debug('\n' + 'scroll event registered: ' + options.type);
       }
 
-      // scroller type showOnScroll
+      // scroller type 'showOnScroll'
+      //
       if (options.type === 'showOnScroll') {
-        logger.info('\n' + 'register scroll event of type: ' + options.type);
-
         // register event function DYNAMICALLY
+        //
         _this[options.id] = function (event) {
           if (_this.isInViewport ($('#' + options.id ), options.scrollOffset)) {
-      			logger.info('\n' + 'specified container is in view: ' + options.id);
+      			logger.debug('\n' + 'specified container is in view: ' + options.id);
             $('.' + options.id).show(options.showDelay);
-      			logger.info('\n' + 'remove eventHandler');
             window.removeEventListener('scroll', _this[options.id]);
+            logger.debug('\n' + 'scroll event showOnScroll: removed');
           }
         }
+
       	window.addEventListener('scroll', _this[options.id]);
+        logger.debug('\n' + 'scroll event registered: ' + options.type);
       }
 
     },
@@ -222,18 +225,21 @@
     //        is NOT finished
     // -------------------------------------------------------------------------
     getNewPost: function (options) {
-      var _this = this;
-      var logger = log4javascript.getLogger('j1.scroller.core.getNewPost');
+      var logger = log4javascript.getLogger('j1.scroller.core');
+      var _this  = this;
 
-      logger.debug('\n' + 'trigger loading ');
+      logger.debug('\n' + 'loading new posts');
 
       // initialze loader flag
+      //
       if (this.itemsLoaded === false) return false;
 
-      // set loader flag (false == not loaded)
+      // set loader flag (false == not loaded
+      //
       this.itemsLoaded = false;
 
       // display spinner while loading
+      //
       if (options.loadStatus) {
         logger.info('\n' + 'show: spinner');
         $('.loader-ellips').show();
@@ -266,8 +272,6 @@
             }
 
             logger.error('\n' + 'loading new items failed, HTTP response: ' + xmlhttp.status );
-            // set loader flag (true == loaded)
-            // return _this.itemsLoaded = false;
             _this.itemsLoaded = false;
           }
         }
@@ -282,12 +286,12 @@
     // extract items from page loaded
     // -------------------------------------------------------------------------
     getChildItemsByAjaxHTML: function (options, HTMLText) {
+      var logger  = log4javascript.getLogger('j1.scroller.core');
       var newHTML = document.createElement('html');
-      var logger = log4javascript.getLogger('j1.scroller.core.getChildItemsByAjaxHTML');
 
       logger.debug('\n' + 'load new items');
       newHTML.innerHTML = HTMLText;
-      var childItems = newHTML.querySelectorAll(options.elementID + ' > *');
+      var childItems    = newHTML.querySelectorAll(options.elementID + ' > *');
       return childItems;
     },
 
@@ -296,22 +300,25 @@
     // append items and run post processing
     // -------------------------------------------------------------------------
     appendNewItems: function (items) {
+      var logger          = log4javascript.getLogger('j1.scroller.core');
       var _this           = this;
-      var logger          = log4javascript.getLogger('j1.scroller.core.appendNewItems');
       var cookie_names    = j1.getCookieNames();
       var user_translate  = j1.readCookie(cookie_names.user_translate);
 
-      logger.debug('\n' + 'append new items');
       items.forEach(function (item) {
-        _this.element.appendChild(item);
+        var elmID = _this.element.id
+        document.getElementById(elmID).appendChild(item);
+        logger.debug('\n' + 'new item appended');
       });
 
       // 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.info('\n' + 'skipped processing of dropcaps');
       } else {
         // initialize dropcaps
+        //
         logger.info('\n' + 'post processing: createDropCap');
         j1.core.createDropCap();
       }
@@ -319,21 +326,21 @@
     },
 
     // -------------------------------------------------------------------------
-    // getNewPost()
-    // load|append new items
-    // Note:  loader flag prevents to load items if AJAX load in progress
-    //        is NOT finished
+    // infoLastPage()
+    // append|show info message on last page (infiniteScroll)
     // -------------------------------------------------------------------------
     infoLastPage: function (options) {
-      var _this         = this;
-        var logger      = log4javascript.getLogger('j1.scroller.core.infoLastPage');
+      var message = options.lastPageInfo;
+
+      $(message).insertAfter(options.elementID);
+      $('.page-scroll-last').show();
+
+    } // END infoLastPage
 
-        logger.info('\n' + 'show: infoLastPage');
-        $('.page-scroll-last').show();
-    }
   }); // END prototype
 
   // wrapper around the constructor to prevent multiple instantiations
+  //
   $.fn [pluginName] = function(options) {
     return this.each(function() {
       if (!$.data( this, "plugin_" + pluginName)) {

data/assets/themes/j1/modules/scroller/js/scroller.min.js

@@ -12,4 +12,4 @@
  # For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  # -----------------------------------------------------------------------------
 */
-!function(e,t,n,i){"use strict";var o={type:"infiniteScroll",scrollOffset:100,elementScroll:!1,firstPage:2,lastPage:!1,infoLastPage:!1,loadStatus:!1,onInit:function(){},onBeforeLoad:function(){},onAfterLoad:function(){}};function s(t,n){this.element=t,this.settings=e.extend({},o,n),this.settings.elementID="#"+this.element.id,this.init(this.settings)}e.extend(s.prototype,{init:function(n){var i=this,o=log4javascript.getLogger("j1.scroller.core.init");if(o.info("\ninitializing plugin: started"),o.info("\nstate: started"),n.elementScroll?i.scroller=i.element:i.scroller=t,n.loadStatus){e('<div class="loader-ellips" style="display: none"> <span class="loader-ellips__dot"></span> <span class="loader-ellips__dot"></span> <span class="loader-ellips__dot"></span> <span class="loader-ellips__dot"></span> </div>').insertAfter(n.elementID)}if(n.infoLastPage){var s=n.lastPageInfo;e(s).insertAfter(n.elementID)}var r=setInterval(function(){"finished"===j1.getState()&&("infiniteScroll"===n.type&&(o.info("\nprocessing mode: "+n.type),o.info("\nloading items from path: "+n.pagePath),o.info("\nmonitoring element set to: "+this.scroller),i.registerScrollEvent(n)),"showOnScroll"===n.type&&(o.info("\nprocessing mode: "+n.type),o.info("\nloading items from path: "+n.pagePath),o.info("\nmonitoring element set to: "+this.scroller),i.registerScrollEvent(n)),o.info("\ninitializing plugin: finished"),o.info("\nstate: finished"),clearInterval(r))},25)},isInViewport:function(e,n){if(0!=e.length){var i=jQuery(t),o=i.scrollTop(),s=i.height(),r=o+s,l=jQuery(e),a=l.offset().top+n,f=l.height(),c=a+f;return a>=o&&a<r||c>o&&c<=r||f>s&&a<=o&&c>=r}},isBottomReached:function(i){var o,s=e(i.elementID).height();if(this.settings.elementScroll){var r=e(t),l=r.scrollTop(),a=r.height(),f=l+a-i.scrollOffset,c=e(i.elementID),d=c.offset().top+s,g=c.height();return o=d+g,d>=l&&d<f||o>l&&o<=f||g>a&&d<=l&&o>=f}return t.innerHeight+t.pageYOffset+i.scrollOffset>=n.body.offsetHeight},registerScrollEvent:function(n){var i=this,o=log4javascript.getLogger("j1.scroller.core.registerScrollEvent");"infiniteScroll"===n.type&&(o.info("\nregister scroll event of type: "+n.type),i[n.id]=function(e){var n=i.settings;if(i.isBottomReached(n)){if(n.firstPage>n.lastPage)return o.info("\nlast page detected on: "+n.lastPage),t.removeEventListener("scroll",i[n.id]),o.info("\nscroll event: removed"),n.infoLastPage&&i.infoLastPage(n),!1;i.getNewPost(n)}},t.addEventListener("scroll",i[n.id]),o.info("\nscroll event: registered")),"showOnScroll"===n.type&&(o.info("\nregister scroll event of type: "+n.type),i[n.id]=function(s){i.isInViewport(e("#"+n.id),n.scrollOffset)&&(o.info("\nspecified container is in view: "+n.id),e("."+n.id).show(n.showDelay),o.info("\nremove eventHandler"),t.removeEventListener("scroll",i[n.id]))},t.addEventListener("scroll",i[n.id]))},getNewPost:function(t){var n=this,i=log4javascript.getLogger("j1.scroller.core.getNewPost");if(i.debug("\ntrigger loading "),!1===this.itemsLoaded)return!1;this.itemsLoaded=!1,t.loadStatus&&(i.info("\nshow: spinner"),e(".loader-ellips").show());var o=new XMLHttpRequest;o.onreadystatechange=function(){if(o.readyState==XMLHttpRequest.DONE)if(200==o.status){t.firstPage++;var s=n.getChildItemsByAjaxHTML(t,o.responseText);n.appendNewItems(s),i.info("\nloading new items: successful"),t.loadStatus&&(i.info("\nhide: spinner"),e(".loader-ellips").hide()),n.itemsLoaded=!0}else t.loadStatus&&(i.info("\nhide: spinner"),e(".loader-ellips").hide()),i.error("\nloading new items failed, HTTP response: "+o.status),n.itemsLoaded=!1},i.info("\nloading new items from path: "+t.pagePath+t.firstPage),o.open("GET",location.origin+t.pagePath+t.firstPage+"/index.html",!0),o.send()},getChildItemsByAjaxHTML:function(e,t){var i=n.createElement("html");return log4javascript.getLogger("j1.scroller.core.getChildItemsByAjaxHTML").debug("\nload new items"),i.innerHTML=t,i.querySelectorAll(e.elementID+" > *")},appendNewItems:function(e){var t=this,n=log4javascript.getLogger("j1.scroller.core.appendNewItems"),i=j1.getCookieNames(),o=j1.readCookie(i.user_translate);n.debug("\nappend new items"),e.forEach(function(e){t.element.appendChild(e)}),o.translationEnabled?(n.info("\ntranslation enabled: "+o.translationEnabled),n.warn("\nskipped processing of dropcaps")):(n.info("\npost processing: createDropCap"),j1.core.createDropCap())},infoLastPage:function(t){log4javascript.getLogger("j1.scroller.core.infoLastPage").info("\nshow: infoLastPage"),e(".page-scroll-last").show()}}),e.fn.scroller=function(t){return this.each(function(){e.data(this,"plugin_scroller")||e.data(this,"plugin_scroller",new s(this,t))})}}(jQuery,window,document);
+!function(e,t,n,i){"use strict";var o="scroller",s={type:"infiniteScroll",scrollOffset:100,elementScroll:!1,firstPage:2,lastPage:!1,infoLastPage:!1,loadStatus:!1,onInit:function(){},onBeforeLoad:function(){},onAfterLoad:function(){}};function r(t,n){this.element=t,this.settings=e.extend({},s,n),this.settings.elementID="#"+this.element.id,this.init(this.settings)}e.extend(r.prototype,{init:function(e){var n=log4javascript.getLogger("j1.scroller.core"),i=this;n.info("\ninitializing plugin: started"),n.info("\nstate: started"),e.elementScroll?i.scroller=i.element:i.scroller=t;var o=setInterval(function(){"finished"===j1.getState()&&("infiniteScroll"===e.type&&(n.info("\nprocessing mode: "+e.type),n.info("\nloading items from path: "+e.pagePath),n.info("\nmonitoring element set to: "+this.scroller),i.registerScrollEvent(e)),"showOnScroll"===e.type&&(n.info("\nprocessing mode: "+e.type),n.info("\nloading items from path: "+e.pagePath),n.info("\nmonitoring element set to: "+this.scroller),i.registerScrollEvent(e)),n.info("\ninitializing plugin: finished"),n.info("\nstate: finished"),clearInterval(o))},25)},isInViewport:function(e,n){if(0!=e.length){var i=jQuery(t),o=i.scrollTop(),s=i.height(),r=o+s,l=jQuery(e),a=l.offset().top+n,d=l.height(),f=a+d;return a>=o&&a<r||f>o&&f<=r||d>s&&a<=o&&f>=r}},isBottomReached:function(i){var o,s=e(i.elementID).height();if(!this.settings.elementScroll)return t.innerHeight+t.pageYOffset+i.scrollOffset>=n.body.offsetHeight;var r=e(t),l=r.scrollTop(),a=r.height(),d=l+a-i.scrollOffset,f=e(i.elementID),g=f.offset().top+s,c=f.height();return o=g+c,g>=l&&g<d||o>l&&o<=d||c>a&&g<=l&&o>=d},registerScrollEvent:function(n){var i=log4javascript.getLogger("j1.scroller.core"),o=this;"infiniteScroll"===n.type&&(o[n.id]=function(e){var n=o.settings;if(o.isBottomReached(n)){if(n.firstPage>n.lastPage)return t.removeEventListener("scroll",o[n.id]),i.debug("\nscroll event removed: "+n.type),n.infoLastPage&&(i.debug("\nshow last page info"),o.infoLastPage(n)),!1;o.getNewPost(n)}},t.addEventListener("scroll",o[n.id]),i.debug("\nscroll event registered: "+n.type)),"showOnScroll"===n.type&&(o[n.id]=function(s){o.isInViewport(e("#"+n.id),n.scrollOffset)&&(i.debug("\nspecified container is in view: "+n.id),e("."+n.id).show(n.showDelay),t.removeEventListener("scroll",o[n.id]),i.debug("\nscroll event showOnScroll: removed"))},t.addEventListener("scroll",o[n.id]),i.debug("\nscroll event registered: "+n.type))},getNewPost:function(t){var n=log4javascript.getLogger("j1.scroller.core"),i=this;if(n.debug("\nloading new posts"),!1===this.itemsLoaded)return!1;this.itemsLoaded=!1,t.loadStatus&&(n.info("\nshow: spinner"),e(".loader-ellips").show());var o=new XMLHttpRequest;o.onreadystatechange=function(){if(o.readyState==XMLHttpRequest.DONE){if(200==o.status){t.firstPage++;var s=i.getChildItemsByAjaxHTML(t,o.responseText);i.appendNewItems(s),n.info("\nloading new items: successful"),t.loadStatus&&(n.info("\nhide: spinner"),e(".loader-ellips").hide()),i.itemsLoaded=!0}else t.loadStatus&&(n.info("\nhide: spinner"),e(".loader-ellips").hide()),n.error("\nloading new items failed, HTTP response: "+o.status),i.itemsLoaded=!1}},n.info("\nloading new items from path: "+t.pagePath+t.firstPage),o.open("GET",location.origin+t.pagePath+t.firstPage+"/index.html",!0),o.send()},getChildItemsByAjaxHTML:function(e,t){var i=log4javascript.getLogger("j1.scroller.core"),o=n.createElement("html");return i.debug("\nload new items"),o.innerHTML=t,o.querySelectorAll(e.elementID+" > *")},appendNewItems:function(e){var t=log4javascript.getLogger("j1.scroller.core"),i=this,o=j1.getCookieNames(),s=j1.readCookie(o.user_translate);e.forEach(function(e){var o=i.element.id;n.getElementById(o).appendChild(e),t.debug("\nnew item appended")}),s.translationEnabled?(t.info("\ntranslation enabled: "+s.translationEnabled),t.info("\nskipped processing of dropcaps")):(t.info("\npost processing: createDropCap"),j1.core.createDropCap())},infoLastPage:function(t){e(t.lastPageInfo).insertAfter(t.elementID),e(".page-scroll-last").show()}}),e.fn[o]=function(t){return this.each(function(){e.data(this,"plugin_"+o)||e.data(this,"plugin_"+o,new r(this,t))})}}(jQuery,window,document);

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

@@ -390,7 +390,7 @@ function Translator(props) {
                 clearInterval(dependencies_met_msDropdownJSON_loaded);
               }
             }
-          }, 25);
+          }, 10);
 
         }); // END modal on 'shown'
 

data/assets/themes/j1/modules/translator/js/translator.min.js

@@ -12,4 +12,4 @@
  #  See: https://github.com/jekyll-one/J1 Theme/blob/master/LICENSE
  # -----------------------------------------------------------------------------
 */
-"use strict";function Translator(o){var e,t,a=this,n=log4javascript.getLogger("j1.core.translator"),i=!!new liteURL(window.location.href).protocol.includes("https"),s=!1,r={set:function(o,e,t,a,n,i){var s=window.btoa(e),r="; expires=Thu, 01 Jan 1970 00:00:00 UTC";if(t>0){var l=new Date;l.setTime(l.getTime()+24*t*60*60*1e3),r="; expires="+l.toUTCString()}document.cookie=i?o+"="+(s||"")+r+"; Path=/; SameSite="+a+"; Domain="+n+"; Secure="+i+";":o+"="+(s||"")+r+"; Path=/; SameSite="+a+";Domain="+n+"; "},get:function(o){for(var e=o+"=",t=document.cookie.split(";"),a=0;a<t.length;a++){for(var n=t[a];" "===n.charAt(0);)n=n.substring(1,n.length);if(0===n.indexOf(e)){var i=n.substring(e.length,n.length);return window.atob(i)}}}};for(var l in n.info("\ninitializing core module: started"),n.info("\nstate: started"),this.props={contentURL:"/assets/data/translator",cookieName:"j1.user.state",cookieConsentName:"j1.user.consent",cookieStorageDays:365,cookieSameSite:"Lax",cookieSecure:i,translationEnabled:!1,disableLanguageSelector:!1,translatorName:"google",translationLanguages:"all",translationLanguage:"auto",translateAllPages:!0,hideSuggestionBox:!0,hidePoweredBy:!0,hideTopFrame:!0,dialogLanguage:"content",dialogLanguages:["en","de"],dialogContainerID:"translator-modal",xhrDataElement:"",postSelectionCallback:""},o)this.props[l]=o[l];-1!==this.props.dialogLanguage.indexOf("-")&&(this.props.dialogLanguage=this.props.dialogLanguage.split("-")[0]),this.props.dialogLanguages.includes(this.props.dialogLanguage)||(this.props.dialogLanguage=this.props.dialogLanguages[0]),this.props.xhrDataElement=this.props.xhrDataElement+"-"+this.props.dialogLanguage,n.info("\ninitializing core module: started"),n.info("\nstate: started");r.get(a.props.cookieName)||(n.info("\ninitializing translator cookie: "+a.props.cookieName),r.set(a.props.cookieName,JSON.stringify({translatorName:"google",translationEnabled:!1,translateAllPages:!0,useLanguageFromBrowser:!0,translationLanguage:"de",analysis:!0,personalization:!0}),a.props.cookieStorageDays,a.props.cookieSameSite,a.props.cookieDomain,a.props.cookieSecure));var d={documentReady:function(o){"loading"!==document.readyState?o():document.addEventListener("DOMContentLoaded",o)}};function p(o){var e,t=function o(){var e={},t=!1,a=0,n=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],a++);for(var i=function(a){for(var n in a)Object.prototype.hasOwnProperty.call(a,n)&&(t&&"[object Object]"===Object.prototype.toString.call(a[n])?e[n]=o(!0,e[n],a[n]):e[n]=a[n])};a<n;a++)i(arguments[a]);return e}({size:0,width:250,multiple:!1,selectedIndex:1,enableAutoFilter:!1,visibleRows:null},o);e="#"+t.selector,$.ajax({url:t.url,dataType:"json",success:function(o){var n=[];if(a.props.translationLanguages.includes("all"))n=o[t.elm];else for(var i=0;i<o[t.elm].length;i++)a.props.translationLanguages.includes(o[t.elm][i].value)&&n.push(o[t.elm][i]);t.visibleRows>n.length&&(t.visibleRows=n.length),MsDropdown.make(e,{byJson:{data:n,name:t.name,size:t.size,width:t.width,multiple:t.multiple},enableAutoFilter:t.enableAutoFilter,visibleRows:t.visibleRows})},error:function(o,e,a){n.error("\nfailed to retrieve JSON data from: "+t.url)}})}function c(){d.documentReady(function(){if(a.modal=document.getElementById(a.props.dialogContainerID),a.modal)a.$modal.modal("show");else{n.info("\nload consent modal"),a.modal=document.createElement("div"),a.modal.id=a.props.dialogContainerID,a.modal.style.display="none",a.modal.setAttribute("class","modal fade"),a.modal.setAttribute("tabindex","-1"),a.modal.setAttribute("role","dialog"),a.modal.setAttribute("aria-labelledby",a.props.dialogContainerID),document.body.append(a.modal),a.$modal=$(a.modal),a.$modal.on("show.bs.modal",function(){n.debug("\nshow.bs.modal: entered"),$.when(p({url:"/assets/data/iso-639-language-codes-flags.json",elm:"iso-639-languages",selector:"dropdownJSON",width:400,visibleRows:8})).then(function(o){n.info("\ncreating msDropdown from JSON data: finished")})}),a.$modal.on("shown.bs.modal",function(){var o,i;i=setInterval(function(){void 0!==document.getElementById("dropdownJSON").msDropdown&&((o=document.getElementById("dropdownJSON").msDropdown).length?("auto"===a.props.translationLanguage?(e=navigator.language||navigator.userLanguage,t=e.split("-")[0]):t=a.props.translationLanguage,o.selectedIndex=$("#dropdownJSON option[value="+t+"]").index(),a.props.disableLanguageSelector&&(o.disabled=!0),$("#dropdownJSON").show(),$("body").addClass("stop-scrolling"),n.info("\nmsDropdown successfully loaded in translation dialog"),clearInterval(i)):(n.error("\nno msDropdown found in translation dialog"),a.$modal.hide()))},25)}),a.$modal.on("hidden.bs.modal",function(){$("body").removeClass("stop-scrolling"),function(o,e){for(var t=Array.prototype.slice.call(arguments,2),a=o.split("."),n=a.pop(),i=0;i<a.length;i++)e=e[a[i]];e[n].apply(e,t)}(a.props.postSelectionCallback,window)});var o=a.props.contentURL+"/index.html";$.get(o).done(function(o){n.info("\nloading consent modal: successfully"),a.modal.innerHTML=o,a.modal.innerHTML=$("#"+a.props.xhrDataElement).eq(0).html(),a.modal.style.display="block",$(a.modal).modal({backdrop:"static",keyboard:!1}),a.$buttonDoNotAgree=$("#translator-buttonDoNotAgree"),a.$buttonAgree=$("#translator-buttonAgree"),a.$buttonSave=$("#translator-buttonSave"),a.$buttonAgreeAll=$("#translator-buttonAgreeAll"),n.info("\nload/initialze options from cookie"),u(),g(),$("#google-options").on("hide.bs.collapse",function(){s=!1,u()}).on("show.bs.collapse",function(){s=!0,u()}),n.info("\ninitialze button event handler"),a.$buttonDoNotAgree.click(function(){var o;(o=m()).translationEnabled=!1,r.set(a.props.cookieName,JSON.stringify(o),a.props.cookieStorageDays,a.props.cookieSameSite,a.props.cookieDomain,a.props.cookieSecure),a.$modal.modal("hide")}),a.$buttonAgree.click(function(){f()}),a.$buttonSave.click(function(){var o,e;$("#google-options").collapse("hide"),o=m(),(e=JSON.parse(r.get(a.props.cookieConsentName))).analysis=o.analysis,e.personalization=o.personalization,r.set(a.props.cookieConsentName,JSON.stringify(e),a.props.cookieStorageDays,a.props.cookieSameSite,a.props.cookieDomain,a.props.cookieSecure),r.set(a.props.cookieName,JSON.stringify(o),a.props.cookieStorageDays,a.props.cookieSameSite,a.props.cookieDomain,a.props.cookieSecure),a.$modal.modal("hide"),g()}),a.$buttonAgreeAll.click(function(){$("#google-options").collapse("hide"),f()}),a.$modal.modal("show")}).fail(function(){n.error("\nloading translator dialog (modal): failed"),n.warn("\nprobably no|wrong `contentURL` set")})}}.bind(this))}function g(){var o=a.getSettings();if(o)for(var e in o){a.$modal.find("#google-options .translator-option[data-name="+e+'] input[type="checkbox"]').prop("checked",o[e])}}function u(){s?(a.$buttonDoNotAgree.hide(),a.$buttonAgree.hide(),a.$buttonSave.show(),a.$buttonAgreeAll.show()):(a.$buttonDoNotAgree.show(),a.$buttonAgree.show(),a.$buttonSave.hide(),a.$buttonAgreeAll.hide())}function m(o){for(var e=a.$modal.find("#google-options .translator-option"),t={},n=0;n<e.length;n++){var i=e[n],s=i.getAttribute("data-name");if("necessary"===s)t[s]=!0;else if(void 0===o){var r=$(i).find('input[type="checkbox"]');t[s]=r.prop("checked")}else t[s]=!!o}return t}function f(){var o=JSON.parse(r.get(a.props.cookieConsentName)),e=JSON.parse(r.get(a.props.cookieName));e.analysis=!0,e.personalization=!0,e.translationEnabled=!0,o.analysis=e.analysis,o.personalization=e.personalization,r.set(a.props.cookieConsentName,JSON.stringify(o),a.props.cookieStorageDays,a.props.cookieSameSite,a.props.cookieDomain,a.props.cookieSecure),r.set(a.props.cookieName,JSON.stringify(e),a.props.cookieStorageDays,a.props.cookieSameSite,a.props.cookieDomain,a.props.cookieSecure),a.$modal.modal("hide")}this.showDialog=function(){c()},this.getSettings=function(o){if(r.get(a.props.cookieName)){var e=JSON.parse(r.get(a.props.cookieName));return void 0===o?e:!!e&&e[o]}},n.info("\ninitializing core module finished"),n.info("\nstate: finished")}
+"use strict";function Translator(o){var e,a,t=this,n=log4javascript.getLogger("j1.core.translator"),i=!!new liteURL(window.location.href).protocol.includes("https"),s=!1,r={set:function(o,e,a,t,n,i){var s=window.btoa(e),r="; expires=Thu, 01 Jan 1970 00:00:00 UTC";if(a>0){var l=new Date;l.setTime(l.getTime()+864e5*a),r="; expires="+l.toUTCString()}i?n?document.cookie=o+"="+(s||"")+r+"; Path=/; SameSite="+t+"; Domain="+n+"; Secure="+i+";":document.cookie=o+"="+(s||"")+r+"; Path=/; SameSite="+t+"; Secure="+i+";":n?document.cookie=o+"="+(s||"")+r+"; Path=/; SameSite="+t+";Domain="+n+"; ":document.cookie=o+"="+(s||"")+r+"; Path=/; SameSite="+t+";"},get:function(o){for(var e=o+"=",a=document.cookie.split(";"),t=0;t<a.length;t++){for(var n=a[t];" "===n.charAt(0);)n=n.substring(1,n.length);if(0===n.indexOf(e)){var i=n.substring(e.length,n.length);return window.atob(i)}}}};for(var l in this.props={contentURL:"/assets/data/translator",cookieName:"j1.user.state",cookieConsentName:"j1.user.consent",cookieStorageDays:365,cookieSameSite:"Lax",cookieSecure:i,translationEnabled:!1,disableLanguageSelector:!1,translatorName:"google",translationLanguages:"all",translationLanguage:"auto",translateAllPages:!0,hideSuggestionBox:!0,hidePoweredBy:!0,hideTopFrame:!0,dialogLanguage:"content",dialogLanguages:["en","de"],dialogContainerID:"translator-modal",xhrDataElement:"",postSelectionCallback:""},o)this.props[l]=o[l];-1!==this.props.dialogLanguage.indexOf("-")&&(this.props.dialogLanguage=this.props.dialogLanguage.split("-")[0]),this.props.dialogLanguages.includes(this.props.dialogLanguage)||(this.props.dialogLanguage=this.props.dialogLanguages[0]),this.props.xhrDataElement=this.props.xhrDataElement+"-"+this.props.dialogLanguage,n.info("\ninitializing core module: started"),n.debug("\nstate: started"),r.get(t.props.cookieName)||(n.info("\ninitializing translator cookie: "+t.props.cookieName),r.set(t.props.cookieName,JSON.stringify({translatorName:"google",translationEnabled:!1,translateAllPages:!0,useLanguageFromBrowser:!0,translationLanguage:"de",analysis:!0,personalization:!0}),t.props.cookieStorageDays,t.props.cookieSameSite,t.props.cookieDomain,t.props.cookieSecure));var p={documentReady:function(o){"loading"!==document.readyState?o():document.addEventListener("DOMContentLoaded",o)}};function d(){var o=t.getSettings();if(o)for(var e in o)t.$modal.find("#google-options .translator-option[data-name="+e+'] input[type="checkbox"]').prop("checked",o[e])}function g(){s?(t.$buttonDoNotAgree.hide(),t.$buttonAgree.hide(),t.$buttonSave.show(),t.$buttonAgreeAll.show()):(t.$buttonDoNotAgree.show(),t.$buttonAgree.show(),t.$buttonSave.hide(),t.$buttonAgreeAll.hide())}function c(o){for(var e=t.$modal.find("#google-options .translator-option"),a={},n=0;n<e.length;n++){var i=e[n],s=i.getAttribute("data-name");if("necessary"===s)a[s]=!0;else if(void 0===o){var r=$(i).find('input[type="checkbox"]');a[s]=r.prop("checked")}else a[s]=!!o}return a}function u(){var o=JSON.parse(r.get(t.props.cookieConsentName)),e=JSON.parse(r.get(t.props.cookieName));e.analysis=!0,e.personalization=!0,e.translationEnabled=!0,o.analysis=e.analysis,o.personalization=e.personalization,r.set(t.props.cookieConsentName,JSON.stringify(o),t.props.cookieStorageDays,t.props.cookieSameSite,t.props.cookieDomain,t.props.cookieSecure),r.set(t.props.cookieName,JSON.stringify(e),t.props.cookieStorageDays,t.props.cookieSameSite,t.props.cookieDomain,t.props.cookieSecure),t.$modal.modal("hide")}this.showDialog=function(){!function o(){p.documentReady((function(){if(t.modal=document.getElementById(t.props.dialogContainerID),t.modal)t.$modal.modal("show");else{n.info("\nload consent modal"),t.modal=document.createElement("div"),t.modal.id=t.props.dialogContainerID,t.modal.style.display="none",t.modal.setAttribute("class","modal fade"),t.modal.setAttribute("tabindex","-1"),t.modal.setAttribute("role","dialog"),t.modal.setAttribute("aria-labelledby",t.props.dialogContainerID),document.body.append(t.modal),t.$modal=$(t.modal),t.$modal.on("show.bs.modal",function(){var o,e,a;n.debug("\nshow.bs.modal: entered"),$.when(void(e="#"+(a=function o(){var e={},a=!1,t=0,n=arguments.length;for("[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(a=arguments[0],t++);t<n;t++){var i=arguments[t];!function(t){for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(a&&"[object Object]"===Object.prototype.toString.call(t[n])?e[n]=o(!0,e[n],t[n]):e[n]=t[n])}(i)}return e}({size:0,width:250,multiple:!1,selectedIndex:1,enableAutoFilter:!1,visibleRows:null},o={url:"/assets/data/iso-639-language-codes-flags.json",elm:"iso-639-languages",selector:"dropdownJSON",width:400,visibleRows:8})).selector,$.ajax({url:a.url,dataType:"json",success:function(o){var n=[];if(t.props.translationLanguages.includes("all"))n=o[a.elm];else for(var i=0;i<o[a.elm].length;i++)t.props.translationLanguages.includes(o[a.elm][i].value)&&n.push(o[a.elm][i]);a.visibleRows>n.length&&(a.visibleRows=n.length),MsDropdown.make(e,{byJson:{data:n,name:a.name,size:a.size,width:a.width,multiple:a.multiple},enableAutoFilter:a.enableAutoFilter,visibleRows:a.visibleRows})},error:function(o,e,t){n.error("\nfailed to retrieve JSON data from: "+a.url)}}))).then(function(o){n.info("\ncreating msDropdown from JSON data: finished")})}),t.$modal.on("shown.bs.modal",function(){var o,i;i=setInterval(function(){void 0!==document.getElementById("dropdownJSON").msDropdown&&((o=document.getElementById("dropdownJSON").msDropdown).length?(a="auto"===t.props.translationLanguage?(e=navigator.language||navigator.userLanguage).split("-")[0]:t.props.translationLanguage,o.selectedIndex=$("#dropdownJSON option[value="+a+"]").index(),t.props.disableLanguageSelector&&(o.disabled=!0),$("#dropdownJSON").show(),$("body").addClass("stop-scrolling"),n.info("\nmsDropdown successfully loaded in translation dialog"),clearInterval(i)):(n.error("\nno msDropdown found in translation dialog"),t.$modal.hide()))},10)}),t.$modal.on("hidden.bs.modal",function(){$("body").removeClass("stop-scrolling"),function o(e,a){for(var t=Array.prototype.slice.call(arguments,2),n=e.split("."),i=n.pop(),s=0;s<n.length;s++)a=a[n[s]];return a[i].apply(a,t)}(t.props.postSelectionCallback,window)});var o=t.props.contentURL+"/index.html";$.get(o).done(function(o){n.info("\nloading consent modal: successfully"),t.modal.innerHTML=o,t.modal.innerHTML=$("#"+t.props.xhrDataElement).eq(0).html(),t.modal.style.display="block",$(t.modal).modal({backdrop:"static",keyboard:!1}),t.$buttonDoNotAgree=$("#translator-buttonDoNotAgree"),t.$buttonAgree=$("#translator-buttonAgree"),t.$buttonSave=$("#translator-buttonSave"),t.$buttonAgreeAll=$("#translator-buttonAgreeAll"),n.info("\nload/initialze options from cookie"),g(),d(),$("#google-options").on("hide.bs.collapse",function(){s=!1,g()}).on("show.bs.collapse",function(){s=!0,g()}),n.info("\ninitialze button event handler"),t.$buttonDoNotAgree.click(function(){var o;o=c(),o.translationEnabled=!1,r.set(t.props.cookieName,JSON.stringify(o),t.props.cookieStorageDays,t.props.cookieSameSite,t.props.cookieDomain,t.props.cookieSecure),t.$modal.modal("hide")}),t.$buttonAgree.click(function(){u()}),t.$buttonSave.click(function(){var o,e;$("#google-options").collapse("hide"),o=c(),(e=JSON.parse(r.get(t.props.cookieConsentName))).analysis=o.analysis,e.personalization=o.personalization,r.set(t.props.cookieConsentName,JSON.stringify(e),t.props.cookieStorageDays,t.props.cookieSameSite,t.props.cookieDomain,t.props.cookieSecure),r.set(t.props.cookieName,JSON.stringify(o),t.props.cookieStorageDays,t.props.cookieSameSite,t.props.cookieDomain,t.props.cookieSecure),t.$modal.modal("hide"),d()}),t.$buttonAgreeAll.click(function(){$("#google-options").collapse("hide"),u()}),t.$modal.modal("show")}).fail(function(){n.error("\nloading translator dialog (modal): failed"),n.warn("\nprobably no|wrong `contentURL` set")})}}).bind(this))}()},this.getSettings=function(o){if(r.get(t.props.cookieName)){var e=JSON.parse(r.get(t.props.cookieName));return void 0===o?e:!!e&&e[o]}},n.info("\ninitializing core module finished"),n.debug("\nstate: finished")}

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2023.2.7'
+  VERSION = '2023.3.0'
 end

data/lib/starter_web/Gemfile

@@ -75,11 +75,11 @@ end
 # Specify the THEME GEM used for the project
 
 # Loaded from RubyGems
-gem 'j1-template', '~> 2023.2.0'
+gem 'j1-template', '~> 2023.3.0'
 
 # Loaded from gem.fury.io
 #source 'https://gem.fury.io/jekyll-one-org/' do
-#  gem 'j1-template', '~> 2023.2.0'
+#  gem 'j1-template', '~> 2023.3.0'
 #end
 
 # ------------------------------------------------------------------------------

data/lib/starter_web/README.md

@@ -379,7 +379,7 @@ This command creates a **initial** project in folder **my-starter**.
   2023-02-28 18:12:12 - GENERATE: Resolving dependencies...
   2023-02-28 18:12:12 - GENERATE: Using bundler 2.3.7
   ...
-  2023-02-28 18:12:12 - GENERATE: Using j1-template 2023.2.7
+  2023-02-28 18:12:12 - GENERATE: Using j1-template 2023.3.0
   2023-02-28 18:12:12 - GENERATE: Bundle complete! 31 Gemfile dependencies, 78 gems now installed.
   2023-02-28 18:12:12 - GENERATE: Bundled gems are installed into `../../.gem`
   2023-02-28 18:12:12 - GENERATE:  C:/Users/xxx/.gem/ruby/3.1.0;C:/DevTools/Ruby31-x64/lib/ruby/gems/3.1.0;
@@ -415,7 +415,7 @@ commands are available as well.
   2023-02-28 18:17:48 - SETUP: Initialize the project ...
   2023-02-28 18:17:48 - SETUP: Be patient, this will take a while ...
   2023-02-28 18:17:49 - SETUP:
-  2023-02-28 18:17:49 - SETUP: > j1@2023.2.7 setup C:\Users\xxx\j1-projects\my-starter
+  2023-02-28 18:17:49 - SETUP: > j1@2023.3.0 setup C:\Users\xxx\j1-projects\my-starter
   2023-02-28 18:17:49 - SETUP: > npm --silent run setup-start && npm --silent run setup-base && run-s -s setup:*
   2023-02-28 18:17:49 - SETUP:
   2023-02-28 18:17:50 - SETUP: Setup project for first use ..
@@ -460,7 +460,7 @@ browser. Let's start the journey ...
   Check setup state of the J1 project ...
   2023-02-28 18:26:18 - SITE: Starting up your site ...
   2023-02-28 18:26:18 - SITE:
-  2023-02-28 18:26:18 - SITE: > j1@2023.2.7 j1-site C:\Users\jadams\j1-projects\my-starter
+  2023-02-28 18:26:18 - SITE: > j1@2023.3.0 j1-site C:\Users\jadams\j1-projects\my-starter
   2023-02-28 18:26:18 - SITE: > run-p -s j1-site:*
   2023-02-28 18:26:18 - SITE:
   2023-02-28 18:26:20 - SITE: Startup UTILSRV ..
@@ -499,7 +499,7 @@ Check setup state of the J1 project ...
 REBUILD: Rebuild the projects website ...
 REBUILD: Be patient, this will take a while ...
 2023-02-28 18:45:09 - REBUILD:
-2023-02-28 18:45:09 - REBUILD: > j1@2023.2.7 rebuild C:\Users\xxx\j1-projects\my-starter
+2023-02-28 18:45:09 - REBUILD: > j1@2023.3.0 rebuild C:\Users\xxx\j1-projects\my-starter
 2023-02-28 18:45:09 - REBUILD: > run-s -s rebuild:* && run-s -s post-rebuild:*
 2023-02-28 18:45:09 - REBUILD:
 2023-02-28 18:45:10 - REBUILD: Rebuild site incremental ..
@@ -547,7 +547,7 @@ using Lerna for all packages:
   2023-02-28 18:29:07 - RESET: Reset the project to factory state ...
   2023-02-28 18:29:07 - RESET: Be patient, this will take a while ...
   2023-02-28 18:29:08 - RESET:
-  2023-02-28 18:29:08 - RESET: > j1@2023.2.7 reset C:\Users\xxx\j1-projects\my-starter
+  2023-02-28 18:29:08 - RESET: > j1@2023.3.0 reset C:\Users\xxx\j1-projects\my-starter
   2023-02-28 18:29:08 - RESET: > run-s -s reset:*
   2023-02-28 18:29:08 - RESET:
   2023-02-28 18:29:08 - RESET: Reset project to factory state ..

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 # Sets the build version of the site
 #
-version:                                2023.2.7
+version:                                2023.3.0
 
 # copyright
 # ------------------------------------------------------------------------------
@@ -682,6 +682,7 @@ defaults:
 
       toc:                              true
       fab_menu_id:                      open_toc
+      comments:                         false
       scrollbar:                        false
       personalization:                  false
       exclude_from_search:              false
@@ -725,6 +726,7 @@ defaults:
 
       toc:                              true
       fab_menu_id:                      open_toc
+      comments:                         false
       scrollbar:                        false
       page_navigation:                  true
       personalization:                  false
@@ -763,6 +765,7 @@ defaults:
 
       toc:                              true
       fab_menu_id:                      open_toc
+      comments:                         false
       scrollbar:                        false
       page_navigation:                  true
       personalization:                  false

data/lib/starter_web/_data/blocks/banner.yml

@@ -11,6 +11,9 @@
 #  See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
+# NOTE: All banner id's has to be prefixed by 'banner_'
+#
+# ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
 # Description
@@ -41,7 +44,7 @@ settings:
       banner:
         enabled:                        true
 
-        id:                             divider-1
+        id:                             banner_divider_1
         comment:                        Divider Banner 1
         type:                           divider
 
@@ -49,7 +52,7 @@ settings:
       banner:
         enabled:                        true
 
-        id:                             divider-2
+        id:                             banner_divider_2
         comment:                        Divider Banner 2
         type:                           divider
 
@@ -70,7 +73,7 @@ settings:
       banner:
         enabled:                        true
 
-        id:                             home_teaser_banner
+        id:                             banner_home_teaser
         comment:                        Top teaser shown on home page
         type:                           teaser
         badges:                         false
@@ -189,7 +192,7 @@ settings:
       banner:
         enabled:                        true
 
-        id:                             home_parallax_banner
+        id:                             banner_home_parallax
         comment:                        Main parallax banner shown on home page
         type:                           parallax
         properties:
@@ -232,7 +235,7 @@ settings:
       banner:
         enabled:                        true
 
-        id:                             home_image_banner
+        id:                             banner_home_image
         comment:                        Image banner shown on home page
         type:                           image
         properties:                     mt-6 mb-6

data/lib/starter_web/_data/blocks/defaults/footer.yml

@@ -25,12 +25,13 @@ description:
 # DEFAULT settings
 #
 defaults:
+  enabled:                              true
 
   # ----------------------------------------------------------------------------
   # FOOTER global settings
   #
+  active_footer:                        footer_uno                              # active footer on all pages
   data_path:                            /assets/data/footer/index.html
-  container-id:                         j1_footer
 
   # ----------------------------------------------------------------------------
   # FOOTER properties
@@ -38,10 +39,9 @@ defaults:
   footer:
     enabled:                            true
     id:                                 default-footer
+    comment:                            Default Footer
     wave:                               false
     wave_color:                         "#212121"
-    comment:                            Default Footer
-    theme:                              footer-light-theme
 
     # --------------------------------------------------------------------------
     # ISSUE settings

data/lib/starter_web/_data/blocks/footer.yml

@@ -11,7 +11,9 @@
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
-
+# NOTE: All footer id's has to be prefixed by 'footer_'
+#
+# ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 # Description (used for J1 CC only)
 #
@@ -25,6 +27,9 @@ description:
 # SETTINGS
 #
 settings:
+  enabled:                              true
+
+  active_footer:                        footer_uno
 
   # ----------------------------------------------------------------------------
   # FOOTER properties
@@ -32,15 +37,14 @@ settings:
   footers:
 
     # --------------------------------------------------------------------------
-    # Footer UNO light
+    # Footer UNO
     #
-    - name:                             Footer UNO light
+    - name:                             Footer UNO
       footer:
         enabled:                        true
 
-        id:                             footer-en
+        id:                             footer_uno
         comment:                        Footer UNO EN-EN
-        theme:                          footer-light-theme
         properties:                     mt-4
 
         wave: