j1-template 2020.0.11 → 2020.0.16

data/_includes/themes/j1/modules/connectors/ad/custom-provider.html

@@ -17,17 +17,14 @@
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
-
+-------------------------------------------------------------------------------- {% endcomment %}
 
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
-
-<!-- Your code for the custom provider goes here -->
-
-
-
+-------------------------------------------------------------------------------- {% endcomment %}
+<script>
+  /* Your code for the custom provider goes here */
+</script>

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

@@ -17,15 +17,20 @@
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign publisher_id = site.data.template_settings.advertising.google.publisher_id %}
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
+<script data-ad-client="{{publisher_id}}"
+    async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
+</script>
+
+{% comment %} Old Ads code
 <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 <script>
   (adsbygoogle = window.adsbygoogle || []).push({
@@ -33,6 +38,4 @@
     enable_page_level_ads: true
   });
 </script>
-
-
-
+-------------------------------------------------------------------------------- {% endcomment %}

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

@@ -36,15 +36,12 @@
 
   {% case advertising_provider %}
     {% when "google" %}
-      <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place Google Adsense ] -->
+      <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place provider: Google Adsense ] -->
       {% include themes/{{site.template.name}}/modules/connectors/ad/google-adsense.html %}
     {% when "custom" %}
-      <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place Custom Provider ] -->
-      {% include themes/{{site.template.name}}/modules/connectors/analytic/custom-analytics.html %}
+      <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place provider: Custom Provider ] -->
+      {% include themes/{{site.template.name}}/modules/connectors/ad/custom-provider.html %}
   {% endcase %}
 
 {% endif %}
 <!-- [INFO   ] [j1.modules.connectors.ads             ] [ end processing ] -->
-          
-
-

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

@@ -38,7 +38,6 @@
 
 {% 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 %}

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

@@ -89,7 +89,7 @@
   ------------------------------------------------------------------------------ {% endcomment %}
   {% if quick_search %}
     <!-- [INFO   ] [j1.modules.navigator.topsearch.proc   ] [ start processing: top search ] -->
-    <div id="{{topsearch_id}}" class="top-search">
+    <div id="{{topsearch_id}}" class="top-search" style="display: none;">
       <div class="container-fluid">
         <div class="input-group">
           <span class="input-group-addon"><i class="{{icon_family}} {{icon_family}}-{{search_icon}} {{icon_size}}" {{icon_color}}></i></span>
@@ -102,13 +102,13 @@
         </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 col-lg-9" 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">
-            <ul id="jss-results"></ul>
+          <div class="search-list-group">
+            <ul id="jss-results" class="search-list-item"></ul>
           </div>
         </div>
       </div>

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

@@ -57,7 +57,10 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 <div id="word-cloud" class="row ml-3 mr-3">
-  <div class="card tagbox raised-z0 mt-0 mb-2">
+  <!-- jadams, 2020-07-24: style cart creates a unwanted border, removed card styles -->
+  <!-- jadams, 2020-07-24: style cart is NOT longer overloaded since CSS generation has changed -->
+  <!-- div class="card tagbox raised-z0 mt-0 mb-2" -->
+  <div class="tagbox mt-0 mb-2">
 
     <div class="tag-cloud">
     {% unless word_list %}
@@ -66,7 +69,7 @@
     {% else  %}
       <ul class="content">
         {% if source == 'categories' %}
-          {% for tag in word_array %}            
+          {% for tag in word_array %}
             <li>
               <a href="#{{tag|slugify}}">
                 {{ tag | capitalize }}

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

@@ -2,7 +2,7 @@
  # -----------------------------------------------------------------------------
  # ~/_includes/themes/j1/procedures/layouts/content_writer.proc
  # Liquid PROCEDURE to load and place the content portion for J1 layouts
- # 
+ #
  # Product/Info:
  # https://jekyll.one
  #
@@ -12,7 +12,7 @@
  # 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 %}
 
