j1-template 2021.1.14 → 2021.1.19

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 %}
@@ -75,7 +77,7 @@
         <!-- Include a pager at top position -->
         {% include {{pager}} %}
         <div class="post-headline mt-4">
-          <h2 id="blog_article_navigator" class="notoc">{{ page.title }}</h2>
+          <h1 id="blog_article_navigator" class="notoc">{{ page.title }}</h1>
         </div>
 
         <!-- [INFO   ] [j1.layout.content_generator_coll.html  ] [ start 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,54 +39,70 @@
 {% 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 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" %}
+          <h1 class="notoc">{{ page.date | localize: "%Y %B, %e" }}</h1>
+        {% endif %}
+        {% if language == "de" %}
+          <h1 class="notoc">{{ page.date | localize: "%-d. %B %Y" }}</h1>
+        {% 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 -->
         <div class="navbar navbar-dark bg-primary raised-z2 mb-3">
-          <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
+          <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator" aria-label="drawer-toggler-button">
             <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>
+              <!-- jadams, 2021-08-04: modified displaying the series name -->
+              <!-- span class="navbar-text">Series: {{page.series}}</span-->
+              <span class="navbar-text">{{page.series|upcase}}</span>
             </li>
           </ul>
         </div>
@@ -103,21 +121,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/layout_metadata_generator.html

@@ -55,6 +55,9 @@
 <!-- [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" />
 
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ added version info for the templte ] -->
+<meta name="template version" content="{{site.version}}" />
+
 {% 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" />
@@ -79,14 +82,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 %}
 
@@ -173,7 +190,7 @@
 {{robots_follow}}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: analytics ] -->
-{% if page.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 %}
@@ -182,7 +199,7 @@
 {{analytics}}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: comments ] -->
-{% if page.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 %}
@@ -191,7 +208,7 @@
 {{comments}}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: advertising ] -->
