j1-template 2020.0.8 → 2020.0.13

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -43,7 +43,6 @@ regenerate:                             true
 {% comment %} Set config files
 {% assign auth_manager_config           = site.j1_auth %}
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config                   = site %}
 {% assign template_config               = site.data.template_settings %}
 {% assign blocks                        = site.data.blocks %}
 {% assign modules                       = site.data.modules %}
@@ -59,9 +58,16 @@ regenerate:                             true
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign navigator_options             = navigator_defaults | merge: navigator_settings %}
 {% assign nav_mmenu_options             = nav_mmenu_defaults | merge: nav_mmenu_settings %}
 {% assign nav_mmenu_id                  = navigator_defaults.nav_mmenu.xhr_container_id %}
 {% assign nav_navbar_media_breakpoint   = navigator_defaults.nav_bar.media_breakpoint %}
+{% assign nav_mmenu_id                  = navigator_options.nav_mmenu.id %}
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
 
 /*
  # -----------------------------------------------------------------------------
@@ -85,6 +91,12 @@ regenerate:                             true
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['mmenu'] = (function (j1, window) {
@@ -107,7 +119,6 @@ j1.adapter['mmenu'] = (function (j1, window) {
   // helper functions
   // ---------------------------------------------------------------------------
 
-
   // ---------------------------------------------------------------------------
   // main object
   // ---------------------------------------------------------------------------
@@ -137,7 +148,9 @@ j1.adapter['mmenu'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------
+      /* eslint-disable */
       var navMenuOptions = $.extend({}, {{nav_mmenu_options | replace: '=>', ':' }});
+      /* eslint-enable */
       var xhr_data_path;
       var menu_id;
 
@@ -147,31 +160,17 @@ j1.adapter['mmenu'] = (function (j1, window) {
 
       // Load (individual) frontmatter options (currently NOT used)
       //
-      if (options != null) { var frontmatterOptions = $.extend({}, options) }
+      if (options != null) { var frontmatterOptions = $.extend({}, options); }
 
       _this.setState('started');
       logger.info('state: ' + _this.getState());
       logger.info('module is being initialized');
 
-      // jadams, 2020-06-24: Set max_count to 100 what cause to wait 2.5s
-      // for J1 Navigator to finish (init)
-      //
-      var interval_count = 0;
-      var max_count      = 100;
-
-      var dependencies_met_navigator = setInterval(function() {
-        interval_count += 1;
-        if ( j1.adapter.navigator.getState() == 'finished' ) {
-          logger.info('dependencies of module navigator met for: mmenu');
-          logger.info('dependencies of module navigator met after: ' + interval_count * 25 + ' ms');
-          j1.adapter.mmenu.mmenuLoader(navMenuOptions);
-          clearInterval(dependencies_met_navigator);
-        }
-        if (interval_count > max_count) {
-          logger.warn('dependency check failed for module: navigator');
-          logger.warn('dependencies of module navigator met after: ' + interval_count * 25 + ' ms');
-          clearInterval(dependencies_met_navigator);
+      var dependencies_met_page_loaded = setInterval(function() {
+        if ( j1.getState() == 'finished' ) {
+          logger.info('dependencies of module met');
           j1.adapter.mmenu.mmenuLoader(navMenuOptions);
+          clearInterval(dependencies_met_page_loaded);
         }
       }, 25);
     }, // END init
@@ -214,8 +213,8 @@ j1.adapter['mmenu'] = (function (j1, window) {
 
         j1.xhrData (
           'j1.adapter.mmenu', {
-          xhr_container_id: "{{menu_id}}",
-          xhr_data_path:    "{{xhr_data_path}}" },
+          xhr_container_id: '{{menu_id}}',
+          xhr_data_path:    '{{xhr_data_path}}' },
           {% if forloop.last %}'null'{% else %}'null'{% endif %}){% if forloop.last %}{% else %},{% endif %}
 
       {% endif %}
@@ -261,8 +260,8 @@ j1.adapter['mmenu'] = (function (j1, window) {
       {% for item in nav_mmenu_options.menus %} {% if item.menu.enabled %}
 
       {% assign menu_id = item.menu.xhr_container_id %}
-      menu_id           = "{{menu_id}}";
-      xhr_data_path     = "{{item.menu.xhr_data_path}}";
+      menu_id           = '{{menu_id}}';
+      xhr_data_path     = '{{item.menu.xhr_data_path}}';
 
       // Create an mmenu instance if id exists: {{menu_id}}
       if ($('#{{menu_id}}').length) {
@@ -322,7 +321,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
                 //   ? drawer_{{menu_id}}.open()
                 //   : drawer_{{menu_id}}.close();
 
-                drawer_{{menu_id}}.open()
+                drawer_{{menu_id}}.open();
               });
             });
             clearInterval(dependencies_met_{{menu_id}}_loaded);
@@ -353,7 +352,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
 
               const drawer_{{menu_id}} = mmenu_{{menu_id}}.offcanvas ({
                 // drawer options
-                position: "{{item.menu.drawer.position}}"
+                position: '{{item.menu.drawer.position}}'
               });
 
               // button for the MMenu tocbar to open|close the toc drawer
@@ -382,7 +381,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
                     //   ? drawer_{{menu_id}}.open()
                     //   : drawer_{{menu_id}}.close();
 
-                    drawer_{{menu_id}}.open()
+                    drawer_{{menu_id}}.open();
                   } // END if hasclass
                 });
               });
