j1-template 2021.1.1 → 2021.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08b2a31555bb43bdff30edc70c3f08281659eae88d30c9ca8d8f78f01e49331
-  data.tar.gz: ca7510d814deec5a3ec78b8f06589632ecdb50d2eb1a408f241c813a036a9ced
+  metadata.gz: 2ed0126c99cc3071cfcafcc4327d406fb539da49c343fc20b8734d840e5d39df
+  data.tar.gz: 5b7d1fbfa8d720e84453ef58c59330ee5d857bccbbfa31469a62b52a63d27f6a
 SHA512:
-  metadata.gz: f6200cc10b34c48742dd350ea7e15edefe8035ed5c2b5c769ab19ec95eb5358cac0efabdb0ec3d74dc6b64882b8bf2bf32a3ce5ec654f3bd8f6e128a24510dfd
-  data.tar.gz: 945218591376a312a84371f10fa83db1fb24724d5b3886f0fdca33b714b6c3f2d4726ba599efc4a663cdf775645a5ea1f9b3e1cab845ab441d00b3e2553b2b14
+  metadata.gz: 2d164e0c994ca79e25908973f912e0b4dc95742e67f96b45fbdab54a156175185a4d91ae683a276198d74f8e4d981d59b289de5dc4bb817f8dab10d472784895
+  data.tar.gz: b0a651b2a288290e8c2ece079ef587e13f18545e6f4dc0af06cd82511b21185d026ab78c2fa140472bbae67ebac49f49c08067c78a089d1a8132fc655a49b8cf

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

@@ -26,6 +26,20 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
+<!-- Google Adsense -->
+<script data-ad-client="{{publisher_id}}"
+    async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
+</script>
+
+{% comment %} to be checked
+--------------------------------------------------------------------------------
+<script data-ad-client="{{publisher_id}}"
+    async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
+</script>
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} to be checked
+--------------------------------------------------------------------------------
 <script data-ad-client="{{publisher_id}}"
   $(document).ready(function() {
     var dependencies_met_page_finished = setInterval (function () {
@@ -35,12 +49,6 @@
       }
   }, 25); // END dependencies_met_page_finished
 </script>
-
-{% comment %} to be checked
---------------------------------------------------------------------------------
-<script data-ad-client="{{publisher_id}}"
-    async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
-</script>
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Old Ads code

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

@@ -24,16 +24,14 @@
 {% assign advertising           = site.data.j1_config.advertising.enabled %}
 {% assign advertising_provider  = site.data.j1_config.advertising.provider %}
 
-
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising (global): {{advertising}} ] -->
+<!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising (j1_config): {{advertising}} ] -->
 <!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising (page): {{page.advertising}}} ] -->
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising (provider): {{advertising_provider}}} ] -->
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ start processing load region head, layout: {{page.layout}} ] -->
 
 {% if advertising and page.advertising %}
-
+  <!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected advertising provider (j1_config): {{advertising_provider}}} ] -->
+  <!-- [INFO   ] [j1.modules.connectors.ads             ] [ start processing load region head, layout: {{page.layout}} ] -->
   {% case advertising_provider %}
     {% when "google" %}
       <!-- [INFO   ] [j1.modules.connectors.ads             ] [ place provider: Google Adsense ] -->

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

@@ -27,10 +27,12 @@
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ detected analytics (j1_config): {{analytics}} ] -->
+<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ detected analytics (page): {{page.analytics}}} ] -->
 
-<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ start processing load region head, layout: {{page.layout}} ] -->
 {% if analytics and page.analytics %}
-
+  <!-- [INFO   ] [j1.modules.connectors.analytics       ] [ detected analytics provider (j1_config): {{analytics_provider}}} ] -->
+  <!-- [INFO   ] [j1.modules.connectors.analytics       ] [ start processing load region head, layout: {{page.layout}} ] -->
   {% case analytics_provider %}
     {% when "google" %}
       <!-- [INFO   ] [j1.modules.connectors.analytics       ] [ place Google Analytics ] -->

