j1-template 2021.1.2 → 2021.1.7

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

@@ -191,7 +191,7 @@ lanes:
       id:                               j1_footer
       region:                           body-footer
       type:                             async
-      class:
+      class:                            mt-5
 
   # ----------------------------------------------------------------------------
   # MODULE generator

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

@@ -173,7 +173,7 @@ lanes:
       id:                               home_teaser_banner
       region:                           body-main
       type:                             async
-      properties:                       mt-3 mr-5 mb-0 ml-3
+      properties:                       elevated-z0
 
   # ----------------------------------------------------------------------------
   # DIVIDER banner
@@ -193,7 +193,7 @@ lanes:
       id:                               home_intro_panel
       region:                           body-main
       type:                             async
-      properties:                       mt-3 mr-5 mb-3 ml-3
+      properties:                       elevated-z2
 
   # ----------------------------------------------------------------------------
   # PARALLAX banner
@@ -203,7 +203,7 @@ lanes:
       id:                               home_parallax_banner
       region:                           body-main
       type:                             async
-      properties:                       mb-3
+      properties:                       elevated-z0
 
   # ----------------------------------------------------------------------------
   # IMAGE banner
@@ -223,7 +223,7 @@ lanes:
       id:                               home_service_panel
       region:                           body-main
       type:                             async
-      properties:                       mt-3 mr-5 mb-3 ml-3
+      properties:                       mt-5 mr-5 mb-4 ml-3
 
   # ----------------------------------------------------------------------------
   # DIVIDER banner
@@ -243,7 +243,7 @@ lanes:
       id:                               home_news_panel
       region:                           body-main
       type:                             async
-      properties:                       mt-3 mr-5 mb-3 ml-3
+      properties:                       elevated-z2
 
   # ----------------------------------------------------------------------------
   # FAM
@@ -253,6 +253,7 @@ lanes:
       id:                               fam-container
       region:                           body-main
       type:                             async
+      properties:                       elevated-z0
 
 # ------------------------------------------------------------------------------
 # END config

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

@@ -124,7 +124,7 @@ lanes:
   # Ad Block
   #
   - lane:
-      enabled:                          true
+      enabled:                          false
       region:                           body-header
       type:                             sync
       base:                             _includes/themes/j1

data/lib/starter_web/_data/modules/{cookiebar.yml → cookieconsent.yml}

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
-#  ~/_data/modules/j1_cookiebar.yml
-#  User configuration settings for J1 Cookiebar module
+#  ~/_data/modules/j1_cookieconsent.yml
+#  User configuration settings for J1 Cookie Consent module
 #
 #  Product/Info:
 #  https://jekyll.one
@@ -16,9 +16,9 @@
 #
 description:
 
-  title:                                Cookiebar
+  title:                                CookieConsent
   scope:                                User settings
-  location:                             _data/modules/cookiebar.yml
+  location:                             _data/modules/cookieconsent.yml
 
 # ------------------------------------------------------------------------------
 # User configuration settings

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

@@ -202,6 +202,7 @@ defaults:
     enabled:                            false
 
     xhr_container_id:                   authclient_modals
+    xhr_data_element:                   authClientModals
     xhr_data_path:                      /assets/data/authclient/index.html
 
     signin_modal_id:                    modalOmniSignIn

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

