j1_template 2019.4.7 → 2019.4.8

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

@@ -0,0 +1,172 @@
+# ------------------------------------------------------------------------------
+# ~/_data/modules/defaults/toccer.yml
+# Default configuration settings for J1 Toccer (TOC Module)
+#
+# 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
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# About this configuration (used for J1 CC only)
+#
+about_config:
+
+  title:                                Toccer
+  scope:                                Default settings
+  location:                             _data/modules/toccer.yml
+
+# ------------------------------------------------------------------------------
+# User configuration settings
+#
+settings:
+
+  # ----------------------------------------------------------------------------
+  # GENERAL settings
+  #
+  # enabled
+  # ----------------------------------------------------------------------------
+  #   Enables|Disables the use of J1 TocManager
+  #
+  #   values:                         boolean (true|false)
+  #   default:                        false
+  #
+  #   log
+  #   --------------------------------------------------------------------------
+  #   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)
+  #     default:                        false
+  # ----------------------------------------------------------------------------
+  enabled:                            true
+  log:                                false
+
+  # ----------------------------------------------------------------------------
+  # MODULE settings
+  #
+  # tocSelector
+  # ----------------------------------------------------------------------------
+  #   Specifies the <div> element where to render the table of contents.
+  #
+  #   type:                           string (HTML class)
+  #   values:                         any HTML class
+  #   default:                        .js-toc
+  #
+  #   headingSelector
+  #   --------------------------------------------------------------------------
+  #   Which headings to grab inside of the contentSelector element to build
+  #   the table of contents.
+  #
+  #     type:                           string (HTML class)
+  #     values:                         any HTML heading element class
+  #     default:                        "h1, h2, h3"
+  #
+  #   ignoreSelector
+  #   --------------------------------------------------------------------------
+  #   Headings that match the ignoreSelector will be skipped and ignored.
+  #   Use this HTML class to exclude a heading from TOC.
+  #
+  #     type:                           string (HTML class)
+  #     values:                         any HTML class
+  #     default:                        .notoc
+  #
+  #   contentSelector
+  #   --------------------------------------------------------------------------
+  #   Specifies the <div> element, typiclly your contet area, from which
+  #   the headings are taken to calculate the TOC.
+  #
+  #     type:                           string (HTML class)
+  #     default:                        .js-toc-content
+  #
+  #   activeLinkColor
+  #   --------------------------------------------------------------------------
+  #   Color of the TOC element that is marked as selected (active).
+  #
+  #     type:                           string (color)
+  #     default:                        "#204A87"
+  #
+  #   collapseDepth
+  #   --------------------------------------------------------------------------
+  #   Specifies how many heading levels should NOT collapsed (displayed).
+  #   For example, a value of 6 will show everything (since there are
+  #   only 6 heading levels (H1 .. H6) and a value of 1 will collapse
+  #   all. Hidden sections opened and closed (accordion effect) as the
+  #   content is being scrolled down.
+  #
+  #     type:                           integer ( [1..6] )
+  #     default:                        2
+  #
+  #   throttleTimeout
+  #   --------------------------------------------------------------------------
+  #   Timeout between events firing to make sure it's not too rapid
+  #   (for performance reasons).
+  #
+  #     type:                           integer
+  #     default:                        50
+  #
+  #   scrollOptions
+  #   --------------------------------------------------------------------------
+  #   smooth-scroll options object, see more details at:
+  #   https://github.com/cferdinandi/smooth-scroll
+  #
+  #   values
+  #
+  #     easing                        Type|Speed of the scroll effect the heading|section
+  #                                   (of the content) is scrolled to if a toc element
+  #                                   has been selected.
+  #       Linear,                     moves at the same speed from start to finish.
+  #       EaseIn,                     gradually increases in speed.
+  #       EaseOut,                    gradually decreases in speed.
+  #       EaseInOut,                  gradually increases in speed, peaks, and then
+  #                                   gradually slows down.
+  #
+  #       values:                     Linear|
+  #                                   easeInQuad|easeInCubic|easeInQuart|easeInQuint
+  #                                   easeOutQuad|easeOutCubic|easeOutQuart|easeOutQuint
+  #                                   easeInOutQuad|easeInOutCubic|easeInOutQuart|easeInOutQuint
+  #
+  #       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.
+  #
+  #       values:                     integer
+  #       default:                    0
+  #
+  #     speed
+  #       Overall time (measured in milliseconds) to complete the scroll.
+  #
+  #       values:                     integer
+  #       default:                    300
+  #
+  #     updateURL
+  #       ...
+  #
+  #       values:                     boolean (true|false)
+  #       default:                    true
+  #
+  # ----------------------------------------------------------------------------
+  tocSelector:                      .js-toc
+  headingSelector:                  "h2, h3, h4, h5"
+  headingsOffset:                   500
+  ignoreSelector:                   .notoc
+  contentSelector:                  .js-toc-content
+  activeLinkColor:                  "#3F51B5"
+  collapseDepth:                    2
+  throttleTimeout:                  50
+  includeHtml:                      false
+  smoothScrollEnabled:              true
+  smoothScrollDuration:             300
+  smoothScrollOffset:               90
+  headingsOffset:                   0
+  throttleTimeout:                  50
+
+
+# END config
+# ------------------------------------------------------------------------------

