j1_template 2019.4.4 → 2019.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43d35e2008f3bffd19ab2e9569db869fb18da73219d8cd55e65c2d5c9ba81348
-  data.tar.gz: 769b48da5a8cac431253b16958c3add71340bb99d5423c17a102891a25f286ec
+  metadata.gz: 2a472788f39ceac50204d3df441c10100ed10f6f120b13b3d28f510265987d79
+  data.tar.gz: c339cb664a884f11ad7e0f292cea86c5efa6a02b302ec6fb9256697fd653a2bb
 SHA512:
-  metadata.gz: 2aa36cdaaa5be1746ba95a47afc1a3ac7bef354fd25909867bd737b6a39b28c0fbad771a346e604550639e8d3dd85d67732dc5678634a210de0bc890033def4b
-  data.tar.gz: 3e7ddd1f4d2cc462361ff77ec07a5df5b7f740bbaa1b66aec25e88452039a2fae089588eba19962bc485648040931d15e20a5efe0dd969c3d46ae2a36be9c3a2
+  metadata.gz: 8a823a7bfd12b891fd5ea35c75f275e973602841b842b58e3e3df475470908d995170510d9f23559307748a914b9357b3f5e12d78148cf6a46dd2c2dd04c61b6
+  data.tar.gz: 5cb3b0862e9c714ba9090babcd5315a35a93b929395d2eef465783bc778f77b96a1fe85b492e481566897ad283427d8cedf4196b325b6f6d630aa6df45ba8d83

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

@@ -1,20 +1,18 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/templates/j1/pages/app_content_generator.html
- #  Liquid template to create the content portion for pages of type POST
+ # ~/_includes/themes/j1/layouts/content_generator_app.html
+ # Liquid template to create the content portion for pages of type APP
  #
- #  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 }}
- #
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 

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

@@ -1,23 +1,21 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/templates/j1/pages/blog_archive_content_generator.html
- #  Liquid template to create the content portion for pages of type PAGE
+ # ~/_includes/themes/j1/layouts/content_generator_blog_archive.html
+ # Liquid template to create the content portion for pages of type BLOG/ARCHIVE
  #
- #  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 }}
- #  page_path:       {{ page_path | debug }}
- #  page_url:        {{ page.url | remove_first:'page2/index.html' | debug }}
- #  navigator_path:  {{ navigator_path | debug }}
- #
+ #    liquid_var:      {{ liquid_var | debug }}
+ #    page_path:       {{ page_path | debug }}
+ #    page_url:        {{ page.url | remove_first:'page2/index.html' | debug }}
+ #    navigator_path:  {{ navigator_path | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -38,14 +36,14 @@
 
 {% assign previewer                     = site.data.builder.blog_navigator.previewer %}
 {% assign paginate                      = site.pagination.enabled %}
-{% assign rtext                         = site.data.j1_config.typography.rtext %}
+{% assign rtext                         = site.data.template_settings.typography.rtext %}
 {% assign page_rtext                    = page.rtext %}
 {% assign page_rtext_size               = page.rtext_size %}
 
 {% comment %} rtext|size detection
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if rtext %}
-  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
+  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}
@@ -198,12 +196,20 @@
         {% capture browser_page_url %}{{page.url | prepend: site.baseurl}}{% endcapture %}
       {% endif %}
 
-      <!-- [INFO   ] [j1.page.{{page.title}}                   ] [ save the current page to cookieUserState cookie: {{ browser_page_url }} ] -->
+      <!-- [INFO   ] [j1.content_generator_blog_archive        ] [ {{page.title}} - save the current page to cookieUserState cookie: {{ browser_page_url }} ] -->      
       <script>
       /* Manage the current page settings */
       $(document).ready(function() {
-          var user_state_last_page = "{{browser_page_url}}";
-          j1.setUserStateCookie( {last_page:user_state_last_page} );
+        var cookie_names                = j1.getCookieNames();
+        const user_state_cookie_name    = cookie_names.user_session;
+        var user_state                  = j1.core.readCookie(user_state_cookie_name);
+        var user_state_last_page        = "{{browser_page_url}}";
+        user_state.last_page            = user_state_last_page;
+//      j1.setUserState( {last_page:user_state_last_page} );
+        j1.core.writeCookie({
+          name: user_state_cookie_name, 
+          data: user_state
+        });
       });
       </script>
 

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

