j1-template 2020.0.17 → 2020.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866b07b9f466233280993fb09f6c9fe38fb68415d4a3cc1f1149d25802778ffb
-  data.tar.gz: f908542399a9c49170960476fb703eed5526195d428b95f6afd392d25455ba1f
+  metadata.gz: 6eff683e591b259db1cb6c69fcdc3ed344808df0b6a139e981cbfa3e6b969637
+  data.tar.gz: 1de451830f98df3fbfc41d65229b9e46f246cfa3e780963487fed8a41f8e262c
 SHA512:
-  metadata.gz: 817fb645f74d90a9a091be389d722b5072dbce6cb1d2c231ef9b23b8638597d6ec9298f7fe01f4b17b33c77f97e858b15bd012c1a939d5f9709256765a6a7e30
-  data.tar.gz: 5e29f4a5f8305abb71670972bcd3e60bf362084e0e7967e5bf244e9c6df9e6822efbe2893219b5d51aa70db1e21e34f593fad8fe342d0b722075ee095998284d
+  metadata.gz: 4553cad532648398b39aebc42503ded0d9a72b798a00ff81adff95ec786f3c7312b198c0b170dc0c83f31738e91e223aeef3eddebc2712052c4ea1edd8e33728
+  data.tar.gz: c7801ae6b8b788b8040bb36b01731daa533a748792f43b2f377a99a6f78c58cd19bcc469e3b981fb59c1d31735ccb86eadba2c93632a7779d113fefd8b590a05

data/_includes/themes/j1/blocks/ads/ad.html

@@ -21,8 +21,8 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign advertising           = site.data.template_settings.advertising.enabled %}
-{% assign advertising_provider  = site.data.template_settings.advertising.provider %}
+{% assign advertising           = site.data.j1_config.advertising.enabled %}
+{% assign advertising_provider  = site.data.j1_config.advertising.provider %}
 
 
 {% comment %} Main

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

@@ -33,11 +33,11 @@
 <!-- [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="g-text-upper g-color-white-opacity-0_9 g-font-size-18 g-font-weight-500 g-mb-0">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0">{{title}}</h2>
   <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>
-  <div class="d-inline-block g-width-50 g-height-2 uno-bg-primary g-mb-5"></div>
+  <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-1"></div>
   {% if justify %}
     <p class="lead text-justify">{{text}}</p>
   {% else %}

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

@@ -32,18 +32,18 @@
 <!-- [INFO   ] [links_box.proc                     ] [ place links box ] -->
 <div class="col-md-{{footer_box_width_md}}">
   <!-- div class="heading-footer"><h2 class="notoc">{{title}}</h2></div -->
-  <h2 class="g-text-upper g-color-white-opacity-0_9 g-font-size-18 g-font-weight-500 g-mb-0">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0">{{title}}</h2>
   <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>
-  <div class="d-inline-block g-width-50 g-height-2 uno-bg-primary g-mb-5"></div>
+  <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-1"></div>
 
-  <ul class="list-unstyled footer-link-list">
+  <ul class="list-unstyled link-news">
     {% for property in links %}
       {% comment %} <!-- proc - property.link: {{ property.link }} --> {% endcomment %}
       <li>
         <a href="{{property.link.href}}" target="_blank" rel="noopener noreferrer">{{property.link.title}}</a>
-        <div style="color: #555;"><small>{{property.link.tagline}}</small></div>
+        <div class="text-uppercase"><small>{{property.link.tagline}}</small></div>
       </li>
     {% endfor %}
   </ul>

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

@@ -39,11 +39,11 @@
 <!-- [INFO   ] [news_box.proc                      ] [ place news box ] -->
 <div class="col-md-{{footer_box_width_md}}">
   <!-- div class="heading-footer"><h2 class="notoc">{{title}}</h2></div -->
-  <h2 class="g-text-upper g-color-white-opacity-0_9 g-font-size-18 g-font-weight-500 g-mb-0">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0">{{title}}</h2>
   <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>
-  <div class="d-inline-block g-width-50 g-height-2 uno-bg-primary g-mb-5"></div>
+  <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-1"></div>
 
     <ul class="list-unstyled link-news">
     {% for post in posts %}

data/_includes/themes/j1/blocks/footer/generator.html

@@ -1,4 +1,4 @@
-{% comment %} 
+{% comment %}
  # -----------------------------------------------------------------------------
  # ~/_includes/templates/j1/blocks/footer/generator.html
  # Liquid TEMPLATE to create the footer for all pages
@@ -47,7 +47,7 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign footer_options        = footer_defaults | merge: footer_settings %}
 