data/_includes/themes/j1/modules/connectors/comments

@@ -26,21 +26,22 @@
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.modules.connectors.comments        ] [ detected comments (j1_config): {{comments}} ] -->
+<!-- [INFO   ] [j1.modules.connectors.comments        ] [ detected comments (page): {{page.comments}}} ] -->
 
-<!-- [INFO   ] [j1.layout.connectors.comments         ] [ start processing load region head, layout: {{page.layout}} ] -->
 {% if comments and page.comments %}
-
+  <!-- [INFO   ] [j1.modules.connectors.comments       ] [ start processing load region head, layout: {{page.layout}} ] -->
   {% case comment_provider %}
     {% when "disqus" %}
-      <!-- [INFO   ] [j1.layout.connectors.comments         ] [ place comment provider DISQUS ] -->
+      <!-- [INFO   ] [j1.modules.connectors.comments        ] [ place comment provider DISQUS ] -->
       {% include themes/{{site.template.name}}/modules/connectors/comment/disqus.html %}
     {% when "facebook" %}
-      <!-- [INFO   ] [j1.layout.connectors.comments         ] [ place comment provider FACEBOOK ] -->
+      <!-- [INFO   ] [j1.modules.connectors.comments        ] [ place comment provider FACEBOOK ] -->
       {% include themes/{{site.template.name}}/procedures/provider/comment/facebook.html %}
     {% when "custom" %}
-      <!-- [INFO   ] [j1.layout.connectors.comments         ] [ place comment provider CUSTOM ] -->
+      <!-- [INFO   ] [j1.modules.connectors.comments        ] [ place comment provider CUSTOM ] -->
       {% include themes/{{site.template.name}}/procedures/provider/comment/custom-provider.html %}
   {% endcase %}
 
 {% endif %}
-<!-- [INFO   ] [j1.layout.connectors.comments         ] [ end processing ] -->
+<!-- [INFO   ] [j1.modules.connectors.comments        ] [ end processing ] -->

data/_includes/themes/j1/modules/connectors/translator

@@ -24,13 +24,13 @@
 {% assign translation          = site.data.j1_config.translation.enabled %}
 {% assign translation_provider = site.data.j1_config.translation.provider %}
 
-
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.modules.connectors.translation     ] [ detected translation (j1_config): {{translation}} ] -->
+<!-- [INFO   ] [j1.modules.connectors.translation     ] [ detected translation (page): {{page.translation}}} ] -->
 
-<!-- [INFO   ] [j1.modules.connectors.translator      ] [ start processing load region head, layout: {{page.layout}} ] -->              
 {% if translation %}
-
+<!-- [INFO   ] [j1.modules.connectors.translator      ] [ start processing load region head, layout: {{page.layout}} ] -->
   {% case translation_provider %}
     {% when "google" %}
       <!-- [INFO   ] [j1.modules.connectors.translator      ] [ place Google Translator ] -->
@@ -42,4 +42,3 @@
 
 {% endif %}
 <!-- [INFO   ] [j1.modules.connectors.translator      ] [ end processing ] -->
-

data/_includes/themes/j1/modules/navigator/generator.html

@@ -50,23 +50,9 @@
 {% assign navigator_defaults          = site.data.modules.defaults.navigator.defaults %}
 {% assign navigator_settings          = site.data.modules.navigator.settings %}
 
-{% comment %} Cookie Consent module NOT used anymore
---------------------------------------------------------------------------------
-{% assign consent_defaults            = site.data.modules.defaults.cookie_consent.defaults %}
-{% assign consent_settings            = site.data.modules.cookie_consent.settings %}
-{% assign cookie_consent_options      = consent_defaults | merge: consent_settings %}
--------------------------------------------------------------------------------- {% endcomment %}
-
 {% assign cookiebar_defaults          = site.data.modules.defaults.cookiebar.defaults %}
 {% assign cookiebar_settings          = site.data.modules.cookiebar.settings %}
 