@@ -74,11 +74,11 @@
             {% 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>
+                <!-- div id="{{id}}" class="{{class}}"></div -->
+                <section id="{{id}}" class="{{class}}"></section>
               {% elsif type == 'sync' %}
                 {% capture path %}{{base}}/{{path}}/{{file}}{% endcapture %}
-                {% include {{ path }} %}
+                {% include {{path}} %}
               {% endif %}
             {% endif %}  {% comment %} END placement {% endcomment %}
 
@@ -89,10 +89,10 @@
             {% if placement == 'body-footer' %}
               <!-- [INFO   ] [j1.layout.content_writer.proc         ] [ load region body-footer for layout: {{page.layout}} ] -->
               {% if type == 'async' %}
-                <div id="{{ id }}" class="{{ class }}"></div>
+                <div id="{{id}}" class="{{class}}"></div>
               {% elsif type == 'sync' %}
                 {% capture path %}{{base}}/{{path}}/{{file}}{% endcapture %}
-                {% include {{ path }} region='body-footer' %}
+                {% include {{path}} region='body-footer' %}
               {% endif %}
             {% endif %} {% comment %} END if placement {% endcomment %}
 
@@ -103,10 +103,9 @@
   {% endfor %}
 {% endfor %}
 
-{% comment %} END Process all lane items 
+{% comment %} END Process all lane items
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.layout.content_writer.proc         ] [ placement for all lane items finished ] -->
 <!-- [DEBUG  ] [j1.layout.content_writer.proc         ] [ reset all lane items ] -->
 <!-- [INFO   ] [j1.layout.content_writer.proc         ] [ end processing ] -->
 {% assign items = nil %}
-

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

@@ -128,18 +128,8 @@ NO need to load this again
         <script>
           $(document).ready(function() {
             var logger = log4javascript.getLogger("j1.module_loader");
-
-            {% if resource_settings.id == 'log4javascript' %}
-              var start = moment();
-              var finished = '';
-              var elapsed = '';
-              var log_text = '[' +start.format("HH:mm:ss.SSS")+ '] [INFO ] [j1.layout.module_writer.proc          ] [ {{resource_settings.comment|strip}} is being initialized ]';
-              console.info(log_text);
-            {% else %}
-              var log_text = '{{resource_settings.comment|strip}} is being initialized';
-              logger.info(log_text);
-            {% endif %}
-
+            var log_text = '{{resource_settings.comment|strip}} is being initialized';
+            logger.info(log_text);
 
             {% comment %} place initializer|s
             -------------------------------------------------------------------- {% endcomment %}
@@ -241,7 +231,7 @@ NO need to load this again
                 {% endif %}
               {% endif %}
             {% endfor %}
-        });
+           });
         </script>
       {% 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
@@ -145,9 +145,9 @@
               </div>
               <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
+                   class="btn btn-secondary btn-raised btn-flex mb-0">
+                   <i class="mdi mdi-eye mdi-lg mr-1" style="color:#FFFFFF;">
+                   </i> Read · {{post.tagline}}
                 </a>
               </div>
             </div>
@@ -166,9 +166,9 @@
               </div>
               <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
+                   class="btn btn-secondary btn-raised btn-flex mb-0">
+                   <i class="mdi mdi-eye mdi-lg mr-1" style="color:#FFFFFF;">
+                   </i> Read · {{post.tagline}}
                 </a>
               </div>
             </div>
@@ -184,9 +184,9 @@
               </div>
               <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
+                   class="btn btn-secondary btn-raised btn-flex mb-0">
+                   <i class="mdi mdi-eye mdi-lg mr-1" style="color:#FFFFFF;">
+                   </i> Read · {{post.tagline}}
                 </a>
               </div>
             </div>
@@ -201,16 +201,16 @@
 
           <div class="timeline-footer">
             <ul class="timeline-list-unstyled list-inline blog-info">
-              <li><i class="fa fa-calendar mr-1"></i> {{post.date | date: "%Y %B, %e"}}</li>
+              <li><i class="mdi mdi-calendar-blank mr-1"></i> {{post.date | date: "%Y %B, %e"}}</li>
               {% if comment_count %}
                 <!-- comment_count enabled  -->
-                <!-- <li><i class="fa fa-comments-o"></i> <a href="#"> 7 Comments</a></li> -->
-                <li><a href="#"><i class="fa fa-comments-o"></i> 7 Comments</a></li>
+                <!-- <li><i class="mdi mdi-comment"></i> <a href="#"> 7 Comments</a></li> -->
+                <li><a href="#"><i class="mdi mdi-comment"></i> 7 Comments</a></li>
               {% endif %}
             </ul>
             {% if likes_count %}
               <!-- likes_count enabled  -->
-              <a class="likes" href="#"><i class="fa fa-heart"></i> 239</a>
+              <a class="likes" href="#"><i class="mdi mdi-heart"></i> 239</a>
             {% endif %}
           </div>
         </div>

data/_layouts/default.html

@@ -56,31 +56,30 @@ layout:                                 compress
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config       = site %}
 {% assign template_config   = site.data.template_settings %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign consent_defaults  = modules.defaults.cookie_consent.defaults %}