data/lib/starter_web/_data/resources.yml

@@ -357,7 +357,7 @@ resources:
   #   14  back2top                      back2top@1.1
   #   15  bs_theme_switcher             bs_theme_switcher@1.1.5
   #   16  backstretch                   backstretch@2.1.16
-  #   17  cookiebar                     cookiebar@2015-07-24
+  #   17  cookie consent                cookieConsent@2019-07-24
   #   18  bootstrap_datepicker          datepicker@1.7.1
   #   19  bs_gallery                    bs_gallery@2017-12-27
   #
@@ -402,7 +402,7 @@ resources:
         css:                            []
         files:                          [ adapter/js/logger.js ]
         js:                             []
-#       init_function:                  [ j1.adapter.logger.init ]
+        init_function:                  [ j1.adapter.logger.init ]
 
   # ----------------------------------------------------------------------------
   # Master Header
@@ -440,7 +440,26 @@ resources:
         css:                            []
         files:                          [ adapter/js/navigator.js ]
         js:                             []
-#       init_function:                  [ j1.adapter.navigator.init ]
+        init_function:                  [ j1.adapter.navigator.init ]
+
+  # ----------------------------------------------------------------------------
+  # WebHook
+  #
+  - name:                               J1 WebHook
+    resource:
+      id:                               webhook
+      enabled:                          true
+      comment:                          Resources used by J1 WebHook
+      region:                           head
+      layout:                           [ all ]
+      required:                         always
+      script_load:                      sync
+      pass_init_data:                   false
+      data:
+        css:                            []
+        files:                          [ adapter/js/octokit.js ]
+        js:                             []
+        init_function:                  [ j1.adapter.octokit.init ]
 
   # ----------------------------------------------------------------------------
   # Toccer
@@ -546,7 +565,7 @@ resources:
       enabled:                          true
       comment:                          Resources used by J1 Cookie Consent
       region:                           head
-      layout:                           [ home, page, post, collection ]        # [ all ]
+      layout:                           [ all ]
       required:                         always
       script_load:                      defer
       pass_init_data:                   false
@@ -556,26 +575,6 @@ resources:
         js:                             []
         init_function:                  [ j1.adapter.cookie_consent.init ]
 
-  # ----------------------------------------------------------------------------
-  # WebHook
-  #
-  - name:                               J1 WebHook
-    resource:
-      id:                               webhook
-      enabled:                          true
-      comment:                          Resources used by J1 WebHook
-      region:                           head
-      layout:                           [ all ]
-      required:                         always
-      script_load:                      defer
-      pass_init_data:                   false
-      data:
-        css:                            []
-        files:                          [ adapter/js/octokit.js ]
-        js:                             []
-        init_function:                  [ j1.adapter.octokit.init ]
-
-
 # ==============================================================================
 # J1 Core MODULES initialized 'ondemand' for a layout
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/template_settings.yml

@@ -112,7 +112,7 @@ cookies:
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-#   flicker_timeout
+#   flicker_timeout (2019-08-06: currently NOT used anymore)
 #   ----------------------------------------------------------------------------
 #   Number of milliseconds (ms) the current page is hidden (display: none)
 #   to prevent "DOM flicker" (aka "FOUC": Flash of unstyled content)
@@ -126,7 +126,7 @@ cookies:
 #   NOTE: See ~/packages/300_template_src/_layouts/default.html
 #
 # ------------------------------------------------------------------------------
-flicker_timeout:                        250                                     # 100
+flicker_timeout:                        100
 
 # -------------------------------------------------------------------------
 # HTML Pretty Print

data/lib/starter_web/assets/data/authclient.html

@@ -5,20 +5,20 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/authclient.html
- #  Liquid PROCEDURE to generate the HTML (data) portion of all modals used
- #  by J1AuthClient
+ # ~/assets/data/authclient.html
+ # Liquid PROCEDURE to generate the HTML (data) portion of all modals used
+ # by J1AuthClient
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2019 Juergen Adams
+ # 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
  #
  # -----------------------------------------------------------------------------
