j1-template 2020.0.22 → 2021.0.2

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

@@ -6,7 +6,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

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

@@ -6,7 +6,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -162,11 +162,11 @@ NOTE: for layout home (home page, the keys are to be set!!!)
 
 {% comment %} PRELOAD fonts
 -------------------------------------------------------------------------------- {% endcomment %}
-{% if template_config.font.preload %}
+{% if template_config.preload.font.preload %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Gratulations! PRELOAD of fonts: enabled ] -->
   <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of font to prioritize fetching ] -->
-  {% assign cors  = template_config.font.cors %}
-  {% assign fonts = template_config.font.fonts %}
+  {% 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}}>
   {% endfor %}
@@ -177,11 +177,11 @@ NOTE: for layout home (home page, the keys are to be set!!!)
 
 {% comment %} PRELOAD CSS files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% if template_config.css.preload %}
+{% if template_config.preload.css.preload %}
   <!-- [INFO    ] [j1.layout.meta_data_generator.html    ] [ Gratulations! PRELOAD of css: enabled ] -->
   <!-- [SEO     ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of font to prioritize fetching ] -->
-  {% assign css   = template_config.css.css %}
-  {% assign files = template_config.css.files %}
+  {% 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}}">
   {% endfor %}
@@ -197,11 +197,11 @@ NOTE: for layout home (home page, the keys are to be set!!!)
 
 {% comment %} PRELOAD JS files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% if template_config.js.preload %}
+{% if template_config.preload.js.preload %}
   <!-- [INFO    ] [j1.layout.meta_data_generator.html    ] [ Gratulations! PRELOAD of js: enabled ] -->
   <!-- [SEO     ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of font to prioritize fetching ] -->
-  {% assign js    = template_config.js.js %}
-  {% assign files = template_config.js.files %}
+  {% 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}}">
   {% endfor %}
@@ -217,10 +217,10 @@ NOTE: for layout home (home page, the keys are to be set!!!)
 
 {% comment %} PRELOAD image files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% if template_config.image.preload %}
+{% if template_config.preload.image.preload %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Gratulations! PRELOAD of images: enabled ] -->
   <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of images to prioritize fetching ] -->
-  {% assign files = template_config.image.files %}
+  {% assign files = template_config.preload.image.files %}
   {% for file in files %}
     <link rel="preload" as="image" href="{{file}}">
   {% endfor %}

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

@@ -7,7 +7,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

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

@@ -6,7 +6,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

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

@@ -6,7 +6,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -119,7 +119,7 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if attic %}
-  <!-- [INFO   ] [j1.attic.generator.html             ] [ place attic detected: {{attic}} ] -->
+  <!-- [INFO   ] [j1.modules.attics.generator.html             ] [ place attic detected: {{attic}} ] -->
 
  {% comment %} Place attic detected
  ------------------------------------------------------------------------------- {% endcomment %}

