j1-template 2020.0.7 → 2020.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '095207380a145093c8fbe903942eacceb0bd4333476ea9395ae450a027f056cd'
-  data.tar.gz: d21ff43668b4a179479c81946672fd0f833b09e4a6907681c814b4cd1e79f3bb
+  metadata.gz: 1b32adf2cd43110496da2e84086973c46969b8cfac73aa1ac0cb6dedaa7b4b8c
+  data.tar.gz: cc7efc7cc774c5e416b21ae5f5030f82f145f0c11ccb7aa5fcb1ae2bb626e093
 SHA512:
-  metadata.gz: 40654099ca6b8e23a094ad8498cf9e1324d813bb0860f3cea692a7c6084ed48e0fc7ec811e0fe8f6fa4ff6d793df501279b4fb6b8fd0497c431c9ed64423d6f0
-  data.tar.gz: 38e401439fca8ab1323e32e846b61fbb4af12929a7d5671eb914bc8e699e0db112ab91bc35ec09b53e9ec0add87365f4d7b07f961bf48803501681c1de0cb6c9
+  metadata.gz: 63036078c4a2bef76cf0785ca1eb6b9358c66f551c13522607ed671707ff3efc79ab4e02122557ec260cf07137a97259728fef0f981e78ffdb978873209faf09
+  data.tar.gz: 5db38ecfd7a12aae51d62a68ec020e6765503bb7cbffea54f57907cbde3c11996824aa2d1a9ee786ce9eafebd166427c351e2c001bfab5b074f4351c31f3b0d6

data/_includes/themes/j1/blocks/ads/ad.html

@@ -0,0 +1,64 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ #  ~/_includes/themes/j1/blocks/ad.html
+ #  Liquid PROCEDURE template to create an advertising block                    for Advertising
+ #
+ #  Product/Info:
+ #  http://jekyll.one
+ #
+ #  Copyright (C) 2020 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 %}
+{% assign advertising           = site.data.template_settings.advertising.enabled %}
+{% assign advertising_provider  = site.data.template_settings.advertising.provider %}
+
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.blocks.ad.html                     ] [ detected advertising (page): {{page.advertising}}} ] -->
+<!-- [INFO   ] [j1.blocks.ad.html                     ] [ detected advertising (provider): {{advertising_provider}}} ] -->
+<!-- [INFO   ] [j1.blocks.ad.html                     ] [ start processing load region body, layout: {{page.layout}} ] -->
+
+{% if advertising and page.advertising %}
+
+  {% case advertising_provider %}
+    {% when "google" %}
+      <!-- [INFO   ] [j1.blocks.ad.html                     ] [ place advertising block for provider: Google ] -->
+    <div id="adblock" class="advertising mb-3">
+      <div class="advertising mb-3">
+        <button type="button" class="btn btn-primary btn-raised">Primary</button>
+        <button type="button" class="btn btn-secondary btn-raised">Secondary</button>
+        <button type="button" class="btn btn-success btn-raised">Success</button>
+        <button type="button" class="btn btn-info btn-raised">Info</button>
+        <button type="button" class="btn btn-warning btn-raised">Warning</button>
+        <button type="button" class="btn btn-danger btn-raised">Danger</button>
+        <button type="button" class="btn btn-link btn-raised">Link</button>
+      </div>
+    </div>
+    {% when "custom" %}
+      <!-- [INFO   ] [j1.blocks.ad.html                     ] [ place advertising block for provider: Custom ] -->
+      <div id="adblock" class="advertising mb-3">
+        <button type="button" class="btn btn-primary btn-raised">Primary</button>
+        <button type="button" class="btn btn-secondary btn-raised">Secondary</button>
+        <button type="button" class="btn btn-success btn-raised">Success</button>
+        <button type="button" class="btn btn-info btn-raised">Info</button>
+        <button type="button" class="btn btn-warning btn-raised">Warning</button>
+        <button type="button" class="btn btn-danger btn-raised">Danger</button>
+        <button type="button" class="btn btn-link btn-raised">Link</button>
+      </div>
+  {% endcase %}
+
+{% endif %}
+<!-- [INFO   ] [j1.blocks.ad.html                     ] [ end processing ] -->