@@ -448,5 +447,9 @@ j1.adapter['mmenu'] = (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/navigator.js

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -31,6 +31,14 @@ regenerate:                             true
  #    J1 Navigator needs a general revision on BS4 code and functionalities
  #    Current, only base function are tested with BS4 (was coded for BS3)
  # -----------------------------------------------------------------------------
+ # NOTE:
+ #  jadams, 2020-07-17:
+ #    J1 Navigator can't be minfied for now. Uglifier fails on an ES6
+ #    (most probably) structure that couldn't fixed by 'harmony' setting.
+ #    Minifier fails by:
+ #    Unexpected token: punc ())
+ #    Current, minifying has been disabled
+ # -----------------------------------------------------------------------------
 {% endcomment %}
 
 {% comment %} Liquid procedures
@@ -49,11 +57,13 @@ regenerate:                             true
 {% comment %} Set config files
 {% assign auth_manager_config           = site.j1_auth %}
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config                   = site %}
 {% assign template_config               = site.data.template_settings %}
 {% assign blocks                        = site.data.blocks %}
 {% assign modules                       = site.data.modules %}
 
+{% assign themer_defaults               = modules.defaults.themer.defaults %}
+{% assign themer_settings               = modules.themer.settings %}
+
 {% assign authentication_defaults       = modules.defaults.authentication.defaults %}
 {% assign authentication_settings       = modules.authentication.settings %}
 
@@ -78,6 +88,7 @@ regenerate:                             true
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign authentication_options        = authentication_defaults | merge: authentication_settings %}
+{% assign themer_options                = themer_defaults | merge: themer_settings %}
 {% assign nav_bar_options               = nav_bar_defaults | merge: nav_bar_settings %}
 {% assign nav_menu_options              = nav_menu_defaults | merge: nav_menu_settings %}
 {% assign quicklinks_options            = nav_quicklinks_defaults | merge: nav_quicklinks_settings %}
