j1_template 2019.4.7 → 2019.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f54785f6bc9aa45e07d3a8c81e18a2c6c54200275140b29de0437593b6d4cb
-  data.tar.gz: a548afa659b303127df404378ece3514d21efce1f7d79c7459b69d0fdc262d87
+  metadata.gz: 29c7952a89b8095a095cd4daa1a93b8935ea7d7d30fb4a5891f3fafcf8411ef4
+  data.tar.gz: 673045ab7dc96a647ebe44d0043c914da3709af9028fcafd1a8647419412b630
 SHA512:
-  metadata.gz: 4170687fd2675a9d1a434f4ba392762f87b805eebcae6421a9b43b134aaffa1a5f4b083f4f7a1867bc22449d60476ffd23f7571ad908319ffc4feec70aead829
-  data.tar.gz: e950f170efe1ad32cfb3f007e85e4aa0f95cf86a2187ff081016b7fdb0023f5ed75413f106d3326390888dcca5383d2bab33ac955ab7efeea3232c964e4747a5
+  metadata.gz: 2fa548cd4d06b7ce576f6fb8357c6dfe3c7600038e9a75032dc2df85a4a6300b5cbd954cdb4f16a2fb2c064a19e52417f1e9f4a78fe12ca077a8050b546cd85e
+  data.tar.gz: 287b94bdc94377fbb03bad20aa4afe85bc648faf5805e17421d80aa6ed257d5a24c52d1b2ecf987959d7ae787898ba88ced0d79ac456b7501994ec361c371831

data/_includes/themes/j1/layouts/content_generator_collection.html

@@ -20,16 +20,31 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture pager %}themes/{{site.template.name}}/procedures/global/pager.proc{% endcapture %}
 
