j1-template 2020.0.7 → 2020.0.12

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

@@ -165,9 +165,9 @@
   {% 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" href="#"> <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.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
-      <a id="navbar-brand" class="navbar-brand animated" href="#" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
+      <a id="navbar-brand" class="navbar-brand animated"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
     <button id="navbar-toggler" type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
       <i class="mdi mdi-menu mdi-48px"></i>
@@ -175,9 +175,9 @@
   {% 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" href="#"> <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.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
-      <a id="navbar-brand" class="navbar-brand animated" href="#" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
+      <a id="navbar-brand" class="navbar-brand animated"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mobile menu button to the: left ] -->
     <button id="mmenu-button" type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
@@ -186,9 +186,9 @@
   {% 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" href="#"> <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.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
-      <a id="navbar-brand" class="navbar-brand animated" href="#" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
+      <a id="navbar-brand" class="navbar-brand animated"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place menu toggler to the: right ] -->
     <button id="navbar-toggler" type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">

data/_includes/themes/j1/modules/navigator/procedures/topsearch.proc

@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture select_color     %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
 {% capture select_icon_size %}themes/{{site.template.name}}/procedures/global/select_icon_size.proc{% endcapture %}
- 
+
 
 {% comment %} Liquid var initialization
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -52,6 +52,7 @@
 {% assign result_heading_lead = topsearch_options.result_heading_lead %}
 {% assign search_icon         = topsearch_options.search_icon %}
 {% assign close_icon          = topsearch_options.close_icon %}
+{% assign clear_icon          = topsearch_options.clear_icon %}
 
 {% assign quick_search   = true %}
 {% assign elastic_search = false %}
@@ -80,7 +81,7 @@
 {% assign icon_size = size %}
 
 
-{% comment %} Main 
+{% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if topsearch_options.enabled %}
 
@@ -93,16 +94,20 @@
         <div class="input-group">
           <span class="input-group-addon"><i class="{{icon_family}} {{icon_family}}-{{search_icon}} {{icon_size}}" {{icon_color}}></i></span>
           <input type="text" id="jss-input" class="form-control" placeholder="{{placeholder}}">
+          {% if clear_icon %}
+          <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ place clear icon ] -->
+          <span class="form-clear form-clear-searcher d-none"><i class="{{icon_family}} {{icon_family}}-{{clear_icon}} {{icon_size}}" {{icon_color}}"></i></span>
+          {% endif %}
           <span class="input-group-addon close-search"><i class="{{icon_family}} {{icon_family}}-{{close_icon}} {{icon_size}}" {{icon_color}}></i></span>
         </div>
       </div>
       <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ add search panel (hidden) ] -->
-      <div class="row">
+      <div class="row no-gutters ml-3 mr-5">
         <!-- div class="card card-flat panel-search mr-5 mb-3 ml-5" id="jss-panel" style="display: none" -->
-        <div class="panel-search mr-5 mb-3 ml-5" id="jss-panel" style="display: none">
+        <div class="panel-search mb-3" id="jss-panel" style="display: none">
           {% if search_heading_lead %}<div class="panel-heading lead">{{ search_heading_lead }}</div>{% endif %}
           {% if result_heading_lead %}<div class="panel-body"><p>{{ result_heading_lead }}</p></div>{% endif %}
-          <div class="search-list-group mr-5 ml-2">
+          <div class="search-list-group">
             <ul id="jss-results"></ul>
           </div>
         </div>

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

@@ -267,4 +267,4 @@ NO need to load this again
     {% assign resource_settings.data            = nil %}
     ---------------------------------------------------------------------------- {% endcomment %}
   {% endif %}
-{% endif %}
+{% endif %}

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

@@ -1,4 +1,4 @@
-{% comment %} 
+{% comment %}
  # -----------------------------------------------------------------------------
  # ~/_includes/themes/j1/procedures/posts/collate_timeline.proc
  # Liquid PROCEDURE to collate posts along a timeline
@@ -146,8 +146,8 @@
               <div class="card-footer">
                 <a href="{{post.url}}#readmore"
                    class="btn btn-primary btn-raised mb-0">
-                   <i class="fa fa-eye fa-lg" style="color:#FFFFFF;">
-                   </i> Read More
+                   <i class="fa fa-eye fa-lg mr-1" style="color:#FFFFFF;">
+                   </i> Read · {{post.tagline}}
                 </a>
               </div>
             </div>