- #  Test data:
+ # Test data:
  #   liquid_var: {{ liquid_var | debug }}
  #   authclient_options: {{ authclient_options | debug }}
  # -----------------------------------------------------------------------------

data/lib/starter_web/assets/data/banner.html

@@ -5,20 +5,20 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/banner.html
- #  Liquid procedure to generate HTML (data) for all BANNER configured for
- #  (fragmented) AJAX load
+ # ~/assets/data/banner.html
+ # Liquid procedure to generate HTML (data) for all BANNER configured for
+ # (fragmented) AJAX load
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2019 Juergen Adams
+ # 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
  #
  # -----------------------------------------------------------------------------
- #  Test data:
+ # Test data:
  #    {{ variable | debug }}
  #
  # -----------------------------------------------------------------------------
@@ -42,14 +42,20 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign banner_config_defaults = site.data.blocks.defaults.banner %}
-{% assign banner_config_settings = site.data.blocks.banner %}
+{% assign template_config         = site.data.template_settings %}
+{% assign blocks                  = site.data.blocks %}
+{% assign banner_config_defaults  = blocks.defaults.banner %}
+{% assign banner_config_settings  = blocks.banner %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign banner_config_defaults = banner_config_defaults.defaults %}
 {% assign banner_config_settings = banner_config_settings.settings %}
 
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign parallax_options  = banner_config_defaults.parallax_settings | merge: banner_config_settings.parallax_settings %}
+
 {% comment %} Set HELPER variables
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture banner_config_file_name %}~/_data/blocks/banner.yml{% endcapture %}
@@ -297,15 +303,14 @@ regenerate:                             true
 
             {% if card_type == 'quote' and card_enabled %}
 
-              {% comment %} Set banner DEFAULTS
+              {% comment %} Set parallax DEFAULTS
               ------------------------------------------------------------------ {% endcomment %}
-              {% assign parallax_defaults     = site.data.modules.j1_parallax.parallax_quote %}
-              {% assign background_image      = parallax_defaults.background %}
-              {% assign gridify               = parallax_defaults.gridify %}
-              {% assign gridifier             = parallax_defaults.gridifier %}
-              {% assign text_color            = parallax_defaults.text_color %}
-              {% assign cite_color            = parallax_defaults.cite_color %}
-              {% assign darken                = parallax_defaults.darken %}
+              {% assign background_image  = parallax_options.background %}
+              {% assign gridify           = parallax_options.gridify %}
+              {% assign gridifier         = parallax_options.gridifier %}
+              {% assign text_color        = parallax_options.text_color %}
+              {% assign cite_color        = parallax_options.cite_color %}
+              {% assign darken            = parallax_options.darken %}
 
               {% comment %} Set banner VALUES
               ------------------------------------------------------------------ {% endcomment %}

data/lib/starter_web/assets/data/cookie_consent.html

@@ -6,20 +6,20 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/cookie_consent.html
- #  Liquid PROCEDURE to generate the HTML (data) portion of all modals used
- #  by J1 Cookie Consent module
+ # ~/assets/data/cookie_consent.html
+ # Liquid PROCEDURE to generate the HTML (data) portion of all modals used
+ # by J1 Cookie Consent module
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2019 Juergen Adams
+ # 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
  #
  # -----------------------------------------------------------------------------
- #  Test data:
+ # Test data:
  #   liquid_var: {{ liquid_var | debug }}
  #   config: {{ config | debug }}
  # -----------------------------------------------------------------------------

data/lib/starter_web/assets/data/footer.html

@@ -5,22 +5,21 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/footer.html
- #  Liquid procedure to generate HTML (data) portion of the page footer for
- #  (fragmented) AJAX load
+ # ~/assets/data/footer.html
+ # Liquid procedure to generate HTML (data) portion of the page footer for
+ # (fragmented) AJAX load
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2019 Juergen Adams
+ # 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
  #
  # -----------------------------------------------------------------------------
- #  Test data:
+ # Test data:
  #    {{ variable | debug }}
- #
  # -----------------------------------------------------------------------------
 {% endcomment %}
 

data/lib/starter_web/assets/data/menu.html

@@ -6,22 +6,21 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/menu.html
- #  Liquid procedure to generate HTML portion of the main menu bar
- #  NOTE: Loaded dynamically by J1 NAV Manager module (AJAX)
+ # ~/assets/data/menu.html
+ # Liquid procedure to generate HTML portion of the main menu bar
+ # NOTE: Loaded dynamically by J1 NAV Manager module (AJAX)
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2019 Juergen Adams
+ # 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
  #
  # -----------------------------------------------------------------------------