data/_includes/themes/j1/blocks/footer/boxes/links_box.proc

@@ -42,7 +42,7 @@
     {% for property in links %}
       {% comment %} <!-- proc - property.link: {{ property.link }} --> {% endcomment %}
       <li>
-        <a href="{{property.link.href}}" target="_blank">{{property.link.title}}</a>
+        <a href="{{property.link.href}}" target="_blank" rel="noopener noreferrer">{{property.link.title}}</a>
         <div style="color: #555;"><small>{{property.link.tagline}}</small></div>
       </li>
     {% endfor %}

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

@@ -23,7 +23,6 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture get_page_path %}themes/{{site.template.name}}/procedures/global/get_page_path.proc{% endcapture %}
 {% capture collate_list %}themes/{{site.template.name}}/procedures/posts/collate_list.proc{% endcapture %}
-{% capture collate_calendar %}themes/{{site.template.name}}/procedures/posts/collate_calendar.proc{% endcapture %}
 {% capture collate_timeline %}themes/{{site.template.name}}/procedures/posts/collate_timeline.proc{% endcapture %}
 {% capture create_navigator %}themes/{{site.template.name}}/procedures/posts/create_navigator.proc{% endcapture %}
 
@@ -67,7 +66,9 @@
 -------------------------------------------------------------------------------- {% endcomment %}
   <!-- [INFO   ] [j1.layout.content_generator_blog.html  ] [Begin content] -->
   <!-- split page to place a sidebar e.g. the document TOC -->
-  <div class="container mr-5 mb-5">
+  <!-- no sidebar, mr-* disabled -->
+  <!-- div class="container mr-5 mb-5" -->
+  <div class="container mb-5">
     <div class="row">
 
       <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->

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

@@ -62,7 +62,9 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
   <!-- [INFO   ] [j1.layout.content_generator_coll.html  ] [ begin content ] -->
-  <div class="container mr-5 mb-5">
+  <!-- div class="container mr-5 mb-5" -->
+  <!-- no sidebar, mr-* disabled -->
+  <div class="container mb-5">
     <div class="row">
 
     {% comment %} COLLECTION content

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

@@ -61,7 +61,9 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ begin content ] -->
-<div class="container mr-5 mb-5">
+<!-- div class="container mr-5 mb-5" -->
+<!-- no sidebar, mr-* disabled -->
+  <div class="container mb-5">
   <div class="row">
 
     {% if sidebar == false %}

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

@@ -65,12 +65,15 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.layout.content_generator_post.html ] [ begin content ] -->
 {% if page.comments %}
-  <div class="container mr-5 mb-0">
+  <!-- div class="container mr-5 mb-0" -->
+  <!-- no sidebar, mr-* disabled -->
+  <div class="container mb-0">
 {% else %}
-  <div class="container mr-5 mb-5"> <!-- Add additional space between end of article and the footer -->
+  <!-- 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 -->
 {% endif %}
 
-
   {% comment %} Blog post CONTENT
   ------------------------------------------------------------------------------ {% endcomment %}
 
@@ -92,13 +95,12 @@
 
           <header class="bmd-layout-header">
             <div class="navbar navbar-dark bg-primary raised-z2 mb-4">
-              <button class="bmd-drawer navbar-toggler" type="button" data-toggle="drawer" data-target="#post_navigator">
-                <span class="sr-only">Toggle drawer</span>
-                <i class="mdi mdi-menu mdi-2x"></i>
+              <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 Navigator</span>
+                  <span class="navbar-text">Series: {{page.series}}</span>
                 </li>
               </ul>
             </div>