-{% if data.template_settings.analytics.enabled %}
+{% if data.j1_config.analytics.enabled %}
   {% include analytics %}
 {% endif %}
 

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

@@ -49,14 +49,14 @@
 
 {% assign previewer            = site.data.builder.blog_navigator.previewer %}
 {% assign paginate             = paginator_options.pagination.enabled %}
-{% assign rtext                = site.data.template_settings.typography.rtext %}
+{% assign rtext                = site.data.j1_config.typography.rtext %}
 {% assign page_rtext           = page.rtext %}
 {% assign page_rtext_size      = page.rtext_size %}
 
 {% comment %} rtext|size detection
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if rtext %}
-  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}
@@ -68,17 +68,18 @@
   <!-- split page to place a sidebar e.g. the document TOC -->
   <!-- no sidebar, mr-* disabled -->
   <!-- div class="container mr-5 mb-5" -->
-  <div class="container mb-5">
-    <div class="row">
+  <!-- div class="container mb-5" -->
+    <!-- div class="row" -->
 
       <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
-      <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
+      <main class="container r-text-{{rtext_size}} js-toc-content mb-5">
 
         {% comment %} Blog Navigator
         ------------------------------------------------------------------------ {% endcomment %}
-        <!-- Content placed by blog_archive_content.html -->
-        <div id="blog_navigator" class="row">
-          <div class="col-md-12" role="main">
+        <!-- Content placed by layouts/content_generator_blog_archive.html -->
+        <!-- div id="blog_navigator" class="row" -->
+        <div id="blog_navigator">
+          <!-- div class="col-md-12" role="main" -->
 
             <div id="article_navigator">
 
@@ -99,7 +100,8 @@
                   <h2 id="post-headline" class="mt-4">Navigator</h2>
                 </div> -->
 
-                <nav class="paginator ml-3">
+                <!-- nav class="paginator ml-3" -->
+                <nav class="paginator">
                   <ul class="pagination raised-z0">
 
                     <li class="page-item"><a class="page-link" href="{{category_view}}" title="View by Category">By Category</a></li>
@@ -134,7 +136,8 @@
                 {% comment %} Display pagination links if any
                 ---------------------------------------------------------------- {% endcomment %}
                 {% if paginator.total_pages > 1 %}
-                <nav class="paginator ml-3">
+                <!-- nav class="paginator ml-3" -->
+                <nav class="paginator">
                   <ul class="pagination raised-z0">
                     {% if paginator.previous_page %}
                       {% if paginator.previous_page > 1 %}
@@ -160,7 +163,8 @@
                 </nav>
                 {% endif %}
 
-                <div class="view-description ml-3 mb-3">
+                <!-- div class="view-description ml-3 mb-3" -->
+                <div class="view-description mb-3">
                   {{article_previewer_description}}
                 </div>
 
@@ -189,7 +193,7 @@
             {% comment %} End Article Previewer
             -------------------------------------------------------------------- {% endcomment %}
 
-          </div> <!-- end col-md-12 -->
+          <!-- /div --> <!-- end col-md-12 -->
         </div> <!-- end row blog_navigator -->
 
         <!-- End Content placed by blog_archive_content.html -->
