j1-template 2020.0.21 → 2020.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b681224aa78c5feac1963cc0c68b8f6525d0a35a3d20706700d16ced3fd6d90
-  data.tar.gz: 77a63976580b15abb2d83b1d563334ded39a4ade3edd970e778c36e3cb7efb41
+  metadata.gz: 6eff683e591b259db1cb6c69fcdc3ed344808df0b6a139e981cbfa3e6b969637
+  data.tar.gz: 1de451830f98df3fbfc41d65229b9e46f246cfa3e780963487fed8a41f8e262c
 SHA512:
-  metadata.gz: 3c5fe2db9d6b14fd5c1d24fcda6c5ae54584568169d922313806565a3341bbefac37d80731204ddbcede2d468b010efd401126ca697dc5b8416979dbc4306a5b
-  data.tar.gz: 366f13212b8612f231de02c87d163a0821e847660f2e41a2a3d3e03e09693edb12e9d8b63d2a15598c7b9c91058ed3b0b7eaba5e8fc5b1326ab0ee5a86abe42e
+  metadata.gz: 4553cad532648398b39aebc42503ded0d9a72b798a00ff81adff95ec786f3c7312b198c0b170dc0c83f31738e91e223aeef3eddebc2712052c4ea1edd8e33728
+  data.tar.gz: c7801ae6b8b788b8040bb36b01731daa533a748792f43b2f377a99a6f78c58cd19bcc469e3b981fb59c1d31735ccb86eadba2c93632a7779d113fefd8b590a05

data/_includes/themes/j1/blocks/ads/ad.html

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

data/_includes/themes/j1/blocks/footer/generator.html

@@ -47,7 +47,7 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign footer_options        = footer_defaults | merge: footer_settings %}
 
-{% if data.template_settings.analytics.enabled %}
+{% if data.j1_config.analytics.enabled %}
   {% include analytics %}
 {% endif %}
 

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

@@ -49,14 +49,14 @@
 
 {% assign previewer            = site.data.builder.blog_navigator.previewer %}
 {% assign paginate             = paginator_options.pagination.enabled %}
-{% assign rtext                = site.data.template_settings.typography.rtext %}
+{% assign rtext                = site.data.j1_config.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.template_settings.typography.rtext_size %}
+  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}

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

@@ -25,7 +25,7 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
@@ -52,7 +52,7 @@
 {% endif %}
 
 {% if rtext %}
-  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}

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

@@ -29,18 +29,18 @@
 
 {% comment %} set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 
 {% comment %} set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign rtext             = site.data.template_settings.typography.rtext %}
+{% assign rtext             = site.data.j1_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 rtext %}
-  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}

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

@@ -27,7 +27,7 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
@@ -41,7 +41,7 @@
 {% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
 {% assign tocbot_enabled    = toccer_options.enabled %}
 
- {% assign rtext            = site.data.template_settings.typography.rtext %}
+ {% assign rtext            = site.data.j1_config.typography.rtext %}
  {% assign page_rtext       = page.rtext %}
  {% assign page_rtext_size  = page.rtext_size %}
  {% assign page_toccer      = page.toccer %}
@@ -54,7 +54,7 @@
  {% endif %}
 
  {% if rtext %}
-   {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+   {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
  {% else %}
    {% assign rtext_size = 0 %}
  {% endif %}

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

@@ -24,7 +24,7 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config = site.data.template_settings %}
+{% assign template_config = site.data.j1_config %}
 {% assign blocks          = site.data.blocks %}
 {% assign modules         = site.data.modules %}
 
@@ -91,7 +91,7 @@
 {% endif %}
 
 {% if site.favicon.image %}
-  <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.template_settings.image_path}}/{{site.favicon.image}}">
+  <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}">
 {% endif %}
 
 {% if page.layout == 'home' %}

data/_includes/themes/j1/modules/connectors/ad/google-adsense.html

@@ -21,7 +21,7 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign publisher_id = site.data.template_settings.advertising.google.publisher_id %}
+{% assign publisher_id = site.data.j1_config.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.template_settings.advertising.enabled %}
-{% assign advertising_provider  = site.data.template_settings.advertising.provider %}
+{% assign advertising           = site.data.j1_config.advertising.enabled %}
+{% assign advertising_provider  = site.data.j1_config.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.template_settings.analytics.google.tracking_id }} %}
+{% assign tracking_id = site.data.j1_config.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.template_settings.analytics.enabled %}
-{% assign analytics_provider  = site.data.template_settings.analytics.provider %}
+{% assign analytics           = site.data.j1_config.analytics.enabled %}
+{% assign analytics_provider  = site.data.j1_config.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.template_settings.comments.disqus.short_name %}
+{% assign disqus_short_name = site.data.j1_config.comments.disqus.short_name %}
 
 
 {% comment %} Main

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

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