@@ -0,0 +1,135 @@
+# ------------------------------------------------------------------------------
+#  ~/_data/modules/defaults/cookieconsent.yml
+#  Default configuration settings for J1 Cookie Consent 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
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# About this configuration (used for J1 CC only)
+#
+about_config:
+  title:                                CookieConsent
+  scope:                                Default settings
+  location:                             _data/modules/defaults/cookieconsent.yml
+
+# ------------------------------------------------------------------------------
+# Default settings
+#
+defaults:
+
+  enabled:                              false
+
+  autoShowDialog:                       true                                    # disable autoShowModal on the privacy policy and legal notice pages, to make these pages readable
+  language:                             en                                      # the language, in which the modal is shown. Default navigator.language
+  languages:                            [en, de]                                # supported languages, defaults to first language in array (en)
+  contentURL:                           /assets/data/cookieconsent              # this URL must contain the dialogs content in the needed languages
+  cookieName:                           j1.user.consent                         # the name of the cookie in which the configuration is stored as JSON
+  cookieStorageDays:                    365                                     # the duration the cookie configuration is stored on the client
+
+  reloadPageOnChange:                   false                                   # reload current page if any user settings has been changed
+  xhr_data_element:                     consent-data                            # container for the language-specific consent modal taken from /assets/data/cookieconsent.html
+  whitelisted:                          [ "/pages/public/legal/en/privacy" ]    # pages no consent issued
+
+  consent_modal_title:
+    de:                                 Ihre Privatsphäre
+    en:                                 Your Privacy
+
+  body_text:
+    en: >
+                                        This website is using cookies and similar technologies that
+                                        are required for operation. You are free to decide to give,
+                                        refuse or withdraw your consent at any time by clicking
+                                        the <code>My Settings</code> button. Subsequent changes are
+                                        possible at any time by clicking on the <code>cookie icon</code>
+                                        in the menu bar.
+                                        <br><br>
+                                        Extended cookies are only used with your consent. Additional
+                                        cookies are used to analyze the usage of this website.
+                                        Analysis of the use of this website help gives you a better
+                                        user experience of the website to offer. More information
+                                        about what data is collected and how they may be passed on
+                                        to partners can be found in the <code>Privacy Policy</code>.
+                                        <br><br>
+                                        Visiting this website, you consent to the use of by clicking the
+                                        <code>I agree</code> button.
+    de: >
+                                        Diese Website nutzt Cookies und ähnliche Technologien, die
+                                        zum Betrieb erforderlich sind. Es steht Ihnen frei, Ihre
+                                        Zustimmung jederzeit zu geben, zu verweigern oder zurückzuziehen,
+                                        indem Sie auf die Schaltfläche <code>Meine Einstellungen</code>
+                                        klicken. Nachträgliche Änderungen sind jederzeit möglich, indem Sie
+                                        auf das <code>Cookie-Icon</code> in der Menüleiste klicken.
+                                        <br><br>
+                                        Erweiterte Cookies werden nur mit Ihrer Zustimmung verwendet.
+                                        Zusätzliche Cookies werden eingesetzt, um Analysen der Nutzung
+                                        dieser Website durchzuführen. Analysen der Nutzung dieser Website
+                                        helfen dabei, Ihnen ein besseres Nutzungserlebnis der Website
+                                        zu bieten. Weitere Informationen welche Daten gesammelt und
+                                        wie sie ggf. an Partner weitergegeben werden finden Sie in der
+                                        <code>Datenschutzerklärung</code>.
+                                        <br><br>
+                                        Für den Besuch dieser Webseite stimmen Sie der Verwendung zu,
+                                        indem Sie auf die Schaltfläche <code>Einverstanden</code> klicken.
+
+  privacy_notice:
+    en: >
+                                        The operators of this website take the protection of your personal data
+                                        seriously. We treat your data confidential and comply with the
+                                        General Data Protection Regulation (GDPR) of the European Union to
+                                        protect your privacy.
+                                        A small set of data is stored in persistent cookies, e.g. what data
+                                        you agree to be stored in cookies. Persistent cookies have a lifespan
+                                        of 365 days (a year). We and our partners make use of persistent cookies.
+                                        Those additional cookies are only used with your consent.
+                                        <br><br>
+                                        <code>Necessary</code> data is stored to run base services of this site.
+                                        This website is based on static content, and no database is used behind it.
+                                        All information (data) needed to control this site is stored in
+                                        so-called session cookies. Session cookies are automatically removed by your
+                                        browser if you close all windows.
+                                        <br><br>
+                                        <code>Analysis</code> of the use of this website helps us to optimize your
+                                        user experience of the website. For analysis, Google Analytics (GA) is used.
+                                        This website does <b>not</b> transfer any personal data to GA. Implicit
+                                        personal information, like IP addresses, is anonymized to protect your privacy.
+                                        <br><br>
+                                        <code>Personalization</code> is used e.g. to collect user feedback or running
+                                        advertising campaigns to provide you a website free of charge. Partners like
+                                        Disqus or Google enables us to provide you excellent personalized services and
+                                        enables us to finance the costs for running this site.
+    de: >
+                                        Die Betreiber dieser Website nehmen den Schutz Ihrer persönlichen Daten ernst.
+                                        Wir behandeln Ihre Daten vertraulich und halten uns zum Schutz Ihrer Privatsphäre
+                                        an die Datenschutz-Grundverordnung (DSGVO) der Europäischen Union. In persistenten
+                                        Cookies wird ein kleiner Datensatz gespeichert, z.B. mit welchen Daten Sie
+                                        einverstanden sind, in Cookies gespeichert zu werden. Dauerhafte Cookies haben
+                                        eine Lebensdauer von 365 Tagen (ein Jahr). Wir und unsere Partner verwenden
+                                        dauerhafte Cookies. Diese zusätzlichen Cookies werden nur mit Ihrer Zustimmung
+                                        verwendet.
+                                        <br><br>
+                                        <code>Notwendige</code> Daten werden gespeichert, um Basisdienste dieser Site zu
+                                        betreiben. Diese Website basiert auf statischen Inhalten und es wird keine
+                                        Datenbank dahinter verwendet. Alle Informationen (Daten), die zur Steuerung dieser
+                                        Seite benötigt werden, werden in sogenannten Session-Cookies gespeichert. Sitzungscookies
+                                        werden von Ihrem Browser automatisch entfernt, wenn Sie alle Fenster schließen.
+                                        <br><br>
+                                        <code>Analysen</code> der Nutzung dieser Website hilft uns, Ihr Nutzungserlebnis der
+                                        Website zu optimieren. Zur Analyse wird Google Analytics (GA) verwendet. Diese Website
+                                        übermittelt keine personenbezogenen Daten an GA. Implizite personenbezogene Daten wie
+                                        IP-Adressen werden zum Schutz Ihrer Privatsphäre anonymisiert.
+                                        <br><br>
+                                        <code>Personalisierung</code> wird z.B. um Benutzerfeedback zu sammeln oder
+                                        Werbekampagnen durchzuführen, um Ihnen eine Website kostenlos zur Verfügung zu
+                                        stellen. Partner wie Disqus oder Google ermöglichen es uns, Ihnen exzellente
+                                        personalisierte Dienste anzubieten und die Kosten für den Betrieb dieser Website
+                                        zu finanzieren.
+
+# ------------------------------------------------------------------------------
+# END config

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

@@ -73,7 +73,7 @@ defaults:
   nav_bar:
     enabled:                            false
 
-    xhr_container_id:                   navigator_nav_navbar
+#   xhr_container_id:                   navigator_nav_navbar
 
     media_breakpoint:                   lg
     brand_position:                     right                                   # left|right
@@ -116,6 +116,7 @@ defaults:
     enabled:                            false
 
     xhr_container_id:                   navigator_nav_menu
+    xhr_data_element:                   desktop_menu
     xhr_data_path:                      /assets/data/menu/index.html
 
     raised_level:                       5                                       # level
@@ -154,6 +155,7 @@ defaults:
     enabled:                            false
 
     xhr_container_id:                   navigator_nav_quicklinks
+    xhr_data_element:                   quicklinks
     xhr_data_path:                      /assets/data/quicklinks/index.html
 
     icon_family:                        MDI
@@ -194,7 +196,8 @@ defaults:
   nav_topsearch:
     enabled:                            false
 
-    xhr_container_id:                   navigator_nav_topsearch
+    container_id:                       navigator_nav_topsearch
+
     type:                               quicksearch
     icon_family:                        MDI
     icon_color:                         "#FFFFFF"                               # md-white

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

@@ -143,6 +143,7 @@ about_config:
 defaults:
 
   enabled:                              false
+
   retries:                              30                                      # retry to load theme list from API
   saveToCookie:                         true
   debug:                                false
@@ -151,7 +152,7 @@ defaults:
   menu_icon_color:                      "#9E9E9E"
   menu_icon_size:                       mdi-sm
   cssThemeLink:                         bootstrapTheme
-  defaultCssFile:                       https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css
+  defaultCssFile:                       https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css
   bootswatchApiUrl:                     https://bootswatch.com/api
   bootswatchApiVersion:                 4
   loadFromBootswatch:                   true

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

@@ -49,7 +49,7 @@ settings:
 
     # --------------------------------------------------------------------------
     # INSTANCE configuration (drawers|menus)
-    # --------------------------------------------------------------------------
+    #
     menus:
 
       # ------------------------------------------------------------------------
@@ -59,6 +59,7 @@ settings:
           enabled:                      true
 
           xhr_container_id:             navigator_nav_mmenu
+          xhr_data_element:             menu_mmenu
           xhr_data_path:                /assets/data/mmenu/index.html
 
           drawer:
@@ -72,6 +73,27 @@ settings:
             button:                     "#mmenu-button"
             button_activated:           always
 
+      # ------------------------------------------------------------------------
+      # DRAWER TOC
+      #
+      - menu:
+          enabled:                      true
+
+          xhr_container_id:             navigator_toc_mmenu
+          xhr_data_element:             toc_mmenu
+          xhr_data_path:                /assets/data/mmenu_toc/index.html
+
+          drawer:
+            position:                   right
+
+          content:
+            id:                         toc_mmenu
+            type:                       drawer
+            title:                      Table of Contents
+            theme:                      dark
+            button:                     "#open_mmenu_toc"
+            button_activated:           "js-toc-content"
+
       # ------------------------------------------------------------------------
       # DRAWER Sidebar
       #
@@ -79,6 +101,7 @@ settings:
           enabled:                      false
 
           xhr_container_id:             navigator_sidebar_mmenu
+          xhr_data_element:             sidebar_mmenu
           xhr_data_path:                /assets/data/mmenu_sidebar/index.html
 
           drawer:
@@ -182,26 +205,6 @@ settings:
 #                     href:             mailto:contact@jekyll.one
 #                     target:           none
 
-      # ------------------------------------------------------------------------
-      # DRAWER TOC
-      #
-      - menu:
-          enabled:                      true
-
-          xhr_container_id:             navigator_toc_mmenu
-          xhr_data_path:                /assets/data/mmenu_toc/index.html
-
-          drawer:
-            position:                   right
-
-          content:
-            id:                         toc_mmenu
-            type:                       drawer
-            title:                      Table of Contents
-            theme:                      dark
-            button:                     "#open_mmenu_toc"
-            button_activated:           "js-toc-content"
-
   # ----------------------------------------------------------------------------
   # NavQuicklinks
   #

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

@@ -75,13 +75,13 @@ generators:
       title:                        Mansonry grid layout of Justified Gallery
       tagline:
 
-        css:                        [
-                                      {
-                                        local:  "modules/cookiebar/css/cookiebar",
-                                        remote: "https://cdnjs.cloudflare.com/ajax/libs/jquery-cookiebar/1.0.5/jquery.cookiebar"
-                                      }
-                                    ]
+        # css:                        [
+        #                               {
+        #                                 local:  "modules/cookiebar/css/cookiebar",
+        #                                 remote: "https://cdnjs.cloudflare.com/ajax/libs/jquery-cookiebar/1.0.5/jquery.cookiebar"
+        #                               }
+        #                             ]
 
 
 # ------------------------------------------------------------------------------
-# END config
+# END config

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

@@ -0,0 +1,119 @@
+# ------------------------------------------------------------------------------
+# ~/_data/private.yml
+# The private.yml file is used to set sensitive private data used by
+# J1 components to configure security and authentication settings
+#
+# Product/Info:
+# https://jekyll.one
+#
+# Copyright (C) 2019 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+# NOTE:
+#   As this file contains very confidential data, a productive private.yml
+#   file should ALWAYS be excluded from ANY source published to the public
+#   (e.g. a repo at Github)
+# ------------------------------------------------------------------------------
+
+
+# ==============================================================================
+# GLOBAL settings
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+global:
+
+  # used by J1 to encrypt cookies
+  session_secret:                       <your-secret-string>
+
+
+# ==============================================================================
+# MODULE settings
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+modules:
+
+  # J1 Webhook
+  # NOTE:
+  # ----------------------------------------------------------------------------
+  webhook:
+
+    comment:
+      name:                             <your-config-name>
+      user:                             <your-gh-user>
+      repo:                             <your-gh-repo>
+      server_url:                       <your-gh-webhook-url>
+
+    secret:                             <your-gh-secret>                        # secret used at GH Webhooks
+    payload_url:                        <your-payload-url>                      # payload url (e.g channel at smee.io)
+
+
+# ==============================================================================
+# # J1 Utility Server
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+util_srv:
+
+  oauth:
+
+    # GH OAuth settings used for J1 Control Center (NetlifyCMS) for the
+    # external OAuth client (base_url)
+    # --------------------------------------------------------------------------
+    comment:
+      name:                           <your-config-name>
+      user:                           <your-gh-user>
+      user_url:                       <your-user-url>
+      strategy:                       members
+      members:                        all
+
+    site_url:                         http://localhost:41010
+    site_redirect_url:                http://localhost:41010/auth/github/callback
+    client_scope:                     repo, user
+    client_id:                        <your-client-id>
+    client_secret:                    <your-client-secret>
+
+
+# ==============================================================================
+# MIDDLEWARE settings
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+middleware:
+
+  # OAuth settings (J1 Auth Client)
+  # ----------------------------------------------------------------------------
+  oauth:
+
+    # --------------------------------------------------------------------------
+    # DISQUS credentials
+    # ==========================================================================
+    disqus:
+
+      # J1 Auth client (mode APP, development system)
+      # ------------------------------------------------------------------------
+      comment:
+        name:                           <your-disqus-config-name>
+        user:                           <your-disqus-user>
+
+      client_url:                       http://localhost:41010
+      client_redirect_url:              http://localhost:41010/auth/disqus/callback
+      client_id:                        <your-disqus-client-id>
+      client_secret:                    <your-disqus-client-secret>
+
+    # --------------------------------------------------------------------------
+    # GITHUB credentials
+    # ==========================================================================
+    github:
+
+      # J1 Auth client (mode APP, development system)
+      # ------------------------------------------------------------------------
+      comment:
+        name:                           <your-gh-config-name>
+        user:                           <your-gh-user>
+        org:                            <your-gh-org>
+        strategy:                       members
+        members:                        all
+
+      client_url:                       http://localhost:41010
+      client_redirect_url:              http://localhost:41010/auth/github/callback
+      client_id:                        <your-gh-client-id>
+      client_secret:                    <your-gh-client-secret>
+
+# ------------------------------------------------------------------------------
+# END