j1-template 2021.1.14 → 2021.1.16

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

@@ -18,7 +18,7 @@
 
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
-{% capture pager %}themes/{{site.template.name}}/procedures/global/pager.proc{% endcapture %}
+{% capture pager %}themes/{{site.template.name}}/procedures/posts/pager.proc{% endcapture %}
 
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
@@ -39,6 +39,8 @@
 {% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
 {% assign tocbot_enabled    = toccer_options.enabled %}
 
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign rtext             = template_config.typography.rtext %}
 {% assign page_rtext        = page.rtext %}
 {% assign page_rtext_size   = page.rtext_size %}

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

@@ -20,7 +20,7 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture create_series_header %}themes/{{site.template.name}}/procedures/posts/create_series_header.proc{% endcapture %}
 {% capture create_ad_block %}themes/{{site.template.name}}/procedures/posts/create_ad_block.proc{% endcapture %}
-{% capture pager %}themes/{{site.template.name}}/procedures/global/pager.proc{% endcapture %}
+{% capture pager %}themes/{{site.template.name}}/procedures/posts/pager.proc{% endcapture %}
 
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
@@ -30,6 +30,8 @@
 {% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
+{% assign builder           = site.data.builder %}
+{% assign plugins           = site.data.plugins %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -37,44 +39,58 @@
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% assign rtext            = site.data.j1_config.typography.rtext %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign rtext            = template_config.typography.rtext %}
 {% assign page_rtext       = page.rtext %}
 {% assign page_rtext_size  = page.rtext_size %}
 
 {% if rtext %}
- {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
+ {% assign rtext_size = template_config.typography.rtext_size %}
 {% else %}
  {% assign rtext_size = 0 %}
 {% endif %}
 
+{% comment %} language detection
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if site.language == "en" %}
+  {% assign language = "en" %}
+{% elsif site.language == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.layout.content_generator_post.html ] [ begin content ] -->
 {% if page.comments %}
-  <!-- div class="container mr-5 mb-0" -->
-  <!-- no sidebar, mr-* disabled -->
+  <!-- No space between set if comments enabled -->
   <div class="container mb-0">
 {% else %}
-  <!-- div class="container mr-5 mb-5" -->
-  <!-- no sidebar, mr-* disabled -->
-  <div class="container mb-5"> <!-- Add additional space between end of article and the footer -->
+  <!-- Add additional space between end of article and the footer -->
+  <div class="container mb-5">
 {% endif %}
 
   {% comment %} Blog post CONTENT
   ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- FULL page - no sidebar for page toc -->
+  <!-- Blog post CONTENT -->
   <div class="row">
     <main id="main-content" class="r-text-{{rtext_size}} js-toc-content">
       <!-- Include a pager at top position -->
       {% include {{pager}} %}
-      <!-- div class="featured-headline" -->
       <div class="post-headline mt-4">
-        <h2 class="notoc">{{ page.date | date_to_long_string }}</h2>
+        {% if language == "en" %}
+          <h2 class="notoc">{{ page.date | localize: "%Y %B, %e" }}</h2>
+        {% endif %}
+        {% if language == "de" %}
+          <h2 class="notoc">{{ page.date | localize: "%-d. %B %Y" }}</h2>
+        {% endif %}
       </div>
 
       {% comment %} Place Blog post SERIES Navigation
-      ------------------------------------------------------------------------ {% endcomment %}
+      -------------------------------------------------------------------------- {% endcomment %}
       {% if page.series %}
       <header class="bmd-layout-header">
         <!-- jadams, 2021-02-28 added mb-3 to the navbar -->
@@ -103,21 +119,13 @@
         </div>
       {% endif %}
       {% comment %} END SERIES Navigation
-      ------------------------------------------------------------------------ {% endcomment %}
+      -------------------------------------------------------------------------- {% endcomment %}
 
       {% comment %} Inherit CONTENT
-      ------------------------------------------------------------------------ {% endcomment %}
+      -------------------------------------------------------------------------- {% endcomment %}
       <!-- Content placed by post_content.html -->
-
       {{content}}
 
-      {% comment %} Place additional headline for comments
-      ------------------------------------------------------------------------ {% endcomment %}
-      {% if page.comments %}
-      <h2 id="comments_leave_comment"> Leave a comment </h2>
-      {% endif %}
-      <!-- End Content placed by post_content.html -->
-
     {% if page.series %}</nav>{% endif %}
 
     </div> <!-- end col-md-12 -->

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

@@ -49,6 +49,23 @@
 {% assign posts_collate   = include.items %}
 {% assign limit_excerpt   = include.limit_excerpt %}
 
+{% comment %} language detection
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if site.language == "en" %}
+  {% assign language = "en" %}
+{% elsif site.language == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
+
+{% if language == "en" %}
+  {% assign readmore_text = "read" %}
+{% endif %}
+
+{% if language == "de" %}
+  {% assign readmore_text = "lesen" %}
+{% endif %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -150,7 +167,7 @@
                 <a href="{{post.url}}#readmore"
                    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}}
