j1-template 2022.6.2 → 2022.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 380a547d5e6a15a8e7976ffc6e243aab1418607f4a35cd996bb7312e7cfd79e8
-  data.tar.gz: 523006d72d3dbfe38a7198c422640fe98de5418fd0d75528d7ebc2bdda0454fe
+  metadata.gz: c79e4445c1cbe98819c8be385539ca774749da8c900fa6520d818e050db2a7e9
+  data.tar.gz: ce639845939d491ef047db8b9abbe25d0a75dbb3fd401e13d255681700ce44b1
 SHA512:
-  metadata.gz: a31064dccd6c8b534b27cb2c4559108c30d6ddc206fcb8d6db154e0e4edae602de8db74e81b41c22304138de868bb3c97e099528411f1767b2326e72a5abdf89
-  data.tar.gz: c7c5b6d0657e5e939c3e38dae202f11a238229075306f777eb965c369c9692af8d8ce16dd298b86d66cb3223434a6dad67e5bba3a97f8703651fd732924b6556
+  metadata.gz: 6024a8c78414a7f59f66ccbb913614b1834fefa5cf4dc3a86efabab30cd7c8c7cb61d132e9e8faa2f54897d6e73455810d703e00428d459bc7f0ba000a31aa8b
+  data.tar.gz: 37e1e309978486db8d046ac91b04006b7194e912c2e80db990d1a9bdf8c9bdabbf80a6279c119ff9b17bac2940e592b733dec00206d102c30067b61236cb7d9f

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

@@ -294,10 +294,10 @@
                       <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ place post image ] -->
                       {% if post.image %}
                         {% if post.image.path %}
-                          <img class="img-fluid img-object--cover g-height-200" src="{{post.image.path}}" alt="{{post.title}}" style="{{image_filters}};">
+                          <img class="img-fluid img-object--cover g-height-300" src="{{post.image.path}}" alt="{{post.title}}" style="{{image_filters}};">
                         {% assign post_width = '80x' %}
                         {% else %}
-                          <img class="img-fluid img-object--cover g-height-200" src="{{post.image}}" alt="{{post.title}}" style="{{image_filters}};">
+                          <img class="img-fluid img-object--cover g-height-300" src="{{post.image}}" alt="{{post.title}}" style="{{image_filters}};">
                         {% assign post_width = '80x' %}
                         {% endif %}
                       {% else %}
@@ -366,10 +366,10 @@
                       <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ place post image ] -->
                       {% if post.image %}
                         {% if post.image.path %}
-                          <img class="img-fluid img-object--cover g-height-200" src="{{post.image.path}}" alt="{{post.title}}" style="{{image_filters}};">
+                          <img class="img-fluid img-object--cover g-height-300" src="{{post.image.path}}" alt="{{post.title}}" style="{{image_filters}};">
                         {% assign post_width = '80x' %}
                         {% else %}
-                          <img class="img-fluid img-object--cover g-height-200" src="{{post.image}}" alt="{{post.title}}" style="{{image_filters}};">
+                          <img class="img-fluid img-object--cover g-height-300" src="{{post.image}}" alt="{{post.title}}" style="{{image_filters}};">
                         {% assign post_width = '80x' %}
                         {% endif %}
                       {% else %}

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

@@ -24,12 +24,25 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config = site.data.j1_config %}
-{% assign blocks          = site.data.blocks %}
-{% assign modules         = site.data.modules %}
+{% assign template_config   = site.data.j1_config %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+{% assign plugins           = site.data.plugins %}
 
-{% comment %} Set GLOBAL variables
+{% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign seo_tag_defaults  = plugins.defaults.seo-tags.defaults %}
+{% assign seo_tag_settings  = plugins.seo-tags.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign seo_tag_options   = seo_tag_defaults | merge: seo_tag_settings %}
+
+{% comment %} initialize global variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign template_version  = site.version %}
+
 {% case site.environment %}
   {% when 'production' %}
     {% assign ext_css = 'min.css' %}