-{% comment %} Variables
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config       = site %}
+{% assign template_config   = site.data.template_settings %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign toccer_defaults   = modules.defaults.toccer.defaults %}
+{% assign toccer_settings   = modules.toccer.settings %}
+
+{% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign toccer_config       = site.data.modules.j1_toccer %}
-{% assign tocbot_enabled      = toccer_config.enabled %}
-
-{% assign rtext               = site.data.template_settings.typography.rtext %}
-{% assign page_rtext          = page.rtext %}
-{% assign page_rtext_size     = page.rtext_size %}
-{% assign page_toccer         = page.toccer %}
-{% assign page_toc            = page.toc %}
+{% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
+{% assign tocbot_enabled    = toccer_options.enabled %}
+
+{% assign rtext             = template_config.typography.rtext %}
+{% assign page_rtext        = page.rtext %}
+{% assign page_rtext_size   = page.rtext_size %}
+{% assign page_toccer       = page.toccer %}
+{% assign page_toc          = page.toc %}
 
 {% if tocbot_enabled and page_toc or page_toccer %}
   {% assign sidebar  = true %}

data/_includes/themes/j1/layouts/content_generator_page.html

@@ -19,16 +19,31 @@
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% comment %} Variables
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config       = site %}
+{% assign template_config   = site.data.template_settings %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign toccer_defaults   = modules.defaults.toccer.defaults %}
+{% assign toccer_settings   = modules.toccer.settings %}
+
+{% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign toccer_config       = site.data.modules.j1_toccer %}
-{% assign tocbot_enabled      = toccer_config.enabled %}
-
-{% assign rtext               = site.data.template_settings.typography.rtext %}
-{% assign page_rtext          = page.rtext %}
-{% assign page_rtext_size     = page.rtext_size %}
-{% assign page_toccer         = page.toccer %}
-{% assign page_toc            = page.toc %}
+{% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
+{% assign tocbot_enabled    = toccer_options.enabled %}
+
+{% assign rtext             = site.data.template_settings.typography.rtext %}
+{% assign page_rtext        = page.rtext %}
+{% assign page_rtext_size   = page.rtext_size %}
+{% assign page_toccer       = page.toccer %}
+{% assign page_toc          = page.toc %}
 
 {% if tocbot_enabled and page_toc or page_toccer %}
   {% assign sidebar  = true %}

data/_includes/themes/j1/layouts/content_generator_post.html

@@ -22,24 +22,36 @@
 {% capture create_ad_block %}themes/{{site.template.name}}/procedures/posts/create_ad_block.proc{% endcapture %}
 {% capture pager %}themes/{{site.template.name}}/procedures/global/pager.proc{% endcapture %}
 
-{% comment %} Variables
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config       = site %}
+{% assign template_config   = site.data.template_settings %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign toccer_defaults   = modules.defaults.toccer.defaults %}
+{% assign toccer_settings   = modules.toccer.settings %}
+
+{% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
- {% assign page_sidebar       = page.sidebar %}
- {% assign toccer_config      = site.data.modules.j1_toccer %}
- {% assign tocbot_enabled     = toccer_config.enabled %}
+{% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
+{% assign tocbot_enabled    = toccer_options.enabled %}
 
- {% assign rtext               = site.data.template_settings.typography.rtext %}
- {% assign page_rtext          = page.rtext %}
- {% assign page_rtext_size     = page.rtext_size %}
- {% assign page_toccer         = page.toccer %}
- {% assign page_toc            = page.toc %}
+ {% assign rtext            = site.data.template_settings.typography.rtext %}
+ {% assign page_rtext       = page.rtext %}
+ {% assign page_rtext_size  = page.rtext_size %}
+ {% assign page_toccer      = page.toccer %}
+ {% assign page_toc         = page.toc %}
 
  {% if page_toc and tocbot_enabled %}
-   {% assign page_toc      = true %}
-   {% assign page_sidebar  = true %}
+   {% assign sidebar  = true %}
  {% else %}
-   {% assign page_toc      = false %}
-   {% assign page_sidebar  = false %}
+   {% assign sidebar  = false %}
  {% endif %}
 
  {% if rtext %}
@@ -62,7 +74,7 @@
   {% comment %} Blog post CONTENT
   ------------------------------------------------------------------------------ {% endcomment %}
 
-  {% if page_sidebar == false %}
+  {% if sidebar == false %}
     <!-- FULL page - no sidebar for page toc -->
     <div class="row">
 
@@ -208,7 +220,7 @@
         </aside> <!-- end col-md-3 -->
 
     </div> <!-- end row -->
-  {% endif %} <!-- endif page_sidebar -->
+  {% endif %} <!-- endif sidebar -->
 
   {% comment %} END Blog post CONTENT
   ------------------------------------------------------------------------------ {% endcomment %}

data/_includes/themes/j1/layouts/layout_theme_generator.html

@@ -24,37 +24,54 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% include themes/{{site.template.name}}/procedures/global/setup.proc %}
 
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config       = site %}
+{% assign template_config   = site.data.template_settings %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign switcher_defaults = modules.defaults.theme_switcher.defaults %}
+{% assign switcher_settings = modules.theme_switcher.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign switcher_options  = switcher_defaults | merge: switcher_settings %}
+
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment     = site.environment %}
-{% assign switcher_config = site.data.modules.j1_theme_switcher %}
-{% assign default_theme   = site.data.template_settings.bootstrap.default_theme %}
-{% assign theme_base      = "core/css" %}
-{% assign theme_ext       = "css" %}
-{% assign themeExtension  = site.data.config.bootstrap.default_theme %}
+{% assign environment       = site_config.environment %}
+{% assign default_theme     = template_config.bootstrap.default_theme %}
+{% assign vendor_css        = "vendor" %}
+{% assign theme_base        = "core/css" %}
+{% assign theme_ext         = "css" %}
 
-{% if environment == "development" or environment == "devel" %}
-  {% assign theme_ext     = "css" %}
+{% if environment == "development" or environment == "test" %}
+  {% assign theme_ext       = "css" %}
 {% else %}
