j1-template 2020.0.6 → 2020.0.11

data/{lib/starter_web/assets → assets}/themes/j1/adapter/js/justified_gallery.js

@@ -64,11 +64,16 @@ regenerate:                             true
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-// j1.JustifiedGallery = (function (j1, window) {
 j1.adapter['jf_gallery'] = (function (j1, window) {
 
   {% comment %} Global variables
@@ -95,7 +100,6 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
       // initialize state flag
       j1.adapter.jf_gallery.state = 'pending';
 
-
       // -----------------------------------------------------------------------
       // Default module settings
       // -----------------------------------------------------------------------
@@ -108,7 +112,9 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
       //
+      /* eslint-disable */
       moduleOptions = $.extend({}, {{jf_gallery_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
 
       if (typeof settings !== 'undefined') {
         moduleOptions = j1.mergeData(moduleOptions, settings);
@@ -196,23 +202,23 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
           $('#{{gallery_id}}').before(gallery_title);
           {% endif %}
 
-          $('#{{gallery_id}}').addClass("justified-gallery {{css_classes}}");
+          $('#{{gallery_id}}').addClass('justified-gallery {{css_classes}}');
 
           {% if gallery_type == "image" %}
             // Collect image gallery data from data file (xhr_data_path)
             $.getJSON('{{jf_gallery_options.xhr_data_path}}', function (data) {
               var content = '';
-              var gallery_class = 'justified-gallery'
+              var gallery_class = 'justified-gallery';
               {% if lightbox == "lg" %}
               gallery_class += ' light-gallery ';
               {% endif %}
 
-              for (var i in data["{{item.gallery.id}}"]) {
-                var img               = data["{{item.gallery.id}}"][i].img;
-                // var img               = data["{{item.gallery.id}}"][i].image_path + '/' + data["{{item.gallery.id}}"][i].poster;
-                var captions_gallery  = data["{{item.gallery.id}}"][i].captions_gallery;
-                var captions_lightbox = data["{{item.gallery.id}}"][i].captions_lightbox;
-                var lightbox          = "{{lightbox}}";
+              for (var i in data['{{item.gallery.id}}']) {
+                var img               = data['{{item.gallery.id}}'][i].img;
+//              var img               = data['{{item.gallery.id}}'][i].image_path + '/' + data['{{item.gallery.id}}'][i].poster;
+                var captions_gallery  = data['{{item.gallery.id}}'][i].captions_gallery;
+                var captions_lightbox = data['{{item.gallery.id}}'][i].captions_lightbox;
+                var lightbox          = '{{lightbox}}';
 
                 if (captions_lightbox != null && lightbox == 'lg') {
                   content +=  '<a data-sub-html="' +captions_lightbox+ '" ';
@@ -227,25 +233,25 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
 
               } // END for
 
-          {% elsif gallery_type == "video-html5" or gallery_type == "video-online" %}        
+          {% elsif gallery_type == "video-html5" or gallery_type == "video-online" %}
 
             // Collect html5 video gallery data from data file (xhr_data_path)
             $.getJSON('{{jf_gallery_options.xhr_data_path}}', function (data) {
               var play_button = '/assets/themes/j1/extensions/light_gallery/css/themes/icons/play-button.png';
               var content = '';
-              var gallery_class = 'justified-gallery'
+              var gallery_class = 'justified-gallery';
               {% if lightbox == "lg" %}
               gallery_class += ' light-gallery ';
               {% endif %}
 
-              for (var i in data["{{item.gallery.id}}"]) {
-                // var img               = data["{{item.gallery.id}}"][i].img;
-                var img               = data["{{item.gallery.id}}"][i].image_path + '/' + data["{{item.gallery.id}}"][i].poster;
-                var captions_gallery  = data["{{item.gallery.id}}"][i].captions_gallery;
-                var captions_lightbox = data["{{item.gallery.id}}"][i].captions_lightbox;
-                var video_id          = data["{{item.gallery.id}}"][i].video_id;
-                var video             = data["{{item.gallery.id}}"][i].video;
-                var lightbox          = "{{lightbox}}"; 
+              for (var i in data['{{item.gallery.id}}']) {
+//              var img               = data['{{item.gallery.id}}'][i].img;
+                var img               = data['{{item.gallery.id}}'][i].image_path + '/' + data['{{item.gallery.id}}'][i].poster;
+                var captions_gallery  = data['{{item.gallery.id}}'][i].captions_gallery;
+                var captions_lightbox = data['{{item.gallery.id}}'][i].captions_lightbox;
+                var video_id          = data['{{item.gallery.id}}'][i].video_id;
+                var video             = data['{{item.gallery.id}}'][i].video;
+                var lightbox          = '{{lightbox}}';
 
                 if (captions_lightbox != null && lightbox == 'lg') {
                   content +=  '<a data-sub-html="' +captions_lightbox+ '" ';
@@ -269,11 +275,11 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
               } // END for
 
               var hidden_video_div = '';
-              for (var i in data["{{item.gallery.id}}"]) {
-                var video        = data["{{item.gallery.id}}"][i].video_path + '/' + data["{{item.gallery.id}}"][i].video;
-                var poster       = data["{{item.gallery.id}}"][i].image_path + '/' + data["{{item.gallery.id}}"][i].poster;
-                var caption      = data["{{item.gallery.id}}"][i].captions_lightbox;
-                var video_id     = data["{{item.gallery.id}}"][i].video_id;
+              for (var i in data['{{item.gallery.id}}']) {
+                var video        = data['{{item.gallery.id}}'][i].video_path + '/' + data['{{item.gallery.id}}'][i].video;
+                var poster       = data['{{item.gallery.id}}'][i].image_path + '/' + data['{{item.gallery.id}}'][i].poster;
+                var caption      = data['{{item.gallery.id}}'][i].captions_lightbox;
+                var video_id     = data['{{item.gallery.id}}'][i].video_id;
                 var video_type   = video.substr(video.lastIndexOf('.') + 1);
                 hidden_video_div += '<div style="display:none;" id="' +video_id+ '">' + '\n';
                 hidden_video_div += '  <video class="lg-video-object lg-html5 video-js vjs-default-skin"' + '\n';
@@ -284,59 +290,70 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
                 hidden_video_div += '</div>' + '\n';
               }
               $('#{{ gallery_id }}').before(hidden_video_div);
-       
+
           {% endif %}
 
               // Hide gallery container (until lightGallery is NOT initialized)
               // and place HTML markup
-              $("#{{gallery_id}}").hide().html(content);
+              $('#{{gallery_id}}').hide().html(content);
               // Initialize and run the gallery using individual gallery|lightbox options
               {% if lightbox == "lg" %}
-                var gallery_selector = $("#{{gallery_id}}");
+                var gallery_selector = $('#{{gallery_id}}');
                 if (options !== undefined) {
                   // lightbox initialized on COMPLETE event of justifiedGallery
+                  /* eslint-disable */
                   gallery_selector.justifiedGallery({
                     {% for option in item.gallery.gallery_options %}
                     {{option[0] | json}}: {{option[1] | json}},
                     {% endfor %}
                   })
+                  /* eslint-enable */
                   .on('jg.complete', function (e) {
                     e.stopPropagation();
+
                     // options enabled
+                    /* eslint-disable */
                     gallery_selector.lightGallery({
                       {% for option in item.gallery.lightbox_options %}
                       {{option[0] | json}}: {{option[1] | json}},
                       {% endfor %}
                     });
+                    /* eslint-enable */
+
                     // Initialize instance variable of lightGallery (for later access)
                     j1['{{gallery_id}}'] = gallery_selector.data('lightGallery');
                     // Show gallery DIV element if jg has completed *and* the
                     // lightbox is initialized (delayed)
-                    setTimeout(function() { 
-                      $("#{{gallery_id}}").show();
+                    setTimeout(function() {
+                      $('#{{gallery_id}}').show();
                       logText = 'initializing gallery finished on id: #{{gallery_id}}';
                       logger.info(logText);
                     }, {{show_delay}});
                   });
                 } else {
+                  /* eslint-disable */
                   gallery_selector.justifiedGallery({
                     {% for option in item.gallery.gallery_options %}
                     {{option[0] | json}}: {{option[1] | json}},
                     {% endfor %}
+                  /* eslint-enable */
                   }).on('jg.complete', function (e) {
                      e.stopPropagation();
                     // lightbox initialized on COMPLETE event of justifiedGallery
+                    /* eslint-disable */
                     gallery_selector.lightGallery({
                       {% for option in item.gallery.lightbox_options %}
                       {{option[0] | json}}: {{option[1] | json}},
                       {% endfor %}
                     });
+                    /* eslint-enable */
+
                     // Initialize instance variable of lightGallery (for later access)
                     j1['{{gallery_id}}'] = gallery_selector.data('lightGallery');
                     // Show gallery DIV element if jg has completed *and* the
                     // lightbox is initialized (delayed)
-                    setTimeout(function() { 
-                      $("#{{gallery_id}}").show();
+                    setTimeout(function() {
+                      $('#{{gallery_id}}').show();
                       logText = 'initializing gallery finished on id: #{{gallery_id}}';
                       logger.info(logText);
                       }, {{show_delay}});
@@ -400,4 +417,4 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
 
 {% endcapture %}
 {{cache | strip_empty_lines}}
-{% assign cache = nil %}
+{% assign cache = nil %}

data/{lib/starter_web/assets → assets}/themes/j1/adapter/js/lightbox.js

@@ -68,6 +68,12 @@ regenerate:                             false
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 {% comment %} Main
@@ -108,6 +114,7 @@ j1.adapter['lightbox'] = (function (j1, window) {
       logger.info('state: ' + _this.getState());
       logger.info('module is being initialized');
 
+      /* eslint-disable */
       lightbox.option({
         alwaysShowNavOnTouchDevices:  {{ lightbox_options.alwaysShowNavOnTouchDevices | json }},
         albumLabel:                   {{ lightbox_options.albumLabel | json }},
@@ -122,6 +129,7 @@ j1.adapter['lightbox'] = (function (j1, window) {
         showImageNumberLabel:         {{ lightbox_options.showImageNumberLabel | json }},
         wrapAround:                   {{ lightbox_options.wrapAround | json }}
       });
+      /* eslint-enable */
 
       _this.setState('finished');
       logger.info('state: ' + _this.getState());
@@ -178,4 +186,4 @@ j1.adapter['lightbox'] = (function (j1, window) {
 
 {% endcapture %}
 {{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% assign cache = nil %}

data/{lib/starter_web/assets → assets}/themes/j1/adapter/js/logger.js

@@ -64,6 +64,12 @@ regenerate:                             false
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['logger'] = (function (j1, window) {
@@ -106,7 +112,7 @@ j1.adapter['logger'] = (function (j1, window) {
   var getCustomData = function(layout, loggingReference) {
     var customData = [];
 
-    try {(0)()} catch (e) {
+    try { (0)(); } catch (e) {
       var pattern = /^(.+?) ?\(?((?:file|https?|chrome-extension):.*?):(\d+)(?::(\d+))?\)?\s*$/ig;
       // Split the stack trace
       var output = e.stack.replace(/^.*?\n/,'').replace(/(?:\n@:0)?\s+$/m,'').replace(/^\(/gm,'{anon}(').split('\n');
@@ -138,8 +144,8 @@ j1.adapter['logger'] = (function (j1, window) {
     }
 
     // return custom field %f{1}
-    return customData[0].value
-  }
+    return customData[0].value;
+  };
 
   var requestCallback = function(data) {
     var xhrData = data;
@@ -147,7 +153,7 @@ j1.adapter['logger'] = (function (j1, window) {
     // place handling of command|action here
     //
     return;
-  }
+  };
 
   // ---------------------------------------------------------------------------
   // main object
@@ -162,7 +168,9 @@ j1.adapter['logger'] = (function (j1, window) {
       j1.adapter.logger.state = 'started';
 
       // load module DEFAULTS|CONFIG to js object
+      /* eslint-disable */
       loggerOptions       = $.extend({}, {{logger_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
       ajaxAppenderOptions = loggerOptions.appenders[1].appender;
 
       // -----------------------------------------------------------------------

data/{lib/starter_web/assets → assets}/themes/j1/adapter/js/mmenu.js

@@ -85,6 +85,12 @@ regenerate:                             true
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['mmenu'] = (function (j1, window) {
@@ -137,7 +143,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,7 +155,7 @@ 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());
@@ -214,8 +222,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 +269,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 +330,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 +361,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 +390,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
                 });
               });

data/{lib/starter_web/assets → assets}/themes/j1/adapter/js/navigator.js

@@ -125,6 +125,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) {
@@ -194,6 +200,7 @@ j1.adapter['navigator'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------
+      /* eslint-disable */
       var authConfig                                = {};
       var navDefaults                               = {};
       var navBarConfig                              = {};
@@ -239,6 +246,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());
@@ -354,8 +362,12 @@ j1.adapter['navigator'] = (function (j1, window) {
         $(window).on('resize', function() {
           j1.core.navigator.manageDropdownMenu(navDefaults, navMenuOptions);
 
+          // jadams, 2020-07-10: cause big touble on mobile devices if
+          // OnScreen Kbd comes up and reduces the window size
+          // DISABLED
+          // -------------------------------------------------------------------
           // Hide|Close topSearch on resize event
-          $('.top-search').slideUp();
+          // $('.top-search').slideUp();
 
           // Manage sticky NAV bars
           setTimeout (function(){
@@ -409,7 +421,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 +431,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 +454,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 +469,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 +487,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 +509,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 +535,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,7 +546,7 @@ 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';
@@ -585,94 +597,70 @@ 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>");
-
-      // Menubar collapsed (mobile)
-//    $('head').append('<style>.navbar-collapse.collapse.show { background-color: ' +bg_scrolled+ ' !important; }</style>');
+      $('head').append('<style>.navbar-brand > img { height: {{brand_image_height}}px !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>');
+
+      // if (navigator.userAgent.toLowerCase().indexOf("chrome") >= 0) {
+    	// 	$('input:-webkit-autofill').each(function(){
+    	// 		var text = $(this).val();
+    	// 		var name = $(this).attr('name');
+    	// 		$(this).after(this.outerHTML).remove();
+    	// 		$('input[name=' + name + ']').val(text);
+    	// 	});
+      // }
 
       return true;
     }, // END setCSS
@@ -683,11 +671,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')