j1-template 2021.1.0 → 2021.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78a543ac0d0dee3dad1e4bd534637503a9a34c4b893b27a5a14846e4b063cd81
-  data.tar.gz: 8da8a6fc202db91f1ca1df24ab26d19af1b9b17993d29e6c2f1b6953b0d0e9cf
+  metadata.gz: 0e93fb15ef56819b92a0d748c7e809c7381ac50e69868be5777ce21f01acf066
+  data.tar.gz: 2b710cb4d00181ee1b027fd6ea406a3e2c293a27cae544c3e72d5de055c43833
 SHA512:
-  metadata.gz: d9982f9b90952982a3a6ecd547cdc6d8fe9fa61601b0c08b06d866c1325351d1ad430ccb6e1def9642d56efacbfbc63df0ea06ff614421c39d7303e2ac0b2cdc
-  data.tar.gz: 1bb2db102b7454c7668055f5a61b0fad09db6322736b07568dc4b3fe6d0a39f33662024f83cf119327246637adac63e276ae0df643b4f1c7729b8ce9adb8194b
+  metadata.gz: 88e8c900a10010e9bc600663c22fb7b0f0b292ea71e3bc700022519c3929cdec359b5af9d07bdfafd970fafd70933548fcc819e808a34acfe0b97ddd9ee8485a
+  data.tar.gz: 4edee51b60f67d1066729ef1fce3e1106cd957e9f06fbfbcfbd232aa7bcedb7d173af6955a516f76b52724f22f4d194227826b59083cfe15c752c0ea86f6a624

data/_includes/themes/j1/layouts/layout_metadata_generator.html

@@ -47,17 +47,17 @@
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ start processing: place meta tags (taken from site config|page frontmatter) ] -->
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ page|content encoding ] -->
-<meta http-equiv="Content-Type" content="text/html;charset={{site.coding}}">
+<meta http-equiv="Content-Type" content="text/html;charset={{site.coding}}" />
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ added for MS Edge Browser ] -->
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ initial zoom level when the page is first loaded by the browser ] -->
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 {% if template_config.translation.enabled %}
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ add google translator meta tag to enable customized translations ] -->
-<meta name="google-translate-customization">
+<meta name="google-translate-customization" />
 {% endif %}
 
 {% if page.layout == 'home' %}
@@ -75,7 +75,7 @@
     {% else %}
     <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider! IMPROVE|INCREASE your site description, recommended: 70-160 characters ] -->
     {% endif %}
-    <meta name="description" content="{{site.description}}">
+    <meta name="description" content="{{site.description}}" />
   {% endif %}
 {% else %}
   {% if page.description %}
@@ -86,76 +86,91 @@
     {% else %}
     <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider!  to IMPROVE|INCREASE your page description ] -->
     {% endif %}
-    <meta name="description" content="{{page.description}}">
+    <meta name="description" content="{{page.description}}" />
   {% endif %}
 {% endif %}
 
 {% if site.favicon.image %}
-  <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}">
+  <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}" />
 {% endif %}
 
 {% if page.layout == 'home' %}
   {% if page.author %}
-    <meta name="author" content="{{page.author}}">
+    <meta name="author" content="{{page.author}}" />
   {% else %}
-    <meta name="author" content="{{site.author.name}}">
+    <meta name="author" content="{{site.author.name}}" />
   {% endif %}
 {% else %}
   {% if page.author %}
-    <meta name="author" content="{{page.author}}">
+    <meta name="author" content="{{page.author}}" />
   {% else %}
-    <meta name="author" content="{{site.author.name}}">
+    <meta name="author" content="{{site.author.name}}" />
   {% endif %}
 {% endif %}
 
 {% if page.layout == 'home' %}
   {% if page.keywords %}
-    <meta name="keywords" content="{{page.keywords}}">
+    <meta name="keywords" content="{{page.keywords}}" />
   {% else %}
     {% if site.keywords %}
