j1-template 2023.0.3 → 2023.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a05cfa6197c6bc052afb4562b88cef4d61183424f17e1437c543d5ace5037d7
-  data.tar.gz: 2b69d2438d3e4d3751e7aa6bd81c03e7165da901b890dc335775aad6c7ae05dd
+  metadata.gz: 7150ba07bf5b44d49e4ba0ea903e645c13544a2a36009e86f257f7887c085f78
+  data.tar.gz: 9b2677bcabb97e8fb2cd7218085bb88f775abf3d5dd67db09ca9c3de0c6660eb
 SHA512:
-  metadata.gz: 7ebaa41228a0c2e906f5ac127c1c9194e0a99b750503161e89b824e7aeafd2c86c4a01e053fe2e8c6e400012566792d8a6b1bb7df7b573074f36ea7f6a3dedb2
-  data.tar.gz: ebc29da57cad6362f9c2387efb44f468b31310030fd3451d8a7d53182e5d67d68a9256618ef69e0b6ea5216762b33d31cb25e34fb066d8005f078ca3c47deca8
+  metadata.gz: ba6a7d46596804de68b14e4beec348eadaed9d1fdf9ced5c992846e6f17de0da83ef5dc3fb4f1891ce47337e13596844843233e6b8097aad8e16f124e51c025c
+  data.tar.gz: e60964554a03bd147ed5a466740aa957408b1ef3acf402d888eb82bed6ad09c65671b9d60394145c61bfd158c3e86def0b067b3ff90997fcec3211fdb764a310

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

@@ -18,7 +18,7 @@
 
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
-{% capture pager %}themes/{{site.template.name}}/procedures/posts/pager.proc{% endcapture %}
+{% capture pager %}themes/{{site.template.name}}/procedures/collections/pager.proc{% endcapture %}
 
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
@@ -31,27 +31,16 @@
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign toccer_defaults   = modules.defaults.toccer.defaults %}
-{% assign toccer_settings   = modules.toccer.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% 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 %}
-{% assign page_toccer       = page.toccer %}
-{% assign page_toc          = page.toc %}
 