@@ -167,8 +167,8 @@
               <div class="card-footer">
                 <a href="{{post.url}}#readmore"
                    class="btn btn-primary btn-raised mb-0">
-                   <i class="fa fa-eye fa-lg" style="color:#FFFFFF;">
-                   </i> Read More
+                   <i class="fa fa-eye fa-lg mr-1" style="color:#FFFFFF;">
+                   </i> Read · {{post.tagline}}
                 </a>
               </div>
             </div>
@@ -185,8 +185,8 @@
               <div class="card-footer">
                 <a href="{{post.url}}#readmore"
                    class="btn btn-primary btn-raised mb-0">
-                   <i class="fa fa-eye fa-lg" style="color:#FFFFFF;">
-                   </i> Read More
+                   <i class="fa fa-eye fa-lg mr-1" style="color:#FFFFFF;">
+                   </i> Read · {{post.tagline}}
                 </a>
               </div>
             </div>

data/_layouts/default.html

@@ -75,6 +75,8 @@ layout:                                 compress
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign consent_options   = consent_defaults | merge: consent_settings %}
+{% assign tooltips_options  = template_config.bootstrap.tooltips %}
+{% assign popovers_options  = template_config.bootstrap.popovers %}
 
 {% comment %} Webhooks disabled
 --------------------------------------------------------------------------------
@@ -138,7 +140,7 @@ layout:                                 compress
     <!-- [INFO   ] [j1.layout.default.html                ] [ make page hidden ] -->
     <!-- div id="no_flicker" class="nojs" -->
     <div id="no_flicker" style="display: none">
-  
+
       {% comment %} collect the BODY-NAVIGATION region
       -------------------------------------------------------------------------- {% endcomment %}
       <!-- [INFO   ] [j1.layout.default.html                ] [ call default_writer for region: 'body-navigation' ] -->
@@ -228,7 +230,7 @@ layout:                                 compress
   {% comment %} Deactivated JS for R-Text
   ------------------------------------------------------------------------------
   <script>
-    // Set global variables    
+    // Set global variables
     var environment     = '{{environment}}';
     var logger          = log4javascript.getLogger('j1.template.rtext-resizer');
     var $el             = $("main[class*='r-text']");
@@ -239,7 +241,7 @@ layout:                                 compress
     var cl;
     var value;
 
-    $('input:checkbox[name="textsize-300"]').on('click', function (e) {                  
+    $('input:checkbox[name="textsize-300"]').on('click', function (e) {
       value = $(this).is(':checked');
 
       $('input:checkbox[name="textsize-400"]').prop('checked', false);
@@ -249,7 +251,7 @@ layout:                                 compress
         cl = r_text_default;
       }
       $el.attr('class', base_classes + cl);
-      
+
       if(environment === 'development') {
         logText = 'Changed textsize to: ' +cl;
         logger.info(logText);
@@ -291,7 +293,7 @@ layout:                                 compress
         logger.info(logText);
       }
       e.stopPropagation();
-    });    
+    });
   </script>
   ------------------------------------------------------------------------------ {% endcomment %}
 
@@ -300,8 +302,16 @@ layout:                                 compress
   <!-- [INFO   ] [j1.layout.default.html                ] [ initialize BS tooltips|popovers ] -->
   <script>
     $(function() {
-      $('[data-toggle="tooltip"]').tooltip();
-      $('[data-toggle="popover"]').popover();
+    {% if tooltips_options.enabled %}
+      $('[data-toggle="tooltip"').tooltip({
+        trigger: '{{tooltips_options.trigger}}'
+      });
+    {% endif %}
+    {% if popovers_options.enabled %}
+      $('[data-toggle="popover"').popover({
+        trigger: '{{popovers_options.trigger}}'
+      });
+    {% endif %}
     });
   </script>
   <!-- [INFO   ] [j1.layout.default.html                ] [ end page processing ] -->
@@ -345,4 +355,4 @@ layout:                                 compress
   {% else %}
     {{ j1_cache | remove: '<p>excerpt__end</p>'| strip_empty_lines  }}
 
-{% endcase %}
+{% endcase %}