-      <meta name="keywords" content="{{site.keywords}}">
+      <meta name="keywords" content="{{site.keywords}}" />
     {% endif %}
   {% endif %}
 {% else %}
   {% if page.keywords %}
-    <meta name="keywords" content="{{page.keywords}}">
+    <meta name="keywords" content="{{page.keywords}}" />
   {% else %}
     {% if site.keywords %}
-      <meta name="keywords" content="{{site.keywords}}">
+      <meta name="keywords" content="{{site.keywords}}" />
     {% endif %}
   {% endif %}
 {% endif %}
 
-{% comment %} site check DISABLED
---------------------------------------------------------------------------------
-{% if site.robots.index %}
-  <meta name="robots" content="index">
+{% comment %} Check robot settings from site configuration
+-------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Check robot settings from SITE configuration ] -->
+{% if site.robots.index and site.robots.index <> nil %}
+  <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Found SITE configuration robots_index: {{site.robots.index}} ] -->
+  {% capture robots_index %}<meta name="robots" content="index" />{% endcapture %}
 {% else %}
-  <meta name="robots" content="noindex">
+  <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Set DEFAULT configuration robots_index: noindex  ] -->
+  {% capture robots_index %}<meta name="robots" content="noindex" />{% endcapture %}
 {% endif %}
 
-{% if site.robots.follow %}
-  <meta name="robots" content="follow">
+{% if site.robots.follow and site.robots.follow <> nil %}
+  <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Found SITE configuration robots_follow: {{site.robots.index}} ] -->
+  {% capture robots_follow %}<meta name="robots" content="follow" />{% endcapture %}
 {% else %}
-  <meta name="robots" content="nofollow">
+  <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Set DEFAULT configuration robots_follow: nofollow  ] -->
+  {% capture robots_follow %}<meta name="robots" content="nofollow" />{% endcapture %}
 {% endif %}
--------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} page.robots.index:  {{ page.robots.index | debug }} {% endcomment %}
 
 {% comment %} Check robot settings from page (or default SCOPE)
-NOTE: for layout home (home page, the keys are to be set!!!)
 -------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Check robot settings from PAGE configuration ] -->
+<!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Found PAGE configuration robots_index: {{page.robots.index}} ] -->
+<!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Found PAGE configuration robots_follow: {{page.robots.follow}} ] -->
 {% if page.robots.index %}
-  <meta name="robots" content="index">
-{% else %}
-  <meta name="robots" content="noindex">
+  {% capture robots_index %}<meta name="robots" content="index" />{% endcapture %}
+{% endif %}
+
+{% if page.robots.index == false %}
+  {% capture robots_index %}<meta name="robots" content="noindex" />{% endcapture %}
 {% endif %}
 
 {% if page.robots.follow %}
-  <meta name="robots" content="follow">
-{% else %}
-  <meta name="robots" content="nofollow">
+  {% capture robots_follow %}<meta name="robots" content="follow" />{% endcapture %}
+{% endif %}
+
+{% if page.robots.follow == false %}
+  {% capture robots_follow %}<meta name="robots" content="nofollow" />{% endcapture %}
 {% endif %}
 
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Place detected/overloaded meta tags for robots ] -->
+{{robots_index}}
+{{robots_follow}}
 
 {% comment %} SEO settings (optimization)
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -168,7 +183,7 @@ NOTE: for layout home (home page, the keys are to be set!!!)
   {% assign cors  = template_config.preload.font.cors %}
   {% assign fonts = template_config.preload.font.fonts %}
   {% for font in fonts %}
-    <link rel="preload" as="font" href="{{font}}" {{cors}}>
+    <link rel="preload" as="font" href="{{font}}" {{cors}} />
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of fonts: disabled ] -->
@@ -183,12 +198,12 @@ NOTE: for layout home (home page, the keys are to be set!!!)
   {% assign css   = template_config.preload.css.css %}
   {% assign files = template_config.preload.css.files %}
   {% for file in css %}
