j1-template 2023.2.7 → 2023.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74dfdbda3c10cbb34270288670b6ab4a0c7a3742ca27895781f348f9f439b96
-  data.tar.gz: c79c2cd6252a8861540f5de4cc945ba7a28993f0c3e925615181e34442b196e5
+  metadata.gz: 71fc85b1224ecc67e1c96405f9c0ca10b39c45ee73135580cf1c6f9decee2d89
+  data.tar.gz: 6dc9eb1d7c92b452f14341e3e59eeb112881979bcef5ea495189f2f1f54a2818
 SHA512:
-  metadata.gz: 2e0c1e883782e6e12256664b0d5258fcd9c1db8b5ae2fb9eda58264bd54cc50b8866264049eb9e315e61c41164e1e3accebc8da0d4d64929cc94a25e2f2d43c4
-  data.tar.gz: e800c90e080627cab7f107062c80e271f18d52bb4dd3057ee72c9618eea56d2e535c8da5f87c9d25581e4a55c59ab0230c0895f4729c83d9ffeeba75ae00c505
+  metadata.gz: 3c8e7cd60c780f05905892bdd81aeddfc9ae4c3918c17c0456a026e2ac881311f51941ebebfaadab14079cea13c6f1b67f6ce131f698c0567ab51c0f1a551555
+  data.tar.gz: 21c8705b2ca83c899addb32fc2bc08525f7064a84a99497d6aa1a3fb1d4d925f79dbf567ded619674c36396119fcb6570c6548dc984c0a8555ee34f102b77548

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

@@ -351,7 +351,7 @@
                 <!-- End post group-->
               </div>
               {% endif %}
-
+              <div id="preview_content">
               {% if card_block == 'card-deck' %}
               <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ card block detected: 'card-deck' ] -->
               <!-- Recent posts -->
@@ -428,6 +428,7 @@
               {% endfor %} {% endfor %}
               </div>
               {% endif %}
+              </div>
               <!-- End recent posts -->
             {% endfor %}
 

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

@@ -102,14 +102,14 @@
       <header class="bmd-layout-header">
         <!-- jadams, 2021-02-28 added mb-3 to the navbar -->
         <div class="navbar navbar-dark bg-primary raised-z0">
-          <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-bs-toggle="drawer" data-bs-target="#post_navigator" aria-label="drawer-toggler-button">
+          <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-bs-toggle="drawer" data-bs-target="#post_navigator" aria-label="Series button">
             <span class="mdi mdi-menu mdi-2x"></span>
           </button>
           <ul class="nav navbar-nav">
             <li class="nav-item">
               <!-- jadams, 2021-08-04: modified displaying the series name -->
               <!-- span class="navbar-text">Series: {{page.series}}</span-->
-              <span class="navbar-text mr-3">{{page.series|upcase}}</span>
+              <span class="navbar-text mr-3" style="color: #FFF;font-weight: 500;"><b>{{page.series|upcase}}</b></span>
             </li>
           </ul>
         </div>

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

@@ -60,32 +60,35 @@
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ start meta-data processing: place meta tags (taken from site config|page frontmatter) ] -->
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ page|content encoding ] -->
-<meta http-equiv="Content-Type" content="text/html;charset={{site.coding}}" />
+<meta http-equiv="Content-Type" content="text/html;charset={{site.coding}}">
+
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ enable Google experimental setting (prevent warnings) ] -->
+<meta http-equiv="Permissions-Policy" content="interest-cohort=()">
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ added for MS Edge Browser ] -->
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ initial zoom level when the page is first loaded by the browser ] -->
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ added version info for the templte ] -->
-<meta name="template version" content="{{site.version}}" />
+<meta name="template version" content="{{site.version}}">
 
 {% if template_config.translation.enabled %}
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ add google translator meta tag to enable customized translations ] -->
-<meta name="translation" content="enabled" />
+<meta name="translation" content="enabled">
 {% endif %}
 
 {% if template_config.translation.google %}
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ add google translator meta tag to enable customized translations ] -->
-<meta name="{{template_config.translation.google.meta_data}}" content="enabled" />
+<meta name="{{template_config.translation.google.meta_data}}" content="enabled">
 {% endif %}
 
 {% if site.favicon.image %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ favicon for browser ] -->
