j1-template 2020.0.12 → 2020.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b32adf2cd43110496da2e84086973c46969b8cfac73aa1ac0cb6dedaa7b4b8c
-  data.tar.gz: cc7efc7cc774c5e416b21ae5f5030f82f145f0c11ccb7aa5fcb1ae2bb626e093
+  metadata.gz: 167e18b8588ebe0e9dea073b12ece567a2b6ad0ecfecd8bb0d22bd56510402dc
+  data.tar.gz: '08ebcc33c79fb43e063ec7a213fdf40d8303e98e5b83d442230af0a2c1a524f8'
 SHA512:
-  metadata.gz: 63036078c4a2bef76cf0785ca1eb6b9358c66f551c13522607ed671707ff3efc79ab4e02122557ec260cf07137a97259728fef0f981e78ffdb978873209faf09
-  data.tar.gz: 5db38ecfd7a12aae51d62a68ec020e6765503bb7cbffea54f57907cbde3c11996824aa2d1a9ee786ce9eafebd166427c351e2c001bfab5b074f4351c31f3b0d6
+  metadata.gz: 5822e0fba673dd12cc0d03b3357b985d86e2f884ee64d58ace1d8e8f88cff8debf794df0ecd85c876eec9e4d90e56ac6dcc2090606808abc272feb45a05b0bb1
+  data.tar.gz: f65bc16f17e9204a339e819e795aa326968f878a95d7d7dcb19230260df468d7db7149fbd00e8184e092f14c2a69b297355d7a6608d4f5ce70e82fc5aef087d9

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 %}

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 %}
 

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 %}

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

@@ -30,7 +30,17 @@
 
 {% comment %} Set GLOBAL variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment         = site.environment %}
+{% 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 %}
@@ -147,20 +157,19 @@ NOTE: for layout home (home page, the keys are to be set!!!)
 {% endif %}
 
 
-{% comment %} Request PRELOAD of primary resources to prioritize fetching (SEO)
+{% comment %} SEO settings (optimization)
 -------------------------------------------------------------------------------- {% 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 %}
+  {% 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 ] -->
@@ -168,20 +177,13 @@ NOTE: for layout home (home page, the keys are to be set!!!)
 
 {% 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 ] -->
+  {% assign css   = template_config.css.css %}
+  {% assign files = template_config.css.files %}
   {% 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}}">
+    <link rel="preload" as="style" href="{{file}}.{{ext_css}}">
   {% endfor %}
 
   {% for file in files %}
@@ -195,20 +197,13 @@ NOTE: for layout home (home page, the keys are to be set!!!)
 
 {% 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 ] -->
+  {% assign js    = template_config.js.js %}
+  {% assign files = template_config.js.files %}
   {% 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}}">
+    <link rel="preload" as="script" href="{{file}}.{{ext_js}}">
   {% endfor %}
 
   {% for file in files %}
@@ -222,10 +217,10 @@ NOTE: for layout home (home page, the keys are to be set!!!)
 
 {% 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 %}
+  <!-- [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 %}
@@ -234,16 +229,12 @@ NOTE: for layout home (home page, the keys are to be set!!!)
   <!-- [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 %}
+{% 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 ] -->
-{% if template_config.preconnect.enabled %}
+  {% 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}}">
@@ -253,3 +244,5 @@ NOTE: for layout home (home page, the keys are to be set!!!)
   <!-- [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 ] -->

data/_includes/themes/j1/modules/navigator/generator.html

@@ -38,7 +38,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 %}

data/_layouts/default.html

@@ -56,7 +56,6 @@ layout:                                 compress
 
 {% 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 %}
@@ -91,10 +90,6 @@ layout:                                 compress
   {% assign body_scrollbar = page.scrollbar %}
 {% endif %}
 
-{% if jekyll.environment != 'development' %}
-  {% assign environment = jekyll.environment | strip %}
-{% endif %}
-
 
 {% comment %} main
 -------------------------------------------------------------------------------- {% endcomment %}

data/assets/data/authclient.html

@@ -30,7 +30,6 @@ regenerate: true
 
 {% 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 %}
@@ -43,7 +42,7 @@ regenerate: true
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment             = site_config.environment %}
+{% assign environment             = site.environment %}
 {% assign nav_authclient_defaults = authentication_defaults.auth_client %}
 {% assign nav_authclient_settings = authentication_settings.auth_client %}
 

