j1-template 2022.0.10 → 2022.0.11

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2022.0.10'
+  VERSION = '2022.0.11'
 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.10'
+gem 'j1-template', '~> 2022.0.11'
 
 # ------------------------------------------------------------------------------
 # 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.10
+version:                                2022.0.11
 
 # version
 # ------------------------------------------------------------------------------
@@ -598,8 +598,6 @@ defaults:
       personalization:                  false
       exclude_from_search:              false
 
-      analytics:                        true
-      comments:                         true
       youtube:                          true
       vimeo:                            true
 
@@ -642,8 +640,6 @@ defaults:
       personalization:                  false
       exclude_from_search:              false
 
-      analytics:                        true
-      comments:                         true
       youtube:                          true
       vimeo:                            true
 
@@ -690,8 +686,6 @@ defaults:
       personalization:                  false
       exclude_from_search:              false
 
-      analytics:                        true
-      comments:                         true
       youtube:                          true
       vimeo:                            true
 
@@ -728,8 +722,6 @@ defaults:
       personalization:                  false
       exclude_from_search:              true
 
-      analytics:                        false
-      comments:                         false
       youtube:                          false
       vimeo:                            false
 

data/lib/starter_web/_data/apps/carousel.yml

@@ -12,9 +12,9 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Carousel
   scope:                                User settings

data/lib/starter_web/_data/apps/defaults/carousel.yml

@@ -11,9 +11,10 @@
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
 # ------------------------------------------------------------------------------
 
-# About this configuration (used for J1 CC only)
+# ------------------------------------------------------------------------------
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Carousel
   scope:                                Default settings

data/lib/starter_web/_data/apps/defaults/justifiedGallery.yml

@@ -12,9 +12,9 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Justified Gallery
   scope:                                Default settings

data/lib/starter_web/_data/apps/defaults/justifiedGalleryCustomizer.yml

@@ -12,9 +12,9 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Gallery Customizer
   scope:                                Default settings

data/lib/starter_web/_data/apps/defaults/lightGallery.yml

@@ -13,9 +13,9 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Light Gallery
   scope:                                Default settings

data/lib/starter_web/_data/apps/defaults/lightbox.yml

@@ -12,9 +12,9 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Lightbox
   scope:                                User settings

data/lib/starter_web/_data/apps/justifiedGallery.yml

@@ -12,9 +12,9 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Justified Gallery
   scope:                                User settings

data/lib/starter_web/_data/apps/justifiedGalleryCustomizer.yml

@@ -12,9 +12,9 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Gallery Customizer
   scope:                                User settings

data/lib/starter_web/_data/apps/lightGallery.yml

@@ -12,9 +12,9 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Light Gallery
   scope:                                User settings

data/lib/starter_web/_data/apps/lightbox.yml

@@ -12,9 +12,9 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
 
   title:                                Lightbox
   scope:                                User settings

data/lib/starter_web/_data/blocks/banner.yml

@@ -13,9 +13,10 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
+
   title:                                Banner
   scope:                                User settings
   location:                             _data/blocks/banner.yml

data/lib/starter_web/_data/blocks/defaults/banner.yml

@@ -12,6 +12,15 @@
 #
 # ------------------------------------------------------------------------------
 
+# ------------------------------------------------------------------------------
+# Description (used for J1 CC only)
+#
+description:
+
+  title:                                Banner
+  scope:                                Default settings
+  location:                             _data/blocks/defaults/banner.yml
+
 # ------------------------------------------------------------------------------
 # DEFAULT settings
 #

data/lib/starter_web/_data/blocks/defaults/footer.yml

@@ -12,6 +12,15 @@
 #
 # ------------------------------------------------------------------------------
 
+# ------------------------------------------------------------------------------
+# Description (used for J1 CC only)
+#
+description:
+
+  title:                                Footer
+  scope:                                Default settings
+  location:                             _data/blocks/defaults/footer.yml
+
 # ------------------------------------------------------------------------------
 # DEFAULT settings
 #