-  <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.j1_config.image_path}}/{{site.favicon.image}}">
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ favicon for the google crawler ] -->
-  <link rel="shortcut icon" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}" />
+  <link rel="shortcut icon" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}">
 {% endif %}
 
 {% comment %} Check robot settings from site configuration
@@ -93,18 +96,18 @@
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Check robot settings from SITE configuration ] -->
 {% if site.robots.index and site.robots.index <> nil %}
   <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Found SITE configuration robots_index: {{site.robots.index}} ] -->
-  {% capture robots_index %}<meta name="robots" content="index" />{% endcapture %}
+  {% capture robots_index %}<meta name="robots" content="index">{% endcapture %}
 {% else %}
   <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Set DEFAULT configuration robots_index: noindex  ] -->
-  {% capture robots_index %}<meta name="robots" content="noindex" />{% endcapture %}
+  {% capture robots_index %}<meta name="robots" content="noindex">{% endcapture %}
 {% endif %}
 
 {% if site.robots.follow and site.robots.follow <> nil %}
   <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Found SITE configuration robots_follow: {{site.robots.index}} ] -->
-  {% capture robots_follow %}<meta name="robots" content="follow" />{% endcapture %}
+  {% capture robots_follow %}<meta name="robots" content="follow">{% endcapture %}
 {% else %}
   <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Set DEFAULT configuration robots_follow: nofollow  ] -->
-  {% capture robots_follow %}<meta name="robots" content="nofollow" />{% endcapture %}
+  {% capture robots_follow %}<meta name="robots" content="nofollow">{% endcapture %}
 {% endif %}
 
 {% comment %} page.robots.index:  {{ page.robots.index | debug }} {% endcomment %}
@@ -115,19 +118,19 @@
 <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Found PAGE configuration robots_index: {{page.robots.index}} ] -->
 <!-- [DEBUG  ] [j1.layout.meta_data_generator.html    ] [ Found PAGE configuration robots_follow: {{page.robots.follow}} ] -->
 {% if page.robots.index %}
-  {% capture robots_index %}<meta name="robots" content="index" />{% endcapture %}
+  {% capture robots_index %}<meta name="robots" content="index">{% endcapture %}
 {% endif %}
 
 {% if page.robots.index == false %}
-  {% capture robots_index %}<meta name="robots" content="noindex" />{% endcapture %}
+  {% capture robots_index %}<meta name="robots" content="noindex">{% endcapture %}
 {% endif %}
 
 {% if page.robots.follow %}
-  {% capture robots_follow %}<meta name="robots" content="follow" />{% endcapture %}
+  {% capture robots_follow %}<meta name="robots" content="follow">{% endcapture %}
 {% endif %}
 
 {% if page.robots.follow == false %}
-  {% capture robots_follow %}<meta name="robots" content="nofollow" />{% endcapture %}
+  {% capture robots_follow %}<meta name="robots" content="nofollow">{% endcapture %}
 {% endif %}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ Place detected/overloaded meta tags for robots ] -->
@@ -136,63 +139,63 @@
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: analytics ] -->
 {% if page.analytics and site.data.j1_config.analytics.enabled %}
-  {% capture analytics %}<meta name="analytics" content="true" />{% endcapture %}
+  {% capture analytics %}<meta name="analytics" content="true">{% endcapture %}
 {% else %}
-  {% capture analytics %}<meta name="analytics" content="false" />{% endcapture %}
+  {% capture analytics %}<meta name="analytics" content="false">{% endcapture %}
 {% endif %}
 
 {{analytics}}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: comments ] -->
 {% if page.comments and site.data.j1_config.comments.enabled %}
-  {% capture comments %}<meta name="comments" content="true" />{% endcapture %}
+  {% capture comments %}<meta name="comments" content="true">{% endcapture %}
 {% else %}
-  {% capture comments %}<meta name="comments" content="false" />{% endcapture %}
+  {% capture comments %}<meta name="comments" content="false">{% endcapture %}
 {% endif %}
 
 {{comments}}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: advertising ] -->
 {% if page.advertising and site.data.j1_config.advertising.enabled %}