@@ -222,6 +226,7 @@
 
         var dependencies_blog_generator = setInterval(function() {
           if ( j1.adapter.themer.getState() == 'finished' ) {
+            // [INFO   ] [j1.content_generator_blog_archive        ] [ {{page.title}} - save the current page to cookieUserState cookie: {{ browser_page_url }} ]
             var cookie_names                = j1.getCookieNames();
             const user_state_cookie_name    = cookie_names.user_session;
             var user_state                  = j1.readCookie(user_state_cookie_name);
@@ -231,10 +236,6 @@
               name: user_state_cookie_name,
               data: user_state
             });
-            /* Set default colors */
-            var bg_primary  = j1.getStyleValue('bg-primary', 'background-color');
-            /* Set color of timeline bullet */
-            $('head').append('<style>.tmicon { background: ' +bg_primary+ ' !important; }</style>');
             // clear interval checking
             clearInterval(dependencies_blog_generator);
             }
@@ -242,6 +243,8 @@
       });
       </script>
 
-    </div> <!-- end row -->
-  </div> <!-- end container -->
+    <!-- /div --> <!-- end row -->
+  <!-- /div --> <!-- end container -->
+
+
   <!-- [INFO   ] [j1.layout.content_generator_blog.html  ] [ end content ] -->

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

@@ -25,7 +25,7 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
@@ -52,7 +52,7 @@
 {% endif %}
 
 {% if rtext %}
-  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}
@@ -70,7 +70,7 @@
     ---------------------------------------------------------------------------- {% endcomment %}
     {% if sidebar == false %}
       <!-- FULL page - no sidebar for page toc -->
-      <main class="col-md-12 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}} %}
@@ -93,7 +93,7 @@
     {% 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="col-md-12 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}} %}

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

@@ -29,79 +29,31 @@
 
 {% comment %} set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
-{% assign toccer_defaults   = modules.defaults.toccer.defaults %}
-{% assign toccer_settings   = modules.toccer.settings %}
+{% assign template_config   = site.data.j1_config %}
 
 {% comment %} set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
-{% assign tocbot_enabled    = toccer_options.enabled %}
-
-{% assign rtext             = site.data.template_settings.typography.rtext %}
+{% assign rtext             = site.data.j1_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.template_settings.typography.rtext_size %}
+  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}
 
-
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [j1.layout.content_generator_page.html ] [ begin content ] -->
-<!-- div class="container mr-5 mb-5" -->
-<!-- no sidebar, mr-* disabled -->
-  <div class="container mb-5">
-  <div class="row">
-
-    {% if sidebar == false %}
-      <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ start main for full page ] -->
-      <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
-        <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ begin place content ] -->
-        {{content}}
-      </main>
-      <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ end main for full page ] -->
-    {% else %}
-      <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ start main for split page (TOC) ] -->
-      <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
-      <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
-        <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ begin place content ] -->
-        {{ content }}
-
-        {% comment %} Place additional headline for comments
-        ------------------------------------------------------------------------ {% endcomment %}
-        {% if page.comments %}
-        <h2 id="comments_leave_comment"> Leave a Comment </h2>
-        {% endif %}
-      </main>
-      <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ end main for split page (TOC) ] -->
-      {% 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 sidebar -->
-
-  </div> <!-- end row -->
-</div> <!-- end container -->
-<!-- [INFO   ] [j1.layout.content_generator_page.html ] [ end place content ] -->
+<!-- [INFO   ] [j1.layout.content_generator_page.html ] [ start main for full page ] -->
+<main class="r-text-{{rtext_size}} js-toc-content">
+  <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ begin place content ] -->
+  {{content}}
+  <!-- [INFO   ] [j1.layout.content_generator_page.html ] [ end place content ] -->
+</main>
+<!-- [INFO   ] [j1.layout.content_generator_page.html ] [ end main for full page ] -->
 
 {% comment %} Calc|Write the Back URL
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -111,7 +63,7 @@
   {% capture browser_page_url %}{{page.url}}{% endcapture %}
 {% endif %}
 