data/assets/data/authclient.html

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false 
+regenerate: true
 ---
 {% capture cache %}
 
@@ -30,6 +30,7 @@ regenerate:                             false
 
 {% 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 %}
@@ -42,6 +43,7 @@ regenerate:                             false
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment             = site_config.environment %}
 {% assign nav_authclient_defaults = authentication_defaults.auth_client %}
 {% assign nav_authclient_settings = authentication_settings.auth_client %}
 
@@ -57,7 +59,12 @@ regenerate:                             false
 {% comment %} Liquid var initialization
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% comment %} Set auth_client properties 
+{% assign production = '' %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+{% comment %} Set auth_client properties
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign icon_family             = authclient_options.icon_family | downcase %}
 {% assign signin_icon             = authclient_options.signin_icon %}
@@ -104,7 +111,7 @@ regenerate:                             false
   {% assign auth_twitter_enabled  = false %}
 {% endif %}
 
-{% if providers contains 'patreon' %} 
+{% if providers contains 'patreon' %}
   {% assign auth_patreon_enabled  = true %}
   {% assign auth_patreon_id       = authclient_options.auth_patreon.id %}
   {% assign auth_patreon_title    = authclient_options.auth_patreon.title | downcase %}
@@ -135,7 +142,7 @@ regenerate:                             false
 <!-- [INFO   ] [j1.authclient.html                    ] [START: Modal signin|signup] -->
 <div class="modal fade" id="modalOmniSignIn" tabindex="-1" role="dialog" aria-labelledby="modalOmniSignIn" aria-hidden="true">
   <div class="modal-dialog modal-lg modal-notify modal-info" role="document">
-    
+
     <!-- Content -->
     <div class="modal-content">
 
@@ -209,7 +216,7 @@ regenerate:                             false
 
           {% endfor %}
           </ul>
-          
+
           <div class="tab-content tab-space">
           {% for provider in providers %}
 
@@ -265,7 +272,7 @@ regenerate:                             false
   <div class="modal-dialog modal-lg modal-notify modal-warning" role="document">
     <!-- Content -->
     <div class="modal-content">
-      
+
       <!--Header-->
       <div class="modal-header">
         <p class="lead">
@@ -314,7 +321,7 @@ regenerate:                             false
         </a>
       </div>
 
-    </div> <!-- END Content -->    
+    </div> <!-- END Content -->
   </div>
 </div> <!-- Modal SignOut -->
 
@@ -369,5 +376,9 @@ regenerate:                             false
 
 {% endcapture %}
 
-{{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
+{% if production %}
+  {% capture _LINE_FEED %}{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ cache | strip_html_comments }}{% else %}{% capture _content %}{{ cache | strip_html_comments }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ cache | strip_html_comments | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}
+{% else %}
+  {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}

data/assets/data/banner.html

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 {% capture cache %}
 
@@ -32,8 +32,9 @@ regenerate:                             true
 
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment = site.environment %}
-{% assign debug       = false %}
+{% assign site_config             = site %}
+{% assign environment             = site_config.environment %}
+{% assign debug                   = false %}
 
 
 {% comment %} Process YML config data
@@ -59,6 +60,10 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture banner_config_file_name %}~/_data/blocks/banner.yml{% endcapture %}
 