-  {% assign theme_ext     = "min.css" %}
+  {% assign theme_ext       = "min.css" %}
 {% endif %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
 <!-- [INFO   ] [j1.layout_theme_generator.html        ] [ start processing: load Theme CSS for all pages ] -->
-{% if switcher_config.enabled %}
+{% if switcher_options.enabled %}
   <!-- [INFO   ] [j1.layout_theme_generator.html        ] [ load the previously selected theme from cookie ] -->
   <script>  
-  // NOTE: to generate logs (from a looger), this script may should fired on 'Document Ready' ???
+  // NOTE: to generate logs (from a logger), this script is to be fired on 'Document Ready'
   // jadams, 2019-07-16: don't see any benefit of fired at 'Document Ready' - no logging at all
-  $(document).ready(function() {
-    var logger                    = log4javascript.getLogger('j1.layout_theme_generator');
-    var cookie_names              = j1.getCookieNames();
-    const user_state_cookie_name  = cookie_names.user_session;
+  // $(document).ready(function() {
+//  var logger                  = log4javascript.getLogger('j1.layout_theme_generator');
+    var cookie_names            = j1.getCookieNames();
+    var user_state_cookie_name  = cookie_names.user_session;
 
-    var id                        = 'default';
-    var cssFile                   = '{{switcher_config.defaultCssFile}}';
+    var id                      = 'default';
+    var cssFile                 = '{{switcher_options.defaultCssFile}}';
     var themeName;
     var themeCss;
     var themeCssHtml;
@@ -65,7 +82,7 @@
     var user_state_json;
     var user_state_cookie;
 
-    logger.info('processing theme');
+//  logger.info('processing theme');
 
     // Detect|Set J1 UserState
     user_state_detected = j1.existsCookie(user_state_cookie_name);
@@ -80,6 +97,8 @@
       themeExtensionCssHtml     = "<link rel='stylesheet' id='" + id + "' href='" + themeExtensionCss + "' type='text/css' />";
     } else {
       themeCssHtml              = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />';
+      vendorCssHtml             = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{vendor_css}}.{{theme_ext}}" />';
+      $('head').append(vendorCssHtml);
     }    
     $('head').append(themeCssHtml);    
 
@@ -90,10 +109,11 @@
     } else {
       $('head').append(themeExtensionCssHtml);
     }
-  });
+//  });
   </script>
 {% else %}
   <!-- [INFO   ] [j1.layout_theme_generator.html        ] [ no cookie found. Load default theme CSS from asset|theme path ] -->
   <link rel="stylesheet" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />
+  <!-- link rel="stylesheet" href="{{asset_path}}/{{theme_base}}/{{vendor_css}}.{{theme_ext}}" / -->
 {% endif %}
 <!-- [INFO   ] [j1.layout_theme_generator.html        ] [ end processing ] -->

data/_includes/themes/j1/layouts/layout_theme_generator.new.html