@@ -185,15 +198,15 @@
 {{personalization}}
 
 
-{% comment %} SEO Optimization
+{% comment %} J1 SEO processing
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ start SEO Optimization ] -->
+<!-- [INFO  ] [j1.layout.meta_data_generator.html    ] [ start SEO Optimization ] -->
 
 {% comment %} PRELOAD fonts
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if template_config.preload.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 ] -->
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of font to prioritize fetching ] -->
   {% assign cors  = template_config.preload.font.cors %}
   {% assign fonts = template_config.preload.font.fonts %}
   {% for font in fonts %}
@@ -201,14 +214,14 @@
   {% 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 ] -->
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Consider! PRELOAD primary used fonts to prioritize fetching ] -->
 {% endif %}
 
 {% comment %} PRELOAD CSS files
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if template_config.preload.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 ] -->
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of font to prioritize fetching ] -->
   {% assign css   = template_config.preload.css.css %}
   {% assign files = template_config.preload.css.files %}
   {% for file in css %}
@@ -221,14 +234,14 @@
   {% 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 ] -->
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Consider! PRELOAD primary used css files to prioritize fetching ] -->
 {% endif %}
 
 {% comment %} PRELOAD JS files
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if template_config.preload.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 ] -->
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of font to prioritize fetching ] -->
   {% assign js    = template_config.preload.js.js %}
   {% assign files = template_config.preload.js.files %}
   {% for file in js %}
@@ -241,28 +254,28 @@
   {% 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 ] -->
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Consider! PRELOAD primary used js files to prioritize fetching ] -->
 {% endif %}
 
 {% comment %} PRELOAD image files
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if template_config.preload.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 ] -->
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of images to prioritize fetching ] -->
   {% assign files = template_config.preload.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 ] -->
+  <!-- [INFO   ] [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 ] -->
+  <!-- [INFO   ] [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}} ] -->
@@ -271,13 +284,17 @@
   {% 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 ] -->
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Consider! PRECONNECT 3rd party origins to establish early connections ] -->
 {% endif %}
 
-{% comment %} Add J1 SEO Tags
+{% comment %} SEO Tag processing
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ add J1 SEO Tags ] -->
+{% if seo_tag_options.enabled %}
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ add J1 SEO Tags ] -->
 {% seo %}
-<!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ end SEO Optimization ] -->
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ end SEO Optimization ] -->
+{% else %}
+<!-- [WARN   ] [j1.layout.meta_data_generator.html    ] [ J1 SEO Tags detected DISABLED ] -->
+{% endif %}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ end meta-data processing ] -->

data/_layouts/default.html

@@ -111,14 +111,9 @@ debug:                                  false
   {% comment %} collect the head section (region head)
   ------------------------------------------------------------------------------ {% endcomment %}
   <head data-proofer-ignore>
-
-    {% comment %}
-    <link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-LRlmVvLKVApDVGuspQFnRQJjkv0P7/YFrw84YYQtmYG4nK8c+M+NlmYDCv0rKWpG" crossorigin="anonymous">
-    {% endcomment %}
     <!-- [INFO   ] [j1.layout.default.html                ] [ call default_writer for region: 'head' ] -->
     {% include {{default_writer}} region='head' items=lanes_collate %}
     <!-- [INFO   ] [j1.layout.default.html                ] [ end default_writer for region: 'head' ] -->
-
   </head>
 
   <body class="nomathjax">

data/assets/data/banner.html

@@ -257,8 +257,8 @@ exclude_from_search:                    true
                 		<img
                 			class="sticker-image"
                 			src="/assets/images/sticker/600x600/sticker-new-version.png"
-                			alt="Get new version 2022.6.2"
-                			title="Get new version 2022.6.2"
+                			alt="Get new version 2022.6.3"
+                			title="Get new version 2022.6.3"
                 			style="width: 140px; height: 120px;"
                 		>
                   </a>