@@ -148,17 +150,16 @@
         {% comment %} Place Blog post SERIES Navigation
         ------------------------------------------------------------------------ {% endcomment %}
         {% if page.series %}
-        <div class="nav bmd-layout-container custom-size-350 bmd-drawer-f-l">
+        <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">
               <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
-                <span class="sr-only">Toggle drawer</span>
                 <span class="mdi mdi-menu mdi-2x"></span>
               </button>
               <ul class="nav navbar-nav">
                 <li class="nav-item">
-                  <span class="navbar-text">Series Navigator: {{page.series}}</span>
+                  <span class="navbar-text">Series: {{page.series}}</span>
                 </li>
               </ul>
             </div>
@@ -199,7 +200,7 @@
         </main>
         <!-- End Content placed by post_content.html -->
 
-        {% if page.series %}</div>{% endif %}
+        {% if page.series %}</nav>{% endif %}
 
       </main> <!-- end col-md-9 -->
 

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

@@ -28,6 +28,9 @@
 {% assign blocks          = site.data.blocks %}
 {% assign modules         = site.data.modules %}
 
+{% comment %} Set GLOBAL variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment         = site.environment %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -55,10 +58,24 @@
 
 {% if page.layout == 'home' %}
   {% if site.description %}
+    {% assign size = site.description|size %}
+    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ SIZE of site description: {{size}} chars ] -->
+    {% if size >= 70 %}
+    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Gratulations! Your site description has more than 70 chars. Recommended: 70-160 characters ] -->
+    {% 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}}">
   {% endif %}
 {% else %}
   {% if page.description %}
+    {% 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  ) ] -->
+    {% else %}
+    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider!  to IMPROVE|INCREASE your page description ] -->
+    {% endif %}
     <meta name="description" content="{{page.description}}">
   {% endif %}
 {% endif %}
@@ -99,20 +116,140 @@
   {% endif %}
 {% endif %}
 
-{% if site.robots.index != true %}
+{% comment %} site check DISABLED
+--------------------------------------------------------------------------------
+{% if site.robots.index %}
+  <meta name="robots" content="index">
+{% else %}
   <meta name="robots" content="noindex">
 {% endif %}
 
-{% if site.robots.follow != true %}
+{% if site.robots.follow %}
+  <meta name="robots" content="follow">
+{% else %}
   <meta name="robots" content="nofollow">
 {% endif %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
-{% if page.robots.index != 'true' %}
+{% comment %} Check robot settings from page (or default SCOPE)
+NOTE: for layout home (home page, the keys are to be set!!!)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if page.robots.index %}
+  <meta name="robots" content="index">
+{% else %}
   <meta name="robots" content="noindex">
 {% endif %}
 
-{% if page.robots.follow != 'true' %}
+{% if page.robots.follow %}
+  <meta name="robots" content="follow">
+{% else %}
   <meta name="robots" content="nofollow">
 {% endif %}
 
