j1-template 2021.1.29 → 2021.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dea149afebef9dd59d1a3c57c11c49529f276a14b45cd23233c329c15241832
-  data.tar.gz: 49d03803cbb2b25b16bcca736824eff674d275ae5fd43e981e390c36b6d640f3
+  metadata.gz: c9dc0e231e62c57b4ba9b58db8fe7fcea64e6e5ce6d4968596be2f0d4b2a327b
+  data.tar.gz: 561ab314b4b3a1c751daa6d44129e28fa2b0df2f8f43593b65ab4281aeacfcbc
 SHA512:
-  metadata.gz: 68d532d58db2ea87b11911fdec65f1b038567c4f3984198a4c739806f232b057f660c79d5f7d8d1c9a5262a3ad25631e78581ca18dea30eae8dcd2dae175d81e
-  data.tar.gz: '05359dea7e854aad8a78e75ed863b60df4f547637da8d9b0276d31f6959195d2854ddc5fa4e348a2c3a62e9b170a9b80bb2a8521af2f4f7927fb9e36d7b5614a'
+  metadata.gz: cb8f3b4979535967f5d06502b7534c69f716bd3162688036f2389660054fc274bb21d7005755d71c7f1ffe1d93f7362fe8ad3e103402b35109fee2836782e130
+  data.tar.gz: 9353adba95082496af4415cefe70d5d6ba30bd88c268f00f17ab6d2f6223184ea6019664578cf46f644e5fccb53348e9e5d37e78d3b4a66897e330e5d825f857

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

@@ -302,13 +302,13 @@
 
                         <div class="card-footer-text">
                           {% if language == "en" %}
-                            <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
+                            <i class="mdi mdi-calendar-blank md-grey-900 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"}}
+                            <i class="mdi mdi-calendar-blank md-grey-900 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
                           {% endif %}
                         </div>
-                        <a class="card-link text-muted text-lowercase"
+                        <a class="card-link md-grey-900 text-lowercase"
                            href="{{post.url}}">
                            {{readmore_text}} · {{post.tagline}}
                         </a>
@@ -350,13 +350,13 @@
 
                         <div class="card-footer-text">
                           {% if language == "en" %}
-                            <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
+                            <i class="mdi mdi-calendar-blank md-grey-900 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"}}
+                            <i class="mdi mdi-calendar-blank md-grey-900 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
                           {% endif %}
                         </div>
-                        <a class="card-link text-muted text-lowercase"
+                        <a class="card-link md-grey-900 text-lowercase"
                            href="{{post.url}}">
                            {{readmore_text}} · {{post.tagline}}
                         </a>

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

@@ -127,7 +127,10 @@
       {% comment %} Inherit CONTENT
       -------------------------------------------------------------------------- {% endcomment %}
       <!-- Content placed by post_content.html -->
+      <!-- Additional div container placed for dropcaps used in series -->
+      <div class="mt-3">
       {{content}}
+      </div>
 
     {% if page.series %}</nav>{% endif %}
 

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

@@ -223,22 +223,22 @@
               <div class="card-footer-text">
                 {% if post.date %}
                   {% if language == "en" %}
-                    <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
+                    <i class="mdi mdi-calendar-blank md-grey-900 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"}}
+                    <i class="mdi mdi-calendar-blank md-md-grey-900 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
                   {% endif %}
                 {% endif %}
                 {% if likes_count %}
                 <span class="font-weight-bold"> · </span>
-                <i class="mdi mdi-heart md-grey-600 mr-1"></i> {{likes_count}}
+                <i class="mdi mdi-heart md-grey-900 mr-1"></i> {{likes_count}}
                 {% endif %}
                 {% if comment_count %}
                 <span class="font-weight-bold"> · </span>
-                <i class="mdi mdi-comment md-grey-600 mr-1"></i> {{comment_count}}
+                <i class="mdi mdi-comment md-grey-900 mr-1"></i> {{comment_count}}
                 {% endif %}
               </div>
-              <a class="card-link text-muted text-lowercase"
+              <a class="card-link md-grey-900 text-lowercase"
                 href="{{post.url}}#readmore">
                 {{readmore_text}} · {{post.tagline}}
               </a>

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

@@ -66,13 +66,13 @@
      <div class="row">
        <div style="width: calc(100% - 5px)">
          {% if site.language == "en" %}
-           {% assign series_heading = "This article is <strong>part <<idx>> </strong> in a <strong><<count>>-part</strong> series:" %}
+           {% assign series_heading = "This is <strong>part <<idx>> </strong> in a <strong><<count>>-part</strong> series:" %}
          {% elsif site.language == "de" %}
-           {% assign series_heading = "Dieser Artikel ist <strong>Teil <<idx>> </strong> einer <strong><<count>>-er</strong> Serie:" %}
+           {% assign series_heading = "indigenous ist <strong>Teil <<idx>> </strong> einer <strong><<count>>-er</strong> Serie:" %}
          {% endif %}
          <!-- series heading -->
          <h4 id="blog_series_list" class="notoc mt-2 mr-2 mb-4">{{series_heading}}</h4>
-         <ul class="side-nav" style="width: calc(100% - 5px)">
+         <ul class="side-nav" style="width: calc(100% - 15px)">
  {% endcapture %}
          {% for post in site.posts reversed %}
            {% if post.series == page.series %}
@@ -91,11 +91,11 @@
        </div>
 
        <!-- place excerpt -->
