j1-template 2020.0.7 → 2020.0.12

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

@@ -0,0 +1,232 @@
+---
+regenerate: true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/clipboard.js
+ # Liquid template to adapt Clipboard for J1 Template
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2020 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config  = site %}
+
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment   = site_config.environment %}
+
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/clipboard.js
+ # JS Adapter for Clipboard
+ #
+ # Product/Info:
+ # {{site.data.template_settings.theme_author_url}}
+ #
+ # Copyright (C) 2020 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see {{site.data.template_settings.theme_author_url}}
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ # -----------------------------------------------------------------------------
+ # Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
+'use strict';
+
+j1.adapter['clipboard'] = (function (j1, window) {
+
+  // ---------------------------------------------------------------------------
+  // globals
+  // ---------------------------------------------------------------------------
+  var environment         = '{{environment}}';
+  var moduleOptions       = {};
+  var logger;
+  var logText;
+  var _this;
+  var clipboardJS;
+
+  // ---------------------------------------------------------------------------
+  // main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // module initializer
+    // -------------------------------------------------------------------------
+    init: function (options) {
+      // initialize state flag
+      j1.adapter.clipboard.state = 'pending';
+
+      // -----------------------------------------------------------------------
+      // defaults
+      // -----------------------------------------------------------------------
+      var settings  = $.extend({
+        module_name: 'j1.adapter.clipboard',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.clipboard;
+      logger  = log4javascript.getLogger('j1.adapter.clipboard');
+      logText = 'initialization: started';
+      logger.info(logText);
+
+      // initialize ClipboardJS if page is loaded
+      var dependencies_met_j1_finished = setInterval(function() {
+        if ( j1.getState() == 'finished' ) {
+          logText = 'create clipboard';
+          logger.info(logText);
+
+          clipboardJS = new ClipboardJS('.btn-clipboard', {
+            target: function target(trigger) {
+              return trigger.parentNode.nextElementSibling;
+            }
+          });
+
+          _this.initClipButtons();
+          _this.initEventHandler(clipboardJS);
+
+          clearInterval(dependencies_met_j1_finished);
+          logText = 'initialization: finished';
+          logger.info(logText);
+        }
+      }, 25); // END dependencies_met_j1_finished
+    },
+
+    // -------------------------------------------------------------------------
+    // initClipboard
+    // Create copy-to-clipboard for all pages
+    // -------------------------------------------------------------------------
+    initClipButtons: function () {
+      // insert copy to clipboard button before all elements having a
+      // class of ".highlight" assigned to (e.g. Asciidoc source blocks)
+      $('.highlight').each(function () {
+        // Check if no clipboard should be applied
+        var isNoClip = $(this).closest('.noclip');
+        if ( isNoClip.length == 0) {
+          var btnHtml = '<div class="j1-clipboard"><span class="btn-clipboard j1-tooltip" data-toggle="tooltip" data-placement="left" title="Copy to clipboard">Copy</span></div>';
+          $(this).before(btnHtml);
+          $('.btn-clipboard').tooltip();
+        }
+      });
+    }, // END initClipboard
+
+    // -------------------------------------------------------------------------
+    // Event handler
+    // -------------------------------------------------------------------------
+    initEventHandler: function (clipboard) {
+      // Manage clipboard events
+      clipboard.on('success', function (e) {
+        $(e.trigger).attr('title', 'copied!').tooltip('_fixTitle').tooltip('show').attr('title', 'Copy to clipboard').tooltip('_fixTitle');
+        var logger = log4javascript.getLogger('j1.initClipboard');
+        var logText = 'initialization copy-to-clipboard sucessfull';
+        logger.debug(logText);
+        /* Cleanup clipped data for trailing numbers */
+        var splitted = e.text.split('\n');
+        var concat;
+        var i;
+        for (i=0; i<splitted.length; i++) {
+          concat += splitted[i].replace(/^\s+\d+/, '');
+        }
+        e.clearSelection();
+      });
+      clipboard.on('error', function (e) {
+        var fallbackMsg = /Mac/i.test(navigator.userAgent) ? 'press \u2318 to copy' : 'press ctrl-c to copy';
+        logger = log4javascript.getLogger('j1.initClipboard');
+        logText = 'initialization copy-to-clipboard failed, fallback used.';
+        logger.warn(logText);
+        $(e.trigger).attr('title', fallbackMsg).tooltip('_fixTitle').tooltip('show').attr('title', 'copy to clipboard').tooltip('_fixTitle');
+      });
+    },
+
+    // -------------------------------------------------------------------------
+    // messageHandler
+    // Manage messages (paylods) send from other J1 modules
+    // -------------------------------------------------------------------------
+    messageHandler: function (sender, message) {
+      // var json_message = JSON.stringify(message, undefined, 2);              // multiline
+      var json_message = JSON.stringify(message);
+
+      logText = 'received message from ' + sender + ': ' + json_message;
+      logger.debug(logText);
+
+      // -----------------------------------------------------------------------
+      //  Process commands|actions
+      // -----------------------------------------------------------------------
+      if (message.type === 'command' && message.action === 'module_initialized') {
+        //
+        // Place handling of command|action here
+        //
+        logger.info(message.text);
+      }
+      if (message.type === 'command' && message.action === 'status') {
+        logger.info('messageHandler: received - ' + message.action);
+      }
+
+      //
+      // Place handling of other command|action here
+      //
+
+      return true;
+    }, // END messageHandler
+
+    // -------------------------------------------------------------------------
+    // setState
+    // Set the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    setState: function (stat) {
+      j1.adapter.clipboard.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: function () {
+      return j1.adapter.clipboard.state;
+    } // END state
+
+  }; // END return
+})(j1, window);
+
+{% endcapture %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate: true
 ---
 
 {% capture cache %}
@@ -31,6 +31,10 @@ regenerate:                             false
 {% assign environment       = site.environment %}
 {% assign template_version  = site.version %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
 
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
@@ -66,6 +70,12 @@ regenerate:                             false
  #  Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['cookie_consent'] = (function (j1, window) {
@@ -126,7 +136,9 @@ j1.adapter['cookie_consent'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------
+      /* eslint-disable */
       moduleOptions = $.extend({}, {{consent_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
 
       if (typeof options !== 'undefined') {
         moduleOptions = j1.mergeData(moduleOptions, settings);
@@ -163,8 +175,9 @@ j1.adapter['cookie_consent'] = (function (j1, window) {
         // ---------------------------------------------------------------------
         // data loader
         // ---------------------------------------------------------------------
-        logger.info('loading html data for modals');
-        $.when (j1.xhrData('j1.adapter.cookie_consent', moduleOptions, 'data_loaded'))
+        $.when (
+          j1.xhrData('j1.adapter.cookie_consent', moduleOptions, 'data_loaded')
+        )
         .then (function (success) {
           if (success) {
             logger.info('loading data completed');
@@ -265,5 +278,9 @@ j1.adapter['cookie_consent'] = (function (j1, window) {
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate: true
 ---
 
 {% capture cache %}
@@ -49,6 +49,10 @@ regenerate:                             false
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign framer_options    = framer_defaults | merge: framer_settings %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
 
 /*
  # -----------------------------------------------------------------------------
@@ -71,6 +75,12 @@ regenerate:                             false
  #  Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
  */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 {% comment %} Main
@@ -112,8 +122,9 @@ j1.adapter['framer'] = (function (j1, window) {
       {% comment %} Load module config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
-      //
+      /* eslint-disable */
       moduleOptions = $.extend({}, {{framer_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
 
       if (typeof settings !== 'undefined') {
         moduleOptions = j1.mergeData(moduleOptions, settings);
@@ -204,5 +215,9 @@ j1.adapter['framer'] = (function (j1, window) {
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate: true
 ---
 
 {% capture cache %}
@@ -70,6 +70,11 @@ regenerate:                             false
 {% assign customizer_title            = customizer_options.title %}
 {% assign gallery_rowHeight           = customizer_options.gallery_settings.rowHeight %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/gallery_customizer.js
@@ -86,6 +91,12 @@ regenerate:                             false
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 {% comment %} Main
@@ -108,7 +119,7 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
     // See: https://stackoverflow.com/questions/359788/how-to-execute-a-javascript-function-when-i-have-its-name-as-a-string
     //
     var args = Array.prototype.slice.call(arguments, 2);
-    var namespaces = functionName.split(".");
+    var namespaces = functionName.split('.');
     var func = namespaces.pop();
     for(var i = 0; i < namespaces.length; i++) {
       context = context[namespaces[i]];
@@ -138,8 +149,10 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
 
       {% comment %} Load gallery config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
+      /* eslint-disable */
       galleryOptions    = $.extend({}, {{gallery_options | replace: '=>', ':' | replace: 'nil', '""'}});
       customizerOptions = $.extend({}, {{customizer_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
@@ -186,7 +199,7 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
               if ($formId.length) {
                 var timerid;
 
-                $("input[name='rowHeight']").on('input', function (e) {
+                $('input[name="rowHeight"]').on('input', function (e) {
                   var value = $(this).val();
 
                   if (value < imageHeightMin) { return false; }
@@ -272,7 +285,7 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
                 });
 
                 $('input:checkbox[name="random"]').on('click', function (e) {
-                  var value = $(this).is(":checked");
+                  var value = $(this).is(':checked');
 
                   $instance.justifiedGallery({randomize: value});
                   if(environment === 'development') {
@@ -300,7 +313,7 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
                 });
 
                 $('input:checkbox[name="hide_last_row"]').on('click', function (e) {
-                  var value = $(this).is(":checked");
+                  var value = $(this).is(':checked');
 
                   if (value == true) {
                     value = 'hide';
@@ -322,10 +335,10 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
                   $('#rowHeightMax').val(customizerOptions.gallery_settings.maxRowHeight);
                   $('#margins').val(customizerOptions.gallery_settings.margins);
                   $('#border').val(customizerOptions.gallery_settings.border);
-                  $('input:checkbox[name="captions"]').val("on").filter('[value="on"]').prop('checked', customizerOptions.gallery_settings.captions);
-                  $('input:checkbox[name="random"]').val("off").filter('[value="off"]').prop('checked', customizerOptions.gallery_settings.randomize);
-                  $('input:checkbox[name="justify_last_row"]').val("on").filter('[value="on"]').prop('checked', customizerOptions.gallery_settings.justifyLastRow);
-                  $('input:checkbox[name="hide_last_row"]').val("off").filter('[value="off"]').prop('checked', customizerOptions.gallery_settings.hideLastRow);
+                  $('input:checkbox[name="captions"]').val('on').filter('[value="on"]').prop('checked', customizerOptions.gallery_settings.captions);
+                  $('input:checkbox[name="random"]').val('off').filter('[value="off"]').prop('checked', customizerOptions.gallery_settings.randomize);
+                  $('input:checkbox[name="justify_last_row"]').val('on').filter('[value="on"]').prop('checked', customizerOptions.gallery_settings.justifyLastRow);
+                  $('input:checkbox[name="hide_last_row"]').val('off').filter('[value="off"]').prop('checked', customizerOptions.gallery_settings.hideLastRow);
 
                   $instance.justifiedGallery({
                     rowHeight:          customizerOptions.gallery_settings.rowHeight,
@@ -423,5 +436,9 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -17,8 +17,6 @@ regenerate:                             true
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
  # -----------------------------------------------------------------------------
- # TODO: jadams, 2019-01-20: Isolate drawer, switch from BME code
- # -----------------------------------------------------------------------------
  # Test data:
  #  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
@@ -43,12 +41,15 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config             = site %}
 {% assign template_config         = site.data.template_settings %}
 {% assign blocks                  = site.data.blocks %}
 {% assign modules                 = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment             = site_config.environment %}
+
 {% assign banner_config_defaults  = blocks.defaults.banner.defaults %}
 {% assign banner_config_settings  = blocks.banner.settings %}
 {% assign panel_config_defaults   = blocks.defaults.panel.defaults %}
@@ -76,6 +77,11 @@ regenerate:                             true
 
 {% assign hideOnReload            = modules.themer_options.hideOnReload %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/j1_template.js
@@ -96,6 +102,14 @@ regenerate:                             true
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+/* eslint quotes: "off"                                                       */
+/* eslint semi: "off"                                                         */
+// -----------------------------------------------------------------------------
 'use strict';
 
 var j1 = (function () {
@@ -121,7 +135,7 @@ var j1 = (function () {
   var user_session_detected;
 
   // Connector settings
-  var translation_enabled = {{template_config.translation.enabled}}
+  var translation_enabled = {{template_config.translation.enabled}};
 
   // Theme information
   var themeName;
@@ -155,7 +169,7 @@ var j1 = (function () {
     'app_session':  '{{template_config.cookies.app_session}}',
     'user_session': '{{template_config.cookies.user_session}}',
     'user_state':   '{{template_config.cookies.user_state}}'
-  }
+  };
 
   // user SESSION cookie (initial values)
   var user_session = {
@@ -202,7 +216,7 @@ var j1 = (function () {
     // See: https://stackoverflow.com/questions/359788/how-to-execute-a-javascript-function-when-i-have-its-name-as-a-string
     //
     var args = Array.prototype.slice.call(arguments, 2);
-    var namespaces = functionName.split(".");
+    var namespaces = functionName.split('.');
     var func = namespaces.pop();
     for(var i = 0; i < namespaces.length; i++) {
       context = context[namespaces[i]];
@@ -216,7 +230,8 @@ var j1 = (function () {
   return {
 
     // -------------------------------------------------------------------------
-    // Initializer
+    // init()
+    // initializer
     // -------------------------------------------------------------------------
     init: function (options) {
 
@@ -224,7 +239,7 @@ var j1 = (function () {
       // global var (function)
       // -----------------------------------------------------------------------
       var logger        = log4javascript.getLogger('j1.init');
-      var url           = new parseURL(window.location.href)
+      var url           = new parseURL(window.location.href);
       var baseUrl       = url.origin;
       var epoch         = Math.floor(Date.now()/1000);
       var timestamp_now = moment.unix(epoch).format('YYYY-MM-DD HH:mm:ss');
@@ -241,39 +256,11 @@ var j1 = (function () {
         options
       );
 
-      // catch senseless detect url 404 errors (middleware /status)
-      // See: https://stackoverflow.com/questions/4687235/jquery-get-or-post-to-catch-page-load-error-eg-404
-      $.ajaxSetup({
-        // called on `$.get()`, `$.post()`, `$.ajax()`
-        statusCode : {
-          // raised on response status code 404
-          404 : function (jqxhr, textStatus, errorThrown) {
-            var interval_count = 0;
-            var max_count      = 10;
-            var dependencies_met_logger = setInterval(function() {
-              interval_count += 1;
-              if ( j1.adapter.logger.getState() == 'finished' ) {
-                var logger = log4javascript.getLogger('j1.init');
-                clearInterval(dependencies_met_logger);
-                if(jqxhr.responseText.indexOf('GET /status') > -1) {
-                  logger.info('no middleware found on url /status: ignored');
-                  logger.info('continue on mode: web');
-                }
-                if (interval_count > max_count) {
-                  logger.warn('dependency check failed for module: logger');
-                  logger.warn('continue on initializer unchecked');
-                  j1.adapter.navigator.init();
-                }
-              }
-            }, 25);
-          }
-        }
-       });
-
       // -----------------------------------------------------------------------
-      // Session ON_CLOSE event
-      // Update user STATE cookie|Remove user SESSION cookie on window CLOSE
-      // See: https://stackoverflow.com/questions/3888902/detect-browser-or-tab-closing
+      // session ON_CLOSE event
+      // wrapup if ALL browser windows get closed. Update user STATE
+      // cookie on window CLOSE.
+      // see: https://stackoverflow.com/questions/3888902/detect-browser-or-tab-closing
       // -----------------------------------------------------------------------
       window.addEventListener('beforeunload', function (event) {
         var cookie_names              = j1.getCookieNames();
@@ -289,23 +276,15 @@ var j1 = (function () {
         user_state.session_active     = false;
         user_state.last_session_ts    = timestamp_now;
 
-        // DANGEROUS (??): delete user session in browser using MULTI_TAB!
-        // if (j1.existsCookie(cookie_names.user_session)) {
-        //   var bla = cookie_names.user_session;
-        //   j1.deleteCookie(cookie_names.user_session)
-        // }
-
         j1.writeCookie({
           name: cookie_user_state_name,
           data: user_state,
           expires: 365
         });
-
-
       });
 
       // -----------------------------------------------------------------------
-      // Initialize|Load (existing) user cookies
+      // initialize|load (existing) user cookies
       // -----------------------------------------------------------------------
       user_session.created    = timestamp_now;
       user_session.timestamp  = timestamp_now;
@@ -332,7 +311,7 @@ var j1 = (function () {
         expires:  365
       });
 
-      // Detect middleware (mode 'app') and update user session cookie
+      // detect middleware (mode 'app') and update user session cookie
       // -----------------------------------------------------------------------
       // if (user_session.mode === 'na' || user_session.mode === 'app') {
       if (user_session.mode === 'na') {
@@ -342,7 +321,10 @@ var j1 = (function () {
 
         baseUrl       = url.origin;
 
-        $.when ($.ajax(ep_status))
+        // see: https://stackoverflow.com/questions/3709597/wait-until-all-jquery-ajax-requests-are-done
+        $.when (
+          $.ajax(ep_status)
+        )
         .then(function(data) {
           var logger                  = log4javascript.getLogger('j1.init');
           user_session                = j1.readCookie(cookie_names.user_session);
@@ -386,153 +368,84 @@ var j1 = (function () {
         logger.info('page is being initialized');
       }
 
+      state = 'started';
+      logger.info('state: ' + state);
+      logger.info('page is being initialized');
+
+      if ( settings.scrollbar === 'false'  ) {
+        $('body').addClass('hide-scrollbar');
+        $('html').addClass('hide-scrollbar-moz');
+      }
+
+      logger.info('read user state from cookie');
+      user_session = j1.readCookie(cookie_names.user_session);
+
+      // process|update user state cookie
+      themeName                 = user_session.theme_name;
+      themeCss                  = user_session.theme_css;
+      themeExtensionCss         = user_session.theme_extension_css;
+
+      // save last page access
+      // see: https://stackoverflow.com/questions/3528324/how-to-get-the-previous-url-in-javascript
+      // see: https://developer.mozilla.org/de/docs/Web/API/Window/history
+      //
+      user_session.timestamp      = timestamp_now;
+      referrer                    = new parseURL(document.referrer);
+      current_page                = window.location.pathname;
+      user_session.requested_page = current_page;
+      user_session.previous_page  = referrer.search === '' ?
+                                    (referrer.pathname === '' ? current_page : referrer.pathname) :
+                                    (user_session.previous_page === '' || user_session.previous_page === 'na'
+                                      ? '/'
+                                      : user_session.previous_page
+                                    );
+
+      // calculate last 'pager' if any
+      if (rePager.test(user_session.previous_page)) {
+        last_pager                = user_session.previous_page;
+        user_session.last_pager   = last_pager;
+      } else {
+        last_pager                = user_session.last_pager;
+      }
+
+      logger.info('update user session cookie');
+      j1.writeCookie({
+        name: cookie_names.user_session,
+        data: user_session
+      });
+
       {% comment %} Deferred data loads
       See: https://stackoverflow.com/questions/3709597/wait-until-all-jquery-ajax-requests-are-done
       Load J1 Template data objects 'asychronously'
       -------------------------------------------------------------------------- {% endcomment %}
+      // initialize page resources for global modules
+      // (asynchronous, should be rewitten to xhrData)
+      j1.initBanner(settings);
+      j1.initPanel(settings);
+      j1.initFooter(settings);
+
+      state = 'running';
+      logger.info('state: ' + state);
+      logger.info(logText);
+
+      user_session.timestamp = timestamp_now;
+      j1.writeCookie({
+        name: cookie_names.user_session,
+        data: user_session
+      });
 
       // -----------------------------------------------------------------------
-      // data loader (should be rewitten to xhrData() )
+      // additional BS helpers from j1.core
       // -----------------------------------------------------------------------
-      $.when (
-        j1.getColorData(colors_data_path),
-        j1.getFontSizeData(font_size_data_path),
-        j1.getMessageCatalog(message_catalog_data_path))
-      .done (function(colorData, fontSizes, messageCatalog, runtime) {
-        j1.colors     	= colorData[0];
-        j1.fonts        = fontSizes[0];
-
-        // set logger for callback|anonymous
-        //
-        var logger = log4javascript.getLogger('j1.init');
-
-        logText = j1.getMessage('info', 'getState', 'text');
-        logText = logText + j1.getMessage('info', 'getState', 'data_objects');
-        logText = logText + j1.getMessage('info', 'getState', 'finished');
-        j1.logger('j1.init', 'info', logText);
-
-        logText = j1.getMessage('info', 'setState', 'text');
-        logText = logText + j1.getMessage('info', 'setState', 'started');
-        j1.logger('j1.init', 'info', logText);
-        executeFunctionByName('j1.setState', window, state);
-
-        // set logger for callback|anonymous
-        var logger = log4javascript.getLogger('j1.init');
-
-        if ( settings.scrollbar === 'false'  ) {
-          $('body').addClass( 'hide-scrollbar' )
-          $('html').addClass( 'hide-scrollbar-moz' )
-        }
-
-        logger.info('read user state from cookie');
-        user_session = j1.readCookie(cookie_names.user_session);
-
-        // process|update UserState
-        //
-        themeName                 = user_session.theme_name;
-        themeCss                  = user_session.theme_css;
-        themeExtensionCss         = user_session.theme_extension_css;
-
-        // save last page access
-        // See: https://stackoverflow.com/questions/3528324/how-to-get-the-previous-url-in-javascript
-        // See: https://developer.mozilla.org/de/docs/Web/API/Window/history
-        //
-        user_session.timestamp      = timestamp_now;
-        referrer                    = new parseURL(document.referrer);
-        current_page                = window.location.pathname;
-        user_session.requested_page = current_page;
-        user_session.previous_page  = referrer.search === '' ?
-                                      (referrer.pathname === '' ? current_page : referrer.pathname) :
-                                      (user_session.previous_page === '' || user_session.previous_page === 'na'
-                                        ? '/'
-                                        : user_session.previous_page
-                                      );
-
-        // calculate last 'pager' if any
-        //
-        if (rePager.test(user_session.previous_page)) {
-          last_pager                = user_session.previous_page;
-          user_session.last_pager   = last_pager;
-        } else {
-          last_pager                = user_session.last_pager;
-        }
+      j1.core.bsFormClearButton();
 
-        logger.info('update user session cookie');
-        j1.writeCookie({
-          name: cookie_names.user_session,
-          data: user_session
-        });
-
-        // ---------------------------------------------------------------------
-        // Initialize page resources for global modules (sequential asynchronous)
-        // (should be rewitten to xhrData() )
-        // ---------------------------------------------------------------------
-        $.when (
-          j1.initBanner(settings),
-          j1.initPanel(settings),
-          j1.initFooter(settings) )
-        .then (function (initBanner_response, initPanel_response, initFooter_response) {
-          var logger  = log4javascript.getLogger('j1.init');
-
-          // Wait for LAST thenable (footer) in chain finishes
-          var footerLoaded = setInterval(function() {
-            if ( j1.getState() == 'footer_loaded') {
-              // clear interval checking
-              clearInterval(footerLoaded);
-              logger.info('loading data completed');
-
-              // Continue to run initializers
-              //
-              state       = j1.getMessage('info', 'setState', 'running');
-              logText     = j1.getMessage('info', 'setState', 'text');
-              logText     = logText + j1.getMessage('info', 'setState', 'running');
-              j1.logger('j1.init', 'info', logText);
-
-              user_session.timestamp = timestamp_now;
-              j1.writeCookie({
-                name: cookie_names.user_session,
-                data: user_session
-              });
-
-              // ---------------------------------------------------------------
-              // Finalize|Display page (sequential asynchronous)
-              // NOTE:
-              //  jadams 2019-01-20: for MDB, enabled only drawer, switch
-              //  and ripples
-              // ---------------------------------------------------------------
-              $.when (
-                j1.initMDB(settings),
-                j1.initClipboard(settings))
-              .then (function () {
-                j1.displayPage();
-              })
-              .catch(function(error) {
-                var logger  = log4javascript.getLogger('j1.init');
-                json_data   = JSON.stringify(error, undefined, 2);
-                logText     = 'deferred: ' + json_data;
-                logger.error(logText);
-              });
-            }
-          }, 25); // END 'footerLoaded'
-        }) // END load global modules
-        .catch(function(error) {
-          var logger  = log4javascript.getLogger('j1.init');
-          json_data   = JSON.stringify(error, undefined, 2);
-          logText     = 'deferred: ' + json_data;
-          logger.error(logText);
-        });
-      }) // END load global data objects
-      .catch(function(error) {
-        var logger  = log4javascript.getLogger('j1.init');
-        json_data   = JSON.stringify(error, undefined, 2);
-        logText     = 'deferred: ' + json_data;
-        logger.error(logText);
-      });
+      // finalize and display page
+      j1.displayPage();
 
     }, // END init
 
     // -------------------------------------------------------------------------
-    // initBanner
+    // initBanner()
     // AJAX fetcher to load and place all banner used for a page
     // -------------------------------------------------------------------------
     initBanner: function (options) {
@@ -581,30 +494,14 @@ var j1 = (function () {
                   {% assign key = item[0] %}
                   {% assign value = item[1] %}
 
-                  {% if key and debug %} item:value  {{key}}:{{value}}  {% endif %}
+                  {% if key and debug %} item:value  {{key}}:{{value}} {% endif %}
 
                   {% if key == 'id' %}                 {% assign id                 = value %} {% endif %}
                   {% if key == 'enabled' %}            {% assign enabled            = value %} {% endif %}
-                  {% if key == 'background_color_1' %} {% assign background_color_1 = value %} {% endif %}
-                  {% if key == 'background_color_2' %} {% assign background_color_2 = value %} {% endif %}
                 {% endfor %}
             {% endfor %}
 
             {% if id and enabled %}
-            {% comment %} Add CSS styles for current banner to section <HEAD>
-            -------------------------------------------------------------------- {% endcomment %}
-            {% if background_color_1 and background_color_2 %}
-            var banner_backround_style = '';
-            // Initialze banner background gradient/colors
-            banner_backround_style += "<style> .{{id}}-background { ";
-            banner_backround_style += "background-image: -webkit-gradient(linear, left top, left bottom, from( " +j1.setColorData('{{background_color_1}}')+ " ), to(  " +j1.setColorData('{{background_color_2}}')+ " ));";
-            banner_backround_style += "background-image: -webkit-linear-gradient(top, " +j1.setColorData('{{background_color_1}}')+ " 0%, " +j1.setColorData('{{background_color_2}}')+ " 100%);";
-            banner_backround_style += "background-image: -o-linear-gradient(top, " +j1.setColorData('{{background_color_1}}')+ " 0%, " +j1.setColorData('{{background_color_2}}')+ " 100%);";
-            banner_backround_style += "background-image: linear-gradient(to bottom, " +j1.setColorData('{{background_color_1}}')+ " 0%, " +j1.setColorData('{{background_color_2}}')+ " 100%);";
-            banner_backround_style += 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' +j1.setColorData('{{background_color_1}}')+ '", endColorstr="' +j1.setColorData('{{background_color_2}}')+ '", GradientType=0); ';
-            banner_backround_style += "} </style>";
-            $('head').append( banner_backround_style );
-            {% endif %}
 
             {% comment %} Register current banner
             -------------------------------------------------------------------- {% endcomment %}
@@ -617,8 +514,6 @@ var j1 = (function () {
           ---------------------------------------------------------------------- {% endcomment %}
           {% assign id                  = nil %}
           {% assign enabled             = nil %}
-          {% assign background_color_1  = nil %}
-          {% assign background_color_2  = nil %}
           {% assign banner_config       = nil %}
 
         {% endfor %}  {% comment %} END banner_config {% endcomment %}
@@ -650,7 +545,7 @@ var j1 = (function () {
     }, // END initBanner
 
     // -------------------------------------------------------------------------
-    // initPanel
+    // initPanel()
     // AJAX fetcher to load and place all panel used for a page
     // -------------------------------------------------------------------------
     // ToDo:
@@ -723,7 +618,7 @@ var j1 = (function () {
 
       if ( panel.length ) {
         for (var i in panel) {
-          var id = "#" + panel[i];
+          var id = '#' + panel[i];
           var selector = $(id);
           if ( selector.length ) {
             logText = 'loading panel on id: ' +panel[i];
@@ -741,7 +636,7 @@ var j1 = (function () {
     }, // END initPanel
 
     // -------------------------------------------------------------------------
-    // initFooter
+    // initFooter()
     // AJAX fetcher to load and place the footer used for a page
     // -------------------------------------------------------------------------
     initFooter: function ( options ) {
@@ -759,7 +654,7 @@ var j1 = (function () {
 
             state = 'footer_loaded';
             logger.info('set state for module ' + mod + ': ' + state);
-            executeFunctionByName(mod + '.setState', window, state)
+            executeFunctionByName(mod + '.setState', window, state);
 
             logText = 'initialization finished';
             logger.info(logText);
@@ -787,77 +682,20 @@ var j1 = (function () {
       return true;
     }, // END initFooter
 
-    // -------------------------------------------------------------------------
-    // initClipboard
-    // Create copy-to-clipboard for all pages
-    // -------------------------------------------------------------------------
-    initClipboard: function ( options ) {
-      var logger = log4javascript.getLogger('j1.initClipboard');
-
-      logText = 'initialization started';
-      logger.info(logText);
-
-      // insert copy to clipboard button before all elements having a
-      // class of ".highlight" assigned to (e.g. Asciidoc source blocks)
-      $('.highlight').each(function () {
-        // Check if no clipboard should be applied
-        var isNoClip = $(this).closest('.noclip');
-        if ( isNoClip.length == 0) {
-          var btnHtml = '<div class="j1-clipboard"><span class="btn-clipboard j1-tooltip" data-toggle="tooltip" data-placement="left" title="Copy to clipboard">Copy</span></div>';
-          var bumms = $(this).closest('.noclip');
-          $(this).before(btnHtml);
-          $('.btn-clipboard').tooltip();
-        }
-      });
-      var clipboard = new Clipboard( '.btn-clipboard', {
-        target: function target(trigger) {
-          return trigger.parentNode.nextElementSibling;
-        }
-      });
-
-      // Manage clipboard events
-      clipboard.on('success', function (e) {
-        $(e.trigger).attr('title', 'copied!').tooltip('_fixTitle').tooltip('show').attr('title', 'Copy to clipboard').tooltip('_fixTitle');
-        var logger = log4javascript.getLogger('j1.initClipboard');
-        var logText = 'initialization copy-to-clipboard sucessfull';
-        logger.debug(logText);
-        /* Cleanup clipped data for trailing numbers */
-        var splitted = e.text.split('\n');
-        var concat;
-        var i;
-        for (i=0; i<splitted.length; i++) {
-          concat += splitted[i].replace(/^\s+\d+/, '');
-        }
-        e.clearSelection();
-      });
-      clipboard.on('error', function (e) {
-        var fallbackMsg = /Mac/i.test(navigator.userAgent) ? 'press \u2318 to copy' : 'press ctrl-c to copy';
-        logger = log4javascript.getLogger('j1.initClipboard');
-        logText = 'initialization copy-to-clipboard failed, fallback used.';
-        logger.warn(logText);
-        $(e.trigger).attr('title', fallbackMsg).tooltip('_fixTitle').tooltip('show').attr('title', 'copy to clipboard').tooltip('_fixTitle');
-      });
-
-      logText = 'initialization finished';
-      logger.info(logText);
-
-      return true;
-    }, // END initClipboard
-
     // -------------------------------------------------------------------------
     // displayPage
-    // Show the page after timeout of {{hideOnReload}} ms
+    // show the page after timeout of {{flickerTimeout}} ms
     // -------------------------------------------------------------------------
     // NOTE:
     //  jadams, 2019-08-21: for unknown reason, the user state data
-    //  (read from cookie) seems not coorect (or loaded too late).
+    //  (read from cookie) seems not correct (or loaded too late).
     //  To make correct data sure for APP mode, a status request is done
     //  to load the current state from the middleware (skipped in WEB mode)
     // -------------------------------------------------------------------------
     displayPage: function (options) {
       var logger              = log4javascript.getLogger('j1.displayPage');
       var flickerTimeout      = {{template_config.flicker_timeout}};
-      var url                 = new parseURL(window.location.href)
+      var url                 = new parseURL(window.location.href);
       var baseUrl             = url.origin;
       var ep_status           = baseUrl + '/status' + '?page=' + window.location.pathname;
       var user_session        = j1.readCookie(cookie_names.user_session);
@@ -869,7 +707,6 @@ var j1 = (function () {
       var appDetected;
       var categoryAllowed;
 
-
       logger.info('finalize page');
       j1.setCss();
 
@@ -892,7 +729,8 @@ var j1 = (function () {
           providerPermissions = user_session.provider_permissions;
           categoryAllowed     = providerPermissions.includes(user_session.page_permission);
 
-          // Make sure that protected pages are ALWAYS checked for permissions
+          // check protected pages (applies for APP only)
+          // make sure that protected pages are ALWAYS checked for permissions
           // -------------------------------------------------------------------
           if (
             j1.authEnabled() &&
@@ -910,10 +748,14 @@ var j1 = (function () {
             }
           } // END check protected pages
 
+          // show the page delayed
           setTimeout (function() {
-            // Display page
+            // display page
             $('#no_flicker').css('display', 'block');
 
+            // bind MDB services to current page
+            j1.initMDB();
+
             // show|hide cookie icon
             if (user_state.cookies_accepted === 'accepted') {
               // show cookie icon
@@ -942,19 +784,19 @@ var j1 = (function () {
               if (user_session.authenticated === 'true') {
                 // set signout
                 logger.info('show signout icon');
-                $('#navLinkSignInOut').attr("data-target","#modalOmniSignOut");
-                $('#iconSignInOut').removeClass( "mdi-login" ).addClass( "mdi-logout" );
+                $('#navLinkSignInOut').attr('data-target','#modalOmniSignOut');
+                $('#iconSignInOut').removeClass('mdi-login').addClass('mdi-logout');
               } else {
                 // set signin
                 logger.info('show signin icon');
-                $('#navLinkSignInOut').attr("data-target","#modalOmniSignIn");
-                $('#iconSignInOut').removeClass( "mdi-logout" ).addClass( "mdi-login" );
+                $('#navLinkSignInOut').attr('data-target','#modalOmniSignIn');
+                $('#iconSignInOut').removeClass('mdi-logout').addClass('mdi-login');
               }
               logger.info('authentication detected as: ' + user_session.authenticated);
               $('#quickLinksSignInOutButton').css('display', 'block');
             }
 
-            // If the page requested contains an anchor element,
+            // if the page requested contains an anchor element,
             // do a smooth scroll to
             j1.scrollTo();
 
@@ -981,89 +823,90 @@ var j1 = (function () {
             logger.info(logText);
 
           }, flickerTimeout);
-        });
-        // END APP mode
-      } else {
-        // web mode
+        }); // END APP mode
+      } else { // web mode
+        // show the page delayed
         setTimeout (function() {
-          // Display page
+          // display page
           $('#no_flicker').css('display', 'block');
-            logger.info('mode detected: web');
-            logger.info('hide signin icon');
-            $('#quickLinksSignInOutButton').css('display', 'none');
+          logger.info('mode detected: web');
+          logger.info('hide signin icon');
+          $('#quickLinksSignInOutButton').css('display', 'none');
 
-            user_session.current_page = current_url.pathname;
-            j1.writeCookie({
+          user_session.current_page = current_url.pathname;
+          j1.writeCookie({
               name:     cookie_names.user_session,
               data:     user_session
-            });
-
-            // show|hide translator icon
-            if (translation_enabled) {
-              logger.info('translator detected: google');
-              logger.info('initialize language selector');
-              $('.goog-te-combo').addClass('form-control');
-            }
-
-            // show|hide cookie icon
-            if (user_state.cookies_accepted === 'accepted') {
-              // Display cookie icon
-              logText = 'show cookie icon';
-              logger.info(logText);
-              $('#quickLinksCookieButton').css('display', 'block');
-            } else {
-              logText = 'hide cookie icon';
-              logger.info(logText);
-              // Display cookie icon
-              $('#quickLinksCookieButton').css('display', 'none');
-            }
+          });
 
-            // If the page requested contains an anchor element,
-            // do a smooth scroll to
-            j1.scrollTo();
+          // show|hide translator icon
+          if (translation_enabled) {
+            logger.info('translator detected: google');
+            logger.info('initialize language selector');
+            $('.goog-te-combo').addClass('form-control');
+          }
 
-            if (user_session.previous_page !== user_session.current_page) {
-              logText = 'page change detected';
-              logger.info(logText);
-              logText = 'previous page: ' + user_session.previous_page;
-              logger.info(logText);
-              logText = 'current page: ' + user_session.current_page;
-              logger.info(logText);
-            }
+          // show|hide cookie icon
+          if (user_state.cookies_accepted === 'accepted') {
+            // Display cookie icon
+            logText = 'show cookie icon';
+            logger.info(logText);
+            $('#quickLinksCookieButton').css('display', 'block');
+          } else {
+            logText = 'hide cookie icon';
+            logger.info(logText);
+            // Display cookie icon
+            $('#quickLinksCookieButton').css('display', 'none');
+          }
 
-            // update sidebar for changed consent|theme data
-            logger.info('update sidebar');
-            user_state        = j1.readCookie(cookie_names.user_state);
-            current_user_data = j1.mergeData(user_session, user_state);
-            j1.core.navigator.updateSidebar(current_user_data);
+          // If the page requested contains an anchor element,
+          // do a smooth scroll to
+          j1.scrollTo();
 
-            // Set|Log status
-            state = 'finished';
-            logText = 'state: ' + state;
+          if (user_session.previous_page !== user_session.current_page) {
+            logText = 'page change detected';
             logger.info(logText);
-            logText = 'page finalized successfully';
+            logText = 'previous page: ' + user_session.previous_page;
             logger.info(logText);
+            logText = 'current page: ' + user_session.current_page;
+            logger.info(logText);
+          }
+
+          // update sidebar for changed consent|theme data
+          logger.info('update sidebar');
+          user_state        = j1.readCookie(cookie_names.user_state);
+          current_user_data = j1.mergeData(user_session, user_state);
+          j1.core.navigator.updateSidebar(current_user_data);
+
+          // set|log status
+          state = 'finished';
+          logText = 'state: ' + state;
+          logger.info(logText);
+          logText = 'page finalized successfully';
+          logger.info(logText);
 
-         }, flickerTimeout);
+        }, flickerTimeout);
       } // END WEB mode
     }, // END displayPage
 
     // -------------------------------------------------------------------------
-    // Initialize BS Material Design
+    // initMDB()
+    // initialize page for MDB
     // -------------------------------------------------------------------------
-    // ToDo:
     initMDB: function (options) {
-      var logger;
-
-      logger  = log4javascript.getLogger('j1.initMDB');
-      logText = 'material design is being started';
-      logger.info(logText);
+      var dependencies_met_bmd = setInterval(function() {
+        if ( j1.adapter.mdb.getState() == 'finished' ) {
+          var logger = log4javascript.getLogger('j1.initMDB');
+          logText = 'initializing MDB for current page: started';
+          logger.info(logText);
 
-      $('body').bootstrapMaterialDesign();
-      //new WOW().init();
+          $('body').bootstrapMaterialDesign();
 
-      var logText = 'initializing material design finished';
-      logger.info(logText);
+          logText = 'initializing MDB for current page: finished';
+          logger.info(logText);
+          clearInterval(dependencies_met_bmd);
+        }
+      }, 25);
     }, // END initMDB
 
     // -------------------------------------------------------------------------
@@ -1071,9 +914,10 @@ var j1 = (function () {
     // -------------------------------------------------------------------------
 
     // -------------------------------------------------------------------------
-    //  Merge two objects (properties) and returns the resulting object
-    //  TODO:  Improve comment, give synopsis and example
-    // See: https://stackoverflow.com/questions/43109229/merge-default-options-containing-object-with-json-object
+    // mergeData()
+    // merge two objects (properties) and returns the resulting object
+    // see: https://stackoverflow.com/questions/43109229/merge-default-options-containing-object-with-json-object
+    // TODO:  Improve comment, give synopsis and example
     // -------------------------------------------------------------------------
     mergeData: function () {
       var a = [].slice.call(arguments), o = a.shift();
@@ -1087,39 +931,43 @@ var j1 = (function () {
     },  // END mergeData
 
     // -------------------------------------------------------------------------
-    //  returns the last vistited page
+    // getPrevPage()
+    // returns the last vistited page
     // -------------------------------------------------------------------------
     getPrevPage: function () {
       return previous_page;
     }, // END getPrevPage
 
     // -------------------------------------------------------------------------
-    //  returns the preferred language taken form window.navigator
-    //  See:
-    //  https://stackoverflow.com/questions/1043339/javascript-for-detecting-browser-language-preference
+    // getLanguage()
+    // returns the preferred language taken form window.navigator
+    // See:
+    // https://stackoverflow.com/questions/1043339/javascript-for-detecting-browser-language-preference
     // -------------------------------------------------------------------------
     getLanguage: function () {
       var language = navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage);
     }, // END getLanguage
 
     // -------------------------------------------------------------------------
-    //  returns the template version taken from site config (_config.yml)
+    // getTemplateVersion()
+    // returns the template version taken from site config (_config.yml)
     // -------------------------------------------------------------------------
     getTemplateVersion: function () {
       return '{{template_version}}';
     }, // END getTemplateVersion
 
     // -------------------------------------------------------------------------
+    // scrollTo()
     // Scrolls smooth to any anchor referenced by an page URL on
     // e.g. a page reload. Values for delay|offset are taken from
     // TOCCER module
     // -------------------------------------------------------------------------
     scrollTo: function () {
-      var anchor    = window.location.href.split("#")[1];
+      var anchor    = window.location.href.split('#')[1];
       var anchor_id = '#' + anchor;
       var selector;
 
-      if (anchor_id) {
+      if (anchor && anchor_id) {
         // scroll only, if an anchor is given with URL
         selector = $(anchor_id);
         if (selector.length) {
@@ -1130,7 +978,9 @@ var j1 = (function () {
           });
         } else {
           // scroll the page one pixel back and forth (trigger)
-          // to get the right position for the Toccer
+          // to get the right position for the Toccer and adjust the
+          // Navigator to display the (tranparent) navbar correctly
+          //
           $(window).scrollTop($(window).scrollTop()+1);
           $(window).scrollTop($(window).scrollTop()-1);
         } // END if anchor_id
@@ -1138,18 +988,18 @@ var j1 = (function () {
     }, // END scrollTo
 
     // -------------------------------------------------------------------------
-    //  authEnabled:
+    //  authEnabled()
     //  Returns the state of the authentication module
     // -------------------------------------------------------------------------
     authEnabled: function () {
-      var logger = log4javascript.getLogger('j1.authentication');
-      var authEnabled = {{authentication_options.j1_auth.enabled}}
+      var logger      = log4javascript.getLogger('j1.authentication');
+      var authEnabled = {{authentication_options.j1_auth.enabled}};
 
       return authEnabled;
     }, // END authEnabled
 
     // -------------------------------------------------------------------------
-    //  appDetected:
+    //  appDetected()
     //  Returns true if a web session cookie exists
     // -------------------------------------------------------------------------
     appDetected: function () {
@@ -1168,7 +1018,7 @@ var j1 = (function () {
     }, // END appDetected
 
     // -------------------------------------------------------------------------
-    // xhrData:
+    // xhrData()
     // Load data asychronously using XHR on a DIV container
     // specified (from options: xhr_data_path)
     // -------------------------------------------------------------------------
@@ -1197,27 +1047,28 @@ var j1 = (function () {
         };
       };
 
-      var id = "#" + options.xhr_container_id;
+      var id = '#' + options.xhr_container_id;
       var selector = $(id);
 
       if ( selector.length ) {
-        var modal_html_data_path = options.xhr_data_path + " > *";
+        var modal_html_data_path = options.xhr_data_path + ' > *';
         selector.load( modal_html_data_path, cb_load_closure( mod, id ) );
         return true;
       } else {
-        logText = "data not loaded"
+        logText = 'data not loaded';
         logger.warn(logText);
         // Set processing state to 'finished' to complete module load
         state = 'finished';
         logger.info('state: ' + state);
-        executeFunctionByName(mod + '.setState', window, state)
+        executeFunctionByName(mod + '.setState', window, state);
         return false;
       }
     }, // END xhrData
 
     // -------------------------------------------------------------------------
-    //  xhrApi: XMLHttpRequest (XHR) based async server API request
-    //  Request an REST API at 'url', using verb 'type' of response type 'type'
+    // xhrApi:()
+    // XMLHttpRequest (XHR) based async server API request
+    // Request an REST API at 'url', using verb 'type' of response type 'type'
     // -------------------------------------------------------------------------
     xhrApi: function (url, request_type, data_type) {
       var logger    = log4javascript.getLogger('j1.xhrApi');
@@ -1244,236 +1095,7 @@ var j1 = (function () {
     }, // END xhrApi
 
     // -------------------------------------------------------------------------
-    //  fetchAPI: Fetch (Promise) based async request
-    //  Returns the current git state collected from /git endpoint
-    // -------------------------------------------------------------------------
-    fetchAPI: function (params, cbData) {
-      var logger    = log4javascript.getLogger('j1.fetchAPI');
-      var cbData      = cbData;
-      var parameters  = params == '' ? 'all' : params;
-      var url         = 'http://localhost:41001/gut';
-
-      async function callAPI() {
-        const URL         = url;
-        const fetchResult = fetch(URL)
-        const response    = await fetchResult;
-
-        if (response.ok) {
-          const jsonData  = await response.json();
-          json_data       = JSON.stringify(jsonData, undefined, 2);
-          logText         = 'response from fetch received: ' + json_data;
-          logger.info(logText);
-          //console.log(jsonData);
-        } else {
-          throw Error(response.statusText);
-          // logger.error("Fetch request failed: " + response.statusText);
-        }
-      }
-      callAPI();
-
-      return true;
-    }, // END fetchAPI
-
-    // -------------------------------------------------------------------------
-    // getRuntimeData: Returns the j1_runtime data object
-    //
-    // -------------------------------------------------------------------------
-    getRuntimeData: function (data_path) {
-    var logger = log4javascript.getLogger('j1.getRuntimeData');
-    var logText;
-
-    return $.ajax({
-        url:      data_path,
-        success:  function (contents) {
-          logText = 'data loaded successfully';
-          logger.info(logText);
-          state = 'runtime_data_loaded_success';
-          logger.info('state: ' + state);
-          executeFunctionByName('j1.setState', window, state);
-        },
-        error: function (err) {
-          logText = 'runtime data not loaded: ' + err;
-          logger.warn(logText);
-          state = 'runtime_data_loaded_failed';
-          logger.info('state: ' + state);
-          executeFunctionByName('j1.setState', window, state)
-          return false;
-        }
-      });
-
-    }, // END getRuntimeData
-
-    // -------------------------------------------------------------------------
-    // getColorData: Returns the j1_colors object
-    // Load color definitions from colors_data_path
-    // -------------------------------------------------------------------------
-    getColorData: function (data_path) {
-      var logger    = log4javascript.getLogger('j1.getColorData');
-      var j1_colors = {};
-
-      return $.ajax({
-        url:      data_path,
-        success:  function (data) {
-          var logText = "color data loaded successfully"
-          logger.info(logText);
-          state = 'color_data_loaded_success';
-          logger.info('state: ' + state);
-          executeFunctionByName('j1.setState', window, state);
-
-          if (typeof data == 'string') {
-            j1_colors = JSON.parse(data);
-          }
-          if (typeof data == 'object') {
-            j1_colors = data;
-          }
-        },
-        error: function (data) {
-          var logText = "color data not loaded"
-          logger.warn(logText);
-          state = 'color_data_loaded_failed';
-          logger.info('state: ' + state);
-          executeFunctionByName('j1.setState', window, state)
-          return false;
-        }
-      });
-
-    }, // END getColorData
-
-    // -------------------------------------------------------------------------
-    // setColorData:
-    //
-    // -------------------------------------------------------------------------
-    setColorData: function (color) {
-
-      if ( typeof color != 'undefined' ) {
-        var reHex = /^#[A-Fa-f0-9]+$/;
-        var reRGBA = /^rgba/;
-        var isHex = color.match(reHex);
-        var isRGBA = color.match(reRGBA);
-
-        if ( typeof j1.colors[color] != 'undefined' ) {
-          return j1.colors[color];
-        } else if (isHex) {
-          return color;
-        } else if (isRGBA) {
-          return color;
-        } else {
-          return false;
-        }
-      } else {
-        return false;
-      }
-
-    }, // END setColorData
-
-    // -------------------------------------------------------------------------
-    // getFontSizeData: Returns the j1_font_sizes object
-    // Load loadFontSize definitions from font_size_data_path
-    // -------------------------------------------------------------------------
-    getFontSizeData: function (data_path) {
-      var logger        = log4javascript.getLogger('j1.getFontSizeData');
-      var j1_font_sizes = {};
-
-      return $.ajax({
-        url:      data_path,
-        success:  function (data) {
-          var logText = "font size data loaded successfully"
-          logger.info(logText);
-          state = 'fontsize_data_loaded_success';
-          logger.info('state: ' + state);
-          executeFunctionByName('j1.setState', window, state);
-
-          if (typeof data == 'string') {
-            j1_font_sizes = JSON.parse(data);
-          }
-          if (typeof data == 'object') {
-            j1_font_sizes = data;
-          }
-        },
-        error: function (data) {
-          var logText = "font size data not loaded"
-          logger.warn(logText);
-          state = 'fontsize_data_loaded_failed';
-          logger.info('state: ' + state);
-          executeFunctionByName('j1.setState', window, state)
-          return false;
-        }
-      });
-
-    }, // END getFontSizeData
-
-    // -------------------------------------------------------------------------
-    // getFontSize: Returns the CSS value for a 'logical' fontsize
-    // out of the j1_font_sizes object
-    // -------------------------------------------------------------------------
-    setFontSize: function (size) {
-
-      if ( typeof size != 'undefined' ) {
-        var reCSS = /\bpx\b|\brem\b|\bem\b|\%|\binherit\b|\binitial\b|\bunset\b/;
-        var isCSS = size.match(reCSS);
-
-//      if ( typeof j1_font_sizes[size] != "undefined" ) {
-        if ( typeof j1.fonts[size] != "undefined" ) {
-            return j1.fonts[size];
-        } else if (isCSS) {
-          return size;
-        } else {
-          return false;
-        }
-      } else {
-        return false;
-      }
-
-    }, // END getFontSize
-
-    // -------------------------------------------------------------------------
-    // loadMessageCatalog
-    // Loads the message catalog object
-    // -------------------------------------------------------------------------
-    getMessageCatalog: function (data_path /*, request_type, data_type*/) {
-      var logger          = log4javascript.getLogger('j1.loadMessageCatalog');
-      var message_catalog = {};
-      var type            = typeof request_type == 'undefined' || request_type  == '' ? 'GET'  : request_type;
-      var data_type       = typeof data_type    == 'undefined' || data_type     == '' ? 'text' : data_type;
-      var messageData;
-      var logBase;
-      var logText;
-      var property;
-
-      return $.ajax({
-        url:      data_path,
-        type:     type,
-        dataType: data_type,
-        success:  function (data) {
-          messageData = yaml.safeLoad(data);
-          for (property in messageData) {
-            if (messageData.hasOwnProperty(property)) {
-              message_catalog[property] = {};
-              messageData[property].forEach((element) => {
-                var key   = Object.keys(element)[0];
-                var value = element[Object.keys(element)[0]];
-                message_catalog[property][key] = value;
-              });
-            }
-          }
-          j1.messages = message_catalog;
-          logBase = message_catalog.info.getData.message
-          logText = logBase.text + logBase.message_catalog + logBase.finished;
-          logger.info(logText);
-        },
-        error: function(data) {
-          var json_data = JSON.stringify(data, undefined, 2);
-          logBase       = message_catalog.error.getData.message;
-          logText       = logBase.text + logBase.xhr + ': ' + json_data
-          logger.error(logText);
-        }
-      });
-
-    }, // END getMessageCatalog
-
-    // -------------------------------------------------------------------------
-    //  readCookie:
-    //
+    //  readCookie()
     // -------------------------------------------------------------------------
     readCookie: function (name) {
       var data;
@@ -1495,7 +1117,7 @@ var j1 = (function () {
     }, // END readCookie
 
     // -------------------------------------------------------------------------
-    // writeCookie:
+    // writeCookie()
     // Write 'data' to a cookie 'name'. If not exists, the cookie gets
     // created. Returns 'true' if cookie was written, otherwise 'false'.
     //
@@ -1527,8 +1149,8 @@ var j1 = (function () {
           Cookies.set(settings.name, data_encoded);
         }
       } else {
-        cookie_data   = settings.data
-        data_json     = JSON.stringify( settings.data );
+        cookie_data   = settings.data;
+        data_json     = JSON.stringify(settings.data);
         data_encoded  = window.btoa(data_json);
         if (settings.expires > 0) {
           Cookies.set(settings.name, data_encoded, { expires: settings.expires });
@@ -1573,13 +1195,13 @@ var j1 = (function () {
     // -------------------------------------------------------------------------
     deleteCookie: function (options) {
       var name        = options;
-      var all_cookies = document.cookie.split("; ");
+      var all_cookies = document.cookie.split('; ');
 
       if ( name === 'all' ) {
         for (var c = 0; c < all_cookies.length; c++) {
-          var d = window.location.hostname.split(".");
+          var d = window.location.hostname.split('.');
           while (d.length > 0) {
-            var cookieBase = encodeURIComponent(all_cookies[c].split(";")[0].split("=")[0]) + '=; expires=Thu, 01-Jan-1970 00:00:01 GMT; domain=' + d.join('.') + ' ;path=';
+            var cookieBase = encodeURIComponent(all_cookies[c].split(';')[0].split('=')[0]) + '=; expires=Thu, 01-Jan-1970 00:00:01 GMT; domain=' + d.join('.') + ' ;path=';
             var p = location.pathname.split('/');
             document.cookie = cookieBase + '/';
             while (p.length > 0) {
@@ -1590,7 +1212,7 @@ var j1 = (function () {
           }
         }
       } else {
-        document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT";
+        document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
       }
 
       return true;
@@ -1601,8 +1223,8 @@ var j1 = (function () {
     // -------------------------------------------------------------------------
     existsCookie: function (name) {
       var dc            = document.cookie;
-      var prefix        = name + "=";
-      var begin         = dc.indexOf("; " + prefix);
+      var prefix        = name + '=';
+      var begin         = dc.indexOf('; ' + prefix);
       var end           = dc.length; // default to end of the string
       var cookieExists  = false;
       var cookieContent = '';
@@ -1620,8 +1242,8 @@ var j1 = (function () {
 
       // if ";" is found somewhere after the prefix position then "end" is
       // that position, otherwise it defaults to the end of the string
-      if (dc.indexOf(";", begin) !== -1) {
-        end = dc.indexOf(";", begin);
+      if (dc.indexOf(';', begin) !== -1) {
+        end = dc.indexOf(';', begin);
       }
 
       cookieContent = decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
@@ -1643,63 +1265,68 @@ var j1 = (function () {
     resolveMacros: function (user_data) {
       var logger = log4javascript.getLogger('j1.resolveMacros');
 
-      if (Object.keys(user_data).length) {
-        $('[id^=macro-]').each(function() {
+      var sidebarLoaded = setInterval(function() {
+        if ($('#sidebar_mmenu').length) {
+          if (Object.keys(user_data).length) {
+            $('[id^=macro-]').each(function() {
 
-          $('#macro-provider').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace('??provider', user_data.provider));
-            this.href = this.href.replace(/.*\/??provider-site-url/, user_data.provider_site_url);
-          });
-          $('#macro-user-name').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace('??user-name', user_data.user_name));
-            this.href = this.href.replace(/.*\/??provider_member_url/, user_data.provider_member_url);
-          });
-          $('#macro-provider-permissions').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace('??provider-permissions', user_data.provider_permissions));
-            this.href = this.href.replace(/.*\/??provider_member_url/, user_data.provider_member_url);
-          });
-          $('#macro-provider-membership').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace('??provider-membership', user_data.provider_membership));
-            this.href = this.href.replace(/.*\/??provider_member_url/, user_data.provider_member_url);
-          });
-          $('#macro-cookie-state').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace('??cookie-state', user_data.cookies_accepted));
-            this.href = this.href.replace(/.*\/??provider_privacy_url/, user_data.provider_privacy_url);
-          });
-          $('#macro-theme-name').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace('??theme-name', user_data.theme_name));
-          });
-          $('#macro-theme-author').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace('??theme-author', user_data.theme_author));
-            this.href = this.href.replace(/.*\/??theme-author-url/, user_data.theme_author_url);
-          });
-          $('#macro-theme-version').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace('??theme-version', user_data.theme_version));
-          });
-
-        });
-        return true;
-      } else {
-        logger.error('no user data provided');
-        return false;
-      }
+              $('#macro-provider').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace('??provider', user_data.provider));
+                this.href = this.href.replace(/.*\/??provider-site-url/, user_data.provider_site_url);
+              });
+              $('#macro-user-name').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace('??user-name', user_data.user_name));
+                this.href = this.href.replace(/.*\/??provider_member_url/, user_data.provider_member_url);
+              });
+              $('#macro-provider-permissions').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace('??provider-permissions', user_data.provider_permissions));
+                this.href = this.href.replace(/.*\/??provider_member_url/, user_data.provider_member_url);
+              });
+              $('#macro-provider-membership').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace('??provider-membership', user_data.provider_membership));
+                this.href = this.href.replace(/.*\/??provider_member_url/, user_data.provider_member_url);
+              });
+              $('#macro-cookie-state').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace('??cookie-state', user_data.cookies_accepted));
+                this.href = this.href.replace(/.*\/??provider_privacy_url/, user_data.provider_privacy_url);
+              });
+              $('#macro-theme-name').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace('??theme-name', user_data.theme_name));
+              });
+              $('#macro-theme-author').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace('??theme-author', user_data.theme_author));
+                this.href = this.href.replace(/.*\/??theme-author-url/, user_data.theme_author_url);
+              });
+              $('#macro-theme-version').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace('??theme-version', user_data.theme_version));
+              });
 
+            });
+            clearInterval(sidebarLoaded);
+            return true;
+          } else {
+            logger.error('no user data provided');
+            clearInterval(sidebarLoaded);
+            return false;
+          }
+        }
+      }, 25); // END 'sidebarLoaded'
     }, // END resolveMacros
 
     // -------------------------------------------------------------------------
@@ -1709,48 +1336,54 @@ var j1 = (function () {
     updateMacros: function (user_data) {
       var logger = log4javascript.getLogger('j1.updateMacros');
 
-      if (Object.keys(user_data).length) {
-        $('[id^=macro-]').each(function() {
+      var sidebarLoaded = setInterval(function() {
+        if ($('#sidebar_mmenu').length) {
 
-          $('#macro-provider').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace(/Provider:.*/, 'Provider: ' + user_data.provider));
-            $('#macro-provider').attr("href", user_data.provider_site_url);
-          });
-          $('#macro-user-name').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace(/User:.*/, 'User: ' + user_data.user_name));
-            $('#macro-user-name').attr("href", user_data.provider_member_url);
-          });
-          $('#macro-provider-permissions').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            // $this.html($html.replace(/public|protected|private|blocked/, user_data.provider_permissions));
-            $this.html($html.replace(/public.*|protected.*|private.*|blocked.*/, user_data.provider_permissions));
-            $('#macro-provider-permissions').attr("href", user_data.provider_member_url);
-          });
-          $('#macro-provider-membership').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace(/guest|member/, user_data.provider_membership));
-            $('#macro-provider-membership').attr("href", user_data.provider_member_url);
-          });
-          $('#macro-cookie-state').each(function() {
-            var $this = $(this);
-            var $html = $this.html();
-            $this.html($html.replace(/accepted|declined|pending/, user_data.cookies_accepted));
-            $('#macro-cookie-state').attr("href", user_data.provider_privacy_url);
-          });
+          if (Object.keys(user_data).length) {
+            $('[id^=macro-]').each(function() {
 
-        });
-        return true;
-      } else {
-        logger.error('no user data provided');
-        return false;
-      }
+              $('#macro-provider').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace(/Provider:.*/, 'Provider: ' + user_data.provider));
+                $('#macro-provider').attr('href', user_data.provider_site_url);
+              });
+              $('#macro-user-name').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace(/User:.*/, 'User: ' + user_data.user_name));
+                $('#macro-user-name').attr('href', user_data.provider_member_url);
+              });
+              $('#macro-provider-permissions').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                // $this.html($html.replace(/public|protected|private|blocked/, user_data.provider_permissions));
+                $this.html($html.replace(/public.*|protected.*|private.*|blocked.*/, user_data.provider_permissions));
+                $('#macro-provider-permissions').attr('href', user_data.provider_member_url);
+              });
+              $('#macro-provider-membership').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace(/guest|member/, user_data.provider_membership));
+                $('#macro-provider-membership').attr('href', user_data.provider_member_url);
+              });
+              $('#macro-cookie-state').each(function() {
+                var $this = $(this);
+                var $html = $this.html();
+                $this.html($html.replace(/accepted|declined|pending/, user_data.cookies_accepted));
+                $('#macro-cookie-state').attr('href', user_data.provider_privacy_url);
+              });
 
+            });
+            clearInterval(sidebarLoaded);
+            return true;
+          } else {
+            logger.error('no user data provided');
+            clearInterval(sidebarLoaded);
+            return false;
+          }
+        }
+      }, 25); // END 'sidebarLoaded'
     }, // END updateMacros
 
     // -------------------------------------------------------------------------
@@ -1758,7 +1391,7 @@ var j1 = (function () {
     // Get a log message from the log message catalog object
     // -------------------------------------------------------------------------
     getMessage: function (level, message, property) {
-      var message = j1.messages[level][message]["message"][property];
+      var message = j1.messages[level][message]['message'][property];
 
       return message;
     }, // END getMessage
@@ -1775,49 +1408,6 @@ var j1 = (function () {
       return true;
     }, // END logger
 
-    // -------------------------------------------------------------------------
-    // getBaseUrl
-    // -------------------------------------------------------------------------
-    // getBaseUrl: function () {
-    //   var myUrl = window.location.href;
-    //   var ua    = platform.name.toLowerCase();
-    //   var reURL = new RegExp('(http[s]?:\/\/)?([^\/]+)(.*)');
-    //   var baseUrl;
-    //   //var reGroups;
-    //
-    //   // NOTE: named capture groups NOT supported by FF + IE11
-    //   // if ( ua === 'chrome' ) {
-    //   //   reURL     = new RegExp('(?<prot>http[s]?:\/\/)?(?<host>[^\/]+)(?<path>.*)');
-    //   //   reGroups  = myUrl.match(reURL).groups;
-    //   //   baseUrl  = reGroups.prot + reGroups.host;
-    //   // } else {
-    //   //   reURL     = new RegExp('(http[s]?:\/\/)?([^\/]+)(.*)');
-    //   //   myUrl.match(reURL);
-    //   //   baseUrl  = RegExp.$1 + RegExp.$2 + RegExp.$3;
-    //   // }
-    //
-    //   myUrl.match(reURL);
-    //   // baseUrl = RegExp.$1 + RegExp.$2 + RegExp.$3;
-    //   baseUrl = RegExp.$1 + RegExp.$2;
-    //
-    //   return baseUrl;
-    // }, // END getBaseUrl
-
-    // -------------------------------------------------------------------------
-    // getPath
-    // See: https://stackoverflow.com/questions/27745/getting-parts-of-a-url-regex
-    // -------------------------------------------------------------------------
-    // getPath: function ( myUrl ) {
-    //   var url = new parseURL(myUrl)
-    //   // var reURL = new RegExp('(http[s]?:\/\/)?([^\/]+)(.*)');
-    //   // var path;
-    //   //
-    //   // myUrl.match(reURL);
-    //   path  = url.path;
-    //
-    //   return path;
-    // }, // END getPath
-
     // -------------------------------------------------------------------------
     // Send message
     // -------------------------------------------------------------------------
@@ -1829,12 +1419,12 @@ var j1 = (function () {
       if ( receiver === 'j1' ) {
         logText = 'send message from ' + sender + ' to' + receiver + ': ' + json_message;
         logger.debug(logText);
-        executeFunctionByName('j1' + '.messageHandler', window, sender, message)
+        executeFunctionByName('j1' + '.messageHandler', window, sender, message);
       } else {
         logText = 'send message from ' + sender + ' to ' + receiver + ': ' + json_message;
         logger.debug(logText);
         //executeFunctionByName('j1.' + receiver + '.messageHandler', window, sender, message)
-        executeFunctionByName(receiver + '.messageHandler', window, sender, message)
+        executeFunctionByName(receiver + '.messageHandler', window, sender, message);
       }
 
     }, // END sendMessage
@@ -1939,19 +1529,18 @@ var j1 = (function () {
       // -----------------------------------------------------------------------
       $('head').append('<style>.btn-viewer:hover { background-color: ' +bg_primary+ ' !important; }</style>');
 
-      // clipboard
-      // -----------------------------------------------------------------------
-      $('head').append('<style>.btn-clipboard:hover { background-color: ' +bg_primary+ ' !important; }</style>');
-
       // extended modals
       // -----------------------------------------------------------------------
-      var tabs_pills_link_color_active    = j1.setColorData('md_blue');         // j1.getStyleValue('btn-info', 'background-color');
-      var tabs_pills_link_color_hover     = j1.setColorData('md_gray_300');     // j1.getStyleValue('btn-secondary', 'background-color');
+      // var tabs_pills_link_color_active    = j1.setColorData('md_blue');         // j1.getStyleValue('btn-info', 'background-color');
+      // var tabs_pills_link_color_hover     = j1.setColorData('md_gray_300');     // j1.getStyleValue('btn-secondary', 'background-color');
+
+      // var tabs_pills_link_color_active    = 'mdi-blue';
+      // var tabs_pills_link_color_hover     = 'mdi-gray-300';
 
       // nav module
       // -----------------------------------------------------------------------
-      $('head').append('<style>.nav-link:hover { background-color: ' +tabs_pills_link_color_hover+ ' !important; }</style>');
-      $('head').append('<style>.nav-link.active { background-color: ' +tabs_pills_link_color_active+ ' !important; }</style>');
+      // $('head').append('<style>.nav-link:hover { background-color: ' +tabs_pills_link_color_hover+ ' !important; }</style>');
+      // $('head').append('<style>.nav-link.active { background-color: ' +tabs_pills_link_color_active+ ' !important; }</style>');
 
       return true;
     }, // END setCss
@@ -1990,14 +1579,13 @@ var j1 = (function () {
     // getUserAgent
     //  Return the name of the web browser
     // -------------------------------------------------------------------------
-    checkUserAgent: function (ua_name) {
+    checkUserAgent: function () {
       if (navigator.userAgent.search(ua_name) >= 0) {
         return true;
       } else {
         return false;
       }
     }, // END checkUserAgent
-
     // -------------------------------------------------------------------------
     //  Return always true (for testing purposes)
     // -------------------------------------------------------------------------
@@ -2021,16 +1609,18 @@ var j1 = (function () {
         window.home();
       } else if (document.all) {
         // for IE
-        window.location.href = "about:home";
+        window.location.href = 'about:home';
       } else {
-        window.location.href = "about:blank";
+        window.location.href = 'about:blank';
       }
     } // END gohome
-
-  } // END j1 (return)
+  }; // END j1 (return)
 }) (j1, window);
 
 {% endcapture %}
-
-{{ cache | strip_empty_lines }}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}