j1-template 2022.0.6 → 2022.0.10

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.6'
+gem 'j1-template', '~> 2022.0.10'
 
 # ------------------------------------------------------------------------------
 # 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.6
+version:                                2022.0.10
 
 # version
 # ------------------------------------------------------------------------------
@@ -600,7 +600,6 @@ defaults:
 
       analytics:                        true
       comments:                         true
-      advertising:                      false
       youtube:                          true
       vimeo:                            true
 
@@ -645,7 +644,6 @@ defaults:
 
       analytics:                        true
       comments:                         true
-      advertising:                      false
       youtube:                          true
       vimeo:                            true
 
@@ -694,7 +692,6 @@ defaults:
 
       analytics:                        true
       comments:                         true
-      advertising:                      false
       youtube:                          true
       vimeo:                            true
 
@@ -729,15 +726,13 @@ defaults:
         follow:                         false
 
       personalization:                  false
-      exclude_from_search:              false
+      exclude_from_search:              true
 
       analytics:                        false
       comments:                         false
-      advertising:                      false
       youtube:                          false
       vimeo:                            false
 
-
 # ==============================================================================
 # 6. LAYOUT configuration
 #

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

@@ -139,13 +139,13 @@ lanes:
   # ----------------------------------------------------------------------------
   # CONNECTORS (advertising)
   #
-  - lane:
-      enabled:                          true
-      region:                           head
-      type:                             sync
-      base:                             _includes/themes/j1
-      path:                             modules/connectors
-      file:                             ads
+  # - lane:
+  #     enabled:                          true
+  #     region:                           head
+  #     type:                             sync
+  #     base:                             _includes/themes/j1
+  #     path:                             modules/connectors
+  #     file:                             ads
 
   # ----------------------------------------------------------------------------
   # RESOURCE loader

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

@@ -125,6 +125,18 @@ lanes:
       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)
   #
@@ -184,6 +196,18 @@ lanes:
       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
   #

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

@@ -29,19 +29,146 @@ about_config:
 settings:
 
   # ----------------------------------------------------------------------------
-  # AD elements
+  # Settings
   #
-  ads:
+  #   enabled
+  #   --------------------------------------------------------------------------
+  #   Enables or disables the Ad services. If disabled, no ads services are
+  #   enabled and no unit container get initialized on any page.
+  #
+  #   values:                           [true|false]
+  #   default:                          false
+  #
+  #   provider
+  #   --------------------------------------------------------------------------
+  #   Currently, only Google adsense (google) is available as an provider
+  #   for advertising.
+  #
+  #   values:                           [google]
+  #   default:                          google
+  #
+  # ----------------------------------------------------------------------------
+  #
+  enabled:                              false
+
+  google:
 
     # --------------------------------------------------------------------------
