j1_template 2019.4.4 → 2019.4.5

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

@@ -1,21 +1,23 @@
 {% comment %}
- # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/layouts/theme_generator.html
- #  Liquid template to generate|add the HTML markup to load
- #  CSS theme files dynamically on 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
- #
- # -----------------------------------------------------------------------------
- # Test data:
- #  liquid_var:  {{ liquid_var | debug }}
- # -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+# ~/_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
@@ -26,7 +28,7 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment     = site.environment %}
 {% assign switcher_config = site.data.modules.j1_theme_switcher %}
-{% assign default_theme   = site.data.j1_config.bootstrap.default_theme %}
+{% 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 %}
@@ -40,16 +42,19 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-<!-- [INFO   ] [j1.layout_theme_generator.html        ] [ start processing: load BS theme CSS for all pages ] -->
+<!-- [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>
+  <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 logger                  = log4javascript.getLogger('ThemeGenerator');
-    var logText;
-
-    var id                      = 'default';
-    var cssFile                 = '{{switcher_config.defaultCssFile}}';
+    var id                        = 'default';
+    var cssFile                   = '{{switcher_config.defaultCssFile}}';
     var themeName;
     var themeCss;
     var themeCssHtml;
@@ -60,48 +65,36 @@
     var user_state_json;
     var user_state_cookie;
 
+    logger.info('processing theme');
+
     // Detect|Set J1 UserState
-    user_state_detected = j1.existsCookie ( 'j1.user.state' );
+    user_state_detected = j1.core.existsCookie(user_state_cookie_name);
     if ( user_state_detected ) {
-      logger.info('Read UserState cookie');
-      user_state              = j1.getUserStateCookie();
-      themeName               = user_state.theme_name;
-      themeCss                = user_state.theme_css;
-      themeExtensionCss       = user_state.theme_extension_css;      
-    } else {
-      logger.warn('UserState cookie NOT found'); 
+  //  user_state                = j1.getUserState();
+      user_state                = j1.core.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' />";
-      logText                 = 'Load theme from cookie: ' +themeName+ ', cssFile: ' +themeCss;
-      logger.info(logText);
+    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}}" />';
-      logText                 = 'Load default theme: ' +themeName+ ' , cssFile: {{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}';
-      logger.info(logText);
+      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
-    */
-
+    // Append|Remove theme extentions
+    // TODO: Make default theme name 'Uno' configurable
     if ( themeName === 'Uno'  ) {
-      logger.info( 'Remove ThemeExtensionCss for theme: ' + themeName );
       $('head link[href*="' +themeExtensionCss+ '"]').remove();
     } else {
-      logger.info( 'Add ThemeExtensionCss for theme: ' + themeName );
       $('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/modules/connectors/ad/google-adsense.html

@@ -21,7 +21,7 @@
 
 {% comment %} Variables
 --------------------------------------------------------------- {% endcomment %}
-{% assign publisher_id = site.data.j1_config.advertising.google.publisher_id %}
+{% assign publisher_id = site.data.template_settings.advertising.google.publisher_id %}
 
 {% comment %} Main
 --------------------------------------------------------------- {% endcomment %}

data/_includes/themes/j1/modules/connectors/ads

@@ -21,8 +21,8 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign advertising           = site.data.j1_config.advertising.enabled %}
-{% assign advertising_provider  = site.data.j1_config.advertising.provider %}
+{% assign advertising           = site.data.template_settings.advertising.enabled %}
+{% assign advertising_provider  = site.data.template_settings.advertising.provider %}
 
 
 {% comment %} Main

data/_includes/themes/j1/modules/connectors/analytic/google-analytics.html

@@ -21,7 +21,7 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id }} %}
+{% assign tracking_id = site.data.template_settings.analytics.google.tracking_id }} %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}

data/_includes/themes/j1/modules/connectors/analytics

@@ -21,8 +21,8 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign analytics           = site.data.j1_config.analytics.enabled %}
-{% assign analytics_provider  = site.data.j1_config.analytics.provider %}
+{% assign analytics           = site.data.template_settings.analytics.enabled %}
+{% assign analytics_provider  = site.data.template_settings.analytics.provider %}
 
 
 {% comment %} Main