+                   </i> {{readmore_text}} · {{post.tagline}}
                 </a>
               </div>
             </div>
@@ -172,7 +189,7 @@
                 <a href="{{post.url}}#readmore"
                    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}}
+                   </i> {{readmore_text}} · {{post.tagline}}
                 </a>
               </div>
             </div>
@@ -196,11 +213,16 @@
               {% assign comment_count = sharing.comment_count %}
             {% endfor %}
 
-            <div class="card-footer r-text-200 text-lowercase">
+            <div class="card-footer r-text-200">
               <hr class="my-3">
               <div class="card-footer-text">
                 {% if post.date %}
-                <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i> {{post.date | date: "%Y %B, %e"}}
+                  {% if language == "en" %}
+                    <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
+                  {% endif %}
+                  {% if language == "de" %}
+                    <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
+                  {% endif %}
                 {% endif %}
                 {% if likes_count %}
                 <span class="font-weight-bold"> · </span>
@@ -213,7 +235,7 @@
               </div>
               <a class="card-link text-muted text-lowercase"
                 href="{{post.url}}#readmore">
-                Read · {{post.tagline}}
+                {{readmore_text}} · {{post.tagline}}
               </a>
             </div>
           {% endif %}

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

@@ -0,0 +1,123 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/_includes/themes/j1/procedures/posts/pager.proc
+ # HTML/Liquid procedure to create a pager for content of type "post|collection"
+ #
+ # Product/Info:
+ # http://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ #    This pager reads the "page path" from cookie "cookieUserState". This
+ #    data is used to return from a previous (page builder) page.
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #    liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config               = site.data.j1_config %}
+{% assign blocks                        = site.data.blocks %}
+{% assign modules                       = site.data.modules %}
+{% assign builder                       = site.data.builder %}
+{% assign plugins                       = site.data.plugins %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign blog_navigator_defaults       = builder.defaults.blog_navigator.defaults %}
+{% assign blog_navigator_settings       = builder.blog_navigator.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign blog_navigator_options        = blog_navigator_defaults | merge: blog_navigator_settings %}
+
+
+{% comment %} Language detection
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if {{site.language}} == "en" %}
+  {% assign language = "en" %}
+{% elsif  {{site.language}} == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
+
+{% comment %} Set language specific button text
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if language == "en" %}
+  {% assign pager_previous_button_text  = blog_navigator_options.button_text.pager.previous.en %}
+  {% assign pager_next_button_text      = blog_navigator_options.button_text.pager.next.en %}
+  {% assign pager_back_button_text      = blog_navigator_options.button_text.pager.back.en %}
+  {% assign pager_first_button_text     = blog_navigator_options.button_text.pager.first.en %}
+  {% assign pager_last_button_text      = blog_navigator_options.button_text.pager.last.en %}
+{% endif %}
+
+{% if language == "de" %}
+  {% assign pager_previous_button_text  = blog_navigator_options.button_text.pager.previous.de %}
+  {% assign pager_next_button_text      = blog_navigator_options.button_text.pager.next.de %}
+  {% assign pager_back_button_text      = blog_navigator_options.button_text.pager.back.de %}
+  {% assign pager_first_button_text     = blog_navigator_options.button_text.pager.first.de %}
+  {% assign pager_last_button_text      = blog_navigator_options.button_text.pager.last.de %}
+{% endif %}
+
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<div class="paginator">
+  <ul class="pagination raised-z0">
+
+    {% comment %} Set PREVIOUS page
+    ---------------------------------------------------------------------------- {% endcomment %}
+    {% if page.previous %}
+      <li class="page-item"><a class="page-link" href="{{base_path}}{{page.previous.url}}" title="{{page.previous.title}}">{{pager_previous_button_text}}</a></li>
+    {% else %}
+      <li class="page-item disabled"><a class="page-link">{{pager_first_button_text}}</a></li>
+    {% endif %}
+
+    {% comment %} Set BACK page (PagerURL)
+    ---------------------------------------------------------------------------- {% endcomment %}
+    <!-- [INFO   ] [procedures.global.pager.proc          ] [Manage the current pager settings for: {{builder_path}}] -->
+    <script>
+      var cookie_names           = j1.getCookieNames();
+      var user_state_cookie_name = cookie_names.user_session;
+      var user_state             = j1.readCookie(user_state_cookie_name);
+      var re                     = new RegExp('navigator|dateview|tagview|archive');
+      var last_pager             = user_state.last_pager;
+      var last_pager_url;
+
+      <!-- [INFO   ] [procedures.global.pager.proc          ] [Calculate BackURL from User State Cookie for page: {{page.title}}] -->
+      if (re.test(last_pager)) {
+        last_pager_url = '<li class="page-item"><a class="page-link" href="' + last_pager + '" title="Back to Top Page">{{pager_back_button_text}}</a></li>';
+      } else {
+        last_pager_url = '<li class="page-item disabled"><a class="page-link" title="Back to Top Page">{{pager_back_button_text}}</a></li>';
+      }
+      document.write( last_pager_url );
+      j1.writeCookie({
+        name: user_state_cookie_name,
+        data: user_state
+      });
+    </script>
+
+    {% comment %} Set NEXT page
+    ---------------------------------------------------------------------------- {% endcomment %}
+    {% if page.next %}
+      <li class="page-item"><a class="page-link" href="{{base_path}}{{page.next.url}}" title="{{page.next.title}}">{{pager_next_button_text}}</a></li>
+    {% else %}
+      <li class="page-item disabled"><a class="page-link" href="#">{{pager_last_button_text}}</a></li>
+    {% endif %}
+
+  </ul>
+</div>

