j1-template 2021.1.12 → 2021.1.17

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

@@ -18,7 +18,7 @@
 
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
-{% capture pager %}themes/{{site.template.name}}/procedures/global/pager.proc{% endcapture %}
+{% capture pager %}themes/{{site.template.name}}/procedures/posts/pager.proc{% endcapture %}
 
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
@@ -39,6 +39,8 @@
 {% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
 {% assign tocbot_enabled    = toccer_options.enabled %}
 
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign rtext             = template_config.typography.rtext %}
 {% assign page_rtext        = page.rtext %}
 {% assign page_rtext_size   = page.rtext_size %}
@@ -70,7 +72,7 @@
     ---------------------------------------------------------------------------- {% endcomment %}
     {% if sidebar == false %}
       <!-- FULL page - no sidebar for page toc -->
-      <main class="r-text-{{rtext_size}} js-toc-content">
+      <main id="main-content" class="r-text-{{rtext_size}} js-toc-content">
 
         <!-- Include a pager at top position -->
         {% include {{pager}} %}

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

@@ -30,6 +30,8 @@
 {% comment %} set config data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign template_config   = site.data.j1_config %}
+{% assign comments          = site.data.j1_config.comments.enabled %}
+
 
 {% comment %} set config options
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -45,10 +47,11 @@
   {% assign rtext_size = 0 %}
 {% endif %}
 
+
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ start main for full page ] -->
-<main class="r-text-{{rtext_size}} js-toc-content">
+<main id="main-content" class="r-text-{{rtext_size}} js-toc-content">
   <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ begin place content ] -->
   {{content}}
   <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ end place content ] -->

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

@@ -20,7 +20,7 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture create_series_header %}themes/{{site.template.name}}/procedures/posts/create_series_header.proc{% endcapture %}
 {% capture create_ad_block %}themes/{{site.template.name}}/procedures/posts/create_ad_block.proc{% endcapture %}
-{% capture pager %}themes/{{site.template.name}}/procedures/global/pager.proc{% endcapture %}
+{% capture pager %}themes/{{site.template.name}}/procedures/posts/pager.proc{% endcapture %}
 
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
@@ -30,6 +30,8 @@
 {% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
+{% assign builder           = site.data.builder %}
+{% assign plugins           = site.data.plugins %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -37,44 +39,58 @@
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% assign rtext            = site.data.j1_config.typography.rtext %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign rtext            = template_config.typography.rtext %}
 {% assign page_rtext       = page.rtext %}
 {% assign page_rtext_size  = page.rtext_size %}
 
 {% if rtext %}
- {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
+ {% assign rtext_size = template_config.typography.rtext_size %}
 {% else %}
  {% assign rtext_size = 0 %}
 {% endif %}
 
+{% comment %} language detection
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if site.language == "en" %}
+  {% assign language = "en" %}
+{% elsif site.language == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.layout.content_generator_post.html ] [ begin content ] -->
 {% if page.comments %}
-  <!-- div class="container mr-5 mb-0" -->
-  <!-- no sidebar, mr-* disabled -->
+  <!-- No space between set if comments enabled -->
   <div class="container mb-0">
 {% else %}
-  <!-- div class="container mr-5 mb-5" -->
-  <!-- no sidebar, mr-* disabled -->
-  <div class="container mb-5"> <!-- Add additional space between end of article and the footer -->
+  <!-- Add additional space between end of article and the footer -->
+  <div class="container mb-5">
 {% endif %}
 
   {% comment %} Blog post CONTENT
   ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- FULL page - no sidebar for page toc -->
+  <!-- Blog post CONTENT -->
   <div class="row">
-    <main class="r-text-{{rtext_size}} js-toc-content">
+    <main id="main-content" 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>
+        {% if language == "en" %}
+          <h2 class="notoc">{{ page.date | localize: "%Y %B, %e" }}</h2>
+        {% endif %}
+        {% if language == "de" %}
+          <h2 class="notoc">{{ page.date | localize: "%-d. %B %Y" }}</h2>
+        {% endif %}
       </div>
 
       {% comment %} Place Blog post SERIES Navigation
-      ------------------------------------------------------------------------ {% endcomment %}
+      -------------------------------------------------------------------------- {% endcomment %}
       {% if page.series %}
       <header class="bmd-layout-header">
         <!-- jadams, 2021-02-28 added mb-3 to the navbar -->
@@ -103,21 +119,13 @@
         </div>
       {% endif %}
       {% comment %} END SERIES Navigation
-      ------------------------------------------------------------------------ {% endcomment %}
+      -------------------------------------------------------------------------- {% endcomment %}
 
       {% comment %} Inherit CONTENT
-      ------------------------------------------------------------------------ {% endcomment %}
+      -------------------------------------------------------------------------- {% 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 -->

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

@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.layout.content_generator_raw.html  ] [ begin content ] -->
 <!-- main id="raw-content" class="col-md-12" style="padding-left:60px;padding-right:60px;" -->
-<main id="raw-content" class="col-md-12">
+<main id="main-content" id="raw-content" class="col-md-12">
   {{content}}
 </main>
 <!-- [INFO   ] [j1.layout.content_generator_raw.html  ] [ end content] -->

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

@@ -79,14 +79,28 @@
   {% endif %}
 {% else %}
   {% if page.description %}
+    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ detected content type: PAGE ] -->
     {% assign size = site.description|size %}
