j1-template 2020.0.17 → 2020.0.22

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             false
 ---
 
 {% capture cache %}
@@ -43,12 +43,12 @@ regenerate: true
  # JS Adapter for Clipboard
  #
  # Product/Info:
- # {{site.data.template_settings.theme_author_url}}
+ # {{site.data.j1_config.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}}
+ # For details, see {{site.data.j1_config.theme_author_url}}
  # -----------------------------------------------------------------------------
  # NOTE:
  # -----------------------------------------------------------------------------

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             false
 ---
 
 {% capture cache %}
@@ -11,15 +11,11 @@ regenerate: true
  #
  # Product/Info:
  # https://jekyll.one
- # http://davidjbradshaw.github.io/iframe-resizer/
  #
  # Copyright (C) 2020 Juergen Adams
- # Copyright (C) 2013-15 David J. Bradshaw
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
- # iFrameResizer is licensed under under the MIT License.
- # For details, see http://davidjbradshaw.github.io/iframe-resizer/
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -36,7 +32,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -49,7 +49,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config             = site.data.template_settings %}
+{% assign template_config             = site.data.j1_config %}
 {% assign blocks                      = site.data.blocks %}
 {% assign modules                     = site.data.modules %}
 

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -41,7 +41,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config         = site.data.template_settings %}
+{% assign template_config         = site.data.j1_config %}
 {% assign blocks                  = site.data.blocks %}
 {% assign modules                 = site.data.modules %}
 