-{% assign consent_settings  = modules.cookie_consent.settings %}
+{% assign cookiebar_settings  = modules.cookiebar.settings %}
+{% assign cookiebar_defaults  = modules.defaults.cookiebar.defaults %}
 
 {% comment %} Webhooks disabled
 --------------------------------------------------------------------------------
-{% assign webhook_defaults  = modules.defaults.webhooks.defaults %}
-{% assign webhook_settings  = modules.webhooks.settings %}
+{% assign webhook_defaults    = modules.defaults.webhooks.defaults %}
+{% assign webhook_settings    = modules.webhooks.settings %}
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% 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 %}
+{% assign cookiebar_options   = cookiebar_defaults | merge: cookiebar_settings %}
+{% assign tooltips_options    = template_config.bootstrap.tooltips %}
+{% assign popovers_options    = template_config.bootstrap.popovers %}
 
 {% comment %} Webhooks disabled
 --------------------------------------------------------------------------------
-{% assign webhook_options   = webhook_defaults | merge: webhook_settings %}
+{% assign webhook_options     = webhook_defaults | merge: webhook_settings %}
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% assign lanes_collate     = data.layouts.default.lanes %}
@@ -91,10 +90,6 @@ layout:                                 compress
   {% assign body_scrollbar = page.scrollbar %}
 {% endif %}
 
-{% if jekyll.environment != 'development' %}
-  {% assign environment = jekyll.environment | strip %}
-{% endif %}
-
 
 {% comment %} main
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -164,71 +159,76 @@ layout:                                 compress
 
   </body>
 
-  {% comment %} Place|Initialize J1 Module components
+  {% comment %} Place|Initialize module components
   ------------------------------------------------------------------------------ {% endcomment %}
 
-  {% comment %} Place container for Cookie Consent Modals
+  {% comment %} Place container for Cookiebar modals
   ------------------------------------------------------------------------------ {% endcomment %}
-  {% if consent_options.enabled %}
-  <!-- [INFO   ] [j1.layout.default.html                ] [ place container for Cookie Consent Modals ] -->
-  <div id="{{consent_options.consent_modal_id}}"></div>
+  {% if cookiebar_options.enabled %}
+  <!-- [INFO   ] [j1.layout.default.html                ] [ place container for Cookiebar modals ] -->
+  <div id="{{cookiebar_options.xhr_container_id}}"></div>
   {% endif %}
 
-  {% comment %} Place container for Web Hook Modals
+  {% comment %} Place container for WebHook modals
   ------------------------------------------------------------------------------ {% endcomment %}
   {% if webhook_options.enabled %}
   <!-- [INFO   ] [j1.layout.default.html                ] [ place container for WebHook Modals ] -->
   <div id="{{webhook_options.xhr_container_id}}"></div>
   {% endif %}
 