-    <link rel="preload" as="style" href="{{file}}.{{ext_css}}">
+    <link rel="preload" as="style" href="{{file}}.{{ext_css}}" />
   {% endfor %}
 
   {% for file in files %}
     <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD css as FILE ] -->
-    <link rel="preload" as="style" href="{{file}}">
+    <link rel="preload" as="style" href="{{file}}" />
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of css: disabled ] -->
@@ -203,12 +218,12 @@ NOTE: for layout home (home page, the keys are to be set!!!)
   {% assign js    = template_config.preload.js.js %}
   {% assign files = template_config.preload.js.files %}
   {% for file in js %}
-    <link rel="preload" as="script" href="{{file}}.{{ext_js}}">
+    <link rel="preload" as="script" href="{{file}}.{{ext_js}}" />
   {% endfor %}
 
   {% for file in files %}
     <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD js as FILE ] -->
-    <link rel="preload" as="script" href="{{file}}">
+    <link rel="preload" as="script" href="{{file}}" />
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of js: disabled ] -->
@@ -222,7 +237,7 @@ NOTE: for layout home (home page, the keys are to be set!!!)
   <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of images to prioritize fetching ] -->
   {% assign files = template_config.preload.image.files %}
   {% for file in files %}
-    <link rel="preload" as="image" href="{{file}}">
+    <link rel="preload" as="image" href="{{file}}" />
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of images: disabled ] -->
@@ -237,8 +252,8 @@ NOTE: for layout home (home page, the keys are to be set!!!)
   {% assign urls = template_config.preconnect.urls %}
   {% for url in urls %}
     <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ establish early connection: {{url}} ] -->
-    <link rel="dns-prefetch" href="{{url}}">
-    <link rel="preconnect"   href="{{url}}">
+    <link rel="dns-prefetch" href="{{url}}" />
+    <link rel="preconnect"   href="{{url}}" />
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRECONNECT remote URLs: disabled ] -->

data/_includes/themes/j1/modules/connectors/ad/google-adsense.html

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/procedures/provider/ad/google-adsense.html
- #  Support of Advertising Provider Google Adsense for J1 Template
+ #  Support of advertising provider Google Adsense for J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one

data/_includes/themes/j1/modules/connectors/ads

@@ -24,16 +24,14 @@
 {% assign advertising           = site.data.j1_config.advertising.enabled %}
 {% assign advertising_provider  = site.data.j1_config.advertising.provider %}
 
-
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising (global): {{advertising}} ] -->
+<!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising (j1_config): {{advertising}} ] -->
 <!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising (page): {{page.advertising}}} ] -->
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising (provider): {{advertising_provider}}} ] -->
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ start processing load region head, layout: {{page.layout}} ] -->
 
 {% if advertising and page.advertising %}
-
+  <!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising provider (j1_config): {{advertising_provider}}} ] -->
+  <!-- [INFO   ] [j1.modules.connectors.ads             ] [ start processing load region head, layout: {{page.layout}} ] -->
   {% case advertising_provider %}
     {% when "google" %}
       <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place provider: Google Adsense ] -->

data/_includes/themes/j1/modules/connectors/analytic/google-analytics.html

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/modules/connectors/analytic/google-analytics.html
- #  Support of Analytics Provider Google Analytics (V4) for J1 Template
+ #  Support of analytics provider Google Analytics for J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one
@@ -21,16 +21,20 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id }} %}
+{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-<!-- Google Analytics: provide global site tag (gtag.js) -->
+
+<!-- Google Analytics: load the GA library -->
 <script async src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>
-<script>
+<!-- Google Analytics: GA cookies disabled by default -->
+<!-- GA cookies disabled by default -->
+<!-- GA depends on the cookie consent and is enabled/disabled on OptIn/Out-->
+<!--script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
   gtag('config', '{{tracking_id}}');
-</script>
+</script-->

data/_includes/themes/j1/modules/connectors/analytics

@@ -27,10 +27,12 @@
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ detected analytics (j1_config): {{analytics}} ] -->
+<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ detected analytics (page): {{page.analytics}}} ] -->
 