data/lib/starter_web/_data/blocks/defaults/panel.yml

@@ -12,6 +12,15 @@
 #
 # ------------------------------------------------------------------------------
 
+# ------------------------------------------------------------------------------
+# Description (used for J1 CC only)
+#
+description:
+
+  title:                                Panel
+  scope:                                Default settings
+  location:                             _data/blocks/defaults/panel.yml
+
 # ------------------------------------------------------------------------------
 # DEFAULT settings
 #

data/lib/starter_web/_data/blocks/footer.yml

@@ -13,9 +13,10 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
+
   title:                                Footer
   scope:                                User settings
   location:                             _data/blocks/footer.yml

data/lib/starter_web/_data/blocks/panel.yml

@@ -13,9 +13,10 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
+
   title:                                Panel
   scope:                                User settings
   location:                             _data/blocks/panel.yml

data/lib/starter_web/_data/builder/blog_navigator.yml

@@ -13,9 +13,10 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
+
   title:                                Blog Navigator
   scope:                                User settings
   location:                             _data/builder/blog_navigator.yml

data/lib/starter_web/_data/builder/defaults/blog_navigator.yml

@@ -12,6 +12,14 @@
 #
 # ------------------------------------------------------------------------------
 
+# ------------------------------------------------------------------------------
+# Description (used for J1 CC only)
+#
+description:
+  title:                                Blog Navigator
+  scope:                                Default settings
+  location:                             _data/builder/defaults/blog_navigator.yml
+
 # ------------------------------------------------------------------------------
 # Global Builder settings
 # ------------------------------------------------------------------------------
@@ -128,14 +136,6 @@
 #
 # ------------------------------------------------------------------------------
 
-# ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
-#
-about_config:
-  title:                                Blog Navigator
-  scope:                                Default settings
-  location:                             _data/builder/defaults/blog_navigator.yml
-
 # ------------------------------------------------------------------------------
 # Default settings
 #

data/lib/starter_web/_data/j1_config.yml

@@ -348,121 +348,5 @@ body:
   font-weight:                          400
   line-height:                          1.5
 
-
-# ==============================================================================
-# CONNECTOR configuration settings
-#
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# COMMENTS settings
-#
-# Set 'enabled' to false to turn off globally. Affects all pages independently
-# from what is set pagewise!
-# Set 'provider' to the provider you want to use.
-# ------------------------------------------------------------------------------
-# hyvor
-#
-#   site_id: your-website-id
-# ------------------------------------------------------------------------------
-# disqus
-#
-#   site_id: your-disqus-short-name
-# ------------------------------------------------------------------------------
-comments:
-  enabled:                              false
-  provider:                             hyvor                                   # disqus | hyvor | commento | just-comments
-
-  comments_headline:
-    en:                                 Leave a comment
-    de:                                 Kommentieren
-
-  hyvor:
-    site_id:                            'hyvor-site-id'
-
-  disqus:
-    site_id:                            '<your-site-short-name>'
-
-  # commento:                                                                   # currently NOT supported
-  #   site_id:                          'commento-site-id'
-  #
-  # just-comments:                                                              # currently NOT supported
-  #   site_id:                          'just-comments-site-id'
-
-  # facebook:                                                                   # currently NOT supported
-  #   appid:                            'facebook-app-id'
-  #   num_posts:                        5
-  #   width:                            580
-  #   colorscheme:                      light
-
-  # custom:                                                                     # currently NOT supported
-  #   custom_data:
-
-# ------------------------------------------------------------------------------
-# ANALYTICS settings
-#
-# Set 'enabled' to false to turn off globally. Affects all pages independently
-# from what is set pagewise!
-# Set 'provider' to the provider you want to use.
-# ------------------------------------------------------------------------------
-analytics:
-  enabled:                              false
-  provider:                             google
-
-  google:
-    tracking_id:                        '<your-tracking-id>'
-
-  custom:
-    custom_data:
-
-# ------------------------------------------------------------------------------
-# ADVERTISING settings
-#
-# Set 'enabled' to false to turn off globally. Affects all pages independently
-# from what is set pagewise!
-# Set 'provider' to the provider you want to use.
-# ------------------------------------------------------------------------------
-advertising:
-  enabled:                              false
-  provider:                             google
-
-  google:
-    publisher_id:                       '<your-publisher-id>'
-
-  custom:
-    custom_data:
-
-# ------------------------------------------------------------------------------
-# TRANSLATOR settings
-#
-# Set 'enabled' to false to turn off globally. Affects all pages independently
-# from what is set pagewise!
-# Set 'provider' to the provider you want to use.
-# ------------------------------------------------------------------------------
-translation:
-  enabled:                              true
-  provider:                             google
-
-  google:
-    layout:                             default
-    meta_data:                          [google-translate]
-    page_language:                      en
-    translation_languages:              [all]
-
-# ------------------------------------------------------------------------------
-# SHARING settings (currently NOT supported)
-#
-# Settings for sharing helper. Sharing is for things like tweet, plusone,
-# like, reddit buttons etc. Set 'provider' to the sharing provider you
-# want to use. Set 'provider' to false to turn sharing off globally.
-#
-# Set 'enabled' to false to turn off globally. Affects all pages independently
-# from what is set pagewise!
-# Set 'provider' to the provider you want to use.
-# ------------------------------------------------------------------------------
-# sharing:
-#   enabled:                            false
-#   provider:
-
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/layouts/default.yml