+
+{% comment %} Request PRELOAD of primary resources to prioritize fetching (SEO)
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} PRELOAD fonts
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign cors  = template_config.font.cors %}
+{% assign fonts = template_config.font.fonts %}
+
+{% if template_config.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 ] -->
+{% for font in fonts %}
+  <link rel="preload" as="font" href="{{font}}" {{cors}}>
+{% endfor %}
+{% else %}
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of fonts: disabled ] -->
+  <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider! PRELOAD primary used fonts to prioritize fetching ] -->
+{% endif %}
+
+{% comment %} PRELOAD CSS files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign css   = template_config.css.css %}
+{% assign files = template_config.css.files %}
+{% if template_config.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 ] -->
+  {% for file in css %}
+  {% if environment == 'development' or environment == 'test' %}
+    {% assign ext = "css" %}
+  {% elsif if environment == 'production' or environment == 'test' %}
+    {% assign ext = "min.css" %}
+  {% else %}
+    {% assign ext = "css" %}
+  {% endif %}
+    <link rel="preload" as="style" href="{{file}}.{{ext}}">
+  {% endfor %}
+
+  {% for file in files %}
+    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD css as FILE ] -->
+    <link rel="preload" as="style" href="{{file}}">
+  {% endfor %}
+{% else %}
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of css: disabled ] -->
+  <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider! PRELOAD primary used css files to prioritize fetching ] -->
+{% endif %}
+
+{% comment %} PRELOAD JS files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign js    = template_config.js.js %}
+{% assign files = template_config.js.files %}
+{% if template_config.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 ] -->
+  {% for file in js %}
+  {% if environment == 'development' or environment == 'test' %}
+    {% assign ext = "js" %}
+  {% elsif if environment == 'production' or environment == 'test' %}
+    {% assign ext = "min.js" %}
+  {% else %}
+    {% assign ext = "js" %}
+  {% endif %}
+    <link rel="preload" as="script" href="{{file}}.{{ext}}">
+  {% endfor %}
+
+  {% for file in files %}
+    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD js as FILE ] -->
+    <link rel="preload" as="script" href="{{file}}">
+  {% endfor %}
+{% else %}
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of js: disabled ] -->
+  <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider! PRELOAD primary used js files to prioritize fetching ] -->
+{% endif %}
+
+{% comment %} PRELOAD image files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign files = template_config.image.files %}
+  <!-- [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 ] -->
+{% if template_config.image.preload %}
+  {% for file in files %}
+    <link rel="preload" as="image" href="{{file}}">
+  {% endfor %}
+{% else %}
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of images: disabled ] -->
+  <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider! PRELOAD primary|globally used image files to prioritize fetching ] -->
+{% endif %}
+
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ end processing ] -->
+
+
+{% comment %} Request PRECONNECT of 3rd party origins (SEO)
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% assign urls = template_config.preconnect.urls %}
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Gratulations! PRECONNECT of remote URLs: enabled ] -->
+  <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ request PRECONNECT of 3rd party origins to speed up remote connections ] -->
+{% if template_config.preconnect.enabled %}
+  {% 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}}">
+  {% endfor %}
+{% else %}
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRECONNECT remote URLs: disabled ] -->
+  <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider! PRECONNECT 3rd party origins to establish early connections ] -->
+{% endif %}

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

@@ -17,17 +17,14 @@
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
-
+-------------------------------------------------------------------------------- {% endcomment %}
 
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
-
-<!-- Your code for the custom provider goes here -->
-
-
-
+-------------------------------------------------------------------------------- {% endcomment %}
+<script>
+  /* Your code for the custom provider goes here */
+</script>

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

@@ -17,15 +17,20 @@
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign publisher_id = site.data.template_settings.advertising.google.publisher_id %}
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
+<script data-ad-client="{{publisher_id}}"
+    async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
+</script>
+
+{% comment %} Old Ads code
 <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 <script>
   (adsbygoogle = window.adsbygoogle || []).push({
@@ -33,6 +38,4 @@
     enable_page_level_ads: true
   });
 </script>
-
-
-
+-------------------------------------------------------------------------------- {% endcomment %}

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

@@ -36,15 +36,12 @@
 
   {% case advertising_provider %}
     {% when "google" %}
-      <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place Google Adsense ] -->
+      <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place provider: Google Adsense ] -->
       {% include themes/{{site.template.name}}/modules/connectors/ad/google-adsense.html %}
     {% when "custom" %}
-      <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place Custom Provider ] -->
-      {% include themes/{{site.template.name}}/modules/connectors/analytic/custom-analytics.html %}
+      <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place provider: Custom Provider ] -->
+      {% include themes/{{site.template.name}}/modules/connectors/ad/custom-provider.html %}
   {% endcase %}
 
 {% endif %}
 <!-- [INFO   ] [j1.modules.connectors.ads             ] [ end processing ] -->
-          
-
-