-<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ start processing load region head, layout: {{page.layout}} ] -->
 {% if analytics and page.analytics %}
-
+  <!-- [INFO   ] [j1.modules.connectors.analytics       ] [ detected analytics provider (j1_config): {{analytics_provider}}} ] -->
+  <!-- [INFO   ] [j1.modules.connectors.analytics       ] [ start processing load region head, layout: {{page.layout}} ] -->
   {% case analytics_provider %}
     {% when "google" %}
       <!-- [INFO   ] [j1.modules.connectors.analytics       ] [ place Google Analytics ] -->

data/_includes/themes/j1/modules/connectors/comments

@@ -26,21 +26,22 @@
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.modules.connectors.comments        ] [ detected comments (j1_config): {{comments}} ] -->
+<!-- [INFO   ] [j1.modules.connectors.comments        ] [ detected comments (page): {{page.comments}}} ] -->
 
-<!-- [INFO   ] [j1.layout.connectors.comments         ] [ start processing load region head, layout: {{page.layout}} ] -->
 {% if comments and page.comments %}
-
+  <!-- [INFO   ] [j1.modules.connectors.comments       ] [ start processing load region head, layout: {{page.layout}} ] -->
   {% case comment_provider %}
     {% when "disqus" %}
-      <!-- [INFO   ] [j1.layout.connectors.comments         ] [ place comment provider DISQUS ] -->
+      <!-- [INFO   ] [j1.modules.connectors.comments        ] [ place comment provider DISQUS ] -->
       {% include themes/{{site.template.name}}/modules/connectors/comment/disqus.html %}
     {% when "facebook" %}
-      <!-- [INFO   ] [j1.layout.connectors.comments         ] [ place comment provider FACEBOOK ] -->
+      <!-- [INFO   ] [j1.modules.connectors.comments        ] [ place comment provider FACEBOOK ] -->
       {% include themes/{{site.template.name}}/procedures/provider/comment/facebook.html %}
     {% when "custom" %}
-      <!-- [INFO   ] [j1.layout.connectors.comments         ] [ place comment provider CUSTOM ] -->
+      <!-- [INFO   ] [j1.modules.connectors.comments        ] [ place comment provider CUSTOM ] -->
       {% include themes/{{site.template.name}}/procedures/provider/comment/custom-provider.html %}
   {% endcase %}
 
 {% endif %}
-<!-- [INFO   ] [j1.layout.connectors.comments         ] [ end processing ] -->
+<!-- [INFO   ] [j1.modules.connectors.comments        ] [ end processing ] -->

data/_includes/themes/j1/modules/connectors/translator

@@ -24,13 +24,13 @@
 {% assign translation          = site.data.j1_config.translation.enabled %}
 {% assign translation_provider = site.data.j1_config.translation.provider %}
 
-
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.modules.connectors.translation     ] [ detected translation (j1_config): {{translation}} ] -->
+<!-- [INFO   ] [j1.modules.connectors.translation     ] [ detected translation (page): {{page.translation}}} ] -->
 
-<!-- [INFO   ] [j1.modules.connectors.translator      ] [ start processing load region head, layout: {{page.layout}} ] -->              
 {% if translation %}
-
+<!-- [INFO   ] [j1.modules.connectors.translator      ] [ start processing load region head, layout: {{page.layout}} ] -->
   {% case translation_provider %}
     {% when "google" %}
       <!-- [INFO   ] [j1.modules.connectors.translator      ] [ place Google Translator ] -->
@@ -42,4 +42,3 @@
 
 {% endif %}
 <!-- [INFO   ] [j1.modules.connectors.translator      ] [ end processing ] -->
-

data/_includes/themes/j1/modules/navigator/generator.html

@@ -50,22 +50,8 @@
 {% assign navigator_defaults          = site.data.modules.defaults.navigator.defaults %}
 {% assign navigator_settings          = site.data.modules.navigator.settings %}
 