@@ -0,0 +1,118 @@
+{% comment %}
+# ------------------------------------------------------------------------------
+# ~/_includes/themes/j1/layouts/layout_theme_generator.html
+# Liquid template to generate|add the HTML markup to load
+# CSS theme files dynamically for the 'ThemeLoader' (on a page re-load)
+#
+# 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
+#   Themes are currently in state EXPERIMENTAL
+# ------------------------------------------------------------------------------
+# Test data:
+#    liquid_var:  {{ liquid_var | debug }}
+# ------------------------------------------------------------------------------
+{% endcomment %} 
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+{% include themes/{{site.template.name}}/procedures/global/setup.proc %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config       = site %}
+{% assign template_config   = site.data.template_settings %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign switcher_defaults = modules.defaults.theme_switcher.defaults %}
+{% assign switcher_settings = modules.theme_switcher.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign switcher_options  = switcher_defaults | merge: switcher_settings %}
+
+<!-- switcher_options:  {{ switcher_options }} -->
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment     = site.environment %}
+{% assign default_theme   = template_config.bootstrap.default_theme %}
+{% assign themeExtension  = switcher_options.themeExtension %}
+{% assign theme_base      = "core/css" %}
+{% assign theme_ext       = "css" %}
+
+{% if environment == "development" or environment == "test" %}
+  {% assign theme_ext     = "css" %}
+{% else %}
+  {% assign theme_ext     = "min.css" %}
+{% endif %}
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<!-- [INFO   ] [j1.layout_theme_generator.html        ] [ start processing: load Theme CSS for all pages ] -->
+{% if switcher_options.enabled %}
+  <!-- [INFO   ] [j1.layout_theme_generator.html        ] [ load the previously selected theme from cookie ] -->
+  <script>  
+  // NOTE: to generate logs (from a looger), this script may should fired on 'Document Ready' ???
+  // jadams, 2019-07-16: don't see any benefit of fired at 'Document Ready' - no logging at all
+  $(document).ready(function() {
+    var logger                    = log4javascript.getLogger('j1.layout_theme_generator');
+    var cookie_names              = j1.getCookieNames();
+    const user_state_cookie_name  = cookie_names.user_session;
+
+    var id                        = 'default';
+    var cssFile                   = '{{switcher_options.defaultCssFile}}';
+    var themeName;
+    var themeCss;
+    var themeCssHtml;
+    var themeExtensionCss;
+    var themeExtensionCssHtml;
+
+    var user_state = {};
+    var user_state_json;
+    var user_state_cookie;
+
+    logger.info('processing theme');
+
+    // Detect|Set J1 UserState
+    user_state_detected = j1.existsCookie(user_state_cookie_name);
+    if ( user_state_detected ) {
+      user_state                = j1.readCookie(user_state_cookie_name);
+      themeName                 = user_state.theme_name;
+      themeCss                  = user_state.theme_css;
+      themeExtensionCss         = user_state.theme_extension_css;      
+    }
+    if (themeCss) {      
+      themeCssHtml              = "<link rel='stylesheet' id='" + id + "' href='" + themeCss + "' type='text/css' />";      
+      themeExtensionCssHtml     = "<link rel='stylesheet' id='" + id + "' href='" + themeExtensionCss + "' type='text/css' />";
+    } else {
+      themeCssHtml              = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />';
+    }    
+    $('head').append(themeCssHtml);    
+
+    // Append|Remove theme extentions
+    // TODO: Make default theme name 'Uno' configurable
+    if ( themeName === 'Uno'  ) {
+      $('head link[href*="' +themeExtensionCss+ '"]').remove();
+    } else {
+      $('head').append(themeExtensionCssHtml);
+    }
+  });
+  </script>
+{% else %}
+  <!-- [INFO   ] [j1.layout_theme_generator.html        ] [ no cookie found. Load default theme CSS from asset|theme path ] -->
+  <link rel="stylesheet" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />
+{% endif %}
+<!-- [INFO   ] [j1.layout_theme_generator.html        ] [ end processing ] -->

data/_includes/themes/j1/layouts/layout_theme_generator.org.html