-       <div class="mt-2">
+       <div class="mt-5 mr-3">
          <h5 class="notoc series-exerpt-title">{{excerpt_title}}</h5>
          <div class="series-exerpt">
-           <div class="paragraph">
-             <p>{{excerpt}}</p>
+           <div class="paragraph mt-3">
+             <p>{{excerpt|strip_html}}</p>
            </div>
            {% if readmore %}
            <div class="card-footer">

data/_layouts/default.html

@@ -130,8 +130,7 @@ layout:                                 compress
   ------------------------------------------------------------------------------ {% endcomment %}
     <!-- [INFO   ] [j1.layout.default.html                ] [ start page processing for region: 'body' ] -->
     <!-- [INFO   ] [j1.layout.default.html                ] [ place wrapper to prevent "DOM flicker" ] -->
-    <!-- [INFO   ] [j1.layout.default.html                ] [ make page hidden ] -->
-    <!-- div id="no_flicker" class="nojs" -->
+    <!-- [INFO   ] [j1.layout.default.html                ] [ make page hidden (suppress flicker) ] -->
     <div id="no_flicker" style="display: none">
 
       {% comment %} collect the BODY-NAVIGATION region
@@ -153,6 +152,7 @@ layout:                                 compress
       <!-- [INFO   ] [j1.layout.default.html                ] [ end content_writer default_writer for region: 'body-footer' ] -->
 
     </div>
+    <!-- [INFO   ] [j1.layout.default.html                ] [ end suppress flicker ] -->
     <!-- [INFO   ] [j1.layout.default.html                ] [ end default writer] -->
 
     <!-- [INFO   ] [j1.layout.default.html                ] [ place noscript info|error page ] -->
@@ -206,17 +206,11 @@ layout:                                 compress
         </body>
       </html>
     </noscript>
-  </body>
 
-  {% comment %} Place|Initialize module components
-  ------------------------------------------------------------------------------
-  NOTE: xhr_container should be DYNAMICALLY placed by
-        the module using it !!!
-        Example CookieConsent
-  ------------------------------------------------------------------------------ {% endcomment %}
+    <!-- [INFO   ] [j1.layout.default.html                ] [ place hidden color selector/themes: bg-primary ] -->
+    <div id="bg-primary" class="bg-primary" style="display: none"></div>
 
-  {% comment %} Place container for Cookiebar modals
-  ------------------------------------------------------------------------------ {% endcomment %}
+  </body>
 
   {% comment %} Place container for WebHook modals
   ------------------------------------------------------------------------------ {% endcomment %}
@@ -230,11 +224,14 @@ layout:                                 compress
   <!-- [INFO   ] [j1.layout.default.html                ] [ place container for the r-text resizer modal ] -->
   <div id="rtext_resizer_container"></div>
 
-  {% comment %} Initialize Tooltips|Popovers
+  {% comment %} Initialize global JS scripts
   ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize BS tooltips|popovers ] -->
+  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize global JS scripts ] -->
   <script>
     $(function() {
+    {% comment %} BS tooltips and popovers
+    ---------------------------------------------------------------------------- {% endcomment %}
+    // initialize BS tooltips and popovers
     {% if tooltips_options.enabled %}
       $('[data-toggle="tooltip"').tooltip({
         trigger: '{{tooltips_options.trigger}}'
@@ -245,25 +242,39 @@ layout:                                 compress
         trigger: '{{popovers_options.trigger}}'
       });
     {% endif %}
-    });
-  </script>
 
-  {% comment %} Initialize Window History (back on <ESC>)
-  ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize window.history.back ] -->
-  <script>
-  // Redirect on KEY <ESC>
-  window.onkeyup = function (e)
-  {
-   if (e.keyCode == 27) window.history.back();
-  }
+    {% comment %} Update cookie for lastpage
+    ---------------------------------------------------------------------------- {% endcomment %}
+      // save the current page to userstate cookie
+      var dependencies_met_page_ready = setInterval (function (options) {
+        if (j1.getState() === 'finished') {
+          var logger = log4javascript.getLogger('j1.layout.default');
+
+          function setLastPage() {
+            var cookie_names                = j1.getCookieNames();
+            const user_state_cookie_name    = cookie_names.user_session;
+            var user_state                  = j1.readCookie(user_state_cookie_name);
+            var user_state_last_page        = window.location.pathname;
+            user_state.last_page            = user_state_last_page;
+
+            j1.writeCookie({
+              name: user_state_cookie_name,
+              data: user_state,
+              samesite: 'Strict'
+            });
+            logger.debug('\n' + 'saved current page to cookie :' + user_state_last_page);
+          }
+          setLastPage();
+          clearInterval(dependencies_met_page_ready);
+        }
+      });
+    });
   </script>
   <!-- [INFO   ] [j1.layout.default.html                ] [ end page processing ] -->
 </html>
 
 {% endcapture %}
 
-
 {% comment %} POST processing of the generated page using (captured) cache
 -------------------------------------------------------------------------------- {% endcomment %}
 {% case environment %}
@@ -277,7 +288,6 @@ layout:                                 compress
       {{ j1_cache | strip_empty_lines | remove: '<p>excerpt__end</p>' }}
     {% endif %} {% comment %} END prettify {% endcomment %}
 
-
   {% comment %} PRODUCTION mode
   ------------------------------------------------------------------------------ {% endcomment %}
   {% when 'production' or 'prod' %}