-  {% capture advertising %}<meta name="advertising" content="true" />{% endcapture %}
+  {% capture advertising %}<meta name="advertising" content="true">{% endcapture %}
 {% else %}
-  {% capture advertising %}<meta name="advertising" content="false" />{% endcapture %}
+  {% capture advertising %}<meta name="advertising" content="false">{% endcapture %}
 {% endif %}
 
 {{advertising}}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: advertising ] -->
 {% if page.translation and site.data.j1_config.translation.enabled %}
-  {% capture translation %}<meta name="translation" content="true" />{% endcapture %}
+  {% capture translation %}<meta name="translation" content="true">{% endcapture %}
 {% else %}
-  {% capture translation %}<meta name="translation" content="false" />{% endcapture %}
+  {% capture translation %}<meta name="translation" content="false">{% endcapture %}
 {% endif %}
 
 {{translation}}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: youtube ] -->
 {% if page.youtube %}
-  {% capture youtube %}<meta name="youtube" content="true" />{% endcapture %}
+  {% capture youtube %}<meta name="youtube" content="true">{% endcapture %}
 {% else %}
-  {% capture youtube %}<meta name="youtube" content="false" />{% endcapture %}
+  {% capture youtube %}<meta name="youtube" content="false">{% endcapture %}
 {% endif %}
 
 {{youtube}}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for provider APIs: vimeo ] -->
 {% if page.vimeo %}
-  {% capture vimeo %}<meta name="vimeo" content="true" />{% endcapture %}
+  {% capture vimeo %}<meta name="vimeo" content="true">{% endcapture %}
 {% else %}
-  {% capture vimeo %}<meta name="vimeo" content="false" />{% endcapture %}
+  {% capture vimeo %}<meta name="vimeo" content="false">{% endcapture %}
 {% endif %}
 
 {{vimeo}}
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ meta tag for privacy settings: personalization ] -->
 {% if page.personalization %}
-  {% capture personalization %}<meta name="personalization" content="true" />{% endcapture %}
+  {% capture personalization %}<meta name="personalization" content="true">{% endcapture %}
 {% else %}
-  {% capture personalization %}<meta name="personalization" content="false" />{% endcapture %}
+  {% capture personalization %}<meta name="personalization" content="false">{% endcapture %}
 {% endif %}
 
 {{personalization}}
@@ -216,7 +219,7 @@
   {% assign cors  = template_config.preload.font.cors %}
   {% assign fonts = template_config.preload.font.fonts %}
   {% for font in fonts %}
-    <link rel="preload" as="font" href="{{font}}" {{cors}} />
+    <link rel="preload" as="font" href="{{font}}" {{cors}}>
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of fonts: disabled ] -->
@@ -231,12 +234,12 @@
   {% assign css   = template_config.preload.css.css %}
   {% assign files = template_config.preload.css.files %}
   {% for file in css %}
-    <link rel="preload" as="style" href="{{file}}.{{ext_css}}" />
+    <link rel="preload" as="style" href="{{file}}.{{ext_css}}">
   {% endfor %}
 
   {% for file in files %}
     <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD css as FILE ] -->
-    <link rel="preload" as="style" href="{{file}}" />
+    <link rel="preload" as="style" href="{{file}}">
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of css: disabled ] -->
@@ -251,12 +254,12 @@
   {% assign js    = template_config.preload.js.js %}
   {% assign files = template_config.preload.js.files %}
   {% for file in js %}
-    <link rel="preload" as="script" href="{{file}}.{{ext_js}}" />
+    <link rel="preload" as="script" href="{{file}}.{{ext_js}}">
   {% endfor %}
 
   {% for file in files %}
     <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD js as FILE ] -->
-    <link rel="preload" as="script" href="{{file}}" />
+    <link rel="preload" as="script" href="{{file}}">
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of js: disabled ] -->
@@ -270,7 +273,7 @@
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ request PRELOAD of images to prioritize fetching ] -->
   {% assign files = template_config.preload.image.files %}
   {% for file in files %}