data/_layouts/default.html

@@ -91,7 +91,7 @@ layout:                                 compress
 {% comment %} main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!DOCTYPE {{ site.doctype }}>
-<html lang="{{ site.language }}">
+<html lang="{{site.language}}">
 
 {% comment %} additional debug data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -188,7 +188,7 @@ layout:                                 compress
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1" />
           <meta name="robots" content="noindex, nofollow">
-          <link rel="icon" type="image/ico" href="modules/icons/j1/j1-32x32.ico">
+          <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}" />
           <title>{{title}} · {{http_error}}</title>
           <style> .my { margin-top: 8.5rem !important;} </style>
           <style type="text/css">/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:.67em 0}figcaption,figure,main{display:block}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{cursor: pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{cursor: pointer ;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}template{display:none}[hidden]{display:none}body,html{width:100%;height:100%;background-color:#21232a}body{color:#fff;text-align:center;text-shadow:0 2px 4px rgba(0,0,0,.5);padding:0;min-height:100%;-webkit-box-shadow:inset 0 0 100px rgba(0,0,0,.8);box-shadow:inset 0 0 100px rgba(0,0,0,.8);display:table;font-family:"Open Sans",Arial,sans-serif}h1{font-family:inherit;font-weight:500;line-height:1.1;color:inherit;font-size:36px}h1 small{font-size:68%;font-weight:400;line-height:1;color:#777}a{text-decoration:none;color:#fff;font-size:inherit;border-bottom:dotted 1px #707070}.lead{color:silver;font-size:21px;line-height:1.4}.cover{display:table-cell;vertical-align:middle;padding:0 20px}footer{position:fixed;width:100%;height:40px;left:0;bottom:0;color:#a0a0a0;font-size:14px}</style>

data/assets/data/cookieconsent.html

@@ -149,8 +149,6 @@ regenerate:                             true
 {% comment %} END Modal cookie consent dialog (en-EN)
 -------------------------------------------------------------------------------- {% endcomment %}
 
-
-
 {% comment %} Modal cookie consent dialog (de-DE)
 -------------------------------------------------------------------------------- {% endcomment %}
 <div id="consent-data-de">

data/assets/data/menu.html

@@ -407,7 +407,7 @@ regenerate:                             true
           {% when 'theme_select' %}
           {% if themer_options.enabled %}
             <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [found menu-type: theme_select] -->
-            <li class="dropdown nav-item">
+            <li id="themes_menu" class="dropdown nav-item">
               <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">{{menu.item}} </a>
               {% if nav_menu_animation %}
               <ul class="dropdown-menu raised-z{{raised_level}}">

data/assets/data/mmenu_toc.html

@@ -35,6 +35,25 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+{% comment %} language detection
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if site.language == "en" %}
+  {% assign language = "en" %}
+{% elsif site.language == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
+
+{% if language == "en" %}
+  {% assign toc_text = "Table of contents" %}
+{% endif %}
+
+{% if language == "de" %}
+  {% assign toc_text = "Inhaltsverzeichnis" %}
+{% endif %}
+
+
 <!-- [INFO   ] [j1.assets.data.mmenu_toc.html           ] [ set meta data (robots) to exclude HTML datafiles from index ] -->
 <head>
   <meta name="robots" content="noindex, nofollow" />
@@ -45,7 +64,7 @@ regenerate:                             true
 <!-- [INFO   ] [ j1.modules.navigator.mmenu_toc.html ] [Start processing: toc] -->
 <div id="toc_mmenu" class="mm-side" style="display:none">
   <div class="widget">
-    <h1 class="heading">Table of Contents</h1>
+    <h1 class="heading">{{toc_text}}</h1>
   </div>
   <!-- use BS4 class d-block to make sure, the sidebar is VISIBLE on ALL @media -->
   <!-- use class sticky for BS4 as a replacement for former BS3 ScrollSpy -->

data/assets/data/panel.html

@@ -63,6 +63,24 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+{% comment %} language detection|i18n
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if site.language == "en" %}
+  {% assign language = "en" %}
+{% elsif site.language == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
+
+{% if language == "en" %}
+  {% assign readmore_text = "read" %}
+{% endif %}
+
+{% if language == "de" %}
+  {% assign readmore_text = "lesen" %}
+{% endif %}
+
 <!-- [INFO   ] [j1.assets.data.panel.html             ] [ set meta data (robots) to exclude HTML datafiles from index ] -->
 <head>
   <meta name="robots" content="noindex, nofollow" />
@@ -251,9 +269,9 @@ regenerate:                             true
                   <hr class="my-3">
 
                   {% if button_target == null %}
-                    <a class="card-link text-muted" href="{{button_href}}">{{button_text}}</a>
+                    <a class="card-link text-muted" href="{{button_href}}">{{readmore_text}} · {{button_text}}</a>
                   {% else %}
-                    <a class="card-link  md-grey-600" href="{{button_href}}" target="{{button_target}}">{{button_text}}</a>
+                    <a class="card-link  md-grey-600" href="{{button_href}}" target="{{button_target}}">{{readmore_text}} · {{button_text}}</a>
                   {% endif %}
                   </div>
 
@@ -434,7 +452,6 @@ regenerate:                             true
                   {% if key == 'category' %}      {% assign post_category = value %} {% endif %}
                   {% if key == 'max_rows' %}      {% assign rows_max      = value %} {% endif %}
                   {% if key == 'max_posts' %}     {% assign posts_max     = value %} {% endif %}
-                  {% if key == 'readmore_text' %} {% assign readmore_text = value %} {% endif %}
                   {% if key == 'truncatewords' %} {% assign truncatewords = value %} {% endif %}
                   {% if key == 'buttons' %}       {% assign card_buttons  = value %} {% endif %}
                 {% endfor %}
@@ -489,13 +506,17 @@ regenerate:                             true
                         {{post.excerpt|truncatewords:50|replace:'...',' ...'|remove:'<div class="paragraph">'|remove:'</div>'|remove:'<p>'|remove:'</p>'}}
                       </div>
                       <!-- End Body|Excerpt -->
-                      <div class="card-footer r-text-200 text-lowercase">
+                      <div class="card-footer r-text-200">
                         <hr class="my-3">
                         <div class="card-footer-text">
-                          <i class="mdi mdi-calendar-blank mdi-md-grey mr-1"></i>
-                          {{post.date|date:"%Y %B, %e"}}
+                          {% if language == "en" %}
+                            <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
+                          {% endif %}
+                          {% if language == "de" %}
+                            <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
+                          {% endif %}
                         </div>
-                        <a class="card-link text-muted"
+                        <a class="card-link text-muted text-lowercase"
                            href="{{post.url}}">
                            {{readmore_text}} · {{post.tagline}}
                         </a>