-{% if page.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 %}
@@ -199,6 +216,15 @@
 
 {{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 %}

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

@@ -114,8 +114,8 @@
             </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><span class="sr-tags">{{#tags}} {{.}} · {{/tags}}</span>
-              <i class="mdi mdi-tag-text-outline mdi-18px mr-1 ml-2"></i><span class="sr-categories">{{#categories}} {{.}} · {{/categories}}</span>
+              <i class="mdi mdi-tag-text-outline mdi-18px mr-1"></i><span class="sr-categories">{{#categories}} {{.}} · {{/categories}}</span>
+              <i class="mdi mdi-tag mdi-18px mr-1 ml-2"></i><span class="sr-tags">{{#tags}} {{.}} · {{/tags}}</span>
             </p>
           </li>
         {{/docs}}

data/_includes/themes/j1/procedures/posts/collate_timeline.proc

@@ -49,6 +49,23 @@
 {% assign posts_collate   = include.items %}
 {% assign limit_excerpt   = include.limit_excerpt %}
 
+{% comment %} language detection
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if site.language == "en" %}
+  {% assign language = "en" %}
+{% elsif site.language == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
+
+{% if language == "en" %}
+  {% assign readmore_text = "read" %}
+{% endif %}
+
+{% if language == "de" %}
+  {% assign readmore_text = "lesen" %}
+{% endif %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -60,6 +77,8 @@
     <!-- Use custom collator -->
     {% include themes/{{site.template.name}}/procedures/custom/posts_collate %}
   {% else %}
+    {% comment %} NOTE: header_title NOT used
+    ---------------------------------------------------------------------------- {% endcomment %}
     <!-- Use j1 blog timeline collator -->
     {% if header_title %}
     <div class="row timeline-header-box">
@@ -90,14 +109,14 @@
 
       <li class="{{blog_position}}">
         <div class="timeline-badge"><i class="tmicon rounded-x hidden-xs"></i></div>
-
         <div class="card raised-z5 timeline-panel">
 
+          {% comment %} jadams, 2021-08-05:
+          NOTE: Changed headerlevel form h3 -> h2
+          ---------------------------------------------------------------------- {% endcomment %}
           <!-- div class="timeline-title" -->
           <div class="card-header bg-primary pt-4 pb-3">
-            <!-- a href="{{post.url}}" -->
-              <h3 id="{{1000000 | rand}}" class="md-white">{{post.title}}</h3>
-            <!-- /a -->
+            <h2 id="{{1000000 | rand}}" class="md-white">{{post.title}}</h2>
           </div>
 
           <!-- Collect icon data from frontmatter -->
@@ -150,7 +169,7 @@
                 <a href="{{post.url}}#readmore"
                    class="btn btn-secondary btn-raised btn-flex mb-0">
                    <i class="mdi mdi-eye mdi-lg mr-1" style="color:#FFFFFF;">
-                   </i> Read · {{post.tagline}}
+                   </i> {{readmore_text}} · {{post.tagline}}
                 </a>
               </div>
             </div>
@@ -172,7 +191,7 @@
                 <a href="{{post.url}}#readmore"
                    class="btn btn-secondary btn-raised btn-flex mb-0">
                    <i class="mdi mdi-eye mdi-lg mr-1" style="color:#FFFFFF;">
-                   </i> Read · {{post.tagline}}
+                   </i> {{readmore_text}} · {{post.tagline}}
                 </a>
               </div>
             </div>
@@ -196,11 +215,16 @@
               {% assign comment_count = sharing.comment_count %}
             {% endfor %}
 
-            <div class="card-footer r-text-200 text-lowercase">
+            <div class="card-footer r-text-200">
               <hr class="my-3">
               <div class="card-footer-text">
                 {% if post.date %}
-                <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i> {{post.date | date: "%Y %B, %e"}}
+                  {% if language == "en" %}
+                    <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
+                  {% endif %}
+                  {% if language == "de" %}
+                    <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
+                  {% endif %}
                 {% endif %}
                 {% if likes_count %}
                 <span class="font-weight-bold"> · </span>
@@ -213,7 +237,7 @@
               </div>
               <a class="card-link text-muted text-lowercase"
                 href="{{post.url}}#readmore">
-                Read · {{post.tagline}}
+                {{readmore_text}} · {{post.tagline}}
               </a>
             </div>
           {% endif %}

data/_includes/themes/j1/procedures/posts/create_series_header.proc

@@ -59,7 +59,7 @@
      <div class="row">
        <!-- div class="col-xs-12 col-md-12 col-lg-12 mb-4" -->
        <div class="">
-         <h5 id="blog_series_list" class="notoc mt-2 mr-2 mb-4">This article is <strong>part <<idx>> </strong> in a <strong><<count>>-part</strong> series:</h5>
+         <h4 id="blog_series_list" class="notoc mt-2 mr-2 mb-4">This article is <strong>part <<idx>> </strong> in a <strong><<count>>-part</strong> series:</h4>
          <ul class="side-nav">
  {% endcapture %}
          {% for post in site.posts reversed %}

data/_includes/themes/j1/procedures/posts/pager.proc

@@ -0,0 +1,123 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/_includes/themes/j1/procedures/posts/pager.proc
+ # HTML/Liquid procedure to create a pager for content of type "post|collection"
+ #
+ # Product/Info:
+ # http://jekyll.one
+ #
+ # 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
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ #    This pager reads the "page path" from cookie "cookieUserState". This
+ #    data is used to return from a previous (page builder) page.
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #    liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% 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 %}
+{% assign blog_navigator_defaults       = builder.defaults.blog_navigator.defaults %}
+{% assign blog_navigator_settings       = builder.blog_navigator.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign blog_navigator_options        = blog_navigator_defaults | merge: blog_navigator_settings %}
+
+
+{% comment %} Language detection
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if {{site.language}} == "en" %}
+  {% assign language = "en" %}
+{% elsif  {{site.language}} == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
+
+{% comment %} Set language specific button text
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if language == "en" %}
+  {% assign pager_previous_button_text  = blog_navigator_options.button_text.pager.previous.en %}
+  {% assign pager_next_button_text      = blog_navigator_options.button_text.pager.next.en %}
+  {% assign pager_back_button_text      = blog_navigator_options.button_text.pager.back.en %}
+  {% assign pager_first_button_text     = blog_navigator_options.button_text.pager.first.en %}
+  {% assign pager_last_button_text      = blog_navigator_options.button_text.pager.last.en %}
+{% endif %}
+
+{% if language == "de" %}
+  {% assign pager_previous_button_text  = blog_navigator_options.button_text.pager.previous.de %}
+  {% assign pager_next_button_text      = blog_navigator_options.button_text.pager.next.de %}
+  {% assign pager_back_button_text      = blog_navigator_options.button_text.pager.back.de %}
+  {% assign pager_first_button_text     = blog_navigator_options.button_text.pager.first.de %}
+  {% assign pager_last_button_text      = blog_navigator_options.button_text.pager.last.de %}
+{% endif %}
+
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<div class="paginator">
+  <ul class="pagination raised-z0">
+
+    {% comment %} Set PREVIOUS page
+    ---------------------------------------------------------------------------- {% endcomment %}
+    {% if page.previous %}
+      <li class="page-item"><a class="page-link" href="{{base_path}}{{page.previous.url}}" title="{{page.previous.title}}">{{pager_previous_button_text}}</a></li>
+    {% else %}
+      <li class="page-item disabled"><a class="page-link">{{pager_first_button_text}}</a></li>
+    {% endif %}
+
+    {% comment %} Set BACK page (PagerURL)
+    ---------------------------------------------------------------------------- {% endcomment %}
+    <!-- [INFO   ] [procedures.global.pager.proc          ] [Manage the current pager settings for: {{builder_path}}] -->
+    <script>
+      var cookie_names           = j1.getCookieNames();
+      var user_state_cookie_name = cookie_names.user_session;
+      var user_state             = j1.readCookie(user_state_cookie_name);
+      var re                     = new RegExp('navigator|dateview|tagview|archive');
+      var last_pager             = user_state.last_pager;
+      var last_pager_url;
+
+      <!-- [INFO   ] [procedures.global.pager.proc          ] [Calculate BackURL from User State Cookie for page: {{page.title}}] -->
+      if (re.test(last_pager)) {
+        last_pager_url = '<li class="page-item"><a class="page-link" href="' + last_pager + '" title="Back to Top Page">{{pager_back_button_text}}</a></li>';
+      } else {
+        last_pager_url = '<li class="page-item disabled"><a class="page-link" title="Back to Top Page">{{pager_back_button_text}}</a></li>';
+      }
+      document.write( last_pager_url );
+      j1.writeCookie({
+        name: user_state_cookie_name,
+        data: user_state
+      });
+    </script>
+
+    {% comment %} Set NEXT page
+    ---------------------------------------------------------------------------- {% endcomment %}
+    {% if page.next %}
+      <li class="page-item"><a class="page-link" href="{{base_path}}{{page.next.url}}" title="{{page.next.title}}">{{pager_next_button_text}}</a></li>
+    {% else %}
+      <li class="page-item disabled"><a class="page-link" href="#">{{pager_last_button_text}}</a></li>
+    {% endif %}
+
+  </ul>
+</div>