data/assets/data/banner.html

@@ -32,8 +32,7 @@ regenerate: true
 
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config             = site %}
-{% assign environment             = site_config.environment %}
+{% assign environment             = site.environment %}
 {% assign debug                   = false %}
 
 

data/assets/data/carousel.json

@@ -44,12 +44,11 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config               = site %}
 {% assign apps                      = site.data.apps %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment               = site_config.environment %}
+{% assign environment               = site.environment %}
 
 {% assign carousel_config_defaults  = apps.defaults.carousel.defaults %}
 {% assign carousel_config_settings  = apps.carousel.settings %}

data/assets/data/cookie_consent.html

@@ -31,8 +31,7 @@ regenerate: true
 
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config                   = site %}
-{% assign environment                   = site_config.environment %}
+{% assign environment                   = site.environment %}
 
 
 {% comment %} Process YML config data

data/assets/data/footer.html

@@ -41,13 +41,12 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config            = site %}
 {% assign footer_config_defaults = site.data.blocks.defaults.footer %}
 {% assign footer_config_settings = site.data.blocks.footer %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment            = site_config.environment %}
+{% assign environment            = site.environment %}
 
 {% assign footer_config_defaults = footer_config_defaults.defaults %}
 {% assign footer_config_settings = footer_config_settings.settings %}

data/assets/data/galleries.json

@@ -44,12 +44,11 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config         = site %}
 {% assign apps                = site.data.apps %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment         = site_config.environment %}
+{% assign environment         = site.environment %}
 
 {% assign jg_config_defaults  = apps.defaults.justified_gallery.defaults %}
 {% assign jg_config_settings  = apps.justified_gallery.settings %}

data/assets/data/gallery_customizer.html

@@ -28,13 +28,12 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config         = site %}
 {% assign apps                = site.data.apps %}
 {% assign modules             = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment         = site_config.environment %}
+{% assign environment         = site.environment %}
 
 {% assign customizer_defaults = apps.defaults.gallery_customizer.defaults %}
 {% assign customizer_settings = apps.gallery_customizer.settings %}

data/assets/data/mdi_icons.json

@@ -34,11 +34,10 @@ regenerate: false
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config  = site %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment  = site_config.environment %}
+{% assign environment  = site.environment %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}

data/assets/data/menu.html

@@ -35,13 +35,12 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config           = site %}
 {% assign template_config       = site.data.template_settings %}
 {% assign modules               = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment           = site_config.environment %}
+{% assign environment           = site.environment %}
 
 {% assign navigator_settings    = modules.navigator.settings %}
 {% assign navigator_defaults    = modules.defaults.navigator.defaults %}

data/assets/data/mmenu.html

@@ -31,13 +31,12 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config           = site %}
 {% assign template_config       = site.data.template_settings %}
 {% assign modules               = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment           = site_config.environment %}
+{% assign environment           = site.environment %}
 
 {% assign navigator_settings    = modules.navigator.settings %}
 {% assign navigator_defaults    = modules.defaults.navigator.defaults %}

data/assets/data/mmenu_sidebar.html

@@ -31,13 +31,12 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config                 = site %}
 {% assign navigator_defaults          = site.data.modules.defaults.navigator.defaults %}
 {% assign navigator_settings          = site.data.modules.navigator.settings %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment                 = site_config.environment %}
+{% assign environment                 = site.environment %}
 
 {% assign nav_mmenu_defaults          = navigator_defaults.nav_mmenu %}
 {% assign nav_mmenu_settings          = navigator_settings.nav_mmenu %}

data/assets/data/mmenu_toc.html

@@ -25,11 +25,10 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config           = site %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment           = site_config.environment %}
+{% assign environment           = site.environment %}
 
 {% assign production = '' %}
 {% if environment == 'prod' or environment == 'production' %}

data/assets/data/panel.html

@@ -32,18 +32,12 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config = site %}
 
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment = site.environment %}
 {% assign debug       = false %}
 
-{% comment %} Set config data
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment = site_config.environment %}
-
-
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
 

data/assets/data/quicklinks.html

@@ -33,8 +33,6 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config           = site %}
-
 {% assign template_settings       = site.data.template_settings %}
 {% assign authentication_defaults = modules.defaults.authentication.defaults %}
 {% assign authentication_settings = modules.authentication.settings %}
