j1-template 2021.1.27 → 2021.2.1

data/assets/data/panel.html

@@ -262,7 +262,7 @@ exclude_from_search:                    true
                   </div>
 
                   <div class="card-body g-min-height-200 r-text-300">{{card_text}}</div>
-                  <div class="card-footer r-text-200 text-lowercase">
+                  <div class="card-footer r-text-200 md-grey-900 text-lowercase">
                   {% for data in card_buttons %} {% for item in data %} {% for button in item[1] %}
                     {% assign key   = button[0] %}
                     {% assign value = button[1] %}
@@ -277,9 +277,9 @@ exclude_from_search:                    true
                   {% endfor %} {% endfor %}{% endfor %}
 
                   {% if button_target == null %}
-                    <a class="card-link text-muted" href="{{button_href}}">{{readmore_text}} · {{button_text}}</a>
+                    <a class="card-link md-grey-900" href="{{button_href}}">{{readmore_text}} · {{button_text}}</a>
                   {% else %}
-                    <a class="card-link  md-grey-600" href="{{button_href}}" target="{{button_target}}">{{readmore_text}} · {{button_text}}</a>
+                    <a class="card-link md-grey-900" href="{{button_href}}" target="{{button_target}}">{{readmore_text}} · {{button_text}}</a>
                   {% endif %}
                   </div>
 
@@ -548,13 +548,13 @@ exclude_from_search:                    true
 
                             <div class="card-footer-text">
                               {% if language == "en" %}
-                                <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
+                                <i class="mdi mdi-calendar-blank md-grey-900 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
                               {% endif %}
                               {% if language == "de" %}
-                                <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
+                                <i class="mdi mdi-calendar-blank md-grey-900 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
                               {% endif %}
                             </div>
-                            <a class="card-link text-muted text-lowercase"
+                            <a class="card-link md-grey-900 text-lowercase"
                                href="{{post.url}}">
                                {{readmore_text}} · {{post.tagline}}
                             </a>
@@ -596,13 +596,13 @@ exclude_from_search:                    true
 
                         <div class="card-footer-text">
                           {% if language == "en" %}
-                            <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
+                            <i class="mdi mdi-calendar-blank md-grey-900 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
                           {% endif %}
                           {% if language == "de" %}
-                            <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
+                            <i class="mdi mdi-calendar-blank md-grey-900 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
                           {% endif %}
                         </div>
-                        <a class="card-link text-muted text-lowercase"
+                        <a class="card-link md-grey-900 text-lowercase"
                            href="{{post.url}}">
                            {{readmore_text}} · {{post.tagline}}
                         </a>

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);
@@ -1289,7 +1289,8 @@ var j1 = (function () {
           logText = '\n' + 'page finalized successfully';
           logger.info(logText);
 
-        }, flickerTimeout);
+//        }, flickerTimeout);
+        }, 500);
       } // END WEB mode
     }, // END displayPage
 

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

@@ -7,7 +7,7 @@ regenerate:                             true
 {% comment %}
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/j1Scroll.js
- # Liquid template to adapt j1Scroll
+ # Liquid template to adapt j1Scroll plugin
  #
  # Product/Info:
  # https://jekyll.one
@@ -21,6 +21,36 @@ regenerate:                             true
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign asset_path        = "/assets/themes/j1" %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config   = site.data.j1_config %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data (settings only)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign scroll_settings   = modules.j1scroll.settings %}
+
+{% comment %} Set config options (settings only)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign scroll_options    = scroll_settings %}
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/j1Scroll.js
@@ -52,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;
 
@@ -80,12 +112,10 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
-
-      // -----------------------------------------------------------------------
-      // globals
-      // -----------------------------------------------------------------------
-      _this   = j1.adapter.j1Scroll;
-      logger  = log4javascript.getLogger('j1.adapter.j1Scroll');
+      {% comment %} Set global variables
+      -------------------------------------------------------------------------- {% endcomment %}
+      _this = j1.adapter.j1Scroll;
+      logger = log4javascript.getLogger('j1.adapter.j1Scroll');
 
       // initialize state flag
       _this.setState('started');