data/_includes/themes/j1/modules/connectors/comment/disqus.html

@@ -21,7 +21,7 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign disqus_short_name = site.data.j1_config.comments.disqus.short_name %}
+{% assign disqus_short_name = site.data.template_settings.comments.disqus.short_name %}
 
 
 {% comment %} Main

data/_includes/themes/j1/modules/connectors/comments

@@ -21,8 +21,8 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign comments          = site.data.j1_config.comments.enabled %}
-{% assign comment_provider  = site.data.j1_config.comments.provider %}
+{% assign comments          = site.data.template_settings.comments.enabled %}
+{% assign comment_provider  = site.data.template_settings.comments.provider %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}

data/_includes/themes/j1/modules/footers/footer_light_generator.html

@@ -1,15 +1,17 @@
 {% comment %} 
  # -----------------------------------------------------------------------------
- #  ~/_includes/templates/j1/modules/footers/footer_light_generator.html
- #  Liquid TEMPLATE to create the footer for all pages
+ # ~/_includes/templates/j1/modules/footers/footer_light_generator.html
+ # Liquid TEMPLATE to create the footer for all pages
  #
- #  Product/Info:
- #  http://jekyll.one
+ # Product/Info:
+ # http://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
+ # -----------------------------------------------------------------------------
+ # NOTE: obsolete since loaded via AJAX from HTML data file
  #
  # -----------------------------------------------------------------------------
  # Test data:
@@ -18,9 +20,8 @@
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% capture analytics%}themes/{{site.template.name}}/modules/connectors/analytics{% endcapture %}
-
 {% capture about_box %}themes/{{site.template.name}}/modules/footers/boxes/about_box.proc{% endcapture %}
 {% capture news_box %}themes/{{site.template.name}}/modules/footers/boxes/news_box.proc{% endcapture %}
 {% capture links_box %}themes/{{site.template.name}}/modules/footers/boxes/links_box.proc{% endcapture %}
@@ -28,21 +29,35 @@
 {% capture legal_statements %}themes/{{site.template.name}}/modules/footers/boxes/legal_statements.proc{% endcapture %}
 {% capture social_media_icons %}themes/{{site.template.name}}/modules/footers/boxes/social_media_icons.proc{% endcapture %}
 
-{% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
-{% assign footer_config = site.data.modules.j1_footer %}
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign data                  = site.data %}
+{% assign blocks                = data.blocks %}
+
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign footer_defaults       = blocks.defaults.footer.defaults %}
+{% assign footer_settings       = blocks.footer.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign footer_options        = footer_defaults | merge: footer_settings %}
 
-{% if site.data.j1_config.analytics.enabled %}
+{% if data.template_settings.analytics.enabled %}
   {% include analytics %}
 {% endif %}
 
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign enabled_boxes = 0 %}
 
 <!-- Calculate number of enabled FooterBoxes -->
-{% for item in footer_config %}
+{% for item in footer_options %}
   {% if item.footer_box %}
     {% for boxes in item.footer_box %}
       {% for box in boxes %}
@@ -62,7 +77,7 @@
   <div class="footer">
     <div class="container">
       <div class="row">
-      {% for item in footer_config %}
+      {% for item in footer_options %}
         {% for box in item.footer_box %}
           {% for item in box %}
 
@@ -118,10 +133,10 @@
       <div class="row">
         <!-- Enable horizontal list using id #inline-->
         <div class="col-md-10" id="inline">
-        {% include {{legal_statements}} footer_config=footer_config %}
+        {% include {{legal_statements}} footer_config=footer_ %}
         </div>
         <div class="col-md-2">
-        {% include {{social_media_icons}} footer_config=footer_config %}
+        {% include {{social_media_icons}} footer_config=footer_ %}
         </div>
       </div> <!-- End Container -->
     </div>

data/_includes/themes/j1/modules/headers/master_header_generator.html

@@ -1,16 +1,15 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/templates/j1/modules/headers/masthead.html
- #  Liquid template to create the Master Header (masthead) of a page
+ # ~/_includes/templates/j1/modules/headers/masthead.html
+ # Liquid template to create the Master Header (masthead) of a page
  #