-    # Image attic (used for layouts posts|pages, image-based)
-    #
-    - name:                             Full width top
-      ad:
-        enabled:                        true
-        id:                             ad_full_width_top
-        layout:                         [ page, post ]
-        type:                           ad-bla
+    # Provider settings
+    #
+    #   publisherID
+    #   ------------------------------------------------------------------------
+    #   Your publisher id (ca-pub-xxxx..xxx) connected with your Adsense
+    #   Account the for the domain registered.
+    #
+    #   values:                         string
+    #   default:                        none
+    #
+    #   autoHideOnUnfilled
+    #   ------------------------------------------------------------------------
+    #   For several reasons, the placed ad (unit) containers get unfilled (no
+    #   ad placed inside). Unfilled unit containers results in blank areas
+    #   instead. Using the setting autoHideOnUnfilled, unfilled containers
+    #   can be hidden automatically.
+    #
+    #   values:                         [true|false]
+    #   default:                        true
+    #
+    #   checkTrackingProtection (currently NOT supported)
+    #   ------------------------------------------------------------------------
+    #   Modern browsers in their current versions (e.g. FireFox) provide
+    #   Tracking Protection build-in. If Tracking Protection is enabled
+    #   for a browser, showing ads may blocked automatically. All unit
+    #   containers affected by Tracking Protection are hidden automatically.
+    #
+    #   values:                         [true|false]
+    #   default:                        false
+    #
+    #   showErrorPageOnBlocked (currently NOT supported)
+    #   ------------------------------------------------------------------------
+    #   If Tracking Protection is detected for a browser, no content is
+    #   presented to the visitor and an error page is shown (HTML 447).
+    #
+    #   values:                         [true|false]
+    #   default:                        false
+    #
+    # --------------------------------------------------------------------------
+    #
+    publisherID:                        ca-pub-xxxx..xxx
+    autoHideOnUnfilled:                 false
+    addBorderOnUnfilled:                true
+    checkTrackingProtection:            true
+    showErrorPageOnBlocked:             true
+    addBorderOnUnfilled:                true
+
+    ads:
+
+      # ------------------------------------------------------------------------
+      # Attributes
+      #
+      #   enabled
+      #   ----------------------------------------------------------------------
+      #   Enables or disables an ad unit (container). If an container is
+      #   disabled, this unit get NOT initialized for ads on any page.
+      #
+      #   values:                       [true|false]
+      #   default:                      true
+      #
+      #   placement (currently NOT supported)
+      #   ----------------------------------------------------------------------
+      #   Defines the placements of the unit container specified. For default
+      #   (manual), all ad units are placed on (home/content) pages manually
+      #   by adding the <ins>-code.
+      #
+      #   values:                       [manual|auto|content-top|content-bottom]
+      #   default:                      manual
+      #
+      #   adSlot (currently NOT supported)
+      #   ----------------------------------------------------------------------
+      #   Defines the slot-id of the unit container specified.
+      #
+      #   values:                       string
+      #   default:                      none
+      #
+      #   adTest (currently NOT supported)
+      #   ------------------------------------------------------------------------
+      #   For testing only. If adTest is enabled (true), clicks and impressions
+      #   aren't recorded by the ad service and advertisers aren't charged.
+      #
+      #   values:                       [true|false]
+      #   default:                      false
+      #
+      # --------------------------------------------------------------------------
+
+      # ------------------------------------------------------------------------
+      # Google Ad resposive full-width
+      #
+#     - name:                           display-ad-horizontal-1
+#       ad:
+#         enabled:                      true
+#         placement:                    manual
+#         adSlot:                       xxxx..xxx
+#         adTest:                       false
+
+      # ------------------------------------------------------------------------
+      # Google Ad resposive full-width
+      #
+#     - name:                           display-ad-horizontal-2
+#       ad:
+#         enabled:                      false
+#         placement:                    manual
+#         adSlot:                       xxxx..xxx
+#         adTest:                       false
+
+      # ------------------------------------------------------------------------
+      # Google Ad resposive full-width
+      #
+#     - name:                           in-article-ad-1
+#       ad:
+#         enabled:                      false
+#         placement:                    manual
+#         adSlot:                       xxxx..xxx
+#         adTest:                       false
 
 # ------------------------------------------------------------------------------
 # END config

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

@@ -0,0 +1,30 @@
+# ------------------------------------------------------------------------------
+#  ~/_data/modules/cookies.yml
+#  User configuration settings for J1 Cookie 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:                                Cookies
+  scope:                                User settings
+  location:                             _data/modules/cookies.yml
+
+# ------------------------------------------------------------------------------
+# User configuration settings
+#
+settings:
+  check_cookies:                        false
+
+# ------------------------------------------------------------------------------
+# END config

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