-    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ SIZE of page description: {{size}} ] -->
-    {% if size >= 15 %}
-    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ GRATULATIONS. Your page description has more than 15 word. (Recommended: 70-160 characters  ) ] -->
+    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ SIZE of page description: {{size}} chars ] -->
+    {% if size >= 70 %}
+    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ GRATULATIONS. Your page description has more than 70 characters. (Recommended: 70-160 characters) ] -->
     {% else %}
-    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider!  to IMPROVE|INCREASE your page description ] -->
+    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider to IMPROVE|INCREASE your page description! ] -->
     {% endif %}
     <meta name="description" content="{{page.description}}" />
+  {% elsif page.excerpt %}
+    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ detected content type: POST ] -->
+    {% assign size = page.excerpt|size %}
+    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ SIZE of page exerpt: {{size}} chars ] -->
+    {% if size >= 70 %}
+    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ GRATULATIONS. Your page description (exerpt) has more than 70 characters. (Recommended: 70-160 characters) ] -->
+    {% else %}
+    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider to IMPROVE|INCREASE your post excerpt for a valid page description! ] -->
+    {% endif %}
+    <meta name="description" content="{{page.excerpt|strip_html}}" />
+  {% else %}
+    <!-- [WARNING] [j1.layout.meta_data_generator.html    ] [ NO page description detected ] -->
+    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider to add a page description! ] -->
   {% endif %}
 {% endif %}
 