-  {% comment %} Place container for Modal R-Text Resizer
-  ------------------------------------------------------------------------------ {% endcomment %}
-  <div class="modal fade right" id="fluidModalRTextResizer" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-side modal-top-right modal-notify modal-success" role="document">
-      <!-- Content -->
-      <div class="modal-content">
-        <!--Header-->
-        <div class="modal-header">
-          <p class="lead">Text Resizer</p>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <i class="mdi mdi-close mdi-dark mdi-48px"></i>
-          </button>
-        </div>
-        <!-- Body -->
-        <div class="modal-body">
-          <div class="text align-left">
-            <p>
-              Change the text size for the main window by the switches from below:
-            </p>
+  {% comment %} Place container for R-Text resizer modals (deactivated)
+  ------------------------------------------------------------------------------
+  <!-- [INFO   ] [j1.layout.default.html                ] [ place container for R-Text resizer modals ] -->
+  <div id="rtext_resizer">
+    <div class="modal fade right" id="fluidModalRTextResizer" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <div class="modal-dialog modal-side modal-top-right modal-notify modal-success" role="document">
+        <!-- Content -->
+        <div class="modal-content">
+          <!--Header-->
+          <div class="modal-header">
+            <p class="lead">Text Resizer</p>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <i class="mdi mdi-close mdi-dark mdi-48px"></i>
+            </button>
           </div>
-          <div class="ml-3 mt-5 mb-5">
-            <div class="switch">
-              <label>
-                <input id="textsize-300" name="textsize-300" type="checkbox" checked>
-                300 - Default Size
-              </label>
-            </div>
-            <div class="switch">
-              <label>
-                <input id="textsize-400" name="textsize-400" type="checkbox">
-                400 - Larger Size
-              </label>
+          <!-- Body -->
+          <div class="modal-body">
+            <div class="text align-left">
+              <p>
+                Change the text size for the main window by the switches from below:
+              </p>
             </div>
-            <div class="switch">
-              <label>
-                <input id="textsize-500" name="textsize-500" type="checkbox">
-                500 - Largest Size
-              </label>
+            <div class="ml-3 mt-5 mb-5">
+              <div class="switch">
+                <label>
+                  <input id="textsize-300" name="textsize-300" type="checkbox" checked>
+                  300 - Default Size
+                </label>
+              </div>
+              <div class="switch">
+                <label>
+                  <input id="textsize-400" name="textsize-400" type="checkbox">
+                  400 - Larger Size
+                </label>
+              </div>
+              <div class="switch">
+                <label>
+                  <input id="textsize-500" name="textsize-500" type="checkbox">
+                  500 - Largest Size
+                </label>
+              </div>
             </div>
           </div>
-        </div>
-      <!-- END Content -->
+        <!-- END Content -->
+      </div>
     </div>
   </div>
-  <!-- END Modal R-Text Resizer -->
+  <!-- [INFO   ] [j1.layout.default.html                ] [ end modals for r-text resizer ] -->
+  ------------------------------------------------------------------------------ {% endcomment %}
 
-  {% comment %} Deactivated JS for R-Text
+  {% comment %} JS for R-Text (deactivated)
   ------------------------------------------------------------------------------
+  <!-- [INFO   ] [j1.layout.default.html                ] [ place JS for R-Text resizer modals ] -->
   <script>
     // Set global variables
     var environment     = '{{environment}}';
@@ -295,6 +295,7 @@ layout:                                 compress
       e.stopPropagation();
     });
   </script>
+  <!-- [INFO   ] [j1.layout.default.html                ] [ end JS for r-text resizer ] -->
   ------------------------------------------------------------------------------ {% endcomment %}
 
   {% comment %} Initialize Tooltips|Popovers