@@ -0,0 +1,105 @@
+# ------------------------------------------------------------------------------
+# ~/_data/modules/default/advertising.yml
+# Default configuration settings of the Ad 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-org/J1 Template/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# NOTE:
+#
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# About this configuration (used for J1 CC only)
+#
+about_config:
+  title:                                Advertising
+  scope:                                Default settings
+  location:                             _data/modules/default/advertising.yml
+
+# ------------------------------------------------------------------------------
+# User settings
+#
+defaults:
+
+  # ----------------------------------------------------------------------------
+  # Settings
+  #
+  #   enabled
+  #   --------------------------------------------------------------------------
+  #   Enables or disables the Ad services. If disabled, no ads services are
+  #   enabled and no unit container get initialized on any page.
+  #
+  #   values:                           [true|false]
+  #   default:                          false
+  #
+  #   provider
+  #   --------------------------------------------------------------------------
+  #   Currently, only Google adsense (google) is available as an provider
+  #   for advertising.
+  #
+  #   values:                           [google]
+  #   default:                          google
+  #
+  # ----------------------------------------------------------------------------
+  #
+  enabled:                              false
+  provider:                             google
+
+  google:
+
+    # --------------------------------------------------------------------------
+    # Provider settings
+    #
+    #   publisherID
+    #   ------------------------------------------------------------------------
+    #   Your publisher id (ca-pub-xxxx..xxx) connected with your Adsense
+    #   Account the for the domain registered.
+    #
+    #   values:                         string
+    #   default:                        none
+    #
+    #   autoHideOnUnfilled
+    #   ------------------------------------------------------------------------
+    #   For several reasons, the placed ad (unit) containers get unfilled (no
+    #   ad placed inside). Unfilled unit containers results in blank areas
+    #   instead. Using the setting autoHideOnUnfilled, unfilled containers
+    #   can be hidden automatically.
+    #
+    #   values:                         [true|false]
+    #   default:                        true
+    #
+    #   checkTrackingProtection (currently NOT supported)
+    #   ------------------------------------------------------------------------
+    #   Modern browsers in their current versions (e.g. FireFox) provide
+    #   Tracking Protection build-in. If Tracking Protection is enabled
+    #   for a browser, showing ads may blocked automatically. All unit
+    #   containers affected by Tracking Protection are hidden automatically.
+    #
+    #   values:                         [true|false]
+    #   default:                        false
+    #
+    #   showErrorPageOnBlocked (currently NOT supported)
+    #   ------------------------------------------------------------------------
+    #   If Tracking Protection is detected for a browser, no content is
+    #   presented to the visitor and an error page is shown (HTML 447).
+    #
+    #   values:                         [true|false]
+    #   default:                        false
+    #
+    # --------------------------------------------------------------------------
+    #
+    autoHideOnUnfilled:                 true
+    addBorderOnUnfilled:                true
+    checkTrackingProtection:            false
+    showErrorPageOnBlocked:             false
+    addBorderOnUnfilled:                true
+
+# ------------------------------------------------------------------------------
+# END config

data/lib/starter_web/_data/modules/defaults/cookieconsent.yml

@@ -31,9 +31,9 @@ defaults:
   dialogLanguage:                       content                                 # auto|content|one of dialogLanguages
   dialogLanguages:                      [en, de]                                # supported dialog (modal) languages, defaults to FIRST language defined by languages
   contentURL:                           /assets/data/cookieconsent              # dialog content (modals) for all supported languages
-  cookieName:                           j1.user.consent                         # name of the user consent cookie
-  cookieStorageDays:                    365                                     # duration the consent cookie is stored
-  cookieSameSite:                       Strict                                  # restrict consent cookie to first-party, do NOT send cookie to other domains
+#  cookieName:                          j1.user.consent                         # name of the user consent cookie
+#  cookieStorageDays:                   365                                     # duration the consent cookie is stored
+#  cookieSameSite:                      Strict                                  # restrict consent cookie to first-party, do NOT send cookie to other domains
   reloadPageOnChange:                   true                                    # reload current page if user settings has been changed
   whitelisted:                          [ '/pages/public/legal/en/privacy' ]    # pages NO consent issued, currently NOT supported
   xhrDataElement:                       consent-data                            # container for all language-specific consent modals (taken from contentURL)

