j1-template 2022.0.12 → 2022.0.13

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

@@ -101,7 +101,15 @@ j1.adapter.rtable = (function (j1, window) {
     init: function (options) {
 
       // -----------------------------------------------------------------------
-      // globals
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.rtable',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.rtable;
       logger  = log4javascript.getLogger('j1.adapter.rtable');
@@ -111,14 +119,6 @@ j1.adapter.rtable = (function (j1, window) {
       logger.info('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      // -----------------------------------------------------------------------
-      // Default module settings
-      // -----------------------------------------------------------------------
-      var settings = $.extend({
-        module_name: 'j1.adapter.rtable',
-        generated:   '{{site.time}}'
-      }, options);
-
       // create settings object from frontmatterOptions
       frontmatterOptions = options != null ? $.extend({}, options) : {};
       moduleOptions = $.extend({}, {{rtable_options | replace: 'nil', 'null' | replace: '=>', ':' }});

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

@@ -111,7 +111,15 @@ j1.adapter.rtextResizer = (function (j1, window) {
     init: function (options) {
 
       // -----------------------------------------------------------------------
-      // globals
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.rtextResizer',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.rtextResizer;
       logger  = log4javascript.getLogger('j1.adapter.rtextResizer');
@@ -121,14 +129,6 @@ j1.adapter.rtextResizer = (function (j1, window) {
       logger.info('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      // -----------------------------------------------------------------------
-      // Default module settings
-      // -----------------------------------------------------------------------
-      var settings = $.extend({
-        module_name: 'j1.adapter.rtextResizer',
-        generated:   '{{site.time}}'
-      }, options);
-
       {% comment %} Load gallery config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
       /* eslint-disable */

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

@@ -97,8 +97,18 @@ var lastPageInfo;
     // adapter initializer
     // -------------------------------------------------------------------------
     init: function (options) {
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
+
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.scroller',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
+      // -----------------------------------------------------------------------
       _this = j1.adapter.scroller;
       logger = log4javascript.getLogger('j1.adapter.scroller');
 
@@ -108,11 +118,6 @@ var lastPageInfo;
       logger.info('\n' + 'module is being initialized');
 
 
-      // default module settings
-      var settings = $.extend({
-        module_name: 'j1.adapter.scroller',
-        generated:   '{{site.time}}'
-      }, options);
 
       _this.generate_scrollers();
 

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

@@ -159,9 +159,18 @@ j1.adapter.themer = (function (j1, window) {
     // -------------------------------------------------------------------------
     // initializer
     // -------------------------------------------------------------------------
-    init: function () {
+    init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.themer',
+        generated:   '{{site.time}}'
+      }, options);
+
       // -----------------------------------------------------------------------
-      // globals
+      // Global variable settings
       // -----------------------------------------------------------------------
       _this       = j1.adapter.themer;
       url         = new liteURL(window.location.href);

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

@@ -117,7 +117,15 @@ j1.adapter.toccer = (function () {
     init: function (options) {
 
       // -----------------------------------------------------------------------
-      // globals
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings  = $.extend({
+        module_name: 'j1.adapter.toccer',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.toccer;
       logger  = log4javascript.getLogger('j1.adapter.toccer');
@@ -130,14 +138,6 @@ j1.adapter.toccer = (function () {
       // create settings object from frontmatterOptions
       var frontmatterOptions = options != null ? $.extend({}, options) : {};
 
-      // -----------------------------------------------------------------------
-      // defaults
-      // -----------------------------------------------------------------------
-      var settings  = $.extend({
-        module_name: 'j1.adapter.toccer',
-        generated:   '{{site.time}}'
-      }, options);
-
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------

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

@@ -37,17 +37,16 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign cookie_defaults     = modules.defaults.cookies.defaults %}
 {% assign cookie_settings     = modules.cookies.settings %}
-
-{% assign tracking_enabled    = modules.analytics.settings.enabled %}
-
 {% assign translator_defaults = modules.defaults.translator.defaults %}
 {% assign translator_settings = modules.translator.settings %}
 
-
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign translator_options  = translator_defaults | merge: translator_settings %}
 {% assign cookie_options      = cookie_defaults | merge: cookie_settings %}
+{% assign translator_options  = translator_defaults | merge: translator_settings %}
+
+{% comment %} Set variables
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -84,9 +83,7 @@ regenerate:                             true
 'use strict';
 
 j1.adapter.translator = (function (j1, window) {
-
   var environment       = '{{environment}}';
-  var tracking_enabled  = ('{{tracking_enabled}}' === 'true') ? true: false;    // Analytics/GA enabled?
   var moduleOptions     = {};
   var user_translate    = {};
   var _this;
@@ -122,7 +119,15 @@ j1.adapter.translator = (function (j1, window) {
     init: function (options) {
 
       // -----------------------------------------------------------------------
-      // globals
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.translator',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       _this                 = j1.adapter.translator;
       logger                = log4javascript.getLogger('j1.adapter.translator');
@@ -154,14 +159,6 @@ j1.adapter.translator = (function (j1, window) {
       // initialize state flag
       _this.state = 'pending';
 
-      // -----------------------------------------------------------------------
-      // Default module settings
-      // -----------------------------------------------------------------------
-      var settings = $.extend({
-        module_name: 'j1.adapter.translator',
-        generated:   '{{site.time}}'
-      }, options);
-
       {% comment %} Load module config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG

data/assets/themes/j1/modules/advertising/js/google/adInitializer.js

@@ -80,13 +80,23 @@ $(document).ready(function() {
   // [INFO   ] [j1.adapter.advertising                  ] [ detected advertising provider: {{advertising_provider}}} ]
   // [INFO   ] [j1.adapter.advertising                  ] [ advertising detected as: {{advertising}} ]
   {% if advertising %}
-  var logger        = log4javascript.getLogger('j1.core.advertising.google');
-  var ads_found     = document.getElementsByClassName('adsbygoogle').length;
-  var cookie_names  = j1.getCookieNames();
-  var user_consent  = j1.readCookie(cookie_names.user_consent);
+  var logger              = log4javascript.getLogger('j1.core.advertising.google');
+  var ads_found           = document.getElementsByClassName('adsbygoogle').length;
+  var cookie_names        = j1.getCookieNames();
+  var user_consent        = j1.readCookie(cookie_names.user_consent);
+  var providerID          = '{{advertising_options.google.publisherID}}';
+  var validProviderID     = (providerID.includes('your')) ? false : true;
+  var advertisingProvider = 'Google Adsense';
 
   var dependencies_met_page_ready = setInterval (function (options) {
     if (j1.getState() === 'finished') {
+
+      if (!validProviderID) {
+        logger.warn('\n' + 'disabled provider: ' + advertisingProvider);
+        clearInterval(dependencies_met_page_ready);
+        return false;
+      }
+
       if (user_consent.personalization) {
         if (ads_found) {
           logger.info('\n' + 'initialize all ads in page: #' + ads_found);

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2022.0.12'
+  VERSION = '2022.0.13'
 end

data/lib/starter_web/Gemfile

@@ -53,7 +53,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2022.0.12'
+gem 'j1-template', '~> 2022.0.13'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2022.0.12
+version:                                2022.0.13
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/layouts/home.ads.yml

@@ -0,0 +1,262 @@
+# ------------------------------------------------------------------------------
+# ~/_data/layouts/home.yml
+# Configuration data to specify the (HTML) Layout of all content
+# pages of type HOME placed by the content loader
+#
+# Product/Info:
+# https://jekyll.one
+#
+# Copyright (C) 2021 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# NOTE:
+#   By J1 template, "Liquid Procedures" are being used intensively. To load
+#   HTML data for a layout, the loader procedure places the data based this
+#   YAML data file into the REGION specified with a LANE.
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# Layout configuration settings
+#
+#   lanes|lane
+#   ----------------------------------------------------------------------------
+#   Set LANE specific configuration parameters for a page LAYOUT. The
+#   LANES array contains multiple (lane) hashes that describes the type
+#   of the component that is loaded into a lane and their specific
+#   (placement) parameters.
+#
+#   region
+#   ----------------------------------------------------------------------------
+#   J1 templates defines, based on the general structure of a HTML page
+#   (head|body), more specific REGIONS based on HTML5 semantic elements
+#   to place HTML data:
+#
+#   head              <head> section. Contains (site-wide) meta data and
+#                     all CSS and JS files are to be loaded for a page.
+#   body-navigation   <body> NAV section. Contains the main navigation bar.
+#                     Placed a the BEGINNING of the <body> section.
+#   body-header       <body> HEADER section. Contains the page banner (header).
+#                     Placed AFTER the page navigation but BEFORE the main
+#                     content (body-main) of a page.
+#   body-main         <body> MAIN section. J1 template puts a <main> container
+#                     element in the <body> section to place the (main) content.
+#                     All content related elements are loaded into the region
+#                     'body-main'. Content may components like boxes, panels,
+#                     quotes etc. and the document content like sections and
+#                     articles.
+#   body-footer       <body> FOOTER section. J1 template puts a <footer> element
+#                     at the end of the <BODY> section. The body-footer region
+#                     contains all elements that should be loaded at the end
+#                     of a page; typically the page footer.
+#
+#   values:           head|body-navigation|body-header|body-main|body-footer
+#   default:          no defaults
+#
+#   type
+#   ----------------------------------------------------------------------------
+#   The (HTML) content of a lane can be included (from an include file) or
+#   loaded asychronously from a HTML data file by AJAX (get|load) calls.
+#   J1 template is using jQuery as an interface to AJAX calls.
+#
+#   values:           include|load
+#   default:          no defaults
+#
+#   source
+#   ----------------------------------------------------------------------------
+#   The parameter source defines a (site root relativ) path to the data
+#   source to be included or loaded.
+#
+#   values:           string (path)
+#   default:          no defaults
+#
+#   file
+#   ----------------------------------------------------------------------------
+#   Defines the data file to be included or loaded.
+#
+#   values:           string
+#   default:          no defaults
+#
+#   id
+#   ----------------------------------------------------------------------------
+#   Used for AJAX load calls (see parameter type). The id is used twice. First,
+#   id references a HTML fragment as part of the (HTML) data file (see parameter
+#   data below). Second, the id is used to identify the placeholder (div)
+#   element where the AJAX call puts the data on.
+#
+#   values:           string
+#   default:          no defaults
+#
+#   class
+#   ----------------------------------------------------------------------------
+#   Additional CSS classes that are put on the placeholder (div) element.
+#   Can be used for type 'load', only.
+#
+#   values:           string (CSS class name)
+#   default:          no defaults
+#
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# Layout configuration settings
+#
+lanes:
+
+  # ----------------------------------------------------------------------------
+  # MASTER header
+  #
+  - lane:
+      enabled:                          true
+      region:                           body-header
+      type:                             sync
+      base:                             _includes/themes/j1
+      path:                             modules/attics
+      file:                             generator.html
+
+  # ----------------------------------------------------------------------------
+  # MASTER slider
+  #
+  - lane:
+      enabled:                          false
+      id:                               master_slider
+      region:                           body-header
+      type:                             async
+      properties:                       mb-0
+
+  # ----------------------------------------------------------------------------
+  # Top Advertisment
+  #
+  - lane:
+      enabled:                          false
+      region:                           body-header
+      id:                               google_ad_top_home
+      type:                             sync
+      base:                             _includes/themes/j1
+      path:                             modules/ads
+      file:                             google_ad_top_home.html
+
+  # ----------------------------------------------------------------------------
+  #   PAGE CONTENT (region body-main)
+  #
+  #   NOTE:
+  #     The CONTENT of a post or page may already rendered (page contains HTML
+  #     data) or unrendered (page contains MARKUP data). In both cases, rendered
+  #     or unrendered content, a valid FRONTMATTER is needed to pass the data.
+  #
+  #     The CONTENT generation for posts and pages depends on the data type,
+  #     the MARKUP language (Markdown, Asciidoc) the page is using. The data
+  #     type is specified by the file EXTENSION (e.g. ".md" for Markdown or
+  #     ".adoc" for Asciidoc formatted content).
+  #
+  #     To enable Jekyll running the render phase, the respective processor
+  #     (e.g.kramdown for MARKDOWN or asciidoctor for ASCIIDOC) needs to be
+  #     loaded and configured (Gemfile and the side-wide configuration file
+  #     _config.yml).
+  #
+  #   NOTE:
+  #     The CONTENT of a PAGE is passed trough a (Liquid) wrapper procedure
+  #     (page_content.html) to add or inject specific ADDITIONAL data like
+  #     a TOC etc. that influences the resulting page.
+  #
+  #     To modify the wrapper, DO NOT CHANGE the template files. See with
+  #     ***URL*** how to create your own wrapper (and OVERLOAD the J1 template
+  #     system with the data you provided).
+  #
+  # ----------------------------------------------------------------------------
+
+  # ----------------------------------------------------------------------------
+  # TEASER banner
+  #
+  - lane:
+      enabled:                          true
+      id:                               home_teaser_banner
+      region:                           body-main
+      type:                             async
+      properties:                       g-2 elevated-z0
+
+  # ----------------------------------------------------------------------------
+  # SERVICE panel
+  #
+  - lane:
+      enabled:                          false
+      id:                               home_service_panel
+      region:                           body-main
+      type:                             async
+      properties:                       g-2 elevated-z0
+
+  # ----------------------------------------------------------------------------
+  # DIVIDER banner
+  #
+  - lane:
+      enabled:                          false
+      id:                               divider-1
+      region:                           body-main
+      type:                             async
+      properties:                       mt-4 mr-5 mb-4 ml-5
+
+  # ----------------------------------------------------------------------------
+  # Page Advertisment
+  #
+  - lane:
+      enabled:                          false
+      region:                           body-main
+      id:                               google_ad_content_home
+      type:                             sync
+      base:                             _includes/themes/j1
+      path:                             modules/ads
+      file:                             google_ad_content_home.html
+
+  # ----------------------------------------------------------------------------
+  # INTRO panel
+  #
+  - lane:
+      enabled:                          true
+      id:                               home_intro_panel
+      region:                           body-main
+      type:                             async
+      properties:                       g-2 elevated-z2
+
+  # ----------------------------------------------------------------------------
+  # PARALLAX banner
+  #
+  - lane:
+      enabled:                          true
+      id:                               home_parallax_banner
+      region:                           body-main
+      type:                             async
+      properties:                       elevated-z0
+
+  # ----------------------------------------------------------------------------
+  # IMAGE banner
+  #
+  - lane:
+      enabled:                          false
+      id:                               home_image_banner
+      region:                           body-main
+      type:                             async
+      properties:                       mb-3
+
+  # ----------------------------------------------------------------------------
+  # NEWS panel
+  #
+  - lane:
+      enabled:                          true
+      id:                               home_news_panel
+      region:                           body-main
+      type:                             async
+      properties:                       g-2 elevated-z2
+
+  # ----------------------------------------------------------------------------
+  # FAB
+  #
+  - lane:
+      enabled:                          true
+      id:                               fab-container
+      region:                           body-main
+      type:                             async
+      properties:                       elevated-z0
+
+# ------------------------------------------------------------------------------
+# END config