data/_includes/themes/j1/modules/connectors/translator

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

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

@@ -38,7 +38,7 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config             = site.data.template_settings %}
+{% assign template_config             = site.data.j1_config %}
 {% assign blocks                      = site.data.blocks %}
 {% assign modules                     = site.data.modules %}
 
@@ -49,8 +49,13 @@
 
 {% assign navigator_defaults          = site.data.modules.defaults.navigator.defaults %}
 {% assign navigator_settings          = site.data.modules.navigator.settings %}
+
+{% comment %} Cookie Consent module NOT used anymore
+--------------------------------------------------------------------------------
 {% assign consent_defaults            = site.data.modules.defaults.cookie_consent.defaults %}
 {% assign consent_settings            = site.data.modules.cookie_consent.settings %}
+{% assign cookie_consent_options      = consent_defaults | merge: consent_settings %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% assign cookiebar_defaults          = site.data.modules.defaults.cookiebar.defaults %}
 {% assign cookiebar_settings          = site.data.modules.cookiebar.settings %}
@@ -79,7 +84,6 @@
 {% assign quicklinks_options          = nav_quicklinks_defaults | merge: nav_quicklinks_settings %}
 {% assign topsearch_options           = nav_topsearch_defaults | merge: nav_topsearch_settings %}
 {% assign authclient_options          = nav_authclient_defaults | merge: nav_authclient_settings %}
-{% assign cookie_consent_options      = consent_defaults | merge: consent_settings %}
 {% assign authentication_options      = authentication_defaults | merge: authentication_settings %}
 {% assign auth_manager_options        = authentication_options.j1_auth %}
 {% assign nav_mmenu_options           = nav_mmenu_defaults | merge: nav_mmenu_settings %}
@@ -164,7 +168,7 @@
   {% if brand_position == "left" %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand image to the: left ] -->
     {% if site.brand.image %}
-      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a id="navbar-brand" class="navbar-brand animated"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
@@ -174,7 +178,7 @@
   {% elsif brand_position == "right" %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand to the: right ] -->
     {% if site.brand.image %}
-      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a id="navbar-brand" class="navbar-brand animated"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
@@ -185,7 +189,7 @@
   {% else %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand to default position: left ] -->
     {% if site.brand.image %}
-      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a id="navbar-brand" class="navbar-brand animated"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}

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

@@ -66,52 +66,52 @@
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign scope = include.scope %}
-{% assign path_elements = page.path|strip|split:'/' %}
+{% assign path_elements = page.path|split:'/' %}
 
 {% comment %} Source pathes
 -------------------------------------------------------------------------------- {% endcomment %}
-{% capture content_root %}path_elements[0]/..{% endcapture %}
+{% capture content_root %}{{path_elements[0]}}/..{% endcapture %}
 {% capture page_root %}{{page_path|strip|remove_first:'./'}}{% endcapture %}
-{% capture site_root %}{{page_path source_dir}}{% endcapture %}
 
 {% comment %} Set PATH attributes
 -------------------------------------------------------------------------------- {% endcomment %}
-:globalincludedir:                      {{content_root}}/includes
-:includedir:                            {{page_root}}/includes
-:documentdir:                           {includedir}/documents
-:imagedir:                              {includedir}/images
-:tabledir:                              {includedir}/tables
+:content_root:                          {{content_root}}
+:page_root:                             {{page_root}}
+
+:globalincludedir:                      {{content_root}}/_includes
+:includedir:                            {{page_root}}/_includes
+
+:globaltablesdir:                       {{content_root}}/_includes/tables
+:globaldocumentsdir:                    {{content_root}}/_includes/documents
+:documentdir:                           {{page_root}}/_includes/documents
+:tabledir:                              {{page_root}}/_includes/tables
 
 // Load|Publish attributes from FILE|S
 // -----------------------------------------------------------------------------
 {% if scope == "global" %}
-include::{globalincludedir}/attributes.asciidoc[tag=urls]
 include::{globalincludedir}/attributes.asciidoc[tag=tags]