data/lib/starter_web/_data/modules/defaults/cookies.yml

@@ -0,0 +1,112 @@
+# ------------------------------------------------------------------------------
+#  ~/_data/modules/defaults/cookies.yml
+#  Default configuration settings for J1 Cookie 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
+# ------------------------------------------------------------------------------
+# See:
+#   https://datatracker.ietf.org/doc/html/rfc6265
+#   https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies
+#
+
+# ------------------------------------------------------------------------------
+# Description (used for J1 CC only)
+#
+description:
+
+  title:                                Cookies
+  scope:                                Default settings
+  location:                             _data/modules/defaults/cookies.yml
+
+# ------------------------------------------------------------------------------
+# Default settings
+#
+defaults:
+
+  # ----------------------------------------------------------------------------
+  # Settings/Attributes
+  #
+  #   path
+  #   --------------------------------------------------------------------------
+  #   Attribute 'path' indicates a URL PATH that must exist in the requested
+  #   URL in order to send the Cookie header
+  #
+  #   values:                           string
+  #   default:                          '/'
+  #
+  #   domain
+  #   --------------------------------------------------------------------------
+  #   Switch 'domain' controls if the value for the attribute 'domain' is
+  #   used (= auto|domain) or NOT used (false). If 'auto' is given, the domain
+  #   is calculated from the hostname. Otherwise domain is treates as domain
+  #   to be used.
+  #   If the switch 'domain' is to 'false', the attribute 'domain' is
+  #   automatically set to the (fully qualified) hostname and all subdomains
+  #   are EXCLUDED from accessing the cookies.
+  #
+  #   NOTE: Be carefull setting switch 'domain' to auto. For sites deployed
+  #         to hosts of public domain providers like Netlify (netlify.app),
+  #         this will open the access on cookies to ALL hosts (subdomains)!
+  #         See 'same_site'.
+  #
+  #   values:                           [false|auto|domain]
+  #   default:                          false
+  #
+  #   expires
+  #   --------------------------------------------------------------------------
+  #   lifetime of a cookie [0..365] days. The value of 0 results in a
+  #   SESSION cookie. For all otrher values >0, the cookie results in a
+  #   PERMANENT cookie.
+  #
+  #   values:                           [0..365]
+  #   default:                          0
+  #
+  #   same_site
+  #   --------------------------------------------------------------------------
+  #   Lax: sent for all requests (including subdomains).
+  #   Strict: the cookie is only sent to the site where it originated
+  #   (excluding subdomains)
+  #
+  #   values:                           [Strict|Lax]
+  #   default:                          Strict
+  #
+  #   http_only
+  #   --------------------------------------------------------------------------
+  #   prevent access to cookie values via JavaScript
+  #
+  #   values:                           [false|true]
+  #   default:                          false
+  #
+  #   secure
+  #   --------------------------------------------------------------------------
+  #   Cookies are only sent to the server with an encrypted request over
+  #   the HTTPS protocol
+  #
+  #   values:                           [false|true]
+  #   default:                          false
+  #
+  #   check_cookies
+  #   --------------------------------------------------------------------------
+  #   Check if cookies created/available
+  #
+  #   values:                           [false|true]
+  #   default:                          true
+  #
+  # ----------------------------------------------------------------------------
+  #
+  check_cookies:                        false
+  path:                                 /
+  domain:                               false
+  expires:                              365
+  same_site:                            Strict
+  http_only:                            false
+  secure:                               false
+
+# ------------------------------------------------------------------------------
+# END config

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

@@ -81,7 +81,7 @@
 #
 - item:                                 Blog
   sublevel:
-    - title:                            Creators Blog
+    - title:                            Starter Blog
       href:                             /pages/public/blog/navigator/
       icon:                             near-me
     - title:                            Categories
@@ -255,6 +255,15 @@
     - title:                            This site
       icon:                             home-variant-outline
       href:                             /pages/public/about/site
