j1-template 2020.0.22 → 2020.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eff683e591b259db1cb6c69fcdc3ed344808df0b6a139e981cbfa3e6b969637
-  data.tar.gz: 1de451830f98df3fbfc41d65229b9e46f246cfa3e780963487fed8a41f8e262c
+  metadata.gz: be75a6c17cc47d3a5fae2dbde123e54fce4290e054ca7d81c0dc4e27aaaf2999
+  data.tar.gz: 9dea389c555853d67884fdf91fe7f8984b3dada8c57bdd3a456f6436a1157e71
 SHA512:
-  metadata.gz: 4553cad532648398b39aebc42503ded0d9a72b798a00ff81adff95ec786f3c7312b198c0b170dc0c83f31738e91e223aeef3eddebc2712052c4ea1edd8e33728
-  data.tar.gz: c7801ae6b8b788b8040bb36b01731daa533a748792f43b2f377a99a6f78c58cd19bcc469e3b981fb59c1d31735ccb86eadba2c93632a7779d113fefd8b590a05
+  metadata.gz: 2af9b4326bd29387947eac424bc507c5eb7619b100df0aa60221fbeec2bc034169f16872d49adc928e8f17a3ff783b8ab23749e8204f4dd1f0185c0dd0e3dc64
+  data.tar.gz: 9606fe354203585146cb6d9c86d6d31dd2572ff7ca733e0afef90fb66a7b166c9c605d0fb4debb93c88848c5d0579fbafc999087083d5d0d7bb84e3c9467f64c

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

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  # ~/_includes/themes/j1/layouts/content_generator_page.html
- # Liquid template to create the content portion for pages of type PAGE
+ # Liquid template to create the content portion for pages
  #
  # Product/Info:
  # https://jekyll.one

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

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  # ~/_includes/themes/j1/layouts/content_generator_post.html
- # Liquid template to create the content portion for pages of type POST
+ # Liquid template to create the content portion for posts
  #
  # Product/Info:
  # https://jekyll.one