@@ -96,6 +107,11 @@ regenerate:                             true
  {% assign animate_duration             = 1 %}
 {% endif %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 {% comment %}
 --------------------------------------------------------------------------------
 Set|Overload Liquid vars hardwired to NOT break the (MD) style
@@ -125,6 +141,12 @@ ToDo: Remove configuration from j1_navigator.yml
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['navigator'] = (function (j1, window) {
@@ -153,9 +175,7 @@ j1.adapter['navigator'] = (function (j1, window) {
   var user_session_merged         = {};
   var session_state               = {};
 
-  var j1_colors                   = {};
-  var j1_font_sizes               = {};
-
+  var themerEnabled               = false;
   var authClientEnabled;
   var appDetected;
   var json_data;
@@ -168,7 +188,6 @@ j1.adapter['navigator'] = (function (j1, window) {
   // helper functions
   // ---------------------------------------------------------------------------
 
-
   // ---------------------------------------------------------------------------
   // main object
   // ---------------------------------------------------------------------------
@@ -194,6 +213,7 @@ j1.adapter['navigator'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------
+      /* eslint-disable */
       var authConfig                                = {};
       var navDefaults                               = {};
       var navBarConfig                              = {};
@@ -239,6 +259,7 @@ j1.adapter['navigator'] = (function (j1, window) {
 
       // Load (individual) frontmatter options (currently NOT used)
       if (options  != null) { var frontmatterOptions = $.extend({}, options) }
+      /* eslint-enable */
 
       _this.setState('started');
       logger.info('state: ' + _this.getState());
@@ -281,11 +302,7 @@ j1.adapter['navigator'] = (function (j1, window) {
         // core initializer
         // ---------------------------------------------------------------------
 
-        // Make sure that Load HTML data (AJAX) is finished
-        // setTimeout (function() {
-        //   _this.setState('data_loaded');
-        // }, 150);
-
+        // continue if all AJAX loads (xhrData) has finished
         var dependencies_met_navigator_core = setInterval (function () {
           if (_this.getState() === 'data_loaded') {
             _this.setState('processing');
@@ -298,38 +315,41 @@ j1.adapter['navigator'] = (function (j1, window) {
             authClientEnabled = j1.authEnabled();
             logger.info('application status detected: ' + appDetected);
 
-            var dependencies_met_nav_menu = setInterval (function() {
-              if (typeof j1.colors !== 'undefined') {
-                j1.core.navigator.init (
-                  _this.navDefaults,
-                  _this.navMenuOptions
-                );
-
-                // initialize theme switcher menu
-                $('#ThemeList').bootstrapThemeSwitcher({localFeed: ''});        // load themes from Bootswatch API
-                $('#ThemeSelect').bootstrapThemeSwitcher();                     // Load (local) J1 themes
-                logText = 'theme switcher menu loaded successfully';
-                logger.info(logText);
-                _this.setState('initialized');
-                clearInterval(dependencies_met_nav_menu);
-              }
-            }, 25); // END 'core initialized'
+            j1.core.navigator.init (
+              _this.navDefaults,
+              _this.navMenuOptions
+            );
+
+            // 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
+              $('#ThemeList').bootstrapThemeSwitcher({localFeed: ''});          // load themes from Bootswatch API
+              $('#ThemeSelect').bootstrapThemeSwitcher();                       // Load (local) J1 themes
+              logText = 'theme switcher menu loaded successfully';
+              logger.info(logText);
+            } else {
+              logText = 'theme switcher detect: disabled';
+              logger.info(logText);
+            }
+            _this.setState('initialized');
 
             // -----------------------------------------------------------------
-            // event handler + css styles
-            // NOTE: jadams, 2019-08-22:
-            //  Add to dependcy to themer to fix
-            //  missing color setting for menu bar background
+            // event handler|css styles
             // -----------------------------------------------------------------
-            var dependencies_met_events_css = setInterval(function() {
-              if (_this.getState() === 'initialized' && j1.adapter.themer.getState() === 'finished') {
+            // continue if Theme CSS is applied
+            var dependencies_met_adapter_finished = setInterval(function() {
+              if (j1.adapter.themer.getState() === 'finished') {
                 _this.setState('processing');
 
-                logger.info('initialize events and styles');
+                logger.info('initialize eventHandler');
                 j1.core.navigator.eventHandler();
 
-                // set general|global module colors
-                logger.info('apply styles');
+                // set general|global theme colors
+                logger.info('apply dynamic CSS styles');
                 _this.setCSS (
                   navBarOptions, navMenuOptions,
                   navQuicklinksOptions, navTopsearchOptions
@@ -339,9 +359,9 @@ j1.adapter['navigator'] = (function (j1, window) {
                 j1.adapter.navigator.initAuthClient(j1.adapter.navigator.navAuthManagerConfig);
                 _this.setState('finished');
                 logger.info('state: ' + _this.getState());
-                clearInterval(dependencies_met_events_css);
+                clearInterval(dependencies_met_adapter_finished);
               }
-            }, 25); // END 'core initialized'
+            }, 25); // END 'dependencies_met_adapter_finished'
             clearInterval(dependencies_met_navigator_core);
           }
         }, 25); // END 'dependencies_met_navigator_core'
@@ -354,14 +374,23 @@ j1.adapter['navigator'] = (function (j1, window) {
         $(window).on('resize', function() {
           j1.core.navigator.manageDropdownMenu(navDefaults, navMenuOptions);
 
+          // jadams, 2020-07-10: cause severe trouble on mobile devices if
+          // OnScreen Kbd comes up and reduces the window size (resize event)
+          // DISABLED
+          // -------------------------------------------------------------------
           // Hide|Close topSearch on resize event
-          $('.top-search').slideUp();
+          // $('.top-search').slideUp();
 
           // Manage sticky NAV bars
           setTimeout (function(){
             j1.core.navigator.navbarSticky();
           }, 500);
 
+          // Scroll the page one pixel back and forth to get
+          // the right position for Toccer (trigger) and SSM
+          $(window).scrollTop($(window).scrollTop()+1);
+          $(window).scrollTop($(window).scrollTop()-1);
+
           // jadams, 2020-06-21: unclear|forgotten what I'm doing here!
           // Looks like the old BS3 implementation
           //
@@ -375,7 +404,7 @@ j1.adapter['navigator'] = (function (j1, window) {
     }, // END init
 
     // -------------------------------------------------------------------------
-    // Initialize JS portion for the dialogs (modals) used by J1AuthClient
+    // initialize JS portion for the dialogs (modals) used by J1AuthClient
     // NOTE: Currently cookie updates NOT processed at the NAV module
     //       All updates on Cookies are managed by Cookie Consent.
     //       To be considered to re-add cookie updates for the auth state
@@ -409,7 +438,7 @@ j1.adapter['navigator'] = (function (j1, window) {
     // See: https://www.nickang.com/add-event-listener-for-loop-problem-in-javascript/
     // -------------------------------------------------------------------------
     modalEventHandler: function (options) {
-      // var logger      = log4javascript.getLogger("j1.adapter.navigator.EventHandler");
+      // var logger      = log4javascript.getLogger('j1.adapter.navigator.EventHandler');
       var authConfig  = options.j1_auth;
       var route;
       var provider;
@@ -419,17 +448,17 @@ j1.adapter['navigator'] = (function (j1, window) {
 
       var signIn = {
         provider:         authConfig.providers.activated[0],
-        users:            authConfig.providers[authConfig.providers["activated"][0]]["users"],
+        users:            authConfig.providers[authConfig.providers['activated'][0]]['users'],
         do:               false
-      }
+      };
 
       var signOut = {
         provider:         authConfig.providers.activated[0],
         providerSignOut:  false,
         do:               false
-      }
+      };
 
-      logText = "initialize button click events";
+      logText = 'initialize button click events';
       logger.info(logText);
 
       // Manage button click events for modal "signInOutButton"
@@ -442,13 +471,13 @@ j1.adapter['navigator'] = (function (j1, window) {
         signIn.allowed_users  = signIn.users.toString();
       });
 
-      $("a.btn").click(function() {
-        if (this.id === "signInButton") {
+      $('a.btn').click(function() {
+        if (this.id === 'signInButton') {
           signIn.do = true;
         } else {
           signIn.do = false;
         }
-        if (this.id === "signOutButton") {
+        if (this.id === 'signOutButton') {
           signOut.do = true;
         } else {
           signOut.do = false;
@@ -457,16 +486,16 @@ j1.adapter['navigator'] = (function (j1, window) {
 
       $('input:checkbox[name="providerSignOut"]').on('click', function (e) {
         e.stopPropagation();
-        signOut.providerSignOut = $('input:checkbox[name="providerSignOut"]').is(":checked");
-        if(environment == "development") {
-          logText = "provider signout set to: " + signOut.providerSignOut;
+        signOut.providerSignOut = $('input:checkbox[name="providerSignOut"]').is(':checked');
+        if(environment === 'development') {
+          logText = 'provider signout set to: ' + signOut.providerSignOut;
           logger.info(logText);
         }
       });
 
       // Manage pre events on modal "modalOmniSignIn"
       // -----------------------------------------------------------------------
-      $("#modalOmniSignOut").on('show.bs.modal', function() {
+      $('#modalOmniSignOut').on('show.bs.modal', function() {
           var modal = $(this);
           logger.info('place current user data');
           user_session = j1.readCookie(cookie_user_session_name);
@@ -475,7 +504,7 @@ j1.adapter['navigator'] = (function (j1, window) {
 
       // Manage post events on modal "modalOmniSignIn"
       // -----------------------------------------------------------------------
-      $("#modalOmniSignIn").on('hidden.bs.modal', function() {
+      $('#modalOmniSignIn').on('hidden.bs.modal', function() {
         if (signIn.do == true) {
           provider      = signIn.provider.toLowerCase();
           allowed_users = signIn.users.toString();
@@ -497,11 +526,11 @@ j1.adapter['navigator'] = (function (j1, window) {
 
       // Manage post events on modal "modalOmniSignOut"
       // -----------------------------------------------------------------------
-      $("#modalOmniSignOut").on('hidden.bs.modal', function() {
+      $('#modalOmniSignOut').on('hidden.bs.modal', function() {
         if (signOut.do == true) {
           logger.info('load active provider from cookie: ' + cookie_user_session_name);
 
-          user_session    = j1.readCookie(cookie_user_session_name);
+          user_session  = j1.readCookie(cookie_user_session_name);
           provider      = user_session.provider;
           provider_url  = user_session.provider_site_url;
 
@@ -523,7 +552,7 @@ j1.adapter['navigator'] = (function (j1, window) {
         }
       }); // END post events "modalSignOut"
 
-      logText = "initialize button click events completed";
+      logText = 'initialize button click events completed';
       logger.info(logText);
 
       return true;
@@ -534,50 +563,40 @@ j1.adapter['navigator'] = (function (j1, window) {
     // Set dynamic CSS styles
     // -------------------------------------------------------------------------
     setCSS: function (navBarOptions, navMenuOptions, navQuicklinksOptions, navTopsearchOptions) {
-      var logger              = log4javascript.getLogger("j1.adapter.navigator.setCSS");
+      var logger              = log4javascript.getLogger('j1.adapter.navigator.setCSS');
       var gridBreakpoint_lg   = '992px';
       var gridBreakpoint_md   = '768px';
       var gridBreakpoint_sm   = '576px';
 
-      {% comment %} Resolve symbolic font sizes
-      -------------------------------------------------------------------------- {% endcomment %}
-
       {% comment %} Set|Resolve navMenuOptions
       -------------------------------------------------------------------------- {% endcomment %}
-      navMenuOptions.dropdown_font_size               = j1.setFontSize(navMenuOptions.dropdown_font_size);
-      navMenuOptions.megamenu_font_size               = j1.setFontSize(navMenuOptions.megamenu_font_size);
-
-
-      {% comment %} Resolve symbolic color names
-      -------------------------------------------------------------------------- {% endcomment %}
+      navMenuOptions.dropdown_font_size               = navMenuOptions.dropdown_font_size;
+      navMenuOptions.megamenu_font_size               = navMenuOptions.megamenu_font_size;
 
       {% comment %} Set|Resolve navBarOptions
       -------------------------------------------------------------------------- {% endcomment %}
-      navBarOptions.background_color_full             = j1.setColorData(navBarOptions.background_color_full);
-//    navBarOptions.background_color_collapsed        = j1.setColorData(navBarOptions.background_color_collapsed);
-//    navBarOptions.background_color_scrolled         = j1.setColorData(navBarOptions.background_color_scrolled);
+      navBarOptions.background_color_full             = navBarOptions.background_color_full;
 
       {% comment %} Set|Resolve navMenuOptions
       -------------------------------------------------------------------------- {% endcomment %}
-      navMenuOptions.menu_item_color                  = j1.setColorData(navMenuOptions.menu_item_color);
-      navMenuOptions.menu_item_color_hover            = j1.setColorData(navMenuOptions.menu_item_color_hover);
-      navMenuOptions.menu_item_dropdown_color         = j1.setColorData(navMenuOptions.menu_item_dropdown_color);
-      navMenuOptions.dropdown_item_color              = j1.setColorData(navMenuOptions.dropdown_item_color);
-      navMenuOptions.dropdown_background_color_hover  = j1.setColorData(navMenuOptions.dropdown_background_color_hover);
-      navMenuOptions.dropdown_background_color_active = j1.setColorData(navMenuOptions.dropdown_background_color_active);
-      navMenuOptions.dropdown_border_color            = j1.setColorData(navMenuOptions.dropdown_border_color);
+      navMenuOptions.menu_item_color                  = navMenuOptions.menu_item_color;
+      navMenuOptions.menu_item_color_hover            = navMenuOptions.menu_item_color_hover;
+      navMenuOptions.menu_item_dropdown_color         = navMenuOptions.menu_item_dropdown_color;
+      navMenuOptions.dropdown_item_color              = navMenuOptions.dropdown_item_color;
+      navMenuOptions.dropdown_background_color_hover  = navMenuOptions.dropdown_background_color_hover;
+      navMenuOptions.dropdown_background_color_active = navMenuOptions.dropdown_background_color_active;
+      navMenuOptions.dropdown_border_color            = navMenuOptions.dropdown_border_color;
 
       {% comment %} Set|Resolve navQuicklinksOptions
       -------------------------------------------------------------------------- {% endcomment %}
-      navQuicklinksOptions.icon_color                 = j1.setColorData(navQuicklinksOptions.icon_color);
-      navQuicklinksOptions.icon_color_hover           = j1.setColorData(navQuicklinksOptions.icon_color_hover);
-      navQuicklinksOptions.background_color           = j1.setColorData(navQuicklinksOptions.background_color);
+      navQuicklinksOptions.icon_color                 = navQuicklinksOptions.icon_color;
+      navQuicklinksOptions.icon_color_hover           = navQuicklinksOptions.icon_color_hover;
+      navQuicklinksOptions.background_color           = navQuicklinksOptions.background_color;
 
       {% comment %} Set|Resolve navTopsearchOptions
       -------------------------------------------------------------------------- {% endcomment %}
-      navTopsearchOptions.input_color                 = j1.setColorData(navTopsearchOptions.input_color);
-      navTopsearchOptions.background_color            = j1.setColorData(navTopsearchOptions.background_color);
-
+      navTopsearchOptions.input_color                 = navTopsearchOptions.input_color;
+      navTopsearchOptions.background_color            = navTopsearchOptions.background_color;
 
       {% comment %} Set dymanic styles
       -------------------------------------------------------------------------- {% endcomment %}
@@ -585,94 +604,61 @@ j1.adapter['navigator'] = (function (j1, window) {
       {% comment %} navBar styles
       -------------------------------------------------------------------------- {% endcomment %}
       var bg_primary    = j1.getStyleValue('bg-primary', 'background-color');
-      var bg_scrolled   = bg_primary
+      var bg_scrolled   = bg_primary;
       var bg_collapsed  = bg_primary;
 
       $('head').append('<style>.mdi-bg-primary {color: ' +bg_scrolled+ ';}</style>');
 
       // Size of brand image
-      $('head').append("<style>.navbar-brand > img { height: {{brand_image_height}}px !important; }</style>");
-      // Navbar transparent-light (light)
-      $('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: " +navBarOptions.background_color_scrolled+ " !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>.navbar-brand > img { height: {{brand_image_height}}px !important; }</style>');
 
-      // Menubar collapsed (mobile)
-//    $('head').append('<style>.navbar-collapse.collapse.show { background-color: ' +bg_scrolled+ ' !important; }</style>');
-
-
-      /* Navbar media-queries, LARGE Window|Desktop (>= 1024) */
-      /* jadams:  Oversized menu bar fixed by: overflow: hidden */
-//    $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator { background-color: " +navBarOptions.background_color_collapsed+ " !important; overflow: hidden; } }</style>");
-//    $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator { background-color: " +bg_collapsed+ " !important; overflow: hidden; } }</style>");
-//    $('head').append("<style>@media (max-width: 1023px) { row { margin-left: 0 !important; margin-right: 0 !important; } }</style>");
+      // Navbar transparent-light (light)
+      $('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>');
 
       {% comment %} navQuicklinks styles
       -------------------------------------------------------------------------- {% endcomment %}
-      $('head').append("<style>.attr-nav> ul > li > a { color: " +navQuicklinksOptions.icon_color+ " !important; }</style>");
-      $('head').append("<style>.attr-nav> ul > li > a:hover { color: " +navQuicklinksOptions.icon_color_hover+ " !important; }</style>");
+      $('head').append('<style>.attr-nav> ul > li > a { color: ' +navQuicklinksOptions.icon_color+ ' !important; }</style>');
+      $('head').append('<style>.attr-nav> ul > li > a:hover { color: ' +navQuicklinksOptions.icon_color_hover+ ' !important; }</style>');
 
       {% comment %} navMenu styles
       -------------------------------------------------------------------------- {% endcomment %}
-
-      // TODO: Check if this style is needed for  MENU item (hover)
-      //$('head').append("<style>nav.navbar.navbar-transparent ul.nav > li > a:hover,nav.navbar.no-background ul.nav > li > a:hover,nav.navbar ul.nav li.scroll.active > a,nav.navbar.navbar-dark ul.nav li.dropdown ul.dropdown-menu  > li > a:hover,nav.navbar ul.nav li.dropdown.on > a,nav.navbar-dark ul.nav li.dropdown.on > a { color: " +navMenuOptions.menu_item_color_hover+ " !important; }</style>");
-      //
-      //$('head').append("<style>.dropdown-menu > .active > a { background-color: " +navMenuOptions.dropdown_background_color_active+ " !important; }</style>");
       // Remove background for anchor
-      $('head').append("<style>.dropdown-menu > .active > a { background-color: transparent !important; }</style>");
+      $('head').append('<style>.dropdown-menu > .active > a { background-color: transparent !important; }</style>');
       // hover menu-item|menu-sub-item
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator .dropdown-item:focus, nav.navbar.navigator .dropdown-item:hover, nav.navbar.navigator .nav-sub-item:focus, nav.navbar.navigator .nav-sub-item:hover { background: " +navMenuOptions.dropdown_background_color_hover+ " !important;  } }</style>");
-      // $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu > li a:hover { color: " +navMenuOptions.menu_item_color_hover+ " !important; background: " +navMenuOptions.dropdown_background_color_hover+ " !important; } }</style>");
-
-      // 1st dropdown, limit height
-      // TODO: overflow needs to be managed correctly (not static)
-      //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu  { max-height: " +navMenuOptions.dropdown_menu_height_max+ "em; overflow: hidden } }</style>");
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator .dropdown-item:focus, nav.navbar.navigator .dropdown-item:hover, nav.navbar.navigator .nav-sub-item:focus, nav.navbar.navigator .nav-sub-item:hover { background: ' +navMenuOptions.dropdown_background_color_hover+ ' !important; }}</style>');
 
-      //  Limit dropdown item width
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator ul.nav.navbar-right .dropdown-menu .dropdown-menu { left: -" +navMenuOptions.dropdown_item_width+ "em !important; } }</style>");
+      // Limit 1st dropdown item width
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator ul.nav.navbar-right .dropdown-menu .dropdown-menu { left: -' +navMenuOptions.dropdown_item_width+ 'em !important; } }</style>');
 
       // Limit last (2nd) dropdown in height (nav.navbar.navigator li.dropdown ul.dropdown-menu ul.dropdown-menu)
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu ul.dropdown-menu  { top: -" +navMenuOptions.dropdown_border_top+ "px !important; max-height: " +navMenuOptions.dropdown_menu_height_max+ "em !important; } }</style>");
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu ul.dropdown-menu  { top: -' +navMenuOptions.dropdown_border_top+ 'px !important; max-height: ' +navMenuOptions.dropdown_menu_height_max+ 'em !important; } }</style>');
 
       //  Set dropdown item colors
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator ul.nav > li > a { color: " +navMenuOptions.menu_item_color+ " !important; } }</style>");
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator ul.nav > li > a:hover { color: " +navMenuOptions.menu_item_color_hover+ " !important; } }</style>");
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator ul.nav > li > a { color: ' +navMenuOptions.menu_item_color+ ' !important; } }</style>');
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator ul.nav > li > a:hover { color: ' +navMenuOptions.menu_item_color_hover+ ' !important; } }</style>');
 
       // Dropdown menu styles
-      //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +navMenuOptions.dropdown_border_color+ "; width: " +navMenuOptions.dropdown_item_width+ "px; border-top: solid " +navMenuOptions.dropdown_border_height+ "px; left: 1rem; top: calc(90px + " +navMenuOptions.dropdown_border_height+ "px); } }</style>");
-      //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +navMenuOptions.dropdown_border_color+ "; width: " +navMenuOptions.dropdown_item_width+ "em; border-top: solid " +navMenuOptions.dropdown_border_height+ "px; left: 1em; } }</style>");
       // jadams, 2017-11-30: removed left padding from dropdown mwenu (for new j1nav style based on Navigator|Slate)
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +bg_scrolled+ " !important; width: " +navMenuOptions.dropdown_item_width+ "emm!important; border-top: solid " +navMenuOptions.dropdown_border_top+ "px !important; border-radius: " +navMenuOptions.dropdown_border_radius+ "px !important; left: 0; } }</style>");
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: ' +navMenuOptions.dropdown_animate_duration+ 's !important; color: ' +bg_scrolled+ ' !important; width: ' +navMenuOptions.dropdown_item_width+ 'emm !important; border-top: solid ' +navMenuOptions.dropdown_border_top+ 'px !important; border-radius: ' +navMenuOptions.dropdown_border_radius+ 'px !important; left: 0; } }</style>');
 
       {% if dropdown_style == 'raised' %}
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu { box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important; } }</style>");
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu { box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important; } }</style>');
       {% endif %}
 
-      // jadams,2017-11-22: stop configure dropdown_font_size
-      //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown li.dropdown.nav-item.nav-sub-item { color: " +navMenuOptions.dropdown_item_color+ "; font-size: " +navMenuOptions.dropdown_font_size+ "; font-weight: 400; } }</style>");
-      // $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a { color: " +navMenuOptions.dropdown_item_color+ "; font-size: " +navMenuOptions.dropdown_font_size+ "; font-weight: 400; display: inline-flex; align-items: center;} }</style>");
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a { color: " +navMenuOptions.dropdown_item_color+ " !important; font-size: " +navMenuOptions.dropdown_font_size+ " !important; font-weight: 400; } }</style>");
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator ul.dropdown-menu.megamenu-content .content ul.menu-col li a { color: " +navMenuOptions.dropdown_item_color+ " !important; font-size: " +navMenuOptions.megamenu_font_size+ " !important; font-weight: 400; } }</style>");
-
-      // dropdown-menu item padding
-      // jadams, 2017-11-22:  moved item padding to nav|dropdown-item based on font-site (rel|em)
-      {% if dropdown_item_style == 'raised' %}
-      //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a { padding: " +navMenuOptions.dropdown_padding_y+ "px " +navMenuOptions.dropdown_padding_x+ "px; box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2); } }</style>");
-      {% else %}
-      //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a { padding: " +navMenuOptions.dropdown_padding_y+ "px " +navMenuOptions.dropdown_padding_x+ "px; } }</style>");
-      // blödsinn $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator .dropdown .nav-item  { padding-top: " +navMenuOptions.dropdown_item_padding+ "px; padding-bottom: " +navMenuOptions.dropdown_item_padding+ "px; } }</style>");
-      {% endif %}
+      // jadams, 2017-11-22: configure dropdown_font_size|color
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a { color: ' +navMenuOptions.dropdown_item_color+ ' !important; font-size: ' +navMenuOptions.dropdown_font_size+ ' !important; font-weight: 400; } }</style>');
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator ul.dropdown-menu.megamenu-content .content ul.menu-col li a { color: ' +navMenuOptions.dropdown_item_color+ ' !important; font-size: ' +navMenuOptions.megamenu_font_size+ ' !important; font-weight: 400; } }</style>');
 
       {% comment %} navQuicklinks styles
       -------------------------------------------------------------------------- {% endcomment %}
 
       {% comment %} navTopSearch Styles
       -------------------------------------------------------------------------- {% endcomment %}
-      $('head').append("<style>.top-search { background-color: " +navTopsearchOptions.background_color+ " !important; }</style>");
-      $('head').append("<style>.top-search .input-group-addon { color: " +navTopsearchOptions.input_color+ " !important; }</style>");
-      $('head').append("<style>.top-search .input.form-control { color: " +navTopsearchOptions.input_color+ " !important; }</style>");
+//    jadams, 2020-07-08: disabled because colors for icons set by the icon font settings
+//    $('head').append('<style>.top-search .input-group-addon { color: ' +navTopsearchOptions.input_color+ ' !important; }</style>');
+      $('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>');
 
       return true;
     }, // END setCSS
@@ -683,11 +669,11 @@ j1.adapter['navigator'] = (function (j1, window) {
     //  See: http://jsfiddle.net/AndreasPizsa/NzvKC/
     // -------------------------------------------------------------------------
     delayShowMenu: function () {
-      var logger      = log4javascript.getLogger("j1.adapter.navigator.delayShowMenu");
+      var logger      = log4javascript.getLogger('j1.adapter.navigator.delayShowMenu');
       var theTimer    = 0;
       var theElement  = null;
 
-      logText = "entered delayShowMenu"
+      logText ='entered delayShowMenu';
       logger.info(logText);
 
       $('#navigator_nav_menu')