+    - title:                            Privacy
+      icon:                             heart
+      href:                             /pages/public/legal/en/privacy/
+    - title:                            Impress
+      icon:                             gavel
+      href:                             /pages/public/legal/en/impress/
+    - title:                            Comments
+      icon:                             comment
+      href:                             /pages/public/legal/en/comment_policy/
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/resources.yml

@@ -1369,5 +1369,29 @@ resources:
         js:                             [ modules/translator/js/translator ]
         init_function:                  [ j1.adapter.translator.init ]
 
+  # ----------------------------------------------------------------------------
+  #  Advertising, JS API to provide Ads for J1 Template
+  #
+  - name:                               Advertising
+    resource:
+      id:                               advertising
+      enabled:                          true
+      comment:                          module advertising
+      region:                           head
+      layout:                           [ all ]
+      required:                         ondemand
+      preload:                          false
+      script_load:                      sync
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            []
+        files:                          [
+                                          modules/advertising/js/google/adInitializer.js,
+                                          adapter/js/advertising.js
+                                        ]
+        js:                             []
+        init_function:                  [ j1.adapter.advertising.init ]
+
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_includes/attributes.asciidoc

@@ -195,6 +195,7 @@ tag::urls[]
 :url-jekyll-sass-converter--gh-repo:              https://github.com/jekyll/jekyll-sass-converter/
 :url-jekyll-sitemap--gh-repo:                     https://github.com/jekyll/jekyll-sitemap/
 
+
 :url-jquery--home:                                https://jquery.com/
 
 :url-js-yaml--gh-repo:                            https://github.com/nodeca/js-yaml/
@@ -234,6 +235,10 @@ tag::urls[]
 :url-materialize--home:                           https://materializecss.com/
 :url-materialize--gh-repo:                        https://github.com/Dogfalo/materialize/
 
+:url-mdi--home:                                   https://materialdesignicons.com/
+:url-mdi--gh-repo:                                https://github.com/Templarian/MaterialDesign/
+:url-mdi--cheatsheet:                             https://pictogrammers.github.io/@mdi/font/5.9.55/
+
 :url-mobile-menu-light--home:                     https://www.mmenujs.com/mmenu-light/
 :url-mobile-menu-light--gh-repo:                  https://github.com/FrDH/mmenu-light
 
@@ -432,7 +437,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2022.0.6
+:j1--version:                                     2022.0.10
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_includes/themes/j1/modules/ads/google_ad_content_home.html

@@ -0,0 +1,11 @@
+<!-- insert gad container -->
+<div id="xxx..xx" class="mb-5">
+  <!-- display-ad-horizontal-2 -->
+  <ins class="adsbygoogle"
+       style="display:block"
+       data-ad-client="ca-pub-xxxx..xxx"
+       data-ad-slot="xxxx..xx"
+       data-ad-format="auto"
+       data-full-width-responsive="true">
+  </ins>
+</div>

data/lib/starter_web/_includes/themes/j1/modules/ads/google_ad_top_home.html

@@ -0,0 +1,11 @@
+<!-- insert gad container -->
+<div id="xxx..xx" class="mb-5">
+  <!-- display-ad-horizontal-1 -->
+  <ins class="adsbygoogle"
+       style="display:block"
+       data-ad-client="ca-pub-xxxx..xxx"
+       data-ad-slot="xxx..xx"
+       data-ad-format="auto"
+       data-full-width-responsive="true">
+  </ins>
+</div>

data/lib/starter_web/_plugins/lunr_index.rb

@@ -364,6 +364,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2022.0.6'
+    VERSION = '2022.0.10'
   end
 end

data/lib/starter_web/index.html

@@ -23,7 +23,6 @@ personalization:                        false
 exclude_from_search:                    false
 
 analytics:                              true
-advertising:                            false
 comments:                               false
 
 fab_menu_id:                            default