-    <link rel="preload" as="image" href="{{file}}" />
+    <link rel="preload" as="image" href="{{file}}">
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRELOAD of images: disabled ] -->
@@ -285,8 +288,8 @@
   {% assign urls = template_config.preconnect.urls %}
   {% for url in urls %}
     <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ establish early connection: {{url}} ] -->
-    <link rel="dns-prefetch" href="{{url}}" />
-    <link rel="preconnect"   href="{{url}}" />
+    <link rel="dns-prefetch" href="{{url}}">
+    <link rel="preconnect"   href="{{url}}">
   {% endfor %}
 {% else %}
   <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ PRECONNECT remote URLs: disabled ] -->

data/_includes/themes/j1/procedures/blocks/footer/boxes/about_box.proc

@@ -34,7 +34,7 @@ box_hash:     {{box | debug}}
 <!-- [INFO   ] [about_box.proc                     ] [ place about box ] -->
 <div class="col-md-{{footer_box_width_md}}">
   <!-- div class="heading-footer"><h2 class="notoc">{{title}}</h2></div -->
-  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0 {{title_translation}}">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_9 g-font-size-18 mb-0 {{title_translation}}">{{title}}</h2>
   <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>

data/_includes/themes/j1/procedures/blocks/footer/boxes/contacts_box.proc

@@ -49,7 +49,7 @@
 <!-- [INFO   ] [j1.assets.data.footer              ] [Found ContactsBox. Process ContactsBox] -->
 <div class="col-md-{{footer_box_width_md}}"> <!-- ContactsBox -->
 
-  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0 {{title_translation}}">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_9 g-font-size-18 mb-0 {{title_translation}}">{{title}}</h2>
   <p class="tagline mb-0"> <large>{{tagline}}</large> </p>
   <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-1"></div>
 

data/_includes/themes/j1/procedures/blocks/footer/boxes/issue.proc

@@ -56,5 +56,5 @@ footer_options.issue:            {{footer_options.issue | debug}}
 <!-- [INFO   ] [issue.proc                         ] [ issue date information ] -->
 {% if footer_options.issue.enabled %}
 <!-- [INFO   ] [issue.proc                         ] [ place issue ] -->
-<p style="color: rgba(255, 255, 255, 0.5)">{{modified}}</p>
+<p class="footer-issue">{{modified}}</p>
 {% endif %}

data/_includes/themes/j1/procedures/blocks/footer/boxes/links_box.proc

@@ -32,7 +32,7 @@
 <!-- [INFO   ] [links_box.proc                     ] [ place links box ] -->
 <div class="col-md-{{footer_box_width_md}}">
 
-  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0 {{title_translation}}">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_9 g-font-size-18 mb-0 {{title_translation}}">{{title}}</h2>
   <p class="tagline mb-0"> <large>{{tagline}}</large> </p>
   <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-1"></div>
 

data/_includes/themes/j1/procedures/blocks/footer/boxes/news_box.proc

@@ -48,7 +48,7 @@
 <!-- [INFO   ] [news_box.proc                      ] [ place news box ] -->
 <div class="col-md-{{footer_box_width_md}}">
 
-  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0 {{title_translation}}">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_9 g-font-size-18 mb-0 {{title_translation}}">{{title}}</h2>
   <p class="tagline mb-0"> <large>{{tagline}}</large> </p>
   <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-1"></div>
 

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

@@ -135,7 +135,7 @@
                     configuration of this page ({{page.title}}). Check the
                     (page) layout config file for the unsupported region. A
                     line contains something wrong like:
-                    <br /><br /> <i>region: {{region}}</i><br /><br />
+                    <br><br> <i>region: {{region}}</i><br><br>
                     Have a look at:
                   </div>
                   <div class="mb-5">
@@ -158,5 +158,3 @@
 <!-- [DEBUG  ] [j1.layout.default_writer.proc         ] [ reset all lane items ] -->
 <!-- [INFO   ] [j1.layout.default_writer.proc         ] [ end processing ] -->
 {% assign items = nil %}
-
-

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