@@ -137,7 +137,7 @@ var j1 = (function () {
   // Theme information
   var themeName;
   var themeCss;
-  var themeExtensionCss = environment === 'production' ? '/assets/themes/j1/core/css/theme_extensions.min.css' : '/assets/themes/j1/core/css/theme_extensions.css';
+  var themeExtensionCss = environment === 'production' ? '/assets/themes/j1/core/css/themes/theme-extensions.min.css' : '/assets/themes/j1/core/css/themes/theme-extensions.css';
 
   // Pathes of J1 data files
   var colors_data_path          = '{{template_config.colors_data_path}}';
@@ -156,10 +156,12 @@ var j1 = (function () {
   var baseUrl;
   var referrer;
 
-  var default_theme_css           = environment === 'production' ? '/assets/themes/j1/core/css/uno.min.css' : '/assets/themes/j1/core/css/uno.css';
-  var default_theme_name          = 'Uno';
-  var default_theme_author        = 'J1 Team';
-  var default_theme_link          = 'https://jekyll.one/';
+  // var default_theme_css           = environment === 'production' ? '/assets/themes/j1/core/css/themes/uno-light/bootstrap.min.css' : '/assets/themes/j1/core/css/themes/uno-light/bootstrap.css';
+  // // TODO: check what property is used default_theme|default_theme_name ?
+  // var default_theme_display_name  = 'Uno (light)';
+  // var default_theme_name          = 'uno-light';
+  // var default_theme_author        = 'J1 Team';
+  // var default_theme_link          = 'https://jekyll.one/';
   var default_white_listed_pages  = [];
 
   var cookie_names = {
@@ -188,12 +190,9 @@ var j1 = (function () {
 
   // user STATE cookie (initial values)
   var user_state = {
-    'theme_css':            default_theme_css,
-    'theme_extension_css':  themeExtensionCss,
-    'theme_name':           default_theme_name,
-    'theme_author':         default_theme_author,
-    'theme_author_url':     '{{template_config.theme_author_url}}',
-    'theme_link':           default_theme_link,
+    'theme_css':            "",
+    'theme_name':           "",
+    'theme_author':         "",
     'theme_version':        '{{site.version}}',
     'cookies_accepted':     'pending',
     'whitelistedPages':     default_white_listed_pages,
@@ -504,7 +503,6 @@ var j1 = (function () {
           if ( statusTxt ==  'success' ) {
             var logger = log4javascript.getLogger('j1.xhrData');
             logText = 'loading banner completed on id: ' +banner_id;
-            $(banner_id).addClass("mutated");
             logger.info(logText);
             j1.setXhrDataState(banner_id, statusTxt);
             j1.setXhrDomState(banner_id, statusTxt);
@@ -713,7 +711,6 @@ var j1 = (function () {
           if ( statusTxt ==  'success' ) {
             logText = 'footer loaded successfully on id: ' + footer_id;
             logger.info(logText);
-            $(footer_id).addClass("mutated");
             j1.setXhrDataState(footer_id, statusTxt);
             j1.setXhrDomState(footer_id, statusTxt);
             logger.info('XHR data loaded in the DOM: ' + footer_id);
@@ -905,6 +902,7 @@ var j1 = (function () {
 
           // display page
           $('#no_flicker').css('display', 'block');
+
           logger.info('mode detected: web');
           logger.info('hide signin icon');
           $('#quickLinksSignInOutButton').css('display', 'none');
@@ -1555,6 +1553,23 @@ var j1 = (function () {
       return val;
     }, // END getStyleValue
 
+    // -------------------------------------------------------------------------
+    // getStyleSheetLoaded:
+    // NOTE:
+    // EXAMPLE: getStyleSheetLoaded('bootstrap');
+    //
+    getStyleSheetLoaded: function (styleSheet) {
+      // var styleSheet  = styleSheetName.toLowerCase() + '.css';
+      var sheets      = document.styleSheets, stylesheet = sheets[(sheets.length - 1)];
+
+      // find CSS file 'styleSheetName' in document
+      for(var i in document.styleSheets) {
+        if(sheets[i].href && sheets[i].href.indexOf(styleSheet) > -1) {
+          return true;;
+        }
+      }
+    },
+
     // -------------------------------------------------------------------------
     //  Returns the names of cookies used for J1 Template
     // -------------------------------------------------------------------------
@@ -1566,8 +1581,9 @@ var j1 = (function () {
     // Set dynamic styles
     // -------------------------------------------------------------------------
     setCss: function () {
-      var logger     = log4javascript.getLogger('j1.setCss');
-      var bg_primary = j1.getStyleValue('bg-primary', 'background-color');
+      var logger        = log4javascript.getLogger('j1.setCss');
+      var bg_primary    = j1.getStyleValue('bg-primary', 'background-color');
+      var bg_secondary  = j1.getStyleValue('bg-secondary', 'background-color');
 
       logger.info('set color scheme for selected theme');
 
@@ -1575,6 +1591,12 @@ var j1 = (function () {
       // -----------------------------------------------------------------------
       $('head').append('<style>.g-bg-primary { background-color: ' +bg_primary+ ' !important; }</style>');
 
+      // Set color of timeline bullet
+      // -----------------------------------------------------------------------
+      // $('head').append('<style>.tmicon { background: ' +bg_primary+ ' !important; }</style>');
+      // $('head').append('<style>.timeline-panel:after { border-left-color: ' +bg_primary+ ' !important; }</style>');
+      // $('head').append('<style>.timeline-panel:after { border-right-color: ' +bg_primary+ ' !important; }</style>');
+
       // mdi icons
       // -----------------------------------------------------------------------
       $('head').append('<style>.iconify-md-bg-primary { color: ' +bg_primary+ ' !important; }</style>');
@@ -1584,9 +1606,9 @@ var j1 = (function () {
 
       // asciidoc
       // -----------------------------------------------------------------------
-      var admonitionblock_note_color      = '#0D47A1';                          // md-blue-900, was: bg_primary;
+      var admonitionblock_note_color      = bg_primary;
       var admonitionblock_tip_color       = j1.getStyleValue('btn-success', 'background-color');
-      var admonitionblock_important_color = j1.getStyleValue('btn-warning', 'background-color');
+      var admonitionblock_important_color = j1.getStyleValue('btn-info', 'background-color');
       var admonitionblock_warning_color   = j1.getStyleValue('icon-warning', 'color');
       var admonitionblock_caution_color   = j1.getStyleValue('btn-danger', 'background-color');
 
@@ -1596,13 +1618,15 @@ var j1 = (function () {
       $('head').append('<style>.icon-warning { color: ' +admonitionblock_warning_color+ ' !important; }</style>');
       $('head').append('<style>.icon-caution { color: ' +admonitionblock_caution_color+ ' !important; }</style>');
 
-      // bs base styles
+      // bs base styles (2020-09-20: diabled. Taken for BS CSS code)
       // -----------------------------------------------------------------------
-      $('head').append('<style>code { color: ' +bg_primary+ ' !important; }</style>');
+      // $('head').append('<style>code { color: ' +bg_secondary+ ' !important; }</style>');
 
       // bs tool tips
       // -----------------------------------------------------------------------
       $('head').append('<style>.tooltip-inner { background-color: ' +bg_primary+ ' !important; }</style>');
+//    $('head').append('<style>.tooltip-arrow { background-color: ' +bg_primary+ ' !important; }</style>');
+      $('head').append('<style>.bs-tooltip-auto[x-placement^=bottom] .arrow::before, .bs-tooltip-bottom .arrow::before { border-bottom-color: ' +bg_primary+ ' !important; }</style>');
 
       // asciidoc results viewer
       // -----------------------------------------------------------------------

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -32,7 +32,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config       = site.data.template_settings %}
+{% assign template_config       = site.data.j1_config %}
 {% assign apps                  = site.data.apps %}
 
 {% comment %} Set config data

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             false
 ---
 
 {% capture cache %}
@@ -35,7 +35,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign apps              = site.data.apps %}
 
 {% comment %} Set config data

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             false
 ---
 
 {% capture cache %}
@@ -36,7 +36,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign modules           = site.data.modules %}
 
 {% comment %} Set config data

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

@@ -107,10 +107,13 @@ j1.adapter['mmenu'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var environment   = '{{environment}}';
-  var dclFinished   = false;
-  var moduleOptions = {};
-  var cookie_names  = j1.getCookieNames();
+  var environment     = '{{environment}}';
+  var dclFinished     = false;
+  var moduleOptions   = {};
+  var navMenuOptions  = {};
+  var themerOptions   = {};
+  var cookie_names    = j1.getCookieNames();
+  var themerEnabled   = {{themer_options.enabled}};
   var user_state;
   var user_session;
   var user_data;
@@ -155,7 +158,8 @@ j1.adapter['mmenu'] = (function (j1, window) {
       // options loader
       // -----------------------------------------------------------------------
       /* eslint-disable */
-      var navMenuOptions = $.extend({}, {{nav_mmenu_options | replace: '=>', ':' }});
+      navMenuOptions = $.extend({}, {{nav_mmenu_options | replace: '=>', ':' }});
+      themerOptions  = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
       /* eslint-enable */
       var xhr_data_path;
       var menu_id;
@@ -314,12 +318,14 @@ j1.adapter['mmenu'] = (function (j1, window) {
               });
             });
 
-            // load themes from Bootswatch API (set localFeed EMPTY)
-            $('#ThemeList_MMenu').bootstrapThemeSwitcher({
-                localFeed: ''
-            });
-            // load (local) J1 themes (default settings)
-            $('#ThemeSelect_MMenu').bootstrapThemeSwitcher();
+            // jadams, 2020-09-30: loading the menues (themes)
+            // from Bootswatch API (set localFeed EMPTY)
+            $('#remote_themes_mmenu').bootstrapThemeSwitcher({localFeed: ''});
+            // load (local) J1 themes (default settings) from JSON data
+            $('#local_themes_mmenu').bootstrapThemeSwitcher();
+
+            $('#{{item.menu.content.id}}').show();
+            logger.info('initializing mmenu finished on id: #{{menu_id}}');
             logger.info('met dependencies for: {{menu_id}} loaded');
             clearInterval(dependencies_met_{{menu_id}}_loaded);
             $('#{{item.menu.content.id}}').show();

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -53,10 +53,11 @@ regenerate: true
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
 
+
 {% comment %} Set config files
 {% assign auth_manager_config           = site.j1_auth %}
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config               = site.data.template_settings %}
+{% assign template_config               = site.data.j1_config %}
 {% assign blocks                        = site.data.blocks %}
 {% assign modules                       = site.data.modules %}
 
@@ -174,7 +175,7 @@ j1.adapter['navigator'] = (function (j1, window) {
   var user_session_merged         = {};
   var session_state               = {};
 
-  var themerEnabled               = false;
+  var themerEnabled               = {{themer_options.enabled}};                 //was (test): false;
   var authClientEnabled;
   var appDetected;
   var json_data;
@@ -234,6 +235,8 @@ j1.adapter['navigator'] = (function (j1, window) {
       var navAuthClientOptions                      = {};
       var navAuthMAnagerConfig                      = {};
 
+      var themerOptions                             = {};
+
       navDefaults                                   = $.extend({}, {{navigator_defaults | replace: '=>', ':' }});
       navBarConfig                                  = $.extend({}, {{nav_bar_options | replace: '=>', ':' }});
       navMenuConfig                                 = $.extend({}, {{nav_menu_options | replace: '=>', ':' }});
@@ -244,6 +247,7 @@ j1.adapter['navigator'] = (function (j1, window) {
       navAuthMAnagerConfig                          = $.extend({}, {{authentication_options | replace: '=>', ':' }});
       authClientEnabled                             = navAuthMAnagerConfig.enabled;
 
+      themerOptions                                 = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
 
       // Merge|Overload module CONFIG by DEFAULTS
       //
@@ -328,32 +332,43 @@ j1.adapter['navigator'] = (function (j1, window) {
             _this.navMenuOptions
           );
 
+          // _this.delayShowMenu( 200 );
+
           // cast text-based booleans
           // themerEnabled = ({{themer_options.enabled }} === 'true');
 
-          if ({{themer_options.enabled }}) {
-            logText = 'theme switcher detect: enabled';
-            logger.info(logText);
-            // initialize theme switcher menu
-            // load themes from Bootswatch API (set localFeed EMPTY)
-            $('#ThemeList').bootstrapThemeSwitcher({
-                localFeed: ''
-            });
-            // load (local) J1 themes (default settings)
-            $('#ThemeSelect').bootstrapThemeSwitcher();
-            logText = 'theme switcher menu loaded successfully';
-            logger.info(logText);
+          // load themes (to menu) if themer is enabled|finished
+          if (themerEnabled) {
+            var dependencies_met_page_finished = setInterval(function() {
+              // jadams, 2020-10-03: NOT needed to wait for j1 finished
+//            if (j1.getState() == 'finished') {
+              if (j1.adapter.themer.getState() == 'finished') {
+                // initialize theme switcher menus
+                logText = 'theme switcher detect: enabled';
+                logger.info(logText);
+
+                // load remote themes (Bootswatch API)
+                logText = 'load remote themes (Bootswatch API)';
+                logger.info(logText);
+                $('#remote_themes').bootstrapThemeSwitcher({localFeed: ''});
+                // load local themes (json file)
+                logText = 'load local themes (json file)';
+                logger.info(logText);
+                $('#local_themes').bootstrapThemeSwitcher({localFeed: themerOptions.localThemes});
+                clearInterval(dependencies_met_page_finished);
+              }
+              _this.setState('initialized');
+            }, 25); // END 'dependencies_met_page_finished'
           } else {
-            logText = 'theme switcher detect: disabled';
+            logText = 'theme switcher detected as: disabled';
             logger.info(logText);
           }
-          _this.setState('initialized');
 
           // -----------------------------------------------------------------
           // event handler|css styles
           // -----------------------------------------------------------------
           // continue if Theme CSS is applied
-          var dependencies_met_adapter_finished = setInterval(function() {
+          var dependencies_met_themer_finished = setInterval(function() {
             if (themerEnabled) {
               if (j1.adapter.themer.getState() === 'finished') {
                 _this.setState('processing');
@@ -361,12 +376,18 @@ j1.adapter['navigator'] = (function (j1, window) {
                 logger.info('initialize eventHandler');
                 j1.core.navigator.eventHandler();
 
-                // set general|global theme colors
-                logger.info('apply dynamic CSS styles');
-                _this.setCSS (
-                  navDefaults, navBarOptions, navMenuOptions,
-                  navQuicklinksOptions, navTopsearchOptions
-                );
+                var dependencies_met_page_finished = setInterval(function() {
+                  if (j1.getState() == 'finished') {
+                    // set general|global theme colors
+                    logger.info('initializing dynamic CSS styles: started');
+                    _this.setCSS (
+                      navDefaults, navBarOptions, navMenuOptions,
+                      navQuicklinksOptions, navTopsearchOptions
+                    );
+                    clearInterval(dependencies_met_page_finished);
+                  }
+                  logger.info('initializing dynamic CSS styles: finished');
+                }, 25); // END 'dependencies_met_page_finished'
 
                 logger.info('init auth client');
                 _this.initAuthClient(_this.navAuthManagerConfig);
@@ -375,7 +396,7 @@ j1.adapter['navigator'] = (function (j1, window) {
                 logger.info('state: ' + _this.getState());
                 logger.info('module initialized successfully');
                 logger.info('met dependencies for: j1');
-                clearInterval(dependencies_met_adapter_finished);
+                clearInterval(dependencies_met_themer_finished);
               }
             } else {
               _this.setState('processing');
@@ -395,9 +416,9 @@ j1.adapter['navigator'] = (function (j1, window) {
               _this.setState('finished');
               logger.info('state: ' + _this.getState());
               logger.info('met dependencies for: themer');
-              clearInterval(dependencies_met_adapter_finished);
+              clearInterval(dependencies_met_themer_finished);
             }
-          }, 25); // END 'dependencies_met_adapter_finished'
+          }, 25); // END 'dependencies_met_themer_finished'
           logger.info('met dependencies for: themer');
           clearInterval(dependencies_met_load_menu_finished);
         }
@@ -635,12 +656,12 @@ j1.adapter['navigator'] = (function (j1, window) {
 
       {% comment %} Set dymanic styles
       -------------------------------------------------------------------------- {% endcomment %}
-      $('nav-primary').css({"background-color": "navPrimaryColor"});
+      // $('nav-primary').css({"background-color": "navPrimaryColor"});
 
 
       {% comment %} navBar styles
       -------------------------------------------------------------------------- {% endcomment %}
-      var bg_primary    = j1.getStyleValue('nav-primary', 'background-color');
+      var bg_primary    = j1.getStyleValue('bg-primary', 'background-color');
       var bg_scrolled   = bg_primary;
       var bg_collapsed  = bg_primary;
 
@@ -653,6 +674,14 @@ j1.adapter['navigator'] = (function (j1, window) {
       $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator.navbar-transparent.light { background-color: ' +navBarOptions.background_color_full+ ' !important; border-bottom: solid 0px !important; } }</style>');
       $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator.navbar-scrolled.light { background-color: ' +bg_scrolled+ ' !important; } }</style>');
 
+      $('head').append('<style id="dynNav">@media (max-width: ' +gridBreakpoint_md+ ') { nav.navbar.navigator.navbar-transparent.light { background-color: ' +navBarOptions.background_color_full+ ' !important; border-bottom: solid 0px !important; } }</style>');
+      $('head').append('<style id="dynNav">@media (max-width: ' +gridBreakpoint_md+ ') { nav.navbar.navigator.navbar-scrolled.light { background-color: ' +bg_scrolled+ ' !important; } }</style>');
+      $('head').append('<style id="dynNav">@media (min-width: ' +gridBreakpoint_md+ ') { nav.navbar.navigator.navbar-transparent.light { background-color: ' +navBarOptions.background_color_full+ ' !important; border-bottom: solid 0px !important; } }</style>');
+      $('head').append('<style id="dynNav">@media (min-width: ' +gridBreakpoint_md+ ') { nav.navbar.navigator.navbar-scrolled.light { background-color: ' +bg_scrolled+ ' !important; } }</style>');
+
+      $('head').append('<style id="dynNav">@media (max-width: ' +gridBreakpoint_sm+ ') { nav.navbar.navigator.navbar-transparent.light { background-color: ' +navBarOptions.background_color_full+ ' !important; border-bottom: solid 0px !important; } }</style>');
+      $('head').append('<style id="dynNav">@media (max-width: ' +gridBreakpoint_sm+ ') { nav.navbar.navigator.navbar-scrolled.light { background-color: ' +bg_scrolled+ ' !important; } }</style>');
+
       {% comment %} navQuicklinks styles
       -------------------------------------------------------------------------- {% endcomment %}
       $('head').append('<style>.attr-nav> ul > li > a { color: ' +navQuicklinksOptions.icon_color+ ' !important; }</style>');
@@ -697,6 +726,32 @@ j1.adapter['navigator'] = (function (j1, window) {
       $('head').append('<style>.top-search { background-color: ' +navTopsearchOptions.background_color+ ' !important; }</style>');
       $('head').append('<style>.top-search input.form-control { color: ' +navTopsearchOptions.input_color+ ' !important; }</style>');
 
+      {% comment %} Timeline styles
+      -------------------------------------------------------------------------- {% endcomment %}
+  	  $('head').append('<style>.timeline > li > .timeline-panel:after {border-right-color: ' +bg_scrolled+ '; border-left-color: ' +bg_scrolled+ ';}</style>');
+      $('head').append('<style>.tmicon {background: ' +bg_scrolled+ ';}</style>');
+
+      {% comment %} Heading styles
+      -------------------------------------------------------------------------- {% endcomment %}
+      $('head').append('<style>.heading:after {background: ' +bg_scrolled+ ' !important;}</style>');
+
+      {% comment %} Tag Cloud styles
+      -------------------------------------------------------------------------- {% endcomment %}
+      $('head').append('<style>.tag-cloud ul li a {background-color: ' +bg_scrolled+ ' !important;}</style>');
+      // $('head').append('<style>.tag-cloud ul li a:hover {background-color: #212121 !important;}</style>');
+
+      {% comment %} Toccer styles
+      -------------------------------------------------------------------------- {% endcomment %}
+      $('head').append('<style>.is-active-link::before {background-color: ' +bg_scrolled+ ' !important;}</style>');
+
+      {% comment %} BS extended Modal styles
+      -------------------------------------------------------------------------- {% endcomment %}
+      $('head').append('<style>.modal-dialog.modal-notify.modal-primary .modal-header {background-color: ' +bg_scrolled+ ';}</style>');
+
+      {% comment %} BS nav|pills styles
+      -------------------------------------------------------------------------- {% endcomment %}
+      $('head').append('<style>.nav-pills .nav-link.active, .nav-pills .show > .nav-link {background-color: ' +bg_scrolled+ ' !important;}</style>');
+
       return true;
     }, // END setCSS
 
@@ -705,49 +760,50 @@ j1.adapter['navigator'] = (function (j1, window) {
     //  delay all dropdown menu to open for "delay" time
     //  See: http://jsfiddle.net/AndreasPizsa/NzvKC/
     // -------------------------------------------------------------------------
-    delayShowMenu: function () {
+    delayShowMenu: function ( menuOpenDelay ) {
       var logger      = log4javascript.getLogger('j1.adapter.navigator.delayShowMenu');
-      var theTimer    = 0;
-      var theElement  = null;
+      var theTimer = 0;
+      var theElement = null;
+      var theLastPosition = {x:0,y:0};
 
       logText ='entered delayShowMenu';
       logger.info(logText);
 
-      $('#navigator_nav_menu')
-        .find('li.dropdown.nav-item')
-        .on('mouseenter', function (inEvent) {
-          theElement = $(this);
-          if (theElement) theElement.removeClass('open');
-          //if (theElement) theElement.css("display", "none");
-          //window.clearTimeout(theTimer);
-
-          //theTimer = window.setTimeout (function () {
-           setTimeout (function () {
-            theElement.addClass('open');
-            //theElement.css("display", "block");
-            //window.clearTimeout(theTimer);
-          }, {{menuOpenDelay}});
-        })
-        .on('mousemove', function (inEvent) {
-          if (theElement.hasClass('open')) return true;
-          //window.clearTimeout(theTimer);
-          //theTimer = window.setTimeout (function () {
-           setTimeout (function () {
-            theElement.addClass('open');
-            //window.clearTimeout(theTimer);
-          }, {{menuOpenDelay}});
-        })
-        .on('mouseleave', function (inEvent) {
-          //window.clearTimeout(theTimer);
-          theElement = $(this);
-          //theTimer = window.setTimeout (function () {
-           setTimeout (function () {
-            theElement.removeClass('open');
-            //window.clearTimeout(theTimer);
-          }, {{menuOpenDelay}});
-        });
-
-        return true;
+      // $('#navigator_nav_menu')
+      //   .find('li.dropdown.nav-item')
+
+      $('[data-toggle]').closest('li')
+      .on('mouseenter', function (inEvent) {
+        if (theElement) theElement.removeClass('open');
+        window.clearTimeout(theTimer);
+        theElement = $(this);
+
+        theTimer = window.setTimeout(function () {
+          theElement.addClass('open');
+        }, menuOpenDelay);
+      })
+      .on('mousemove', function (inEvent) {
+        if(Math.abs(theLastPosition.x - inEvent.ScreenX) > 4 ||
+           Math.abs(theLastPosition.y - inEvent.ScreenY) > 4) {
+          theLastPosition.x = inEvent.ScreenX;
+          theLastPosition.y = inEvent.ScreenY;
+          return;
+        }
+        if (theElement.hasClass('open')) return;
+        window.clearTimeout(theTimer);
+        theTimer = window.setTimeout(function () {
+          theElement.addClass('open');
+        }, menuOpenDelay);
+      })
+      .on('mouseleave', function (inEvent) {
+        window.clearTimeout(theTimer);
+        theElement = $(this);
+        theTimer = window.setTimeout(function () {
+          theElement.removeClass('open');
+        }, menuOpenDelay);
+      });
+
+      return true;
     }, // END delayShowMenu
 
     // -------------------------------------------------------------------------
@@ -800,6 +856,22 @@ j1.adapter['navigator'] = (function (j1, window) {
   }; // END return
 })(j1, window);
 
+{% comment %} process adapter COMPRESSED for production DISABLED
+NOTE: for unknown reason, minifyJS detect JS/ES6 code
+      SyntaxError: Unexpected token: punc ())
+--------------------------------------------------------------------------------
+{% assign production = true %}
+{% endcapture %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} process adapter UNCOMPRESSED
+-------------------------------------------------------------------------------- {% endcomment %}
 {% endcapture %}
 {{ cache | strip_empty_lines }}
 {% assign cache = nil %}