-<!-- [INFO   ] [j1.page.{{page.title}}                   ] [Save the current ArticleBrowser page to UserState cookie] -->
+<!-- [INFO   ] [j1.page.{{page.title}}                   ] [Save the current page to UserState cookie] -->
 <!-- script>
         var logger   = log4javascript.getLogger("j1.page.{{page.title|downcase}}.init");
         var cookieUserState = 'j1.user.state'

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

@@ -27,7 +27,7 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
@@ -41,7 +41,7 @@
 {% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
 {% assign tocbot_enabled    = toccer_options.enabled %}
 
- {% assign rtext            = site.data.template_settings.typography.rtext %}
+ {% assign rtext            = site.data.j1_config.typography.rtext %}
  {% assign page_rtext       = page.rtext %}
  {% assign page_rtext_size  = page.rtext_size %}
  {% assign page_toccer      = page.toccer %}
@@ -54,7 +54,7 @@
  {% endif %}
 
  {% if rtext %}
-   {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+   {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
  {% else %}
    {% assign rtext_size = 0 %}
  {% endif %}
@@ -79,7 +79,7 @@
   {% if sidebar == false %}
     <!-- FULL page - no sidebar for page toc -->
     <div class="row">
-      <main class="col-md-12 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="featured-headline" -->
@@ -94,7 +94,7 @@
 
           <header class="bmd-layout-header">
             <!-- div class="navbar navbar-dark bg-primary raised-z2 mb-4" -->
-            <div class="navbar navbar-dark uno-bg-primary raised-z2 mb-4">
+            <div class="navbar navbar-dark bg-primary raised-z2 mb-4">
               <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
                 <span class="mdi mdi-menu mdi-2x"></span>
               </button>
@@ -139,7 +139,7 @@
     <!-- SPLIT page. Place a sidebar e.g. for the document toc -->
     <div class="row">
       <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
-      <main class="col-md-12 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}} %}
@@ -154,7 +154,7 @@
 
           <header class="bmd-layout-header">
             <!-- div class="navbar navbar-dark bg-primary raised-z2 mb-4" -->
-            <div class="navbar navbar-dark uno-bg-primary raised-z2 mb-4">
+            <div class="navbar navbar-dark bg-primary raised-z2 mb-4">
               <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
                 <span class="mdi mdi-menu mdi-2x"></span>
               </button>

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

@@ -24,7 +24,7 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config = site.data.template_settings %}
+{% assign template_config = site.data.j1_config %}
 {% assign blocks          = site.data.blocks %}
 {% assign modules         = site.data.modules %}
 
@@ -91,7 +91,7 @@
 {% endif %}
 
 {% if site.favicon.image %}
-  <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.template_settings.image_path}}/{{site.favicon.image}}">
+  <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}">
 {% endif %}
 
 {% if page.layout == 'home' %}

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

@@ -21,7 +21,7 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign publisher_id = site.data.template_settings.advertising.google.publisher_id %}
+{% assign publisher_id = site.data.j1_config.advertising.google.publisher_id %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}

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

@@ -21,8 +21,8 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign advertising           = site.data.template_settings.advertising.enabled %}
-{% assign advertising_provider  = site.data.template_settings.advertising.provider %}
+{% assign advertising           = site.data.j1_config.advertising.enabled %}
+{% assign advertising_provider  = site.data.j1_config.advertising.provider %}
 
 
 {% comment %} Main

data/_includes/themes/j1/modules/connectors/analytic/google-analytics.html

@@ -21,7 +21,7 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign tracking_id = site.data.template_settings.analytics.google.tracking_id }} %}
+{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id }} %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}

data/_includes/themes/j1/modules/connectors/analytics

@@ -21,8 +21,8 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign analytics           = site.data.template_settings.analytics.enabled %}
-{% assign analytics_provider  = site.data.template_settings.analytics.provider %}
+{% assign analytics           = site.data.j1_config.analytics.enabled %}
+{% assign analytics_provider  = site.data.j1_config.analytics.provider %}
 
 
 {% comment %} Main