@@ -127,10 +127,6 @@ NO need to load this again
         <!-- [INFO   ] [j1.layout.module_writer.proc          ] [ place J1 adapter for resource: {{resource_settings.id}} ] -->
         <script>
           $(function() {
-            var logger = log4javascript.getLogger("j1.module_loader");
-            var log_text = '{{resource_settings.comment|strip}} is being initialized';
-            logger.info(log_text);
-
             {% comment %} place initializer|s
             -------------------------------------------------------------------- {% endcomment %}
             {% for init_function in data_value %}
@@ -150,20 +146,16 @@ NO need to load this again
                   var max_count      = {{dependency_check_max_count}};
                     interval_count += 1;
                     if ( {{depends}} ) {
-                      {{init_function}}( settings );
-                      logger.info('dependencies of module {{resource_settings.id}} met for: {{resource_settings.dependencies}}');
-                      logger.debug('dependencies of module {{resource_settings.id}} met after: ' + interval_count * {{dependency_check_cycle}} + ' ms');
+                      {{init_function}} (settings);
                       clearInterval(dependencies_met_{{resource_settings.id}});
                       }
                     if (interval_count > max_count) {
-                      logger.warn('dependency check failed for module: {{resource_settings.id}}');
                       clearInterval(dependencies_met_{{resource_settings.id}});
-                      logger.warn('run initializer {{resource_settings.id}} unchecked for: {{resource_settings.dependencies}}');
-                      {{init_function}}(settings);
+                      {{init_function}} (settings);
                     }
                   }, {{dependency_check_cycle}});
                 {% else %}
-                  {{init_function}}(settings);
+                  {{init_function}} (settings);
                 {% endif %}
               {% else %}
                 {% comment %} no module specific frontmatter options
@@ -186,20 +178,16 @@ NO need to load this again
                     var dependencies_met_{{resource_settings.id}} = setInterval(function() {
                       interval_count += 1;
                       if ( {{depends}} ) {
-                        {{init_function}}(settings);
-                        logger.info('dependencies of module {{resource_settings.id}} met for: {{resource_settings.dependencies}}');
-                        logger.debug('dependencies of module {{resource_settings.id}} met after: ' + interval_count * {{dependency_check_cycle}} + ' ms');
+                        {{init_function}} (settings);
                         clearInterval(dependencies_met_{{resource_settings.id}});
                         }
                       if (interval_count > max_count) {
-                        logger.warn('dependency check failed for module: {{resource_settings.id}}');
                         clearInterval(dependencies_met_{{resource_settings.id}});
-                        logger.warn('run initializer {{resource_settings.id}} unchecked for: {{resource_settings.dependencies}}');
-                        {{init_function}}(settings);
+                        {{init_function}} (settings);
                       }
                     }, {{dependency_check_cycle}});
                   {% else %}
-                    {{init_function}}(settings);
+                    {{init_function}} (settings);
                   {% endif %}
                 {% else %}
                   {% comment %} no default settings