-{% if tocbot_enabled and page_toc or page_toccer %}
-  {% assign sidebar  = true %}
-{% else %}
-  {% assign sidebar  = false %}
-{% endif %}
 
 {% if rtext %}
   {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
@@ -62,76 +51,39 @@
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-  <!-- [INFO   ] [j1.layout.content_generator_coll.html  ] [ begin content ] -->
-  <!-- div class="container mr-5 mb-5" -->
-  <!-- no sidebar, mr-* disabled -->
+  <!-- [INFO   ] [j1.layout.content_generator_coll.html ] [ begin content ] -->
   <div class="container mb-5">
     <div class="row">
 
     {% comment %} COLLECTION content
     ---------------------------------------------------------------------------- {% endcomment %}
-    {% if sidebar == false %}
-      <!-- FULL page - no sidebar for page toc -->
-      <main id="main-content" class="r-text-{{rtext_size}} js-toc-content">
-
-        <!-- Include a pager at top position -->
-        {% include {{pager}} %}
-        <div class="post-headline mt-4">
-          <h1 id="blog_article_navigator" class="notoc">{{ page.title }}</h1>
-        </div>
-
-        <!-- [INFO   ] [j1.layout.content_generator_coll.html  ] [ start place content ] -->
-        {{content}}
-        <!-- [INFO   ] [j1.layout.content_generator_coll.html  ] [ end place content ] -->
-
-        {% comment %} CONNECTORS moved to a separate lane
-        ------------------------------------------------------------------------ {% endcomment %}
-        <!-- [INFO   ] [j1.layout.content_generator_coll.html  ] [ place CONNECTOR for supported comment providers ] -->
-        {% comment %}
-        {% include themes/{{site.template.name}}/procedures/provider/comments %}
-        {% endcomment %}
-
-      </main> <!-- end col-md-12 -->
-    {% else %}
-      <!-- SPLIT page. Place a sidebar e.g. for the document toc -->
-      <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
-      <main class="r-text-{{rtext_size}} js-toc-content">
-
-        <!-- Include a pager at top position -->
-        {% include {{pager}} %}
-        <div class="post-headline mt-4">
-          <h2 id="blog_article_navigator" class="notoc">{{ page.title }}</h2>
-        </div>
-
-        <!-- [INFO   ] [j1.layout.content_generator_coll.html  ] [ begin place content ] -->
-        {{content}}
-        <!-- [INFO   ] [j1.layout.content_generator_coll.html  ] [ end place content ] -->
-
-        {% comment %} CONNECTORS moved to a separate lane
-        ------------------------------------------------------------------------ {% endcomment %}
-        <!-- Include the CONNECTOR for supported comment providers -->
-        {% comment %}
-        {% include themes/{{site.template.name}}/procedures/provider/comments %}
-        {% endcomment %}
-
-      </main> <!-- end col-md-9 -->
-
-      {% comment %} Place Sidebar|Tocbot
-      -------------------------------------------------------------------------- {% endcomment %}
-      <!-- NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" -->
-      {% comment %} tocbot and page_navigation (not used anymore)
-      --------------------------------------------------------------------------
-      <aside class="col-md-3 d-none d-md-block sticky">
-        <div id="sidebar">
-          <div id="j1-toc-mgr" class="toc js-toc"></div>
-        </div>
-      </aside>
-      -------------------------------------------------------------------------- {% endcomment %}
-    {% endif %} <!-- endif page_navigation -->
+    <main class="r-text-{{rtext_size}} js-toc-content">
+
+      <!-- [INFO   ] [j1.layout.content_generator_coll.html ] [ include a collection pager at the top most position ] -->
+      {% include {{pager}} %}
+
+      <div class="post-headline mt-4">
+        <h2 id="coll_article_navigator" class="notoc">{{ page.title }}</h2>
+      </div>
+
+      <!-- [INFO   ] [j1.layout.content_generator_coll.html ] [ begin place content ] -->
+
+      {{content}}
+      <!-- [INFO   ] [j1.layout.content_generator_coll.html ] [ end place content ] -->
+
+      {% comment %} CONNECTORS moved to a separate lane
+      ------------------------------------------------------------------------ {% endcomment %}
+      <!--  -->
+      <!-- [INFO   ] [j1.layout.content_generator_coll.html ] [ include the CONNECTOR for supported comment providers ] -->
+      {% comment %}
+      {% include themes/{{site.template.name}}/procedures/provider/comments %}
+      {% endcomment %}
+
+    </main>
 
     {% comment %} END COLLECTION content
     ---------------------------------------------------------------------------- {% endcomment %}
 
     </div> <!-- end row -->
   </div> <!-- end container -->
-  <!-- [INFO   ] [j1.layout.content_generator_coll.html  ] [Begin content] -->
+  <!-- [INFO   ] [j1.layout.content_generator_coll.html ] [ end content ] -->

data/_includes/themes/j1/procedures/collections/create_collection_article_preview.proc

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #   ~/_includes/themes/j1/procedures/posts/create_ad_block.proc
- #  Liquid PROCEDURE to create a series header for post series
+ #   ~/_includes/themes/j1/procedures/posts/create_collection_article_preview.proc
+ #  Liquid PROCEDURE to create a series header for collection articles
  #
  #  http://jekyll.one
  #
@@ -32,38 +32,83 @@
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
-{% comment %} Liquid procedures
+{% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-
+{% assign template_config     = site.data.j1_config %}
+{% assign blocks              = site.data.blocks %}
+{% assign modules             = site.data.modules %}
+{% assign plugins             = site.data.plugins %}
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign articles = include.collection %}
+{% assign category_blacklist  = template_config.posts.category_blacklist %}
+{% assign articles            = include.collection %}
 
+{% comment %} Debug templates
+-------------------------------------------------------------------------------- {% endcomment %}
 {% comment %} articles:  {{ articles | debug }} {% endcomment %}
 
+
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 {% for article in articles %}
 
  {% comment %} article_url:  {{ article.url | debug }} {% endcomment %}
+ {% comment %} article:  {{ article | debug }} {% endcomment %}
+
+ <!-- Cleanup categories by given blacklist -->
+ {% assign my_categories = article.categories | difference: category_blacklist %}
 
- <div class="article-overview clearfix mb-5">
-   <div class="article-overview-heading">
-
-     <h3 id="{{ 100000 | rand }}" class="article-overview-name">
-       <a class="link-no-decoration" href="{{ article.url }}#readmore">
-         {% if article.nickname %}
-           {{ article.nickname }}
-         {% else %}
-           {{ article.title }}
-         {% endif %}
-       </a>
+ <!-- Build element strings -->
+ {% assign categories    = my_categories |join: " · "  %}
+ {% assign tags          = article.tags | join: " · "  %}
+
+ <article class="card raised-z0 mb-5">
+
+   <div class="card-header bg-primary">
+     <h3 id="{{100000|rand}}" class="card-header bg-primary notranslate">
+       {{ article.title }}
      </h3>
+   </div>
+
+   <div class="row mx-0">
 
+     <div class="col-md-4 img-bg--fill px-0" style="border-right: 1px dotted rgba(0, 0, 0, 0.25);
+       filter: grayscale(1) contrast(0.8) brightness(0.7);
+       background-image: url( {{article.book.cover}} );">
+     </div>
+
+     <div class="col-md-8 p-0">
+
+       <div class="card-body r-text-300 mt-0">
+         <div class="paragraph dropcap">
+           {{ article.excerpt }}
+         </div>
+       </div>
+
+       <div class="card-footer not-rounded r-text-200">
+         <div class="card-footer-text">
+           <i class="mdi mdi-calendar-blank md-grey-900 mr-1"></i> {{article.book.published}}</i>
+
+           <!-- Cleanup categories by given blacklist -->
+           <!-- Build element strings -->
+           <p class="result-item-text small mb-3 notranslate">
+             <i class="mdi mdi-tag-text-outline mdi-18px mr-1"></i>
+             <span class="sr-categories">{{categories}}</span>
+             <br>
+             <i class="mdi mdi-tag mdi-18px mr-1"></i>
+             <span class="sr-tags">{{tags}}</span>
+           </p>
+         </div>
+
+         <a class="card-link md-grey-900 text-lowercase" href="{{ article.url }}#readmore">
+           read · {{article.tagline}}
+         </a>
+       </div>
+
+     </div>
    </div>
-   <p class="article-overview-description"><i>{{ article.tagline }}</i></p>
-   <div class="article-overview-excerpt"> {{ article.excerpt }} </div>
- </div>
+
+ </article>
 
 {% endfor %}

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

@@ -0,0 +1,127 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/_includes/themes/j1/procedures/collections/pager.proc
+ # HTML/Liquid procedure to create a pager for content of type "collection"
+ #
+ # Product/Info:
+ # http://jekyll.one
+ #
+ # Copyright (C) 2023 Juergen Adams
+ #
+ # J1 Theme is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
+ # -----------------------------------------------------------------------------
+ # 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 plugins                       = site.data.plugins %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign blog_navigator_defaults       = modules.defaults.blog_navigator.defaults %}
+{% assign blog_navigator_settings       = modules.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 %}
+<!-- [INFO   ] [procedures.collections.pager.proc     ] [ manage the current pager settings ] -->
+<div class="paginator">
+  <ul class="pagination raised-z0">
+
+    {% comment %} Set HOME page BUTTON (always)
+    ---------------------------------------------------------------------------- {% endcomment %}
+      <li class="page-item"><a class="page-link" href="/" title="Home">Home</a></li>
+
+    {% comment %} Set PREVIOUS page BUTTON
+    ---------------------------------------------------------------------------- {% endcomment %}
+    {% if page.previous %}
+      <li class="page-item"><a class="page-link" href="{{page.previous.url | absolute_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 NEXT page BUTTON
+    ---------------------------------------------------------------------------- {% endcomment %}
+    {% if page.next %}
+      <li class="page-item"><a class="page-link" href="{{page.next.url | absolute_url}}" title="{{page.next.title}}">{{pager_next_button_text}}</a></li>
+    {% else %}
+      <li class="page-item disabled"><a class="page-link" href="#void">{{pager_last_button_text}}</a></li>
+    {% endif %}
+
+    {% comment %} Set BACK page (PagerURL) BUTTON (currently NOT used)
+    ----------------------------------------------------------------------------
+    <!-- [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 {{pager_back_button_text}}">{{pager_back_button_text}}</a></li>';
+      } else {
+        last_pager_url = '<li class="page-item disabled"><a class="page-link" title="Back to {{pager_back_button_text}}">{{pager_back_button_text}}</a></li>';
+      }
+      document.write( last_pager_url );
+      j1.writeCookie({
+        name: user_state_cookie_name,
+        data: user_state
+      });
+    </script>
+    ---------------------------------------------------------------------------- {% endcomment %}
+
+  </ul>
+</div>

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

@@ -78,11 +78,11 @@
 <div class="paginator">
   <ul class="pagination raised-z0">
 
-    {% comment %} Set HOME page (always)
+    {% comment %} Set HOME page BUTTON (always)
     ---------------------------------------------------------------------------- {% endcomment %}
       <li class="page-item"><a class="page-link" href="/" title="Home">Home</a></li>
 
-    {% comment %} Set PREVIOUS page
+    {% comment %} Set PREVIOUS page BUTTON
     ---------------------------------------------------------------------------- {% endcomment %}
     {% if page.previous %}
       <li class="page-item"><a class="page-link" href="{{page.previous.url | absolute_url}}" title="{{page.previous.title}}">{{pager_previous_button_text}}</a></li>
@@ -90,7 +90,7 @@
       <li class="page-item disabled"><a class="page-link">{{pager_first_button_text}}</a></li>
     {% endif %}
 
-    {% comment %} Set NEXT page
+    {% comment %} Set NEXT page BUTTON
     ---------------------------------------------------------------------------- {% endcomment %}
     {% if page.next %}
       <li class="page-item"><a class="page-link" href="{{page.next.url | absolute_url}}" title="{{page.next.title}}">{{pager_next_button_text}}</a></li>
@@ -98,7 +98,7 @@
       <li class="page-item disabled"><a class="page-link" href="#void">{{pager_last_button_text}}</a></li>
     {% endif %}
 
-    {% comment %} Set BACK page (PagerURL)
+    {% comment %} Set BACK page (PagerURL) BUTTON
     ---------------------------------------------------------------------------- {% endcomment %}
     <!-- [INFO   ] [procedures.global.pager.proc          ] [Manage the current pager settings for: {{builder_path}}] -->
     <script>

data/assets/data/banner.html

@@ -258,8 +258,8 @@ exclude_from_search:                    true
                 		<img
                 			class="sticker-image"
                 			src="/assets/images/sticker/600x600/sticker-new-version.png"
-                			alt="Get new version 2023.0.3"
-                			title="Get new version 2023.0.3"
+                			alt="Get new version 2023.0.5"
+                			title="Get new version 2023.0.5"
                 			style="width: 140px; height: 120px;"
                 		>
                   </a>