@@ -117,24 +117,24 @@ lanes:
   # ----------------------------------------------------------------------------
   # CONNECTORS (analytics)
   #
-  - lane:
-      enabled:                          true
-      region:                           head
-      type:                             sync
-      base:                             _includes/themes/j1
-      path:                             modules/connectors
-      file:                             analytics
+  # - lane:
+  #     enabled:                          true
+  #     region:                           head
+  #     type:                             sync
+  #     base:                             _includes/themes/j1
+  #     path:                             modules/connectors
+  #     file:                             analytics
 
   # ----------------------------------------------------------------------------
   # CONNECTORS (translation)
   #
-  - lane:
-      enabled:                          true
-      region:                           head
-      type:                             sync
-      base:                             _includes/themes/j1
-      path:                             modules/connectors
-      file:                             translator
+  # - lane:
+  #     enabled:                          true
+  #     region:                           head
+  #     type:                             sync
+  #     base:                             _includes/themes/j1
+  #     path:                             modules/connectors
+  #     file:                             translator
 
   # ----------------------------------------------------------------------------
   # CONNECTORS (advertising)

data/lib/starter_web/_data/layouts/page.yml

@@ -123,13 +123,13 @@ lanes:
   # ----------------------------------------------------------------------------
   # Ad Block
   #
-  - lane:
-      enabled:                          false
-      region:                           body-header
-      type:                             sync
-      base:                             _includes/themes/j1
-      path:                             blocks/ads
-      file:                             ad.html
+  # - lane:
+  #     enabled:                          false
+  #     region:                           body-header
+  #     type:                             sync
+  #     base:                             _includes/themes/j1
+  #     path:                             blocks/ads
+  #     file:                             ad.html
 
   # ----------------------------------------------------------------------------
   # PAGE CONTENT (region body-main)
@@ -170,17 +170,6 @@ lanes:
       path:                             layouts
       file:                             content_generator_page.html
 
-  # ----------------------------------------------------------------------------
-  # COMMENT connector (e.g. for DISQUS as part of the CONTENT section)
-  #
-  - lane:
-      enabled:                          true
-      region:                           body-main
-      type:                             sync
-      base:                             _includes/themes/j1
-      path:                             modules/connectors
-      file:                             comments
-
   # ----------------------------------------------------------------------------
   # FAM
   #

data/lib/starter_web/_data/layouts/post.yml

@@ -160,17 +160,6 @@ lanes:
       path:                             layouts
       file:                             content_generator_post.html
 