-{% comment %} Cookie Consent module NOT used anymore
---------------------------------------------------------------------------------
-{% assign consent_defaults            = site.data.modules.defaults.cookie_consent.defaults %}
-{% assign consent_settings            = site.data.modules.cookie_consent.settings %}
-{% assign cookie_consent_options      = consent_defaults | merge: consent_settings %}
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% assign cookiebar_defaults          = site.data.modules.defaults.cookiebar.defaults %}
-{% assign cookiebar_settings          = site.data.modules.cookiebar.settings %}
-
-{% comment %} SSM module NOT used anymore
---------------------------------------------------------------------------------
-{% assign ssm_settings                = modules.ssm.settings %}
-{% assign ssm_defaults                = modules.defaults.ssm.defaults %}
-{% assign ssm_options                 = ssm_defaults | merge: ssm_settings %}
--------------------------------------------------------------------------------- {% endcomment %}
+{% assign consent_defaults            = site.data.modules.defaults.cookieconsent.defaults %}
+{% assign consent_settings            = site.data.modules.cookieconsent.settings %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -92,7 +78,6 @@
 {% assign auth_manager_options        = authentication_options.j1_auth %}
 {% assign nav_mmenu_options           = nav_mmenu_defaults | merge: nav_mmenu_settings %}
 
-
 {% comment %} Set navBarOptions
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign brand_position              = nav_bar_options.brand_position %}
@@ -126,16 +111,7 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% comment %} Generate SSM container (not used anymore)
---------------------------------------------------------------------------------
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ check for ssm ] -->
-{% if ssm_options.enabled %}
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place ssm container for AJAX load ] -->
-<nav id="ssm-container" class="ssm-btns-right ssm-anim-slide no-r-text"></nav>
-{% endif %}
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} Generate TopSearch container
+{% comment %} Generate search container
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ check for topsearch ] -->
 {% if topsearch_options.enabled %}
@@ -148,19 +124,8 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: mmenu ] -->
 {% for item in nav_mmenu_options.menus %}
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ processing: {{item.menu.xhr_container_id}} ] -->
-
-{% comment %} Condition DISABLED for testing
---------------------------------------------------------------------------------
-{% if item.menu.enabled %}
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mmenu container for AJAX load ] -->
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mmenu container {{item.menu.xhr_container_id}} for AJAX load ] -->
 <nav id="{{item.menu.xhr_container_id}}"></nav>
-{% endif %}
--------------------------------------------------------------------------------- {% endcomment %}
-
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mmenu container for AJAX load ] -->
-<nav id="{{item.menu.xhr_container_id}}"></nav>
-
 {% endfor %}
 
 <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: navigation ] -->
@@ -168,7 +133,6 @@
 
   {% comment %} Place brand image
   ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ end processing: sidebar ] -->
   <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: main menue ] -->
   {% if brand_position == "left" %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand image to the: left ] -->

data/_includes/themes/j1/modules/navigator/procedures/topsearch.proc

@@ -45,7 +45,7 @@
 
 {% comment %} Set quicksearch properties
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign topsearch_id        = topsearch_options.xhr_container_id %}
+{% assign topsearch_id        = topsearch_options.container_id %}
 {% assign icon_family         = topsearch_options.icon_family | downcase %}
 {% assign placeholder         = topsearch_options.placeholder %}
 {% assign search_heading_lead = topsearch_options.search_heading_lead %}
@@ -89,7 +89,7 @@
   ------------------------------------------------------------------------------ {% endcomment %}
   {% if quick_search %}
     <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ start processing: top search ] -->
-    <div id="navigator_nav_topsearch" class="top-search ml-4 mr-4" style="display: none;">
+    <div id="{{topsearch_id}}" class="top-search ml-4 mr-4" style="display: none;">
     	<div class="input-group">
     	  <span class="input-group-addon"><i class="mdi mdi-magnify mdi-2x" style="color:#9E9E9E"></i></span>
     	  <input id="search-query" type="text" name="q" placeholder="QuickSearch" autocomplete="off" class="form-control">