-{% comment %} SSM module NOT used anymore
---------------------------------------------------------------------------------
-{% assign ssm_settings                = modules.ssm.settings %}
-{% assign ssm_defaults                = modules.defaults.ssm.defaults %}
-{% assign ssm_options                 = ssm_defaults | merge: ssm_settings %}
--------------------------------------------------------------------------------- {% endcomment %}
-
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign nav_bar_defaults            = navigator_defaults.nav_bar %}
@@ -92,7 +78,6 @@
 {% assign auth_manager_options        = authentication_options.j1_auth %}
 {% assign nav_mmenu_options           = nav_mmenu_defaults | merge: nav_mmenu_settings %}
 
-
 {% comment %} Set navBarOptions
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign brand_position              = nav_bar_options.brand_position %}
@@ -126,16 +111,7 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% comment %} Generate SSM container (not used anymore)
---------------------------------------------------------------------------------
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ check for ssm ] -->
-{% if ssm_options.enabled %}
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place ssm container for AJAX load ] -->
-<nav id="ssm-container" class="ssm-btns-right ssm-anim-slide no-r-text"></nav>
-{% endif %}
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} Generate TopSearch container
+{% comment %} Generate search container
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ check for topsearch ] -->
 {% if topsearch_options.enabled %}
@@ -148,19 +124,8 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: mmenu ] -->
 {% for item in nav_mmenu_options.menus %}
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ processing: {{item.menu.xhr_container_id}} ] -->
-
-{% comment %} Condition DISABLED for testing
---------------------------------------------------------------------------------
-{% if item.menu.enabled %}
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mmenu container for AJAX load ] -->
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mmenu container {{item.menu.xhr_container_id}} for AJAX load ] -->
 <nav id="{{item.menu.xhr_container_id}}"></nav>
-{% endif %}
--------------------------------------------------------------------------------- {% endcomment %}
-
-<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mmenu container for AJAX load ] -->
-<nav id="{{item.menu.xhr_container_id}}"></nav>
-
 {% endfor %}
 
 <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: navigation ] -->
@@ -168,7 +133,6 @@
 
   {% comment %} Place brand image
   ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ end processing: sidebar ] -->
   <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: main menue ] -->
   {% if brand_position == "left" %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand image to the: left ] -->

data/_includes/themes/j1/modules/navigator/generator.org.html