@@ -100,60 +130,127 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      // -----------------------------------------------------------------------
-      // j1Scroll initializer
-      // -----------------------------------------------------------------------
+      {% comment %} Load module config from yml data (disabled)
+      --------------------------------------------------------------------------
+      // Load  module DEFAULTS|CONFIG
+      //
+      /* eslint-disable */
+      moduleOptions = $.extend({}, {{scroll_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
+
+      if (typeof settings !== 'undefined') {
+        moduleOptions = j1.mergeData(moduleOptions, settings);
+      }
+
+      // _this.initialize(moduleOptions);
+      -------------------------------------------------------------------------- {% endcomment %}
+
+      _this.initialize();
+
+      _this.setState('finished');
+      logger.info('\n' + 'state: ' + _this.getState());
+      logger.info('\n' + 'module initialized successfully');
+    }, // END init
+
+    // -----------------------------------------------------------------------
+    // Generate scrollers configured/enabled
+    // -----------------------------------------------------------------------
+    initialize: function () {
+      logger = log4javascript.getLogger('j1.adapter.j1Scroll');
+
       var log_text = '\n' + 'j1Scroll is being initialized';
       logger.info(log_text);
 
+      // START generate scrollers
       var dependencies_met_page_ready = setInterval (function (options) {
         if (j1.getState() === 'finished') {
-          var log_text = '\n' + 'j1Scroll is being initialized';
-          logger.info(log_text);
 
-          var postWrapperId = '#home_news_panel-scroll-group';
-          var paginatePath  = '/assets/data/news_panel_posts/page';
+          {% for item in scroll_options.scrollers %} {% if item.scroller.enabled %}
+
+          {% assign scroller_id     = item.scroller.id %}
+          {% assign container       = item.scroller.container %}
+          {% assign path            = item.scroller.path  %}
+          {% assign elementScroll   = item.scroller.elementScroll %}
+          {% 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}}';
+          logger.info(log_text);
+
+          {% comment %} Unused options
+          ----------------------------------------------------------------------
           // status:              '.page-scroll-last',
           // firstPage:            2,
           // onInit:               function(){},				                        // Callback after plugin has loaded
           // onBeforeLoad:         function(link){},	                          // Callback before new content is loaded
           // onAfterLoad:          function(html){}	                            // Callback after new content has been loaded
-
-          $(postWrapperId).j1Scroll({
-            path:                 paginatePath,
-            elementScroll:        false,
-            scrollThreshold:      300,
-            lastPage:             4,
-            infoLastPage:         true,
-          });
-
-          $('.list-group').on( 'load.j1Scroll', function( event, body, path, response ) {
-            var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
-            var log_text = `\n loaded data from path: ${path}`;
-            logger.info(log_text);
-
-            var log_text = "\n initialize backdrops on load";
-            logger.info(log_text);
-
-            // initialize backdrops
-            j1.core.createDropCap();
-
-          });
-
-          $('.list-group').on( 'request.j1Scroll', function( event, path, fetchPromise ) {
-            var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
-            var log_text = `\n request for the next page to be loaded from path: ${path}`;
-            logger.info(log_text);
-          });
-
+          ---------------------------------------------------------------------- {% endcomment %}
+
+          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({
+              path:                 pagePath,
+              elementScroll:        {{elementScroll}},
+              scrollOffset:         {{scrollOffset}},
+              lastPage:             {{lastPage}},
+              infoLastPage:         {{infoLastPage}},
+              lastPageInfo:         lastPageInfo,
+            });
+          }
+
+          {% comment %} Unused callbacks (disabled)
+          ----------------------------------------------------------------------
+          // $('.list-group').on( 'load.j1Scroll', function( event, body, path, response ) {
+          //   var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
+          //   var log_text = `\n loaded data from path: ${path}`;
+          //   logger.info(log_text);
+          //
+          //   var log_text = "\n initialize backdrops on load";
+          //   logger.info(log_text);
+          //
+          //   // initialize backdrops
+          //   j1.core.createDropCap();
+          //
+          // });
+          //
+          // $('.list-group').on( 'request.j1Scroll', function( event, path, fetchPromise ) {
+          //   var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
+          //   var log_text = `\n request for the next page to be loaded from path: ${path}`;
+          //   logger.info(log_text);
+          // });
+          ---------------------------------------------------------------------- {% endcomment %}
+
+          // END scroller_id: {{ scroller_id }}
+          {% endif %} {% endfor %}
           clearInterval(dependencies_met_page_ready);
         }
       });
-    }, // END init
+      // END generate scrollers
+    },
 
     // -------------------------------------------------------------------------