@@ -1,20 +1,18 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/templates/j1/pages/collection_content_generator.html
- #  Liquid template to create the content portion for pages of type COLLECTION
+ # ~/_includes/themes/j1/layouts/content_generator_collection.html
+ # Liquid template to create the content portion for pages of type COLLECTION
  #
- #  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 }}
- #
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -27,7 +25,7 @@
 {% assign toccer_config       = site.data.modules.j1_toccer %}
 {% assign tocbot_enabled      = toccer_config.enabled %}
 
-{% assign rtext               = site.data.j1_config.typography.rtext %}
+{% 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 %}
@@ -40,7 +38,7 @@
 {% endif %}
 
 {% if rtext %}
-  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
+  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}

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

@@ -1,21 +1,18 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/templates/j1/pages/page_content_generator.html
- #  Liquid template to create the content portion for pages of type PAGE
- #  as a sidebar
+ # ~/_includes/themes/j1/layouts/content_generator_page.html
+ # Liquid template to create the content portion for pages of type 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 }}
- #
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -27,7 +24,7 @@
 {% assign toccer_config       = site.data.modules.j1_toccer %}
 {% assign tocbot_enabled      = toccer_config.enabled %}
 
-{% assign rtext               = site.data.j1_config.typography.rtext %}
+{% 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 %}
@@ -40,7 +37,7 @@
 {% endif %}
 
 {% if rtext %}
-  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
+  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}
@@ -123,7 +120,7 @@
 
   // Set|Detect J1 App status
   j1_user_state.last_page = "{{browser_page_url}}"
-  j1.setUserStateCookie( j1_user_state ); 
+  j1.setUserState( j1_user_state ); 
   logger.info(log_text);
 </script -->
 

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

@@ -1,20 +1,18 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/templates/j1/pages/post_content_generator.html
- #  Liquid template to create the content portion for pages of type POST
+ # ~/_includes/themes/j1/layouts/content_generator_post.html
+ # Liquid template to create the content portion for pages of type POST
  #
- #  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 }}
- #
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -30,7 +28,7 @@
  {% assign toccer_config      = site.data.modules.j1_toccer %}
  {% assign tocbot_enabled     = toccer_config.enabled %}
 
- {% assign rtext               = site.data.j1_config.typography.rtext %}
+ {% 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 %}
@@ -45,7 +43,7 @@
  {% endif %}
 
  {% if rtext %}
-   {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
+   {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
  {% else %}
    {% assign rtext_size = 0 %}
  {% endif %}

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

@@ -1,20 +1,18 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/templates/j1/pages/raw_content_generator.html
- #  Liquid template to create the content portion for pages of type RAW
+ # ~/_includes/themes/j1/layouts/content_generator_raw
+ # Liquid template to create the content portion for pages of type RAW
  #
- #  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 }}
- #
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 

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

@@ -1,19 +1,18 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/layouts/meta_data_generator.html
- #  Liquid template to generate all meta data for all pages
+ # ~/_includes/themes/j1/layouts/meta_data_generator.html
+ # Liquid template to generate all meta data for all pages
  #
- #  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:
- #  {{site.robots | debug}}
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -54,7 +53,7 @@
 {% endif %}
 
 {% if site.favicon.image %}
-  <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}">
+  <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.template_settings.image_path}}/{{site.favicon.image}}">
 {% endif %}
 
 {% if page.layout == 'home' %}

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

@@ -1,20 +1,19 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/themes/j1/layouts/js_init_generator.html
- #  Liquid template to generate all Javascript init scripts defined
- #  for a layout
+ # ~/_includes/themes/j1/layouts/layout_module_generator.html
+ # Liquid template to generate all Javascript init scripts defined
+ # for a layout
  #
- #  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:
- #  {{ lanes_collate | debug }}
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -25,7 +24,7 @@
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign resource_placement = include.region %}
-{% assign items_collate      = site.data.j1_resources %}
+{% assign items_collate      = site.data.resources %}
 
 
 {% comment %} Main

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