@@ -0,0 +1,232 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ #  ~/_includes/themes/j1/modules/navigator/generator.html
+ #  Liquid HTML template to create the Navigation System for J1 Template
+ #  (includes all containers needed for MMenu)
+ #
+ #  Product/Info:
+ #  https://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
+ #
+ # -----------------------------------------------------------------------------
+ #  Test data:
+ #   liquid_var: {{ liquid_var | debug }}
+ #
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+{% include themes/{{site.template.name}}/procedures/global/setup.proc %}
+{% capture select_color %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
+{% capture topsearch_create %}themes/{{site.template.name}}/modules/navigator/procedures/topsearch.proc{% endcapture %}
+
+{% comment %} Not longer used (loaded via AJAX)
+--------------------------------------------------------------------------------
+{% capture sidebar_create %}themes/{{site.template.name}}/modules/navigator/procedures/sidebar.proc{% endcapture %}
+{% capture quicklinks_create %}themes/{{site.template.name}}/modules/navigator/procedures/quicklinks.proc{% endcapture %}
+--------------------------------------------------------------------------------
+{% 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 %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign authentication_defaults     = modules.defaults.authentication.defaults %}
+{% assign authentication_settings     = modules.authentication.settings %}
+
+{% assign navigator_defaults          = site.data.modules.defaults.navigator.defaults %}
+{% assign navigator_settings          = site.data.modules.navigator.settings %}
+
+{% comment %} Cookie Consent module NOT used anymore
+--------------------------------------------------------------------------------
+{% assign consent_defaults            = site.data.modules.defaults.cookie_consent.defaults %}
+{% assign consent_settings            = site.data.modules.cookie_consent.settings %}
+{% assign cookie_consent_options      = consent_defaults | merge: consent_settings %}
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% assign cookiebar_defaults          = site.data.modules.defaults.cookiebar.defaults %}
+{% assign cookiebar_settings          = site.data.modules.cookiebar.settings %}
+
+{% comment %} SSM module NOT used anymore
+--------------------------------------------------------------------------------
+{% assign ssm_settings                = modules.ssm.settings %}
+{% assign ssm_defaults                = modules.defaults.ssm.defaults %}
+{% assign ssm_options                 = ssm_defaults | merge: ssm_settings %}
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign nav_bar_defaults            = navigator_defaults.nav_bar %}
+{% assign nav_bar_settings            = navigator_settings.nav_bar %}
+{% assign nav_quicklinks_defaults     = navigator_defaults.nav_quicklinks %}
+{% assign nav_quicklinks_settings     = navigator_settings.nav_quicklinks %}
+{% assign nav_topsearch_defaults      = navigator_defaults.nav_topsearch %}
+{% assign nav_topsearch_settings      = navigator_settings.nav_topsearch %}
+
+{% assign nav_authclient_defaults     = authentication_defaults.auth_client %}
+{% assign nav_authclient_settings     = authentication_settings.auth_client %}
+
+{% assign nav_mmenu_defaults            = navigator_defaults.nav_mmenu %}
+{% assign nav_mmenu_settings            = navigator_settings.nav_mmenu %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign nav_bar_options             = nav_bar_defaults | merge: nav_bar_settings %}
+{% assign quicklinks_options          = nav_quicklinks_defaults | merge: nav_quicklinks_settings %}
+{% assign topsearch_options           = nav_topsearch_defaults | merge: nav_topsearch_settings %}
+{% assign authclient_options          = nav_authclient_defaults | merge: nav_authclient_settings %}
+{% assign authentication_options      = authentication_defaults | merge: authentication_settings %}
+{% assign auth_manager_options        = authentication_options.j1_auth %}
+{% assign nav_mmenu_options           = nav_mmenu_defaults | merge: nav_mmenu_settings %}
+
+
+{% comment %} Set navBarOptions
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign brand_position              = nav_bar_options.brand_position %}
+{% assign nav_fixed                   = nav_bar_options.fixed %}
+{% assign nav_style                   = nav_bar_options.style %}
+{% assign nav_color                   = nav_bar_options.color %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign nav_bar_id                  = navigator_defaults.nav_bar.xhr_container_id %}
+{% assign nav_menu_id                 = navigator_defaults.nav_menu.xhr_container_id %}
+{% assign nav_mmenu_id                = navigator_defaults.nav_mmenu.xhr_container_id %}
+{% assign nav_sidebar_id              = navigator_defaults.nav_sidebar.xhr_container_id %}
+{% assign nav_quicklinks_id           = navigator_defaults.nav_quicklinks.xhr_container_id %}
+{% assign authclient_modals_id        = authclient_options.xhr_container_id %}
+{% assign nav_navbar_media_breakpoint = navigator_defaults.nav_bar.media_breakpoint %}
+
+{% comment %} Set navBarProperties
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if nav_fixed %}
+  {% assign nav_bar_fixed = 'navbar-fixed' %}
+  {% if nav_style == 'overlay' %} {% assign nav_bar_style = 'navbar-transparent' %} {% endif %}
+{% endif %}
+
+{% if nav_color == 'light' %}
+  {% assign nav_bar_color = 'light' %}
+{% endif %}
+
+{% capture nav_bar_default_css_classes %}navbar navigator navbar-expand-{{nav_navbar_media_breakpoint}} navbar-default{% endcapture %}
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Generate SSM container (not used anymore)
+--------------------------------------------------------------------------------
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ check for ssm ] -->
+{% if ssm_options.enabled %}
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place ssm container for AJAX load ] -->
+<nav id="ssm-container" class="ssm-btns-right ssm-anim-slide no-r-text"></nav>
+{% endif %}
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Generate TopSearch container
+-------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ check for topsearch ] -->
+{% if topsearch_options.enabled %}
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: topsearch ] -->
+  {% include {{ topsearch_create }} options=topsearch_options %}
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ end processing: topsearch ] -->
+{% endif %}
+
+{% comment %} Place MMobile NAV menu containers (HTML data loaded via AJAX)
+-------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: mmenu ] -->
+{% for item in nav_mmenu_options.menus %}
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ processing: {{item.menu.xhr_container_id}} ] -->
+
+{% comment %} Condition DISABLED for testing
+--------------------------------------------------------------------------------
+{% if item.menu.enabled %}
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mmenu container for AJAX load ] -->
+<nav id="{{item.menu.xhr_container_id}}"></nav>
+{% endif %}
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mmenu container for AJAX load ] -->
+<nav id="{{item.menu.xhr_container_id}}"></nav>
+
+{% endfor %}
+
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: navigation ] -->
+<nav id="{{nav_bar_id}}" class="{{nav_bar_default_css_classes}} {{nav_bar_color}} {{nav_bar_fixed}} {{nav_bar_style}}">
+
+  {% comment %} Place brand image
+  ------------------------------------------------------------------------------ {% endcomment %}
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ end processing: sidebar ] -->
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: main menue ] -->
+  {% if brand_position == "left" %}
+    <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand image to the: left ] -->
+    {% if site.brand.image %}
+      <a href="#" id="navbar-brand" class="navbar-brand"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+    {% else %}
+      <a href="#" id="navbar-brand" class="navbar-brand"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
+    {% endif %}
+    <button id="navbar-toggler" type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
+      <i class="mdi mdi-menu mdi-48px"></i>
+    </button>
+  {% elsif brand_position == "right" %}
+    <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand to the: right ] -->
+    {% if site.brand.image %}
+      <a href="#" id="navbar-brand" class="navbar-brand"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+    {% else %}
+      <a href="#" id="navbar-brand" class="navbar-brand"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
+    {% endif %}
+    <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place mobile menu button to the: left ] -->
+    <button id="mmenu-button" type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
+      <i class="mdi mdi-menu mdi-36px"></i>
+    </button>
+  {% else %}
+    <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand to default position: left ] -->
+    {% if site.brand.image %}
+      <a href="#" id="navbar-brand" class="navbar-brand"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+    {% else %}
+      <a href="#" id="navbar-brand" class="navbar-brand"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
+    {% endif %}
+    <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place menu toggler to the: right ] -->
+    <button id="navbar-toggler" type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
+      <i class="mdi mdi-menu mdi-48px"></i>
+    </button>
+  {% endif %}
+
+  {% comment %} Place Desktop NAV menu container (HTML data loaded via AJAX)
+  ------------------------------------------------------------------------------ {% endcomment %}
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ start processing: nav bar ] -->
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place nav menu container for AJAX load (desktop) ] -->
+  <div id="{{nav_menu_id}}" class="collapse"></div>
+
+  {% comment %} Place|Hide Quicklinks container (HTML data loaded via AJAX)
+  ------------------------------------------------------------------------------ {% endcomment %}
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ check for quicklinks ] -->
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ quicklinks enabled: {{quicklinks_options.enabled}} ] -->
+  {% if quicklinks_options.enabled %}
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place container for: quicklinks ] -->
+  <div id="{{nav_quicklinks_id}}" class="attr-nav collapse navbar-collapse justify-content-end"></div>
+  {% endif %}
+  <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ end processing for: quicklinks ] -->
+
+</nav>
+
+{% comment %} Place container for sign in|out dialog used by J1 AuthClient
+-------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ check for: authclient ] -->
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ authclient enabled: {{auth_manager_options.enabled}} ] -->
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place container for: authclient ] -->
+<div id="{{authclient_modals_id}}" class="authclient_modals"></div>
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ end processing: auth_client ] -->
+<!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ end processing: navigation ] -->