data/_includes/themes/j1/modules/boards/news_pin_board.html

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/_includes/themes/j1/modules/connectors/ad/custom-provider.html

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

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

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -26,11 +26,25 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
+<script data-ad-client="{{publisher_id}}"
+  $(document).ready(function() {
+    var dependencies_met_page_finished = setInterval (function () {
+      if (j1.getState() === 'finished') {
+        async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
+        clearInterval(dependencies_met_page_finished);
+      }
+  }, 25); // END dependencies_met_page_finished
+</script>
+
+{% comment %} to be checked
+--------------------------------------------------------------------------------
 <script data-ad-client="{{publisher_id}}"
     async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
 </script>
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Old Ads code
+--------------------------------------------------------------------------------
 <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 <script>
   (adsbygoogle = window.adsbygoogle || []).push({

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

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/_includes/themes/j1/modules/connectors/analytic/custom-provider.html

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

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

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -26,13 +26,11 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-<!-- Global site tag (gtag.js) - Google Analytics -->
+<!-- Google Analytics: provide global site tag (gtag.js) -->
 <script async src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
-
   gtag('config', '{{tracking_id}}');
 </script>
-

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

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/_includes/themes/j1/modules/connectors/comment/custom-provider.html

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  https://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/_includes/themes/j1/modules/connectors/comment/disqus.html

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  https://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -30,32 +30,45 @@
 <div id="disqus" class="container mt-5 mb-5">
 
   <div id="disqus_thread" class="disqus-thread">
-     <script>
-        var disqus_shortname = '{{disqus_short_name}}';
-
-        /**
-         *  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
-         *  LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables
-         */
-        /*
-        var disqus_config = function () {
-            this.page.url = PAGE_URL;  // Replace PAGE_URL with your page's canonical URL variable
-            this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
-        };
-        */
-
-        /* DON'T EDIT BELOW THIS LINE */
-        (function() {
-            var d = document, s = d.createElement('script');
-            s.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-            s.setAttribute('data-timestamp', +new Date());
-            (d.head || d.body).appendChild(s);
-        })();
-
-      </script>
+    <script>
+      $(document).ready(function() {
+        var dependencies_met_page_finished = setInterval (function () {
+          if (j1.getState() === 'finished') {
+            var disqus_shortname = '{{disqus_short_name}}';
+            // -----------------------------------------------------------------
+            // RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE
+            // SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
+            // LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT:
+            // https://disqus.com/admin/universalcode/#configuration-variables
+            // -----------------------------------------------------------------
+            //
+            // var disqus_config = function () {
+            // this.page.url = PAGE_URL;  // Replace PAGE_URL with your page's canonical URL variable
+            // Replace PAGE_IDENTIFIER with your page's unique
+            // identifier variable
+            // this.page.identifier = PAGE_IDENTIFIER;
+            // };
+            //
+            // DON'T EDIT BELOW THIS LINE
+            // -----------------------------------------------------------------
+            (function() {
+                var d = document,
+                    s = d.createElement('script');
+                s.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+                s.setAttribute('data-timestamp', +new Date());
+                (d.head || d.body).appendChild(s);
+            })();
+            clearInterval(dependencies_met_page_finished);
+          }
+        }, 25);
+    });
+    </script>
   </div>
 
-  <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+  <noscript>
+    Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a>
+  </noscript>
+
   <script id="dsq-count-scr" src="//{{disqus_short_name}}.disqus.com/count.js" async></script>
 
 </div>

data/_includes/themes/j1/modules/connectors/comment/facebook.html

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  https://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

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

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  https://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/_includes/themes/j1/modules/connectors/sharing

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

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

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/_includes/themes/j1/modules/connectors/translators/custom-translator.html

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/_includes/themes/j1/modules/connectors/translators/google-translator.html

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

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

@@ -7,7 +7,7 @@
  #  Product/Info:
  #  https://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -60,8 +60,12 @@
 {% 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 %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -87,7 +91,7 @@
 {% assign authentication_options      = authentication_defaults | merge: authentication_settings %}
 {% assign auth_manager_options        = authentication_options.j1_auth %}
 {% assign nav_mmenu_options           = nav_mmenu_defaults | merge: nav_mmenu_settings %}
-{% assign ssm_options                 = ssm_defaults | merge: ssm_settings %}
+
 
 {% comment %} Set navBarOptions
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -122,13 +126,14 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% comment %} Generate SSM container
--------------------------------------------------------------------------------- {% 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
 -------------------------------------------------------------------------------- {% endcomment %}

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

@@ -1,12 +1,12 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/templates/j1/modules/navigator/procedures/topsearch.proc
- #  Liquid PROCEDURE template to create search input for the quicklink bar
+ #  Liquid PROCEDURE template to create search input for the quicklinks bar
  #
  #  Product/Info:
  #  https://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -85,35 +85,45 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if topsearch_options.enabled %}
 
-  {% comment %} JekyllSimpleSearch engine
+  {% comment %} lunrSearch engine
   ------------------------------------------------------------------------------ {% endcomment %}
   {% if quick_search %}
     <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ start processing: top search ] -->
-    <div id="{{topsearch_id}}" class="top-search" style="display: none;">
-      <div class="container-fluid">
-        <div class="input-group">
-          <span class="input-group-addon"><i class="{{icon_family}} {{icon_family}}-{{search_icon}} {{icon_size}}" {{icon_color}}></i></span>
-          <input type="text" id="jss-input" class="form-control" placeholder="{{placeholder}}">
-          {% if clear_icon %}
-          <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ place clear icon ] -->
-          <span class="form-clear form-clear-searcher d-none"><i class="{{icon_family}} {{icon_family}}-{{clear_icon}} {{icon_size}}" {{icon_color}}"></i></span>
-          {% endif %}
-          <span class="input-group-addon close-search"><i class="{{icon_family}} {{icon_family}}-{{close_icon}} {{icon_size}}" {{icon_color}}></i></span>
-        </div>
-      </div>
-      <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ add search panel (hidden) ] -->
-      <div class="row no-gutters ml-3 mr-5">
-        <!-- div class="card card-flat panel-search mr-5 mb-3 ml-5" id="jss-panel" style="display: none" -->
-        <div class="panel-search mb-3" id="jss-panel" style="display: none">
-          {% if search_heading_lead %}<div class="panel-heading lead">{{ search_heading_lead }}</div>{% endif %}
-          {% if result_heading_lead %}<div class="panel-body"><p>{{ result_heading_lead }}</p></div>{% endif %}
-          <div class="search-list-group">
-            <ul id="jss-results" class="search-list-item"></ul>
-          </div>
-        </div>
+    <div id="navigator_nav_topsearch" 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">
+    	  <span id="clear-topsearch" class="form-clear form-clear-searcher d-none mt-2"><i class="mdi mdi-format-clear mdi-2x" style="color:#9E9E9E"></i></span>
+    	  <span class="input-group-addon close-search"><i class="mdi mdi-close mdi-3x" style="color:#9E9E9E"></i></span>
+    	</div>
+
+      <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ place: results container ] -->
+      <div class="search-results hide-scrollbar">
+        <section id="search-results" style="display: none"></section>
       </div>
+
+      <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ place: mustache template ] -->
+      {% raw %}
+      <script id="search-results-template" type="text/mustache">
+        <ul style="list-style: none; margin-left: .25rem; margin-right: 3.75rem">
+        {{#docs}}
+          <li>
+            <h4 class="result-item"> <a href="{{url}}" target="_blank">{{title}} · {{tagline}}</a> </h4>
+            <p class="result-item-text small text-muted mt-2 mb-0">
+              <i class="mdi mdi-calendar-blank mdi-18px mr-1"></i>{{displaydate}}
+            </p>
+            <p class="result-item-text">{{description}}</p>
+            <p class="result-item-text small text-muted mb-3">
+              <i class="mdi mdi-tag mdi-18px mr-1"></i>{{#tags}} {{.}} {{/tags}}
+              <i class="mdi mdi-tag-text-outline mdi-18px mr-1 ml-2"></i>{{#categories}} {{.}} {{/categories}}
+            </p>
+          </li>
+        {{/docs}}
+        <ul>
+      </script>
+      {% endraw %}
+
+    {% endif %}
     </div>
     <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ end processing: top search ] -->
-    {% endif %}
-
 {% endif %}