@@ -53,7 +51,7 @@ regenerate: true
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment             = site_config.environment %}
+{% assign environment             = site.environment %}
 
 {% assign nav_quicklinks_defaults = navigator_defaults.nav_quicklinks %}
 {% assign nav_quicklinks_settings = navigator_settings.nav_quicklinks %}

data/assets/data/ssm.html

@@ -36,13 +36,12 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config     = site %}
 {% assign template_config = site.data.template_settings %}
 {% assign modules         = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment     = site_config.environment %}
+{% assign environment     = site.environment %}
 
 {% assign ssm_settings    = modules.ssm.settings %}
 {% assign ssm_defaults    = modules.defaults.ssm.defaults %}

data/assets/data/twa_v1.json

@@ -34,11 +34,10 @@ regenerate: false
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config  = site %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment  = site_config.environment %}
+{% assign environment  = site.environment %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}

data/assets/themes/j1/adapter/js/algolia.js

@@ -35,15 +35,13 @@ regenerate: true
 
 {% 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 %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment       = site_config.environment %}
-{% assign algolia_config    = site_config.algolia %}
+{% assign algolia_config    = site.algolia %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}

data/assets/themes/j1/adapter/js/attic.js

@@ -36,7 +36,6 @@ regenerate: true
 
 {% 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 %}

data/assets/themes/j1/adapter/js/clipboard.js

@@ -26,12 +26,10 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config  = site %}
-
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment   = site_config.environment %}
+{% assign environment   = site.environment %}
 
 
 {% assign production = false %}

data/assets/themes/j1/adapter/js/j1.js

@@ -41,15 +41,12 @@ regenerate: true
 
 {% 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 %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment             = site_config.environment %}
-
 {% assign banner_config_defaults  = blocks.defaults.banner.defaults %}
 {% assign banner_config_settings  = blocks.banner.settings %}
 {% assign panel_config_defaults   = blocks.defaults.panel.defaults %}

data/assets/themes/j1/adapter/js/mmenu.js

@@ -43,7 +43,6 @@ regenerate: true
 {% comment %} Set config files
 {% assign auth_manager_config           = site.j1_auth %}
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config                   = site %}
 {% assign template_config               = site.data.template_settings %}
 {% assign blocks                        = site.data.blocks %}
 {% assign modules                       = site.data.modules %}