+include::{globalincludedir}/attributes.asciidoc[tag=urls]
 include::{globalincludedir}/attributes.asciidoc[tag=data]
-include::{globalincludedir}/attributes.asciidoc[tag=images]
+include::{globalincludedir}/attributes.asciidoc[tag=tables]
+include::{globalincludedir}/attributes.asciidoc[tag=documents]
 include::{globalincludedir}/attributes.asciidoc[tag=products]
 include::{globalincludedir}/attributes.asciidoc[tag=authors]
 {% elsif scope == "local" %}
-include::{includedir}/attributes.asciidoc[tag=authors]
 include::{includedir}/attributes.asciidoc[tag=tags]
 include::{includedir}/attributes.asciidoc[tag=urls]
 include::{includedir}/attributes.asciidoc[tag=data]
+include::{includedir}/attributes.asciidoc[tag=authors]
 {% elsif scope == "all" %}
-include::{globalincludedir}/attributes.asciidoc[tag=urls]
 include::{globalincludedir}/attributes.asciidoc[tag=tags]
+include::{globalincludedir}/attributes.asciidoc[tag=urls]
 include::{globalincludedir}/attributes.asciidoc[tag=data]
-include::{globalincludedir}/attributes.asciidoc[tag=images]
+include::{globalincludedir}/attributes.asciidoc[tag=tables]
+include::{globalincludedir}/attributes.asciidoc[tag=documents]
 include::{globalincludedir}/attributes.asciidoc[tag=products]
 include::{globalincludedir}/attributes.asciidoc[tag=authors]
-include::{includedir}/attributes.asciidoc[tag=authors]
 include::{includedir}/attributes.asciidoc[tag=tags]
 include::{includedir}/attributes.asciidoc[tag=urls]
 include::{includedir}/attributes.asciidoc[tag=data]
+include::{includedir}/attributes.asciidoc[tag=authors]
 {% else %}
-include::{globalincludedir}/attributes.asciidoc[tag=urls]
-include::{globalincludedir}/attributes.asciidoc[tag=tags]
-include::{globalincludedir}/attributes.asciidoc[tag=data]
-include::{globalincludedir}/attributes.asciidoc[tag=images]
-include::{globalincludedir}/attributes.asciidoc[tag=products]
-include::{globalincludedir}/attributes.asciidoc[tag=authors]
 {% endif %}

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

@@ -64,6 +64,7 @@
         {% assign value = button[1] %}
         {% if key == 'text' %}       {% assign button_text       = value %} {% endif %}
         {% if key == 'class' %}      {% assign button_class      = value %} {% endif %}
+        {% if key == 'style' %}      {% assign button_style      = value %} {% endif %}
         {% if key == 'icon' %}       {% assign button_icon       = value %} {% endif %}
         {% if key == 'icon_color' %} {% assign button_icon_color = value %} {% endif %}
         {% if key == 'icon_size' %}  {% assign button_icon_size  = value %} {% endif %}
@@ -74,9 +75,9 @@
     {% endfor %}
 
     {% if button_href and button_target %}
-      {% capture bs_button_html %}<a href="{{button_href}}" target="{{ button_target }}" class="{{button_class}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
+      {% capture bs_button_html %}<a href="{{button_href}}" target="{{ button_target }}" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
     {% elsif button_href %}
-      {% capture bs_button_html %}<a href="{{button_href}}" class="{{button_class}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
+      {% capture bs_button_html %}<a href="{{button_href}}" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
     {% else %}
       {% capture bs_button_html %}<!-- INFO: No valid value for parameter href found. -->{% endcapture %}
     {% endif %}

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

@@ -25,28 +25,28 @@ jadams, 2019-08-23: no procedures should be used for initial setup
 {% if site.template.setup_provider == "custom" %}
   {% include custom/functions/setup %}
 {% else %}
-  {% if site.theme.safe and site.data.template_settings.base_path and site.data.template_settings.base_path != '' %}
-    {% assign base_path = site.data.template_settings.base_path %}
-    {% assign home_path = site.data.template_settings.base_path %}
+  {% if site.theme.safe and site.data.j1_config.base_path and site.data.j1_config.base_path != '' %}
+    {% assign base_path = site.data.j1_config.base_path %}
+    {% assign home_path = site.data.j1_config.base_path %}
   {% else %}
     {% assign base_path = nil %}
     {% assign home_path = "/" %}
   {% endif %}
 