@@ -172,6 +186,70 @@
 {{robots_index}}
 {{robots_follow}}
 
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: analytics ] -->
+{% if page.analytics and site.data.j1_config.analytics.enabled %}
+  {% capture analytics %}<meta name="analytics" content="true" />{% endcapture %}
+{% else %}
+  {% capture analytics %}<meta name="analytics" content="false" />{% endcapture %}
+{% endif %}
+
+{{analytics}}
+
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: comments ] -->
+{% if page.comments and site.data.j1_config.comments.enabled %}
+  {% capture comments %}<meta name="comments" content="true" />{% endcapture %}
+{% else %}
+  {% capture comments %}<meta name="comments" content="false" />{% endcapture %}
+{% endif %}
+
+{{comments}}
+
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: advertising ] -->
+{% if page.advertising and site.data.j1_config.advertising.enabled %}
+  {% capture advertising %}<meta name="advertising" content="true" />{% endcapture %}
+{% else %}
+  {% capture advertising %}<meta name="advertising" content="false" />{% endcapture %}
+{% endif %}
+
+{{advertising}}
+
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: advertising ] -->
+{% if page.translation and site.data.j1_config.translation.enabled %}
+  {% capture translation %}<meta name="translation" content="true" />{% endcapture %}
+{% else %}
+  {% capture translation %}<meta name="translation" content="false" />{% endcapture %}
+{% endif %}
+
+{{translation}}
+
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: youtube ] -->
+{% if page.youtube %}
+  {% capture youtube %}<meta name="youtube" content="true" />{% endcapture %}
+{% else %}
+  {% capture youtube %}<meta name="youtube" content="false" />{% endcapture %}
+{% endif %}
+
+{{youtube}}
+
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: vimeo ] -->
+{% if page.vimeo %}
+  {% capture vimeo %}<meta name="vimeo" content="true" />{% endcapture %}
+{% else %}
+  {% capture vimeo %}<meta name="vimeo" content="false" />{% endcapture %}
+{% endif %}
+
+{{vimeo}}
+
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for privacy settings: personalization ] -->
+{% if page.personalization %}
+  {% capture personalization %}<meta name="personalization" content="true" />{% endcapture %}
+{% else %}
+  {% capture personalization %}<meta name="personalization" content="false" />{% endcapture %}
+{% endif %}
+
+{{personalization}}
+
+
 {% comment %} SEO settings (optimization)
 -------------------------------------------------------------------------------- {% endcomment %}
 

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

@@ -0,0 +1,31 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/_includes/themes/j1/modules/connectors/comments/commento.html
+ # Support of commento comment provider for J1 Template
+ #
+ # Product/Info:
+ # https://jekyll.one
+ # https://commento.io/
+ #
+ # 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
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+
+
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<!-- Your code for the custom provider goes here -->

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

@@ -1,15 +1,15 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/modules/connectors/comments/custom-provider.html
- #  Support of custom comment provider for J1 Template
+ # ~/_includes/themes/j1/modules/connectors/comments/custom-provider.html
+ # Support of custom comment provider for J1 Template
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2021 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
  # Test data:
  #  liquid_var:  {{ liquid_var | debug }}
@@ -28,4 +28,3 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 
 <!-- Your code for the custom provider goes here -->
-

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

@@ -1,15 +1,15 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/modules/connectors/comments/disqus.html
- #  Support of comment provider DISQUS for J1 Template
+ # ~/_includes/themes/j1/modules/connectors/comments/disqus.html
+ # Support of comment provider DISQUS for J1 Template
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2021 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
  # Test data:
  #  liquid_var:  {{ liquid_var | debug }}
@@ -21,54 +21,12 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign disqus_short_name = site.data.j1_config.comments.disqus.short_name %}
 
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-
-<div id="disqus" class="container mb-5">
-
-  <div id="disqus_thread" class="disqus-thread">
-    <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>
-
-  <script id="dsq-count-scr" src="//{{disqus_short_name}}.disqus.com/count.js" async></script>
-
-</div>
+<!-- [INFO   ] [j1.modules.connectors.disqus          ] [ place the thread container: start ] -->
+<div id="disqus_thread"></div>
+<!-- [INFO   ] [j1.modules.connectors.disqus          ] [ connector depends on the cookie consent (personalization) ] -->
+<!-- [INFO   ] [j1.modules.connectors.disqus          ] [ connector (dynamic) JS is enabled/disabled on OptIn/Out ] -->
+<!-- [INFO   ] [j1.modules.connectors.disqus          ] [ place the thread container: end ] -->

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

@@ -1,15 +1,15 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/modules/connectors/comments/custom-provider.html
- #  Support of comment provider Facebookfor J1 Template
+ # ~/_includes/themes/j1/modules/connectors/comments/custom-provider.html
+ # Support of comment provider Facebook for J1 Template
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2021 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
  # Test data:
  #  liquid_var:  {{ liquid_var | debug }}
@@ -28,4 +28,3 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 
 <!-- Your code for the custom provider goes here -->
-