- #  Test data:
+ # Test data:
  #    {{ variable | debug }}
- #
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -36,13 +35,19 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign navigator_settings        = site.data.modules.navigator.settings %}
-{% assign navigator_defaults        = site.data.modules.defaults.navigator.defaults %}
-{% assign navigator_menu_config     = site.data.modules.j1_navigator_menu %}
-{% assign themeswitcher_config      = site.data.modules.j1_theme_switcher %}
+{% assign site_config       = site %}
+{% assign template_config   = site.data.template_settings %}
+{% assign modules           = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign navigator_settings        = modules.navigator.settings %}
+{% assign navigator_defaults        = modules.defaults.navigator.defaults %}
+{% assign navigator_menu_config     = modules.navigator_menu %}
+
+{% assign switcher_defaults         = modules.defaults.theme_switcher.defaults %}
+{% assign switcher_settings         = modules.theme_switcher.settings %}
+
 {% assign nav_bar_defaults          = navigator_defaults.nav_bar %}
 {% assign nav_bar_settings          = navigator_settings.nav_bar %}
 {% assign nav_menu_defaults         = navigator_defaults.nav_menu %}
@@ -50,12 +55,12 @@ regenerate:                             true
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign switcher_options          = switcher_defaults | merge: switcher_settings %}
 {% assign nav_bar_options           = nav_bar_defaults  | merge: nav_bar_settings %}
 {% assign nav_menu_options          = nav_menu_defaults | merge: nav_menu_settings %}
-{% assign theme_preview             = themeswitcher_config.previewPage %}
+{% assign theme_preview             = switcher_options.preview_page %}
 {% assign nav_menu_id               = nav_menu_options.id %}
 
-
 {% assign ext = '' %}
 {% if site.permalink == 'none' %}
   {% assign ext = '.html' %}
@@ -392,6 +397,7 @@ regenerate:                             true
           {% comment %} Collect items having a THEMES menu
           ---------------------------------------------------------------------- {% endcomment %}
           {% when 'theme_select' %}
+          {% if switcher_options.enabled %}
             <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [found menu-type: theme_select] -->
             <li class="dropdown nav-item">
               <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">{{menu.item}} </a>
@@ -439,6 +445,7 @@ regenerate:                             true
               </ul>
             </li>
             <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [reset menu_type for next loop] -->
+          {% endif %}
           {% assign menu_type = '' %}
 
 

data/lib/starter_web/assets/data/panel.html

@@ -5,22 +5,21 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/panel.html
- #  Liquid procedure to generate HTML (data) for all panel configured for
- #  (fragmented) AJAX load
+ # ~/assets/data/panel.html
+ # Liquid procedure to generate HTML (data) for all panel configured for
+ # (fragmented) AJAX load
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2019 Juergen Adams
+ # 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
  #
  # -----------------------------------------------------------------------------
- #  Test data:
+ # Test data:
  #    {{ variable | debug }}
- #
  # -----------------------------------------------------------------------------
 {% endcomment %}
 

data/lib/starter_web/assets/data/sidebar.html

@@ -6,21 +6,20 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/sidebar.html
- #  Liquid PROCEDURE template to create the HTML portion of the sidebar
- #  NOTE: Loaded dynamically by J1 NAV Manager module (AJAX)
+ # ~/assets/data/sidebar.html
+ # Liquid PROCEDURE template to create the HTML portion of the sidebar
+ # NOTE: Loaded dynamically by J1 NAV Manager module (AJAX)
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2019 Juergen Adams
+ # 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
- #  Test data:
+ # Test data:
  #   liquid_var: {{ liquid_var | debug }}
- #
  # -----------------------------------------------------------------------------
 {% endcomment %}
 

data/lib/starter_web/assets/data/webhook.html

@@ -6,17 +6,17 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/web_hook.html
- #  Liquid PROCEDURE to generate the HTML (data) portion of all modals used
- #  by J1 WebHook module
+ # ~/assets/data/web_hook.html
+ # Liquid PROCEDURE to generate the HTML (data) portion of all modals used
+ # by J1 WebHook module
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2019 Juergen Adams
+ # 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
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
  #
  # -----------------------------------------------------------------------------
  #  Test data:

data/lib/starter_web/assets/images/pages/roundtrip/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "web",
-  "version": "2019.4.7",
+  "version": "2019.4.8",
   "description": "Web/Content sources for J1 Starter",
   "main": "_config.yml",
   "config": {