@@ -0,0 +1,119 @@
+{% comment %}
+# ------------------------------------------------------------------------------
+# ~/_includes/themes/j1/layouts/layout_theme_generator.html
+# Liquid template to generate|add the HTML markup to load
+# CSS theme files dynamically for the 'ThemeLoader' (on a page re-load)
+#
+# 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
+#   Themes are currently in state EXPERIMENTAL
+# ------------------------------------------------------------------------------
+# Test data:
+#    liquid_var:  {{ liquid_var | debug }}
+# ------------------------------------------------------------------------------
+{% endcomment %} 
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+{% include themes/{{site.template.name}}/procedures/global/setup.proc %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config       = site %}
+{% assign template_config   = site.data.template_settings %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign switcher_defaults = modules.defaults.theme_switcher.defaults %}
+{% assign switcher_settings = modules.theme_switcher.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign switcher_options  = switcher_defaults | merge: switcher_settings %}
+
+<!-- switcher_options:  {{ switcher_options }} -->
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment     = site.environment %}
+{% assign switcher_config = site.data.modules.j1_theme_switcher %}
+{% assign default_theme   = site.data.template_settings.bootstrap.default_theme %}
+{% assign theme_base      = "core/css" %}
+{% assign theme_ext       = "css" %}
+{% assign themeExtension  = site.data.config.bootstrap.default_theme %}
+
+{% if environment == "development" or environment == "devel" %}
+  {% assign theme_ext     = "css" %}
+{% else %}
+  {% assign theme_ext     = "min.css" %}
+{% endif %}
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<!-- [INFO   ] [j1.layout_theme_generator.html        ] [ start processing: load Theme CSS for all pages ] -->
+{% if switcher_config.enabled %}
+  <!-- [INFO   ] [j1.layout_theme_generator.html        ] [ load the previously selected theme from cookie ] -->
+  <script>  
+  // NOTE: to generate logs (from a looger), this script may should fired on 'Document Ready' ???
+  // jadams, 2019-07-16: don't see any benefit of fired at 'Document Ready' - no logging at all
+  $(document).ready(function() {
+    var logger                    = log4javascript.getLogger('j1.layout_theme_generator');
+    var cookie_names              = j1.getCookieNames();
+    const user_state_cookie_name  = cookie_names.user_session;
+
+    var id                        = 'default';
+    var cssFile                   = '{{switcher_config.defaultCssFile}}';
+    var themeName;
+    var themeCss;
+    var themeCssHtml;
+    var themeExtensionCss;
+    var themeExtensionCssHtml;
+
+    var user_state = {};
+    var user_state_json;
+    var user_state_cookie;
+
+    logger.info('processing theme');
+
+    // Detect|Set J1 UserState
+    user_state_detected = j1.existsCookie(user_state_cookie_name);
+    if ( user_state_detected ) {
+      user_state                = j1.readCookie(user_state_cookie_name);
+      themeName                 = user_state.theme_name;
+      themeCss                  = user_state.theme_css;
+      themeExtensionCss         = user_state.theme_extension_css;      
+    }
+    if (themeCss) {      
+      themeCssHtml              = "<link rel='stylesheet' id='" + id + "' href='" + themeCss + "' type='text/css' />";      
+      themeExtensionCssHtml     = "<link rel='stylesheet' id='" + id + "' href='" + themeExtensionCss + "' type='text/css' />";
+    } else {
+      themeCssHtml              = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />';
+    }    
+    $('head').append(themeCssHtml);    
+
+    // Append|Remove theme extentions
+    // TODO: Make default theme name 'Uno' configurable
+    if ( themeName === 'Uno'  ) {
+      $('head link[href*="' +themeExtensionCss+ '"]').remove();
+    } else {
+      $('head').append(themeExtensionCssHtml);
+    }
+  });
+  </script>
+{% else %}
+  <!-- [INFO   ] [j1.layout_theme_generator.html        ] [ no cookie found. Load default theme CSS from asset|theme path ] -->
+  <link rel="stylesheet" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />
+{% endif %}
+<!-- [INFO   ] [j1.layout_theme_generator.html        ] [ end processing ] -->

data/_includes/themes/j1/procedures/global/pager.proc

@@ -1,24 +1,22 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/procedures/global/pager.proc
- #  HTML/Liquid procedure to create a paginator for pages of type "post"
+ # ~/_includes/themes/j1/procedures/global/pager.proc
+ # HTML/Liquid procedure to create a paginator for pages of type "post"
  #
- #  Product/Info:
- #  http://jekyll.one
+ # Product/Info:
+ # http://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
+ # 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:
+ # NOTE:
  #    This pager reads the "page path" from cookie "cookieUserState". This
  #    data is used to return from a previous (page builder) page.
  # -----------------------------------------------------------------------------
  # Test data:
- #  liquid_var:  {{ liquid_var | debug }}
- #
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -34,48 +32,48 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-  <div class="paginator">
-    <ul class="pagination raised-z0">
+<div class="paginator">
+  <ul class="pagination raised-z0">
 