@@ -33,31 +33,19 @@
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign toccer_defaults   = modules.defaults.toccer.defaults %}
-{% assign toccer_settings   = modules.toccer.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
-{% assign tocbot_enabled    = toccer_options.enabled %}
 
- {% assign rtext            = site.data.j1_config.typography.rtext %}
- {% assign page_rtext       = page.rtext %}
- {% assign page_rtext_size  = page.rtext_size %}
- {% assign page_toccer      = page.toccer %}
- {% assign page_toc         = page.toc %}
+{% assign rtext            = site.data.j1_config.typography.rtext %}
+{% assign page_rtext       = page.rtext %}
+{% assign page_rtext_size  = page.rtext_size %}
 
- {% if page_toc and tocbot_enabled %}
-   {% assign sidebar  = true %}
- {% else %}
-   {% assign sidebar  = false %}
- {% endif %}
-
- {% if rtext %}
-   {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
- {% else %}
-   {% assign rtext_size = 0 %}
- {% endif %}
+{% if rtext %}
+ {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
+{% else %}
+ {% assign rtext_size = 0 %}
+{% endif %}
 
 
 {% comment %} Main
@@ -75,149 +63,63 @@
 
   {% comment %} Blog post CONTENT
   ------------------------------------------------------------------------------ {% endcomment %}
-
-  {% if sidebar == false %}
-    <!-- FULL page - no sidebar for page toc -->
-    <div class="row">
-      <main class="r-text-{{rtext_size}} js-toc-content">
-        <!-- Include a pager at top position -->
-        {% include {{pager}} %}
-        <!-- div class="featured-headline" -->
-        <div class="post-headline mt-4">
-          <h2 class="notoc">{{ page.date | date_to_long_string }}</h2>
+  <!-- FULL page - no sidebar for page toc -->
+  <div class="row">
+    <main class="r-text-{{rtext_size}} js-toc-content">
+      <!-- Include a pager at top position -->
+      {% include {{pager}} %}
+      <!-- div class="featured-headline" -->
+      <div class="post-headline mt-4">
+        <h2 class="notoc">{{ page.date | date_to_long_string }}</h2>
+      </div>
+
+      {% comment %} Place Blog post SERIES Navigation
+      ------------------------------------------------------------------------ {% endcomment %}
+      {% if page.series %}
+      <header class="bmd-layout-header">
+        <!-- div class="navbar navbar-dark bg-primary raised-z2 mb-4" -->
+        <div class="navbar navbar-dark bg-primary raised-z2">
+          <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
+            <span class="mdi mdi-menu mdi-2x"></span>
+          </button>
+          <ul class="nav navbar-nav">
+            <li class="nav-item">
+              <span class="navbar-text">Series: {{page.series}}</span>
+            </li>
+          </ul>
         </div>
-
-        {% comment %} Place Blog post SERIES Navigation
-        ------------------------------------------------------------------------ {% endcomment %}
-        {% if page.series %}
-        <nav class="nav bmd-layout-container custom-size-350 bmd-drawer-f-l">
-
-          <header class="bmd-layout-header">
-            <!-- div class="navbar navbar-dark bg-primary raised-z2 mb-4" -->
-            <div class="navbar navbar-dark bg-primary raised-z2 mb-4">
-              <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
-                <span class="mdi mdi-menu mdi-2x"></span>
-              </button>
-              <ul class="nav navbar-nav">
-                <li class="nav-item">
-                  <span class="navbar-text">Series: {{page.series}}</span>
-                </li>
-              </ul>
-            </div>
-          </header>
-
-          <!-- Drawer content -->
-          <div id="post_navigator" class="bmd-layout-drawer bg-faded">
-            <header><a class="navbar-brand ml-3 mb-3">{{page.title}}</a></header>
-            <!--  Series Navigator -->
-            {% comment %}{% include {{create_series_header}} page=page post=post readmore=page.readmore %}{% endcomment %}
-            {% include {{create_series_header}} page=page post=post readmore=false %}
-          </div>
-        {% endif %}
-        {% comment %} END SERIES Navigation
-        ------------------------------------------------------------------------ {% endcomment %}
-
-        {% comment %} Inherit CONTENT
-        ------------------------------------------------------------------------ {% endcomment %}
-        <!-- Content placed by post_content.html -->
-        <main class="bmd-layout-content">
-        {{content}}
-
-        {% comment %} Place additional headline for comments
-        ------------------------------------------------------------------------ {% endcomment %}
-        {% if page.comments %}
-        <h2 id="comments_leave_comment"> Leave a Comment </h2>
-        {% endif %}
-        </main>
-        <!-- End Content placed by post_content.html -->
-
-      {% if page.series %}</nav>{% endif %}
-
-      </div> <!-- end col-md-12 -->
-    </div> <!-- end row -->
-  {% else %}
-    <!-- SPLIT page. Place a sidebar e.g. for the document toc -->
-    <div class="row">
-      <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
-      <main class="r-text-{{rtext_size}} js-toc-content">
-
-        <!-- Include a pager at top position -->
-        {% include {{pager}} %}
-        <div class="post-headline mt-4">
-          <h2 id="blog_article_navigator" class="notoc">{{ page.date | date_to_long_string }}</h2>
+      </header>
+
+      <nav class="nav bmd-layout-container custom-size-350 bmd-drawer-f-l">
+        <!-- Drawer content -->
+        <div id="post_navigator" class="bmd-layout-drawer bg-faded">
+          <!-- header><a class="navbar-brand ml-3 mb-3">{{page.title}}</a></header -->
+          <header><a class="navbar-brand mb-3">{{page.title}}</a></header>
+          <!--  Series Navigator -->
+          {% comment %}{% include {{create_series_header}} page=page post=post readmore=page.readmore %}{% endcomment %}
+          {% include {{create_series_header}} page=page post=post readmore=false %}
         </div>
+      {% endif %}
+      {% comment %} END SERIES Navigation
+      ------------------------------------------------------------------------ {% endcomment %}
 
-        {% comment %} Place Blog post SERIES Navigation
-        ------------------------------------------------------------------------ {% endcomment %}
-        {% if page.series %}
-        <nav class="nav bmd-layout-container custom-size-350 bmd-drawer-f-l">
-
-          <header class="bmd-layout-header">
-            <!-- div class="navbar navbar-dark bg-primary raised-z2 mb-4" -->
-            <div class="navbar navbar-dark bg-primary raised-z2 mb-4">
-              <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
-                <span class="mdi mdi-menu mdi-2x"></span>
-              </button>
-              <ul class="nav navbar-nav">
-                <li class="nav-item">
-                  <span class="navbar-text">Series: {{page.series}}</span>
-                </li>
-              </ul>
-            </div>
-          </header>
-
-          <script>
-          // See: https://jsfiddle.net/prathviraj080/vbbbw46a/1/
-          $('button.drawer-toggler').click(function(){
-            $('button.drawer-toggler span.mdi').toggleClass('mdi-menu mdi-close');
-          });
-          $('button.drawer-toggler').click(function(){
-            $('button.drawer-toggler').toggleClass('fadeIn rotateIn');
-          });
-          </script>
-
-          <!-- Drawer content -->
-          <div id="post_navigator" class="bmd-layout-drawer bg-faded">
-            <span class="navbar-brand mt-2 ml-3" style="font-weight: 500;">{{page.series|upcase}}</span>
-            <!--  Series Navigator -->
-            {% comment %}{% include {{create_series_header}} page=page post=post readmore=page.readmore %}{% endcomment %}
-            {% include {{create_series_header}} page=page post=post readmore=false %}
-          </div>
-        {% endif %}
-        {% comment %} END SERIES Navigation
-        ------------------------------------------------------------------------ {% endcomment %}
-
-        {% comment %} Inherit CONTENT
-        ------------------------------------------------------------------------ {% endcomment %}
-        <!-- Content placed by post_content.html -->
-        <main class="bmd-layout-content">
-        {{content}}
-
-        {% comment %} Place additional headline for comments
-        ------------------------------------------------------------------------ {% endcomment %}
-        {% if page.comments %}
-        <h2 id="comments_leave_comment"> Leave a Comment </h2>
-        {% endif %}
-        </main>
-        <!-- End Content placed by post_content.html -->
-
-        {% if page.series %}</nav>{% endif %}
-
-      </main> <!-- end col-md-9 -->
-
-      {% comment %} Place Sidebar|Tocbot
-      -------------------------------------------------------------------------- {% endcomment %}
-      <!-- NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" -->
-      {% comment %} tocbot and page_navigation (not used anymore)
-      --------------------------------------------------------------------------
-      <aside class="col-md-3 d-none d-md-block sticky">
-        <div id="sidebar">
-          <div id="j1-toc-mgr" class="toc js-toc"></div>
-        </div>
-      </aside>
-      -------------------------------------------------------------------------- {% endcomment %}
-    </div> <!-- end row -->
-  {% endif %} <!-- endif sidebar -->
+      {% comment %} Inherit CONTENT
+      ------------------------------------------------------------------------ {% endcomment %}
+      <!-- Content placed by post_content.html -->
+
+      {{content}}
+
+      {% comment %} Place additional headline for comments
+      ------------------------------------------------------------------------ {% endcomment %}
+      {% if page.comments %}
+      <h2 id="comments_leave_comment"> Leave a comment </h2>
+      {% endif %}
+      <!-- End Content placed by post_content.html -->
+
+    {% if page.series %}</nav>{% endif %}
+
+    </div> <!-- end col-md-12 -->
+  </div> <!-- end row -->
 
   {% comment %} END Blog post CONTENT
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -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/analytic/google-analytics.html

@@ -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/comment/disqus.html

@@ -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/navigator/generator.html

@@ -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,7 +1,7 @@
 {% 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
@@ -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 %}