-  # ----------------------------------------------------------------------------
-  # COMMENT connector
-  #
-  - lane:
-      enabled:                          true
-      region:                           body-main
-      type:                             sync
-      base:                             _includes/themes/j1
-      path:                             modules/connectors
-      file:                             comments
-
   # ----------------------------------------------------------------------------
   # FAM
   #

data/lib/starter_web/_data/modules/advertising.yml

@@ -16,9 +16,10 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
+# Description (used for J1 CC only)
 #
-about_config:
+description:
+
   title:                                Advertising
   scope:                                User settings
   location:                             _data/modules/advertising.yml

data/lib/starter_web/_data/modules/analytics.yml

@@ -0,0 +1,99 @@
+# ------------------------------------------------------------------------------
+#  ~/_data/modules/analytics.yml
+#  User configuration settings for J1 Analytics module
+#
+#  Product/Info:
+#  https://jekyll.one
+#
+#  Copyright (C) 2021 Juergen Adams
+#
+#  J1 Template is licensed under the MIT License.
+#  See: https://github.com/jekyll-one/J1 Template/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# Description (used for J1 CC only)
+#
+description:
+
+  title:                                J1 Analytics
+  scope:                                User settings
+  location:                             _data/modules/analytics.yml
+
+# ------------------------------------------------------------------------------
+# User configuration settings
+#
+settings:
+
+  # ----------------------------------------------------------------------------
+  # Settings
+  #
+  #   enabled
+  #   --------------------------------------------------------------------------
+  #   Enables or disables the Analytics services. If disabled, the services
+  #   won't be enabled on any page.
+  #
+  #   values:                           [true|false]
+  #   default:                          false
+  #
+  #   provider
+  #   --------------------------------------------------------------------------
+  #   Currently, only Google Analytics (google) is available as an provider
+  #   for Analytics services.
+  #
+  #   values:                           [google]
+  #   default:                          google
+  #
+  # ----------------------------------------------------------------------------
+  #
+  enabled:                              false
+
+  provider:                             google
+  google:
+    # --------------------------------------------------------------------------
+    # Provider settings
+    #
+    #   trackingID
+    #   ------------------------------------------------------------------------
+    #   Your tracking id (G-XXX..XX) connected with your Analytices
+    #   Account the for the domain registered.
+    #
+    #   values:                         string
+    #   default:                        none
+    #
+    #   optInOut
+    #   ------------------------------------------------------------------------
+    #   Google Analytics Opt In. GA will be enabled by default and at a
+    #   later point it can be disabled based on the visitor's privacy
+    #   settings (Analytics) with the cookie consent dialog.
+    #
+    #   values:                         [true|false]
+    #   default:                        true
+    #
+    #   anonymizeIP
+    #   ------------------------------------------------------------------------
+    #   For the use of Google Analytics to comply with the GDPR, the processed
+    #   IP address at GA can be anonymized (set option 'anonymizeIp' to 'true').
+    #   The IP anonymization function at Google GA holds the data "in memeory"
+    #   and sets the last octet for the user's IPv4 addresses and the last
+    #   80 bits for IPv6 addresses to zero.
+    #   That happens at GA shortly after they are sent to Google Analytics.
+    #   This way, the full IP address is NEVER written to disk or stored
+    #   permanenty anyway. Geographically dimensions are later derived from
+    #   the anonymized IP address NOT affected by anonymization.
+    #
+    #   See:
+    #     https://support.google.com/analytics/answer/2763052
+    #     https://developers.google.com/analytics/devguides/collection/analyticsjs/ip-anonymization?hl=en
+    #
+    #   values:                         [true|false]
+    #   default:                        true
+    #
+    # --------------------------------------------------------------------------
+    #
+    trackingID:                         G-299QGW5RJH                            # '<your-tracking-id>'
+    optInOut:                           true
+    anonymizeIP:                        true
+
+# ------------------------------------------------------------------------------
+# END config