-    // messageHandler: MessageHandler for J1 CookieConsent module
+    // messageHandler: MessageHandler for j1Scroll module
     // Manage messages send from other J1 modules
     // -------------------------------------------------------------------------
     messageHandler: function (sender, message) {

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

@@ -410,10 +410,10 @@ j1.adapter['navigator'] = (function (j1, window) {
             // -----------------------------------------------------------------
             // event handler|css styles
             // -----------------------------------------------------------------
-            // continue if themer|navigator are INITIALIZED
             var dependencies_met_initialized = setInterval(function() {
               if (themerEnabled) {
-                if (j1.adapter.navigator.getState() === 'initialized') {
+                // for themes, initialize if page is visible (DOM ready)
+                if (j1.getState() === 'finished') {
                   _this.setState('processing');
 
                   // set general|global theme colors
@@ -433,6 +433,7 @@ j1.adapter['navigator'] = (function (j1, window) {
                   clearInterval(dependencies_met_initialized);
                 }
               } else {
+                // no themes used
                 _this.setState('processing');
 
                 // set general|global theme colors
@@ -681,14 +682,20 @@ j1.adapter['navigator'] = (function (j1, window) {
 
       // Set dymanic styles
       // -----------------------------------------------------------------------
-      // $('nav-primary').css({"background-color": "navPrimaryColor"});
 
       // navBar styles
       // -----------------------------------------------------------------------
-      var bg_primary    = j1.getStyleValue('bg-primary', 'background-color');
+      // read current background colors
+      var bg_primary    = $('#bg-primary').css('background-color');
+      var bg_table      = $('body').css('background-color');
+
+      // set navbar background colors
       var bg_scrolled   = bg_primary;
       var bg_collapsed  = bg_primary;
 
+      // set current body background color for all tables
+      $('table').css('background', bg_table);
+
       $('head').append('<style>.mdi-bg-primary {color: ' +bg_scrolled+ ';}</style>');
 
       // Size of brand image

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -21,6 +21,37 @@ regenerate:                             false
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign asset_path        = "/assets/themes/j1" %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config   = site.data.j1_config %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign rtable_defaults = modules.defaults.rtable.defaults %}
+{% assign rtable_settings = modules.rtable.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign rtable_options  = rtable_defaults | merge: rtable_settings %}
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/rtable.js
@@ -53,6 +84,7 @@ j1.adapter['rtable'] = (function (j1, window) {
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
   var moduleOptions = {};
+  var frontmatterOptions;
   var _this;
   var logger;
   var logText;
@@ -90,34 +122,55 @@ j1.adapter['rtable'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      // -----------------------------------------------------------------------
-      // rtable initializer
-      // -----------------------------------------------------------------------
-      var log_text = '\n' + 'rtable is being initialized';
-      logger.info(log_text);
+      // create settings object from frontmatterOptions
+      frontmatterOptions = options != null ? $.extend({}, options) : {};
+      moduleOptions = $.extend({}, {{rtable_options | replace: 'nil', 'null' | replace: '=>', ':' }});
 
-      // Add data attribute for tablesaw to all tables of a page
-      // as Asciidoctor has NO option to pass 'data attributes'
-      // See: https://stackoverflow.com/questions/50600405/how-to-add-custom-data-attributes-with-asciidoctor
-      //
-      $('table').each(function(){
-        var curTable = $(this);
-        // jadams, 2020-09-16: class 'rtable' indicate use of 'tablesaw'
-        if ($(curTable).hasClass('rtable')) {
-          // jadams, 2020-09-17: add BS responsive class in case of an overflow
-          // jadams, 2020-11-21: BS responsive class disabled, bcause the
-          // table doesn't stretch full page width
-          //$(curTable).addClass('table-responsive')
-          // jadams, 2020-09-16: add needed CSS class/attribute for tablesaw
-          $(curTable).addClass('tablesaw');
-          $(curTable).attr('data-tablesaw-mode','stack');
-        }
-      });
+      if (typeof frontmatterOptions !== 'undefined') {
+        moduleOptions = j1.mergeData(moduleOptions, frontmatterOptions);
+      }
 
       var dependencies_met_j1_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
 
-        	Tablesaw.init();
+          // -----------------------------------------------------------------------
+          // rtable initializer
+          // -----------------------------------------------------------------------
+          var log_text = '\n' + 'rtable is being initialized';
+          // -----------------------------------------------------------------------
+          // rtable initializer
+          // -----------------------------------------------------------------------
+          var log_text = '\n' + 'rtable is being initialized';
+          logger.info(log_text);
+
+          // Add data attributes for tablesaw to all tables of a page
+          // as Asciidoctor has NO option to pass 'data attributes'
+          // See: https://stackoverflow.com/questions/50600405/how-to-add-custom-data-attributes-with-asciidoctor
+          //
+          $('table').each(function(){
+            var curTable = $(this);
+            var log_text;
+            // jadams, 2020-09-16: class 'rtable' indicate use of 'tablesaw'
+            if ($(curTable).hasClass('rtable')) {
+              // jadams, 2020-09-16: add needed CSS class/attribute for tablesaw
+              $(curTable).addClass('tablesaw');
+              $(curTable).attr('data-tablesaw-mode','stack');
+
+              Tablesaw.init(curTable, moduleOptions);
+
+              // set initial state for all table/colgroup elements
+              //
+              if ($(window).width() < moduleOptions.breakpoint) {
+                log_text = '\n' + 'hide colgroups: ' + curTable.attr('id')
+                curTable.find('colgroup').hide();
+                logger.debug(log_text);
+              } else {
+                log_text = '\n' + 'show colgroup: ' + curTable.attr('id')
+                curTable.find('colgroup').show();
+                logger.debug(log_text);
+              }
+            } // END if hasClass 'rtable'
+          });
 
           _this.setState('finished');
           logger.info('\n' + 'state: ' + _this.getState());