-  {% if site.data.template_settings.asset_path %}
-    {% assign asset_path = site.data.template_settings.asset_path %}
+  {% if site.data.j1_config.asset_path %}
+    {% assign asset_path = site.data.j1_config.asset_path %}
   {% else %}
     {% capture asset_path %}{{ base_path }}/assets/themes/{{ page.theme.name }}{% endcapture %}
   {% endif %}
 
-  {% if site.data.template_settings.app_path %}
-    {% assign app_path = site.data.template_settings.app_path %}
+  {% if site.data.j1_config.app_path %}
+    {% assign app_path = site.data.j1_config.app_path %}
   {% else %}
     {% capture app_path %}{{ base_path }}/assets/apps{% endcapture %}
   {% endif %}
 
-  {% if site.data.template_settings.image_path %}
-    {% assign image_path = site.data.template_settings.image_path %}
+  {% if site.data.j1_config.image_path %}
+    {% assign image_path = site.data.j1_config.image_path %}
   {% else %}
     {% capture image_path %}{{ base_path }}/assets/images/{{ page.theme.name }}{% endcapture %}
   {% endif %}

data/_includes/themes/j1/procedures/layouts/content_writer.proc

@@ -46,7 +46,7 @@
           {% if key == 'path' %}            {% assign path = value %}       {% endif %}
           {% if key == 'file' %}            {% assign file = value %}       {% endif %}
           {% if key == 'id' %}              {% assign id = value %}         {% endif %}
-          {% if key == 'helper_classes' %}  {% assign class = value %}      {% endif %}
+          {% if key == 'properties' %}      {% assign class = value %}      {% endif %}
           {% if key == 'data' %}            {% assign data = value %}       {% endif %}
         {% endif %}
       {% endfor %}
@@ -74,7 +74,6 @@
             {% if placement == 'body-main' %}
               <!-- [INFO   ] [j1.layout.content_writer.proc         ] [ load region 'body-main' for layout: {{page.layout}} ] -->
               {% if type == 'async' %}
-                <!-- div id="{{id}}" class="{{class}}"></div -->
                 <section id="{{id}}" class="{{class}}"></section>
               {% elsif type == 'sync' %}
                 {% capture path %}{{base}}/{{path}}/{{file}}{% endcapture %}

data/_includes/themes/j1/procedures/posts/collate_calendar.proc

@@ -56,7 +56,7 @@
   {% if include.header_title %}  {% assign header_title   = include.header_title %}  {% endif %}
   {% if include.header_tagline %}{% assign header_tagline = include.header_tagline %}{% endif %}
 
-  {% if site.data.template_settings.posts_collate.provider == 'custom' %}
+  {% if site.data.j1_config.posts_collate.provider == 'custom' %}
     <!-- Use custom collator -->
     {% include themes/{{site.template.name}}/procedures/posts/custom/collate_calendar %}
   {% else %}

data/_includes/themes/j1/procedures/posts/collate_list.proc

@@ -54,7 +54,7 @@
 {% comment %} Main
    ----------------------------------------------------------------------------- {% endcomment %}
 
-  {% if site.data.template_settings.posts_collate.provider == 'custom' %}
+  {% if site.data.j1_config.posts_collate.provider == 'custom' %}
     <!-- Use custom collator -->
     {% include themes/{{site.template.name}}/procedures/custom/collate_simple %}
   {% else %}

data/_includes/themes/j1/procedures/posts/collate_timeline.proc

@@ -55,7 +55,7 @@
   {% if include.header_title %}  {% assign header_title   = include.header_title %}  {% endif %}
   {% if include.header_tagline %}{% assign header_tagline = include.header_tagline %}{% endif %}
 
-  {% if site.data.template_settings.posts_collate.provider == 'custom' %}
+  {% if site.data.j1_config.posts_collate.provider == 'custom' %}
     <!-- Use custom collator -->
     {% include themes/{{site.template.name}}/procedures/custom/posts_collate %}
   {% else %}
@@ -95,7 +95,7 @@
           <!-- div class="timeline-title" -->
           <div class="card-header bg-primary pt-4 pb-3">
             <!-- a href="{{post.url}}" -->
-              <h3 id="{{1000000 | rand}}" class="md-white">{{post.title}}</h3>
+              <h3 id="{{1000000 | rand}}" class="md-grey-300">{{post.title}}</h3>
             <!-- /a -->
           </div>