j1-template 2020.0.10 → 2020.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 294ad76aaea5bb9b75bfe21b5412ca52d5f63255c80e6383d42717171b886311
-  data.tar.gz: 9ee6d60d4f040fcff8d7ed4f9e0b1b0cc3327c625e2026da898fecc520000dda
+  metadata.gz: 3c78220dd3099b55d5ede662248734bb99fdb916f2403ca5a6370f2a9de59782
+  data.tar.gz: 38693cde5a6b7ba5b5b368f77c0e422707a7e71416e90de478f8e78fe088c145
 SHA512:
-  metadata.gz: 34562865fd1e38574fbb99d55cbcab7cee3e704febe4fe410a560d7147fba85541cf33331b8755efbccf7092eb19fecf1790e59dff3080a26c8249bef63b7d23
-  data.tar.gz: 7e80771307131117aac96d63e40e08aa3c8d592fd3cc7335666568d95d4cbbe76901c383c0334c2ee86ad6453ab4824d88519d4b5e1a332debe8be59c0790d3c
+  metadata.gz: da0c957da32655a04434f6949fa321631c7f5ae47fa805b8e896ba56efba94e77ad6ef9ab2787a9d03a2681a5646a00fa47c28a05a28e44227c4e53c6369cb17
+  data.tar.gz: 8e6774d21dcd49daedcfef6b0bf171ecb47d73e0ccc05949d290137cbd2a0883eefc7c34fee698b37b1f2b9e7b666de61eb82ef0b8f5ca1985c1176b17f3897e

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/about_box.proc

@@ -34,7 +34,7 @@
 <div class="col-md-{{footer_box_width_md}}">
   <!-- div class="heading-footer"><h2 class="notoc">{{title}}</h2></div -->
   <h2 class="g-text-upper g-color-white-opacity-0_9 g-font-size-18 g-font-weight-500 g-mb-0">{{title}}</h2>
-  <p class="tagline">
+  <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>
   <div class="d-inline-block g-width-50 g-height-2 g-bg-primary g-mb-5"></div>

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

@@ -33,7 +33,7 @@
 <div class="col-md-{{footer_box_width_md}}">
   <!-- div class="heading-footer"><h2 class="notoc">{{title}}</h2></div -->
   <h2 class="g-text-upper g-color-white-opacity-0_9 g-font-size-18 g-font-weight-500 g-mb-0">{{title}}</h2>
-  <p class="tagline">
+  <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>
   <div class="d-inline-block g-width-50 g-height-2 g-bg-primary g-mb-5"></div>
@@ -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/blocks/footer/boxes/news_box.proc

@@ -40,7 +40,7 @@
 <div class="col-md-{{footer_box_width_md}}">
   <!-- div class="heading-footer"><h2 class="notoc">{{title}}</h2></div -->
   <h2 class="g-text-upper g-color-white-opacity-0_9 g-font-size-18 g-font-weight-500 g-mb-0">{{title}}</h2>
-  <p class="tagline">
+  <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>
   <div class="d-inline-block g-width-50 g-height-2 g-bg-primary g-mb-5"></div>
@@ -52,7 +52,7 @@
         {% assign posts_written = posts_written | plus:'1' %}
         <li>
           <a href="{{post.url}}">{{post.title}}</a>
-          <small>{{post.date | date: "%Y %B, %e"}}</small>
+          <small class="text-uppercase">{{post.date | date: "%Y %B, %e"}}</small>
         </li>
         {% endif %}
       {% 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

@@ -25,7 +25,6 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config       = site %}
 {% assign template_config   = site.data.template_settings %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
@@ -62,7 +61,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

@@ -24,7 +24,6 @@
 
 {% comment %} set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config       = site %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
@@ -61,7 +60,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 %}
@@ -112,26 +113,26 @@
 
 <!-- [INFO   ] [j1.page.{{page.title}}                   ] [Save the current ArticleBrowser page to UserState cookie] -->
 <!-- script>