-      {% comment %} Set PREVIOUS page
-      -------------------------------------------------------------------------- {% endcomment %}
-      {% if page.previous %}
-        <li class="page-item"><a class="page-link" href="{{ base_path }}{{ page.previous.url }}" title="{{ page.previous.title }}">Prev</a></li>
-      {% else %}
-        <li class="page-item disabled"><a class="page-link">Prev</a></li>
-      {% endif %}
+    {% comment %} Set PREVIOUS page
+    ---------------------------------------------------------------------------- {% endcomment %}
+    {% if page.previous %}
+      <li class="page-item"><a class="page-link" href="{{ base_path }}{{ page.previous.url }}" title="{{ page.previous.title }}">Prev</a></li>
+    {% else %}
+      <li class="page-item disabled"><a class="page-link">Prev</a></li>
+    {% endif %}
 
-      {% comment %} Set BACK page (PagerURL)
-      -------------------------------------------------------------------------- {% endcomment %}
-      <!-- [INFO   ] [j1.posts.pager.proc                   ] [Manage the current pager settings for: {{ builder_path }}] -->
-      <script>
-        var cookie_names                = j1.getCookieNames();
-        const user_state_cookie_name    = cookie_names.user_session;
-        var user_state                  = j1.readCookie(user_state_cookie_name);
-        var re                          = new RegExp("navigator|dateview|tagview|archive");
-        var last_pager                  = user_state.last_pager;
-        var last_pager_url;
+    {% comment %} Set BACK page (PagerURL)
+    ---------------------------------------------------------------------------- {% endcomment %}
+    <!-- [INFO   ] [procedures.global.pager.proc          ] [Manage the current pager settings for: {{ builder_path }}] -->
+    <script>
+      var cookie_names           = j1.getCookieNames();
+      var user_state_cookie_name = cookie_names.user_session;
+      var user_state             = j1.readCookie(user_state_cookie_name);
+      var re                     = new RegExp('navigator|dateview|tagview|archive');
+      var last_pager             = user_state.last_pager;
+      var last_pager_url;
 
-        <!-- [INFO   ] [j1.page.{{page.title}}                ] [Calculate BackURL from User State Cookie] -->
-        if (re.test(last_pager)) {
-          last_pager_url = '<li class="page-item"><a class="page-link" href="' + last_pager + '" title="Back to Top Page">Back</a></li>';
-        } else {
-          last_pager_url = '<li class="page-item disabled"><a class="page-link" title="Back to Top Page">Back</a></li>';
-        }  
-        document.write( last_pager_url );
-        j1.writeCookie({
-          name: user_state_cookie_name, 
-          data: user_state
-        });
-      </script>
+      <!-- [INFO   ] [procedures.global.pager.proc          ] [Calculate BackURL from User State Cookie for page: {{page.title}}] -->
+      if (re.test(last_pager)) {
+        last_pager_url = '<li class="page-item"><a class="page-link" href="' + last_pager + '" title="Back to Top Page">Back</a></li>';
+      } else {
+        last_pager_url = '<li class="page-item disabled"><a class="page-link" title="Back to Top Page">Back</a></li>';
+      }  
+      document.write( last_pager_url );
+      j1.writeCookie({
+        name: user_state_cookie_name, 
+        data: user_state
+      });
+    </script>
 
-      {% comment %} Set NEXT page
-      -------------------------------------------------------------------------- {% endcomment %}
-      {% if page.next %}
-        <li class="page-item"><a class="page-link" href="{{ base_path }}{{ page.next.url }}" title="{{ page.next.title }}">Next</a></li>
-      {% else %}
-        <li class="page-item disabled"><a class="page-link" href="#">Next</a></li>
-      {% endif %}
+    {% comment %} Set NEXT page
+    ---------------------------------------------------------------------------- {% endcomment %}
+    {% if page.next %}
+      <li class="page-item"><a class="page-link" href="{{ base_path }}{{ page.next.url }}" title="{{ page.next.title }}">Next</a></li>
+    {% else %}
+      <li class="page-item disabled"><a class="page-link" href="#">Next</a></li>
+    {% endif %}
 
-    </ul>
-  </div>
+  </ul>
+</div>

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2019.4.7'
+  VERSION = '2019.4.8'
 end