+{% assign production = '' %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
 
 {% comment %} Main
 ================================================================================ {% endcomment %}
@@ -187,32 +192,24 @@ regenerate:                             true
             {% if card_animate %} {% capture animate %}animated {{card_animate}}{% endcapture %} {% endif %}
             <!-- Heading -->
             <div class="row">
-              <div class="col-lg-9">
-                <div class="{{animate}}">
-                  <h1 class="g-font-weight-500 g-mb-0">{{card_title}}</h1>
-                  <p class="tagline">{{card_tagline}}</p>
-                  <div class="d-inline-block g-width-50 g-height-2 g-bg-primary g-mb-5"></div>
-                </div>
+              <div class="{{animate}}">
+                <h1 class="g-font-weight-500 g-mb-0">{{card_title}}</h1>
+                <p class="tagline">{{card_tagline}}</p>
+                <div class="d-inline-block g-width-50 g-height-2 g-bg-primary g-mb-5"></div>
               </div>
             </div>
             <!-- End Heading -->
 
             <!-- Card -->
             <div class="row {{animate}}">
-              <div class="col-lg-9">
-
-                <!-- p class="lead">{{card_description|asciidocify}}</p -->
-                <!-- p class="lead">{{card_description}}</p -->
-                <p class="">{{card_description}}</p>
-                <div class="row btn-row mt-4">
-                  <div class="col-md-{{card_width_md}} col-md-offset-1 col-sm-{{card_width_md}} col-sm-offset-1 col-xs-{{card_width_md | plus:2}}">
-                    {% for button_hash in card_buttons %}
-                      {% include {{create_bs_button}} button_data=button_hash button_type="link" %}
-                      {{bs_button_html}}
-                    {% endfor %}
-                  </div>
+              <p class="">{{card_description}}</p>
+              <div class="row btn-row mt-4">
+                <div class="col-md-{{card_width_md}} col-md-offset-1 col-sm-{{card_width_md}} col-sm-offset-1 col-xs-{{card_width_md | plus:2}}">
+                  {% for button_hash in card_buttons %}
+                    {% include {{create_bs_button}} button_data=button_hash button_type="link" %}
+                    {{bs_button_html}}
+                  {% endfor %}
                 </div>
-
               </div>
             </div>
             <!-- End Card -->
@@ -428,5 +425,9 @@ regenerate:                             true
 
 {% endcapture %}
 
-{{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
+{% if production %}
+  {% capture _LINE_FEED %}{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ cache | strip_html_comments }}{% else %}{% capture _content %}{{ cache | strip_html_comments }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ cache | strip_html_comments | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}
+{% else %}
+  {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}

data/assets/data/carousel.json

@@ -1,8 +1,8 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
-{% capture j1_cache %}
+{% capture cache %}
 
 {% comment %}
  # -----------------------------------------------------------------------------
@@ -17,24 +17,22 @@ regenerate:                             true
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
+ # The Liquid template sliders.json is used by J1 Slider (Owl Carousel).
+ # This template is a helper that creates the carousel (JSON) data
+ # for all sliders configured (if enabled or NOT). It's used by
+ # the J1 Template Adapter to LOAD the carousel HTML markup portion
+ # via AJAX get.
  #
- #  The Liquid template sliders.json is used by J1 Slider (Owl Carousel).
- #  This template is a helper that creates the carousel (JSON) data
- #  for all sliders configured (if enabled or NOT). It's used by
- #  the J1 Template Adapter to LOAD the carousel HTML markup portion
- #  via AJAX get.
- #
- #  The Liquid template engine generates a JSON file as an object of
- #  arrays that contains all image data used by several sliders. See
- #  below the fields taken from the YAML data file:
- #  ~/_data/apps/j1_carousel.yml.
- #
- #  NOTE:
- #  Be careful changing the Liquid code. If the code is changed, check
- #  the integrity of the JSON data created. Corrupted JSON data makes
- #  the Javascript of an Adapter to fail and no functionality will
- #  be available for most UNCLEAR reasons.
- #
+ # The Liquid template engine generates a JSON file as an object of
+ # arrays that contains all image data used by several sliders. See
+ # below the fields taken from the YAML data file:
+ # ~/_data/apps/j1_carousel.yml.
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ # Be careful changing the Liquid code. If the code is changed, check
+ # the integrity of the JSON data created. Corrupted JSON data makes
+ # the Javascript of an Adapter to fail and no functionality will
+ # be available for most UNCLEAR reasons.
  # -----------------------------------------------------------------------------
  # Test data:
  #  {{ liquid_var | debug }}
@@ -46,10 +44,13 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config               = site %}
 {% assign apps                      = site.data.apps %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment               = site_config.environment %}
+
 {% assign carousel_config_defaults  = apps.defaults.carousel.defaults %}
 {% assign carousel_config_settings  = apps.carousel.settings %}
 
@@ -57,6 +58,11 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign carousel_config           = carousel_config_defaults | merge: carousel_config_settings %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 {
   {% for item in carousel_config.carousel %}
     "{{item.show.id}}" : [
@@ -105,5 +111,9 @@ regenerate:                             true
 }
 
 {% endcapture %}
-{{ j1_cache | strip_empty_lines }}
-{% assign j1_cache = nil %}
+{% if production %}
+  {{ cache | minifyJSON }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}