-  var logger   = log4javascript.getLogger("j1.page.{{page.title|downcase}}.init");
-  var cookieUserState = 'j1.user.state'
-  var log_text = 'Save the current browser page ({{page.title|downcase}}) to cookie: ' +cookieUserState;
-
-  var j1_user_state = {
-    'authenticated' : 'false',
-    'cookies_accepted' : 'false',
-    'theme_css' : 'unknown',
-    'theme_extension_css' : 'unknown',
-    'theme_name' : 'unknown',
-    'last_page' : 'unknown',
-    'last_provider' : 'unknown',
-    'last_signin' : 'unknown',
-    'provider' : 'unknown',
-    'user_name' : 'unknown',
-    'user_id' : 'unknown'
-  };
-
-  // Set|Detect J1 App status
-  j1_user_state.last_page = "{{browser_page_url}}"
-  j1.setUserState( j1_user_state );
-  logger.info(log_text);
-</script -->
+        var logger   = log4javascript.getLogger("j1.page.{{page.title|downcase}}.init");
+        var cookieUserState = 'j1.user.state'
+        var log_text = 'Save the current browser page ({{page.title|downcase}}) to cookie: ' +cookieUserState;
+
+        var j1_user_state = {
+          'authenticated' : 'false',
+          'cookies_accepted' : 'false',
+          'theme_css' : 'unknown',
+          'theme_extension_css' : 'unknown',
+          'theme_name' : 'unknown',
+          'last_page' : 'unknown',
+          'last_provider' : 'unknown',
+          'last_signin' : 'unknown',
+          'provider' : 'unknown',
+          'user_name' : 'unknown',
+          'user_id' : 'unknown'
+        };
+
+        // Set|Detect J1 App status
+        j1_user_state.last_page = "{{browser_page_url}}"
+        j1.setUserState( j1_user_state );
+        logger.info(log_text);
+        </script -->

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

@@ -27,7 +27,6 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config       = site %}
 {% assign template_config   = site.data.template_settings %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
@@ -65,12 +64,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 +94,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 +149,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 +199,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,19 @@
 {% assign blocks          = site.data.blocks %}
 {% assign modules         = site.data.modules %}
 
+{% comment %} Set GLOBAL variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% case site.environment %}
+  {% when 'production' %}
+    {% assign ext_css = 'min.css' %}
+    {% assign ext_js  = 'min.js' %}
+  {% when 'prod' %}
+    {% assign ext_css = 'min.css' %}
+    {% assign ext_js  = 'min.js' %}
+  {% else %}
+    {% assign ext_css = 'css' %}
+    {% assign ext_js  = 'js' %}
+{% endcase %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -55,10 +68,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 +126,123 @@
   {% 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 %} SEO settings (optimization)
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} PRELOAD fonts
+-------------------------------------------------------------------------------- {% endcomment %}
+{% 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 ] -->
+  {% assign cors  = template_config.font.cors %}
+  {% assign fonts = template_config.font.fonts %}
+  {% 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 %}
+{% 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 ] -->
+  {% assign css   = template_config.css.css %}
+  {% assign files = template_config.css.files %}
+  {% for file in css %}
+    <link rel="preload" as="style" href="{{file}}.{{ext_css}}">
+  {% 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 %}
+{% 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 ] -->
+  {% assign js    = template_config.js.js %}
+  {% assign files = template_config.js.files %}
+  {% for file in js %}
+    <link rel="preload" as="script" href="{{file}}.{{ext_js}}">
+  {% 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 %}
+{% if template_config.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 %}
+  {% 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 %}
+
+{% comment %} Request PRECONNECT of 3rd party origins (SEO)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if template_config.preconnect.enabled %}
+  <!-- [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 ] -->
+  {% assign urls = template_config.preconnect.urls %}
+  {% 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 %}
+
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ end processing ] -->