- #  Product/Info:
- #  https://jekyll.one
+ # 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
+ # 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
  # -----------------------------------------------------------------------------
  # Test data:
  #  liquid_var:  {{ liquid_var | debug }}
@@ -22,9 +21,22 @@
 {% capture select_color     %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
 {% capture select_font_size %}themes/{{site.template.name}}/procedures/global/select_font_size.proc{% endcapture %}
 
-{% comment %} Variables
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign modules               = site.data.modules %}
+
+{% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign header_config             = site.data.modules.j1_header %}
+{% assign header_defaults       = modules.defaults.header.defaults %}
+{% assign header_settings       = modules.header.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign header_options        = header_defaults | merge: header_settings %}
+
 
 {% comment %} Initialize default values
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -40,7 +52,7 @@
 
 {% comment %} Initialize header values
 -------------------------------------------------------------------------------- {% endcomment %}
-{% for item in header_config.headers %}
+{% for item in header_options.headers %}
   {% if item.header.enabled %}
 
     {% comment %} Detect header for the page (layout)

data/_includes/themes/j1/modules/navigator/generator.html

@@ -133,7 +133,7 @@
   {% if brand_position == "left" %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand image to the: left ] -->
     {% if site.brand.image %}
-      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
@@ -146,7 +146,7 @@
       <i class="mdi mdi-menu mdi-48px"></i>
     </button>
     {% if site.brand.image %}
-      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
@@ -156,7 +156,7 @@
       <i class="mdi mdi-menu mdi-48px"></i>
     </button>
     {% if site.brand.image %}
-      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}

data/_includes/themes/j1/modules/navigator/generator.olde.html

@@ -133,7 +133,7 @@
   {% if brand_position == "left" %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand image to the: left ] -->
     {% if site.brand.image %}
-      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
@@ -146,7 +146,7 @@
       <i class="mdi mdi-menu mdi-48px"></i>
     </button>
     {% if site.brand.image %}
-      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
@@ -156,7 +156,7 @@
       <i class="mdi mdi-menu mdi-48px"></i>
     </button>
     {% if site.brand.image %}
-      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}

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

@@ -40,7 +40,7 @@
 {% assign _category       = include.category %}
 {% assign _category_icon  = nil %}
 
-{% assign _category_icons = site.data.j1_categories %}
+{% assign _category_icons = site.data.categories %}
 
 
 {% comment %} Liquid procedures
@@ -59,9 +59,9 @@
   {% endfor %}
 
   {% if _category == include.category %}
-    {% assign icon_name = site.data.j1_categories.default.icon_name | downcase %}
-    {% assign icon_family = site.data.j1_categories.default.icon_family %}
-    {% assign icon_size = site.data.j1_categories.default.icon_size %}
+    {% assign icon_name = site.data.categories.default.icon_name | downcase %}
+    {% assign icon_family = site.data.categories.default.icon_family %}
+    {% assign icon_size = site.data.categories.default.icon_size %}
   {% else%}
     {% assign icon_name   = _category_icon.icon_name | downcase %}
     {% assign icon_family = _category_icon.icon_family %}

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

@@ -48,10 +48,13 @@
       {% comment %} Set BACK page (PagerURL)
       -------------------------------------------------------------------------- {% endcomment %}
       <!-- [INFO   ] [j1.posts.pager.proc                   ] [Manage the current pager settings for: {{ builder_path }}] -->
-      <script>   
-        var user_state  = j1.getUserStateCookie();
-        var re          = new RegExp("navigator|dateview|tagview|archive");
-        var last_pager  = user_state.last_pager;
+      <script>
+        var cookie_names                = j1.getCookieNames();
+        const user_state_cookie_name    = cookie_names.user_session;
+    //  var user_state                  = j1.getUserState();
+        var user_state                  = j1.core.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] -->
@@ -61,7 +64,11 @@
           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.setUserStateCookie( user_state );
+        // j1.setUserState( user_state );
+        j1.core.writeCookie({
+          name: user_state_cookie_name, 
+          data: user_state
+        });
       </script>
 
       {% comment %} Set NEXT page