@@ -167,25 +166,11 @@ j1.adapter['mmenu'] = (function (j1, window) {
       logger.info('state: ' + _this.getState());
       logger.info('module is being initialized');
 
-      // jadams, 2020-06-24: Set max_count to 100 what cause to wait 2.5s
-      // for J1 Navigator to finish (init)
-      //
-      var interval_count = 0;
-      var max_count      = 100;
-
-      var dependencies_met_navigator = setInterval(function() {
-        interval_count += 1;
-        if ( j1.adapter.navigator.getState() == 'finished' ) {
-          logger.info('dependencies of module navigator met for: mmenu');
-          logger.info('dependencies of module navigator met after: ' + interval_count * 25 + ' ms');
-          j1.adapter.mmenu.mmenuLoader(navMenuOptions);
-          clearInterval(dependencies_met_navigator);
-        }
-        if (interval_count > max_count) {
-          logger.warn('dependency check failed for module: navigator');
-          logger.warn('dependencies of module navigator met after: ' + interval_count * 25 + ' ms');
-          clearInterval(dependencies_met_navigator);
+      var dependencies_met_page_loaded = setInterval(function() {
+        if ( j1.getState() == 'finished' ) {
+          logger.info('dependencies of module met');
           j1.adapter.mmenu.mmenuLoader(navMenuOptions);
+          clearInterval(dependencies_met_page_loaded);
         }
       }, 25);
     }, // END init

data/assets/themes/j1/adapter/js/navigator.js

@@ -57,7 +57,6 @@ regenerate: true
 {% comment %} Set config files
 {% assign auth_manager_config           = site.j1_auth %}
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config                   = site %}
 {% assign template_config               = site.data.template_settings %}
 {% assign blocks                        = site.data.blocks %}
 {% assign modules                       = site.data.modules %}

data/assets/themes/j1/adapter/js/ssm.js

@@ -34,8 +34,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config     = site %}
-{% assign environment     = site_config.environment %}
+{% assign environment     = site.environment %}
 {% assign template_config = site.data.template_settings %}
 {% assign modules         = site.data.modules %}
 

data/assets/themes/j1/adapter/js/themer.js

@@ -37,7 +37,6 @@ regenerate: true
 
 {% 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 %}

data/assets/themes/j1/adapter/js/toccer.js

@@ -33,15 +33,14 @@ regenerate: true
 
 {% 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 %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment       = site_config.environment %}
-{% assign template_version  = site_config.version %}
+{% assign environment       = site.environment %}
+{% assign template_version  = site.version %}
 
 {% assign toccer_defaults   = modules.defaults.toccer.defaults %}
 {% assign toccer_settings   = modules.toccer.settings %}

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
-module J1
-  VERSION = '2020.0.12'
-end
+module J1
+  VERSION = '2020.0.13'
+end

data/lib/starter_web/Gemfile

@@ -51,7 +51,7 @@ gem 'jekyll', '~> 4.0'
 
 # Theme Rubies, default: J1 Template
 #
-gem 'j1-template', '~> 2020.0.12'
+gem 'j1-template', '~> 2020.0.13'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            production
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2020.0.12
+version:                                2020.0.13
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/resources.yml

@@ -350,7 +350,7 @@ resources:
   #   5   log4javascript                log4javascript@1.4.15
   #   6   Bootstrap                     bootstrap@4.4.1
   #   6   bs_material_design            bootstrap-material-design@4.0.0-beta.4
-  #   7   j1_template                   j1_template_4@2020.0.12
+  #   7   j1_template                   j1_template_4@2020.0.13
   #   8   tocbot                        tocbot@4.11.2
   #   9   jekyll_search                 simple_jekyll_search@1.1.5
   #   10  bs_theme_switcher             bs_theme_switcher@1.1.5

data/lib/starter_web/_data/template_settings.yml

@@ -138,7 +138,7 @@ cookies:
 #   NOTE: Used for developent mode ONLY
 #   NOTE: See ~/packages/300_template_src/_layouts/default.html
 # ------------------------------------------------------------------------------
-flicker_timeout:                        250
+flicker_timeout:                        0
 
 # ------------------------------------------------------------------------------
 # HTML PrettyPrint
@@ -228,22 +228,30 @@ bootstrap:
 #   https://developer.mozilla.org/en-US/docs/Web/HTML/Preloading_content
 #   https://github.com/GoogleChromeLabs/critters/issues/18 (crossorigin)
 # ------------------------------------------------------------------------------
+# font:
+#   preload:                              true
+#   cors:                                 crossorigin
+#   fonts:                                [
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Thin.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Thin.woff2,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Light.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Light.woff2,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Regular.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Regular.woff2,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Medium.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Medium.woff2,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Bold.woff,
+#                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Bold.woff2,
+#                                           /assets/themes/j1/core/fonts/materialdesign_icons/fonts/materialdesignicons-webfont.woff,
+#                                           /assets/themes/j1/core/fonts/materialdesign_icons/fonts/materialdesignicons-webfont.woff2
+#                                         ]
+
 font:
   preload:                              true
   cors:                                 crossorigin
   fonts:                                [
-                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Thin.woff,
-                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Thin.woff2,
-                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Light.woff,
-                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Light.woff2,
                                           /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Regular.woff,
-                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Regular.woff2,
-                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Medium.woff,
-                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Medium.woff2,
-                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Bold.woff,
-                                          /assets/themes/j1/core/fonts/roboto/fonts/Roboto-Bold.woff2,
-                                          /assets/themes/j1/core/fonts/materialdesign_icons/fonts/materialdesignicons-webfont.woff,
-                                          /assets/themes/j1/core/fonts/materialdesign_icons/fonts/materialdesignicons-webfont.woff2
+                                          /assets/themes/j1/core/fonts/materialdesign_icons/fonts/materialdesignicons-webfont.woff
                                         ]
 css:
   preload:                              true
@@ -281,7 +289,7 @@ image:
 # ------------------------------------------------------------------------------
 preconnect:
   enabled:                              true
-  urls:                                 [ https://bootswatch.com ]
+  urls:                                 [ "https://bootswatch.com" ]
 
 
 # ------------------------------------------------------------------------------

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2020.0.12",
+  "version": "2020.0.13",
   "description": "J1 Template starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2020.0.12",
+  "version": "2020.0.13",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2020.0.12",
+  "version": "2020.0.13",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2020.0.12
+  version: 2020.0.13
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll