j1-template 2021.3.1 → 2022.0.2

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

@@ -162,7 +162,7 @@ lanes:
       id:                               home_teaser_banner
       region:                           body-main
       type:                             async
-      properties:                       elevated-z0
+      properties:                       g-2 elevated-z0
 
   # ----------------------------------------------------------------------------
   # SERVICE panel
@@ -172,7 +172,7 @@ lanes:
       id:                               home_service_panel
       region:                           body-main
       type:                             async
-      properties:                       elevated-z0 mb-3
+      properties:                       g-2 elevated-z0
 
   # ----------------------------------------------------------------------------
   # DIVIDER banner
@@ -192,7 +192,7 @@ lanes:
       id:                               home_intro_panel
       region:                           body-main
       type:                             async
-      properties:                       elevated-z2
+      properties:                       g-2 elevated-z2
 
   # ----------------------------------------------------------------------------
   # PARALLAX banner
@@ -214,26 +214,6 @@ lanes:
       type:                             async
       properties:                       mb-3
 
-  # ----------------------------------------------------------------------------
-  # DIVIDER banner
-  #
-  - lane:
-      enabled:                          false
-      id:                               divider-2
-      region:                           body-main
-      type:                             async
-      properties:                       mt-4 mr-5 mb-4 ml-5
-
-  # # ----------------------------------------------------------------------------
-  # # SERVICE panel
-  # #
-  # - lane:
-  #     enabled:                          true
-  #     id:                               home_service_panel
-  #     region:                           body-main
-  #     type:                             async
-  #     properties:                       elevated-z0 mb-3
-
   # ----------------------------------------------------------------------------
   # NEWS panel
   #
@@ -242,14 +222,14 @@ lanes:
       id:                               home_news_panel
       region:                           body-main
       type:                             async
-      properties:                       elevated-z2
+      properties:                       g-2 elevated-z2
 
   # ----------------------------------------------------------------------------
-  # FAM
+  # FAB
   #
   - lane:
       enabled:                          true
-      id:                               fam-container
+      id:                               fab-container
       region:                           body-main
       type:                             async
       properties:                       elevated-z0

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

@@ -160,7 +160,7 @@ lanes:
   #
   - lane:
       enabled:                          false
-      id:                               fam-container
+      id:                               fab-container
       region:                           body-main
       type:                             async
 

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

@@ -186,7 +186,7 @@ lanes:
   #
   - lane:
       enabled:                          true
-      id:                               fam-container
+      id:                               fab-container
       region:                           body-main
       type:                             async
 

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

@@ -176,7 +176,7 @@ lanes:
   #
   - lane:
       enabled:                          true
-      id:                               fam-container
+      id:                               fab-container
       region:                           body-main
       type:                             async
 

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

@@ -67,7 +67,7 @@ defaults:
 
   action_enabled:                       false
   action_url:                           "#void"
-  action_button:                        btn-default btn-raised
+  action_button:                        btn-default
   action_icon:                          download                                # cloud-action
   action_icon_family:                   MDI                                     # FontAweSome
   action_text:                          Download Now

data/lib/starter_web/_data/modules/defaults/{fam.yml → fab.yml}

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
-# ~/_data/modules/fam.yml
-# Default Configuration of the FAM Module (Floating Action Menu)
+# ~/_data/modules/fab.yml
+# Default Configuration of the FAB Module (Floating Action Button)
 #
 # Product/Info:
 # https://jekyll.one
@@ -19,9 +19,9 @@
 # About this configuration (used for J1 CC only)
 #
 about_config:
-  title:                                Floating Action Menu
+  title:                                Floating Action Button
   scope:                                Default settings
-  location:                             _data/modules/defaults/fam.yml
+  location:                             _data/modules/defaults/fab.yml
 
 # ------------------------------------------------------------------------------
 # Default settings
@@ -30,13 +30,14 @@ defaults:
   enabled:                              false
   mode:                                 icon
 
-  xhr_container_id:                     fam-container
-  xhr_data_path:                        /assets/data/fam/index.html
+  xhr_container_id:                     fab-container
+  xhr_data_path:                        /assets/data/fab/index.html
 
   icon_family:                          MDI
   icon_color:                           mdi-md-grey
   icon_size:                            mdi-2x
-  raised_level:                         5
+  raised:                               5                                       # false | one of [1 .. 10]
+  pulsed:                               false                                   # false | one of [1 .. 3]
 
   menu_options:
     direction:                          top

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

@@ -95,6 +95,9 @@ defaults:
   nav_mmenu:
     enabled:                            false
 
+    nav_main_menu:                      navigator_nav_menu                      # used to toggle the menu visibility
+    nav_quicklinks:                     quicklinks                              # used to toggle the menu visibility
+
     mmenu_plugin:
       node:                             "null"
       mediaQuery:                       all

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

@@ -24,10 +24,11 @@ about_config:
   location:                             _data/modules/defaults/rtable.yml
 
 # ------------------------------------------------------------------------------
-# User settings
+# Default settings
 #
 defaults:
   enabled:                              false
+
   breakpoint:                           992
 
 # ------------------------------------------------------------------------------

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

@@ -0,0 +1,33 @@
+# ------------------------------------------------------------------------------
+# ~/_data/modules/defaults/scroller.yml
+# User configuration for J1 Scroller API
+#
+# 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:                                Scroller API
+  scope:                                Default settings
+  location:                             _data/modules/defaults/rtable.yml
+
+# ------------------------------------------------------------------------------
+# Default settings
+#
+defaults:
+  enabled:                              false
+
+# ------------------------------------------------------------------------------
+# END config

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

@@ -155,7 +155,7 @@ defaults:
   cssThemeLink:                         bootstrapTheme
   defaultCssFile:                       https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css
   bootswatchApiUrl:                     https://bootswatch.com/api
-  bootswatchApiVersion:                 4
+  bootswatchApiVersion:                 5
   loadFromBootswatch:                   true
   localThemes:                          /assets/data/themes.json
   excludeBootswatch:                    "Default, default, Lux, Sketchy"

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

@@ -133,8 +133,9 @@ defaults:
   #       default:                      easeInOutCubic
   #
   #     offset
-  #       Amount of space (calculated as pixels) between the top of page and the
-  #       selected table of contents item after the page has been scrolled.
+  #       Amount of space (calculated as pixels) between the top of
+  #       page and the selected table of contents item after the page
+  #       has been scrolled.
   #
   #       values:                       integer
   #       default:                      0
@@ -161,8 +162,8 @@ defaults:
   throttleTimeout:                      150
   scrollSmooth:                         true
   scrollSmoothDuration:                 300
-  scrollSmoothOffset:                   10                                      # TODO: to checked, if set dynamically with toccer adapter
-  scrollContainer:                      null                                    # TODO: to checked, what this option does
+  scrollSmoothOffset:                   0
+  scrollContainer:                      null                                    # TODO: to be checked, what this option does
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/modules/{fam.yml → fab.yml}

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
-# ~/_data/modules/fam.yml
-# User Configuration of the FAM Module (Floating Action Menu)
+# ~/_data/modules/fab.yml
+# User Configuration of the FAB Module (Floating Action Button)
 #
 # Product/Info:
 # https://jekyll.one
@@ -19,9 +19,9 @@
 # About this configuration (used for J1 CC only)
 #
 about_config:
-  title:                                Floating Action Menu
+  title:                                Floating Action Button
   scope:                                User settings
-  location:                             _data/modules/fam.yml
+  location:                             _data/modules/fab.yml
 
 # ------------------------------------------------------------------------------
 # User settings
@@ -43,9 +43,9 @@ settings:
     - name:                             Scroll to top
       enabled:                          true
       id:                               default
-      icon:                             plus
-      icon_hover:                       chevron-up
-      color:                            md-blue
+      icon:                             chevron-double-up
+      icon_hover:                       chevron-double-up
+      color:                            primary
 
       # ------------------------------------------------------------------------
       # MENU items
@@ -62,8 +62,8 @@ settings:
       enabled:                          true
       id:                               open_toc
       icon:                             plus
-      icon_hover:                       cursor-pointer
-      color:                            md-blue
+      icon_hover:                       plus
+      color:                            primary
 
       # ------------------------------------------------------------------------
       # MENU items
@@ -72,27 +72,27 @@ settings:
         - item:                         To Top
           enabled:                      true
           id:                           fam_scroll_to_top
-          color:                        md-green
+          color:                        primary
           event_handler:                scroll_to_top
-          icon:                         step-backward-2
-          icon_properties:              rotate-90
+          icon:                         chevron-double-up
+          icon_properties:
 
         - item:                         Table of Contents
           enabled:                      true
           id:                           open_mmenu_toc
-          color:                        md-blue
+          color:                        info
           event_handler:                open_mmenu_toc
           icon:                         wrap
 
     # --------------------------------------------------------------------------
     # FAM for in-page navigation (simplified)
     #
-    - name:                             in-page control
+    - name:                             in-page control simple
       enabled:                          true
       id:                               page_ctrl_simple
       icon:                             plus
-      icon_hover:                       cursor-pointer
-      color:                            md-blue
+      icon_hover:                       plus
+      color:                            primary
 
       # ------------------------------------------------------------------------
       # MENU items
@@ -102,15 +102,15 @@ settings:
         - item:                         To Top
           enabled:                      true
           id:                           fam_scroll_to_top
-          color:                        md-green
+          color:                        primary
           event_handler:                scroll_to_top
-          icon:                         step-backward-2
-          icon_properties:              rotate-90
+          icon:                         chevron-double-up
+          icon_properties:
 
         - item:                         Previous Section
           enabled:                      true
           id:                           fam_previous_section
-          color:                        md-green
+          color:                        success
           event_handler:                scroll_previous_section
           icon:                         step-backward
           icon_properties:              rotate-90
@@ -118,7 +118,7 @@ settings:
         - item:                         Next Section
           enabled:                      true
           id:                           fam_next_section
-          color:                        md-green
+          color:                        success
           event_handler:                scroll_next_section
           icon:                         step-forward
           icon_properties:              rotate-90
@@ -126,7 +126,7 @@ settings:
         - item:                         Table of Contents
           enabled:                      true
           id:                           open_mmenu_toc
-          color:                        md-blue
+          color:                        info
           event_handler:                open_mmenu_toc
           icon:                         wrap
 
@@ -137,8 +137,8 @@ settings:
       enabled:                          true
       id:                               page_ctrl
       icon:                             plus
-      icon_hover:                       cursor-pointer
-      color:                            md-blue
+      icon_hover:                       plus
+      color:                            primary
 
       # ------------------------------------------------------------------------
       # MENU items
@@ -155,15 +155,15 @@ settings:
         - item:                         To Top
           enabled:                      true
           id:                           fam_scroll_to_top
-          color:                        md-green
+          color:                        primary
           event_handler:                scroll_to_top
-          icon:                         step-backward-2
-          icon_properties:              rotate-90
+          icon:                         chevron-double-up
+          icon_properties:
 
         - item:                         Previous Section
           enabled:                      true
           id:                           fam_previous_section
-          color:                        md-green
+          color:                        success
           event_handler:                scroll_previous_section
           icon:                         step-backward
           icon_properties:              rotate-90
@@ -171,7 +171,7 @@ settings:
         - item:                         Next Section
           enabled:                      true
           id:                           fam_next_section
-          color:                        md-green
+          color:                        success
           event_handler:                scroll_next_section
           icon:                         step-forward
           icon_properties:              rotate-90
@@ -179,7 +179,7 @@ settings:
         - item:                         To bottom
           enabled:                      true
           id:                           fam_scroll_to_bottom
-          color:                        md-green
+          color:                        info
           event_handler:                scroll_to_bottom
           icon:                         step-forward-2
           icon_properties:              rotate-90
@@ -187,7 +187,7 @@ settings:
         - item:                         Table of Contents
           enabled:                      true
           id:                           open_mmenu_toc
-          color:                        md-blue
+          color:                        info
           event_handler:                open_mmenu_toc
           icon:                         wrap
 

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

@@ -16,7 +16,7 @@
 #
 about_config:
 
-  title:
+  title:                                Scroller API
   scope:                                User settings
   location:                             _data/modules/scroller.yml
 
@@ -36,7 +36,7 @@ settings:
         type:                           showOnScroll
         id:                             home_intro_panel
         container:                      home_intro_panel
-        showDelay:                      700
+        showDelay:                      1000
         scrollOffset:                   500
 
     # --------------------------------------------------------------------------

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

@@ -30,9 +30,9 @@ settings:
   #
   # enabled
   # ----------------------------------------------------------------------------
-  #   Enables|Disables the use of J1 TocManager
+  #   Enables|Disables the use of J1 Toccer module
   #
-  #   values:                           boolean (true|false)
+  #   values:                           boolean: [true|false]
   #   default:                          false
   #
   #   log
@@ -40,13 +40,11 @@ settings:
   #   Setting the log option to true enables the current option settings to
   #   be written to the JavaScript console so you can inspect the settings.
   #
-  #     values:                         boolean (true|false)
+  #     values:                         boolean: [true|false]
   #     default:                        false
   # ----------------------------------------------------------------------------
   enabled:                              true
   log:                                  false
-  delay:                                400
-
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/private.yml

@@ -26,13 +26,15 @@ global:
   # used by J1 for encryption
   session_secret:                       <your-secret-string>
 
+
 # ==============================================================================
 # Translator settings
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 translators:
 
   deepl:
-    auth_key:                           1c360075-1a30-28c7-e4eb-2c0c0164ce4b
+    auth_key:                           <your-auth-key>
+
 
 # ==============================================================================
 # MODULE settings

data/lib/starter_web/_data/resources.yml

@@ -354,18 +354,16 @@ resources:
       pass_init_data:                   true
       data:
         css:                            [
-                                          core/css/themes/uno-light/bootstrap,
-                                          core/css/icon-fonts/materialdesign,
-                                          core/css/icon-fonts/materialdesign-light,
+                                          core/css/themes/unolight/bootstrap,
+                                          core/css/icon-fonts/mdi,
+                                          core/css/icon-fonts/mdil,
                                           core/css/icon-fonts/fontawesome,
                                           core/css/vendor
 
                                         ]
-        files:                          [
-                                          modules/util/js/gtag-opt-in.js,
-                                          adapter/js/j1.js
-                                        ]
+        files:                          [ adapter/js/j1.js ]
         js:                             [
+                                          modules/gtag-opt-in/js/gtag-opt-in,
                                           modules/jquery/js/jquery,
                                           modules/jquery/js/jqueryUI,
                                           modules/popper/js/popper,
@@ -477,10 +475,8 @@ resources:
                                           modules/mmenuLight/css/mmenu-light,
                                           modules/mmenuLight/css/theme/uno/mmenu
                                         ]
-        files:                          [
-                                          modules/mmenuLight/js/mmenu.js,
-                                          adapter/js/mmenu.js ]
-        js:                             []
+        files:                          [adapter/js/mmenu.js]
+        js:                             [modules/mmenuLight/js/mmenu]
         init_function:                  [ j1.adapter.mmenu.init ]
 
   # ----------------------------------------------------------------------------
@@ -588,14 +584,36 @@ resources:
         js:                             [ modules/themeSwitcher/js/switcher ]
         init_function:                  []
 
+  # ----------------------------------------------------------------------------
+  # Bootstrap JS (V5)
+  #
+  - name:                               Bootstrap JS
+    resource:
+      id:                               bs5
+      enabled:                          true
+      comment:                          Bootstrap JS
+      region:                           head
+      layout:                           [ all ]
+      required:                         always
+      preload:                          false
+      script_load:                      sync
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            []
+        files:                          []
+        js:                             [ modules/bootstrap/js/bootstrap ]
+        init_function:                  []
+
   # ----------------------------------------------------------------------------
   # BMD, responsive UI framework for Bootstrap
+  # https://github.com/mdbootstrap/bootstrap-material-design/tree/4.1.3
   #
   - name:                               Bootstrap Material Design
     resource:
       id:                               bmd
       enabled:                          true
-      comment:                          Material Design for Bootstrap
+      comment:                          Bootstrap Material Design
       region:                           head
       layout:                           [ all ]
       required:                         always
@@ -606,11 +624,12 @@ resources:
       data:
         css:                            []
         files:                          [ adapter/js/bmd.js ]
-        js:                             [ modules/bmd/js/bootstrap-material-design ]
+        js:                             [ modules/bmd/js/bmd ]
         init_function:                  [ j1.adapter.bmd.init ]
 
   # ----------------------------------------------------------------------------
   # Materialize, responsive UI framework (Vanilla JS)
+  # https://materializecss.com/
   #
   - name:                               Materialize
     resource:
@@ -627,10 +646,9 @@ resources:
       data:
         css:                            []
         files:                          [
-                                          modules/materialize/js/cash.js,
                                           modules/materialize/js/fam.js
                                         ]
-        js:                             []
+        js:                             [ modules/materialize/js/cash ]
         init_function:                  []
 
   # ----------------------------------------------------------------------------
@@ -900,8 +918,8 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            []
-        files:                          [ core/country-flags/css/theme/uno.css ]
+        css:                            [ core/country-flags/css/theme/uno ]
+        files:                          []
         js:                             []
         init_function:                  []
 
@@ -1148,33 +1166,29 @@ resources:
         init_function:                  []
 
   # ----------------------------------------------------------------------------
-  # Floating Button Menu, JS API to create FAM buttons for J1 Template
+  # Floating Action Button Menu. JS API to create FAB menus
   #
-  - name:                               FAM
+  - name:                               FABM
     resource:
-      id:                               fam
+      id:                               fabm
       enabled:                          true
-      comment:                          Floating Button Menu
+      comment:                          FAB Menus
       region:                           head
-      layout:                           [                                       # TODO: check if FAM makes sense for layout app
-                                          home, page, post, collection,
-                                          blog_archive
-                                        ]
+      layout:                           [ all ]
       required:                         always
-      preload:                          false                                   # property currently unused
+      preload:                          false
       script_load:                      sync
       dependencies:                     false
       pass_init_data:                   true
       data:
-        css:                            [ modules/fam/css/theme/uno/fam ]             # styles for (J1) theme Uno]
+        css:                            []                                      # styles moved to Template CSS
         files:                          [
-#                                         modules/cash/js/cash.js,              # current version|s of Cash NOT usable
-                                          modules/materialize/js/cash.js,       # adapted|old (1.3.5) version from Materialize
-                                          modules/fam/js/fam.js,                # modified version for J1 (former: button.js)
-                                          adapter/js/fam.js                     # adapter adopted from ssm module
+                                          modules/fab/js/cash.js,               # adapted|old (1.3.5) version from Materialize
+                                          modules/fab/js/fab.js,                # modified version for J1 (former: button.js)
+                                          adapter/js/fab.js                     # adapter adopted from ssm module
                                         ]
         js:                             []
-        init_function:                  [ j1.adapter.fam.init ]
+        init_function:                  [ j1.adapter.fab.init ]
 
   # ----------------------------------------------------------------------------
   # lunr search engine, JS API used for the QuickSearch feature of J1 Template
@@ -1304,8 +1318,8 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            [ modules/msDropdown/css/msDropdown ]
-        files:                          []
+        css:                            []
+        files:                          [ modules/msDropdown/css/themes/uno/msDropdown.css ]
         js:                             [ modules/msDropdown/js/msDropdown ]
         init_function:                  []