@@ -1,22 +1,21 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/themes/j1/layouts/resource_generator.html
- #  Liquid template to generate all resource entries defined for a layout
+ # ~/_includes/themes/j1/layouts/layout_resource_generator.html
+ # Liquid template to generate all resource entries defined for a layout
  #
- #  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
  # -----------------------------------------------------------------------------
  #  NOTE:
  #    Do NOT add any RESOURCES here. Go for ...
  # -----------------------------------------------------------------------------
  # Test data:
- #  {{ lanes_collate | debug }}
- #
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %} 
 
@@ -27,7 +26,7 @@
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign resource_placement = include.region %}
-{% assign items_collate      = site.data.j1_resources %} 
+{% assign items_collate      = site.data.resources %} 
 
 
 {% comment %} Main 
@@ -52,7 +51,7 @@
   <!-- [DEBUG2 ] [j1.layout_resource_generator.html     ] [ place DATA: {{array_value}} ] -->
   {% endif %}
 
-    <!-- [INFO   ] [j1.layout_resource_generator.html     ] [ call resource writer for: {{array_name}} ] 
+    <!-- [INFO   ] [j1.layout_resource_generator.html     ] [ call resource writer for: {{array_name}} ] -->
     {% include {{ resource_writer }}  region=resource_placement globals=global_array resources=array_value %}
 
 {% endfor %}

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

@@ -1,20 +1,18 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/templates/j1/layouts/shim_generator.html
- #  Liquid template to generate HTML shim configs for ALL modules configured
+ # ~/_includes/themes/j1/layouts/layout_shim_generator.html
+ # Liquid template to generate HTML shim configs for ALL modules configured
  #
- #  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:
- #  {{ j1_config | debug }}
- #
+ #    liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -53,10 +51,10 @@
   var j1_environment = '{{site.environment}}';
 
   {% comment %} Create global INSTANCE variables
+  TODO: Apps (based j1_apps) on NOT detected !!! 
   ------------------------------------------------------------------------------ {% endcomment %}
-  // [INFO   ] [j1.layout_shim_generator.html         ] [ create global INSTANCE variables for J1 Carousel ]
   {% if j1_apps.j1_carousel.enabled and page.layout != 'app' %}
-
+  // [INFO   ] [j1.layout_shim_generator.html         ] [ create global INSTANCE variables for J1 Carousel ]
     {% assign config = site.data.apps.j1_carousel %}
     {% for item in config.carousel %}
       {% if item.show.enabled %}
@@ -68,10 +66,9 @@
     {% assign config = nil %}
 
   {% endif %}
-
-  // [INFO   ] [j1.layout_shim_generator.html         ] [ create global INSTANCE variables for J1 Justified Gallery ]
+  
   {% if j1_apps.j1_justified_gallery.enabled and page.layout != 'app' %}
-
+    // [INFO   ] [j1.layout_shim_generator.html         ] [ create global INSTANCE variables for J1 Justified Gallery ]
     {% assign config = site.data.apps.j1_justified_gallery %}
     {% for item in config.galleries %}
       {% if item.gallery.enabled %}
@@ -84,10 +81,9 @@
     {% assign config = nil %}
 
   {% endif %}
-
-  // [INFO   ] [j1.layout_shim_generator.html         ] [ create global INSTANCE variables for J1 Justified Gallery ]
+  
   {% if j1_apps.j1_light_gallery.enabled and page.layout != 'app' %}
-
+    // [INFO   ] [j1.layout_shim_generator.html         ] [ create global INSTANCE variables for J1 Justified Gallery ]
     {% assign config = site.data.apps.j1_light_gallery %}
     {% for item in config.galleries %}
       {% if item.gallery.enabled %}
@@ -112,10 +108,8 @@
     j1["texthead"] = true;
   }
 
-
   {% comment %} Page hacks
   ------------------------------------------------------------------------------ {% endcomment %}
-
   // IE10 viewport hack for Surface/Desktop Windows 8 bug
   // Copyright 2014-2015 Twitter, Inc. (Bootstrap)
   if (navigator.userAgent.match(/IEMobile\/10\.0/)) {