@@ -212,16 +200,12 @@ NO need to load this again
                     var max_count      = {{dependency_check_max_count}};
                     var dependencies_met_{{resource_settings.id}} = setInterval(function() {
                       interval_count += 1;
-                      if ( {{depends}} ) {
+                      if ({{depends}}) {
                         {{init_function}}();
-                        logger.info('dependencies of module {{resource_settings.id}} met for: {{resource_settings.dependencies}}');
-                        logger.debug('dependencies of module {{resource_settings.id}} met after: ' + interval_count * {{dependency_check_cycle}} + ' ms');
                         clearInterval(dependencies_met_{{resource_settings.id}});
                         }
                       if (interval_count > max_count) {
-                        logger.warn('dependency check failed for module: {{resource_settings.id}}');
                         clearInterval(dependencies_met_{{resource_settings.id}});
-                        logger.warn('run initializer {{resource_settings.id}} unchecked for: {{resource_settings.dependencies}}');
                         {{init_function}}();
                       }
                     }, {{dependency_check_cycle}});

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

@@ -120,18 +120,18 @@
                     {% endif %}
                 {% when 'css' %}
                   {% if url_detected > 1 %}
-                    <link rel="stylesheet" href="{{file}}" />
+                    <link rel="stylesheet" href="{{file}}">
                   {% else %}
-                    <link rel="stylesheet" href="{{base_path}}/{{file}}" />
+                    <link rel="stylesheet" href="{{base_path}}/{{file}}">
                   {% endif %}
                 {% else %}
                   <--! UNKNOWN resource type detected for: "{{file}}" -->
               {% endcase %}
             {% else %}
               {% if url_detected > 1 %}
-                <link rel="stylesheet" href="{{file}}" />
+                <link rel="stylesheet" href="{{file}}">
               {% else %}
-                <link rel="stylesheet" href="{{base_path}}/{{file}}" />
+                <link rel="stylesheet" href="{{base_path}}/{{file}}">
               {% endif %}
             {% endif %}
 
@@ -150,11 +150,11 @@
           {% assign my_location = {{location_source}} %}
 
           {% if environment == 'development' %}
-            {% if location == 'remote' %} <link rel="stylesheet" href="{{my_location}}.css" /> {% endif %}
-            {% if location == 'local'  %} <link rel="stylesheet" href="{{my_location}}.css" /> {% endif %}
+            {% if location == 'remote' %} <link rel="stylesheet" href="{{my_location}}.css"> {% endif %}
+            {% if location == 'local'  %} <link rel="stylesheet" href="{{my_location}}.css"> {% endif %}
           {% else %}
-            {% if location == 'remote' %} <link rel="stylesheet" href="{{my_location}}.min.css" /> {% endif %}
-            {% if location == 'local'  %} <link rel="stylesheet" href="{{my_location}}.min.css" /> {% endif %}
+            {% if location == 'remote' %} <link rel="stylesheet" href="{{my_location}}.min.css"> {% endif %}
+            {% if location == 'local'  %} <link rel="stylesheet" href="{{my_location}}.min.css"> {% endif %}
           {% endif %}
 
         {% endfor %}

data/_layouts/compress.html

@@ -25,6 +25,10 @@
  #    DEFAULT for all content layouts to compress the HTML for all pages
  #    generated. NO other layout are inherited by Compress.
  # -----------------------------------------------------------------------------
+ # NOTE:
+ #   Output whitespace control: '%-' and '-%'for all liquid markups to strip
+ #   blank lines from the rendered HTML.
+ # -----------------------------------------------------------------------------
  #  NOTE:
  #    Compress is only used for PRODUCTION mode.
  # -----------------------------------------------------------------------------
@@ -34,29 +38,30 @@
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
-{% assign environment   = site.environment %}
+{%- assign environment = site.environment -%}
+
+{%- if page.compress -%}
+  {%- assign compress_page = 'enabled' -%}
+{%- else -%}
+  {%- assign compress_page = 'disabled' -%}
+{%- endif -%}
 
-{% if page.compress %}
-  {% assign compress_page = 'enabled' %}
-{% else %}
-  {% assign compress_page = 'disabled' %}
-{% endif %}
+{%- case environment -%}
 
-  {% case environment %}
+  {% comment %} PRODUCTION mode (compress)
+  ------------------------------------------------------------------------------ {% endcomment %}
+  {%- when 'production' or 'prod' -%}
 
-    {% comment %} PRODUCTION mode (compress)
-    ---------------------------------------------------------------------------- {% endcomment %}
-    {% when 'production' or 'prod' %}
+  {%- if compress_page == 'enabled' -%}
+    {% capture _LINE_FEED %}
+    {% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ content }}{% else %}{% capture _content %}{{ content }}{% 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>{{ content | 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 -%}
+    {{content|strip_empty_lines}}
+  {%- endif -%}
 
-    {% if compress_page == 'enabled' %}
-      {% capture _LINE_FEED %}
-      {% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ content }}{% else %}{% capture _content %}{{ content }}{% 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>{{ content | 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 %}
-      {{content|strip_empty_lines}}
-    {% endif %}
+  {% comment %} ALL OTHER modes (no compression)
+  ----------------------------------------------------------------------------- {% endcomment %}
+  {%- else -%}
+    {{content|strip_empty_lines}}
 
-    {% comment %} ALL OTHER modes (no compression)
-    --------------------------------------------------------------------------- {% endcomment %}
-    {% else %}
-      {{content|strip_empty_lines}}
-  {% endcase %}
+{%- endcase -%}