data/_includes/themes/j1/procedures/global/create_bs_button.proc

@@ -57,31 +57,73 @@
   {% comment %} Create BS link button
   ------------------------------------------------------------------------------ {% endcomment %}
 
-    {% for item in button_data %}
-
-      {% for button in item[1] %}
-        {% assign key   = button[0] %}
-        {% assign value = button[1] %}
-        {% if key == 'text' %}       {% assign button_text       = value %} {% endif %}
-        {% if key == 'class' %}      {% assign button_class      = value %} {% endif %}
-        {% if key == 'style' %}      {% assign button_style      = value %} {% endif %}
-        {% if key == 'icon' %}       {% assign button_icon       = value %} {% endif %}
-        {% if key == 'icon_color' %} {% assign button_icon_color = value %} {% endif %}
-        {% if key == 'icon_size' %}  {% assign button_icon_size  = value %} {% endif %}
-        {% if key == 'href' %}       {% assign button_href       = value %} {% endif %}
-        {% if key == 'target' %}     {% assign button_target     = value %} {% endif %}
-      {% endfor %}
-
-    {% endfor %}
-
-    {% if button_href and button_target %}
-      {% capture bs_button_html %}<a href="{{button_href}}" target="{{ button_target }}" rel="noopener" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
-    {% elsif button_href %}
-      {% capture bs_button_html %}<a href="{{button_href}}" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
+    {% for item in button_data %} {% for button in item[1] %}
+      {% assign key   = button[0] %}
+      {% assign value = button[1] %}
+      {% if key == 'title' %}      {% assign button_title      = value %} {% endif %}
+      {% if key == 'tagline' %}    {% assign button_tagline    = value %} {% endif %}
+      {% if key == 'class' %}      {% assign button_class      = value %} {% endif %}
+      {% if key == 'style' %}      {% assign button_style      = value %} {% endif %}
+      {% if key == 'icon' %}       {% assign button_icon       = value %} {% endif %}
+      {% if key == 'icon_color' %} {% assign button_icon_color = value %} {% endif %}
+      {% if key == 'icon_size' %}  {% assign button_icon_size  = value %} {% endif %}
+      {% if key == 'href' %}       {% assign button_href       = value %} {% endif %}
+      {% if key == 'target' %}     {% assign button_target     = value %} {% endif %}
+    {% endfor %} {% endfor %}
+
+    {% comment %} jadams, 2021-04-24:
+    TODO, mr-x on font-icon are to be scaled on icon-size (fixed on: mr-3)
+    -------------------------------------------------------------------------------- {% endcomment %}
+
+    {% if button_tagline %}
+      {% if button_href and button_target %}
+        {% capture bs_button_html %}
+          <a href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
+            <i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-3"></i>
+            <span class="float-right text-left mt-2">
+              {{button_title}}
+              <span class="d-block r-text-200 text-lowercase">{{button_tagline}}</span>
+            </span>
+          </a>
+        {% endcapture %}
+      {% elsif button_href %}
+        {% capture bs_button_html %}
+          <a href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
+            <i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-3"></i>
+            <span class="float-right text-left mt-2">
+              {{button_title}}
+              <span class="d-block r-text-200 text-lowercase">{{button_tagline}}</span>
+            </span>
+          </a>
+        {% endcapture %}
+      {% else %}
+        {% capture bs_button_html %}INFO: No valid value for parameter href found{% endcapture %}
+      {% endif %}
     {% else %}
-      {% capture bs_button_html %}<!-- INFO: No valid value for parameter href found. -->{% endcapture %}
+      {% if button_href and button_target %}
+        {% capture bs_button_html %}
+          <a href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
+            <i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i>
+            <span class="float-right text-left">
+              {{button_title}}
+            </span>
+          </a>
+        {% endcapture %}
+      {% elsif button_href %}
+        {% capture bs_button_html %}
+          <a href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
+            <i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i>
+            <span class="float-right text-left">
+              {{button_title}}
+            </span>
+          </a>
+        {% endcapture %}
+      {% else %}
+        {% capture bs_button_html %}INFO: No valid value for parameter href found{% endcapture %}
+      {% endif %}
     {% endif %}
 
+
   {% when 'input' %}
   {% comment %} Create BS link button
   ------------------------------------------------------------------------------ {% endcomment %}