j1-template 2022.0.2 → 2022.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c31477f87609e60552f0ffa76b8f36daab38d8915affbef9fca29e185a13dbd
-  data.tar.gz: 65f2a6293c1f9f05e31c8576f528d30e397b4a790236e0a25a7672b0b3adb705
+  metadata.gz: 2bb3d3d9ec50c3accd1a12762ce25a50af83caa99dafd1bee48bccb375cc572c
+  data.tar.gz: 32221fe28fbf693fb2a43063a673ed63c1ee394471959abd7c1b9270b1c36929
 SHA512:
-  metadata.gz: eff73da4fb89bb43588bfe63bae111e880693ecf423c34051251b4fce2e2014b4de5c392b7dc9161d2bbe7342a1ce52d46f704c2ce5fac526dfc98a9ad4fd3f6
-  data.tar.gz: 7425d1165d8e388f640cf8d0cdbcf78b9ba7f48d1dd98a5943b446a1e197b35a7555af4086c4ac7d788a27343493b4a35bd30a1affdc843b208efe9e6e66dcb4
+  metadata.gz: 3c0e049981164833e1aec1719c26e570e0828033fa19ac63fbd7054af416ffb119f451574329a480020fa5af13a31b1b89020d8f58418cd38a6cdde80769b4e6
+  data.tar.gz: 416606126e81685ff50f3ad4bdc8c01c58ff9184af618d876f3b3618414874bdf1e76ce27712a8c1b744779aa3851032d7c3a3a31acf16a5c283ebdb06e8a9b5

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

@@ -25,16 +25,6 @@
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-
-<!-- load the GA library -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>
-
-<!-- GA depends on the cookie consent and is enabled/disabled on OptIn/Out-->
-<!--
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-  gtag('config', '{{tracking_id}}');
-</script>
--->
+<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ GA depends on the cookie consent and is enabled/disabled dynamically on OptIn/Out ] -->
+<!-- [INFO   ] [j1.modules.connectors.analytics       ] [ if analytics enabled, load the GA library statically by default ] -->
+<script async id="google-tag-manager" src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>

data/_includes/themes/j1/modules/connectors/comment/hyvor.html

@@ -23,11 +23,10 @@
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 
-
 {% comment %} Main
+<!-- thread container places dynamically by j1 adapter
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ place the thread container: start ] -->
-<div id="hyvor-talk-view"></div>
 <!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ connector depends on the cookie consent (personalization) ] -->
-<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ connector (dynamic) JS is enabled/disabled on OptIn/Out ] -->
-<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ place the thread container: end ] -->
+<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ connector is enabled/disabled dynamically by j1 adapter on OptIn/Out ] -->
+<!-- [INFO   ] [j1.modules.connectors.hyvor           ] [ thread container disabled, placed dynamically by j1 adapter ] -->
+<!-- div id="hyvor-talk-view"></div -->

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

@@ -79,7 +79,7 @@
     {% if button_tagline %}
       {% if button_href and button_target %}
         {% capture bs_button_html %}
-          <a id="#{{button_id}}" href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
+          <a id="{{button_id}}" 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}}
@@ -89,7 +89,7 @@
         {% endcapture %}
       {% elsif button_href %}
         {% capture bs_button_html %}
-          <a id="#{{button_id}}" href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
+          <a id="{{button_id}}" 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}}
@@ -103,7 +103,7 @@
     {% else %}
       {% if button_href and button_target %}
         {% capture bs_button_html %}
-          <a id="#{{button_id}}" href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
+          <a id="{{button_id}}" 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}}
@@ -112,7 +112,7 @@
         {% endcapture %}
       {% elsif button_href %}
         {% capture bs_button_html %}
-          <a id="#{{button_id}}" href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
+          <a id="{{button_id}}" 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}}

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

@@ -100,9 +100,9 @@
 
       <!-- [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>';
+        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 Top Page">{{pager_back_button_text}}</a></li>';
+        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({

data/_layouts/default.html

@@ -121,23 +121,15 @@ layout:                                 compress
   {% comment %} collect the head section (region head)
   ------------------------------------------------------------------------------ {% endcomment %}
   <head data-proofer-ignore>
+
     {% comment %}
     <link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-LRlmVvLKVApDVGuspQFnRQJjkv0P7/YFrw84YYQtmYG4nK8c+M+NlmYDCv0rKWpG" crossorigin="anonymous">
     {% endcomment %}
     <!-- [INFO   ] [j1.layout.default.html                ] [ call default_writer for region: 'head' ] -->
     {% include {{default_writer}} region='head' items=lanes_collate %}
     <!-- [INFO   ] [j1.layout.default.html                ] [ end default_writer for region: 'head' ] -->
-  </head>
 
-  {% comment %} collect the body section (region body-*)
-  ------------------------------------------------------------------------------
-  {% if body_scrollbar %}
-    <body>
-  {% else %}
-    <body class="hide-scrollbar">
-  {% endif %}
-  ------------------------------------------------------------------------------
-  {% endcomment %}
+  </head>
 
   <body>
 
@@ -174,7 +166,6 @@ layout:                                 compress
 
     </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 ] -->
     {% assign language            = site.language %}
@@ -230,6 +221,7 @@ layout:                                 compress
     <!-- [INFO   ] [j1.layout.default.html                ] [ place hidden color selector/themes: bg-primary ] -->
     <div id="bg-primary" class="bg-primary" style="display: none"></div>
 
+    <!-- [INFO   ] [j1.layout.default.html                ] [ end default writer] -->
   </body>
 
   {% comment %} Place container for WebHook modals

data/assets/data/private.json

@@ -45,9 +45,5 @@ exclude_from_search:                    true
 {{ private_settings | json }}
 
 {% endcapture %}
-{% if production %}
-  {{ cache | minifyJSON }}
-{% else %}
-  {{ cache | strip_empty_lines }}
-{% endif %}
+{{ cache | encodeBase64 }}
 {% assign cache = nil %}

data/assets/data/quicklinks.html

@@ -78,30 +78,15 @@ exclude_from_search:                    true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign icon_family             = quicklinks_options.icon_family | downcase %}
 
-{% assign cookies_icon            = quicklinks_options.cookies_icon %}
-
-{% assign translate_icon          = quicklinks_options.translate_icon %}
-
-{% assign search_icon             = quicklinks_options.top_search_icon %}
-{% assign sidebar_icon            = quicklinks_options.sidebar_icon %}
-
-{% assign signin_icon             = auth_client_config.signin_icon %}
-{% assign signout_icon            = auth_client_config.signout_icon %}
-
-{% assign control_center_icon     = cc_app_config_options.quicklinks_icon %}
-{% assign control_center_url      = cc_app_config_options.quicklinks_url %}
-
-{% assign translator_icon         = quicklinks_options.translator_icon %}
-
+{% comment %} Link buttons
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign home_icon               = quicklinks_options.home_icon %}
 {% assign home_url                = quicklinks_options.home_url %}
-
-{% assign r_text_icon             = quicklinks_options.r_text_icon %}
-
-{% assign toc_icon                = quicklinks_options.toc_icon %}
+{% assign home_label              = quicklinks_options.home_label %}
 
 {% assign back_icon               = quicklinks_options.back_icon %}
 {% assign back_url                = quicklinks_options.back_url %}
+{% assign back_label                = quicklinks_options.back_label %}
 
 {% assign disqus_icon             = quicklinks_options.disqus_icon %}
 {% assign github_icon             = quicklinks_options.github_icon %}
@@ -115,15 +100,50 @@ exclude_from_search:                    true
 {% assign facebook_url            = quicklinks_options.facebook_url %}
 {% assign twitter_url             = quicklinks_options.twitter_url %}
 
+{% assign disqus_label            = quicklinks_options.disqus_label %}
+{% assign github_label            = quicklinks_options.github_label %}
+{% assign patreon_label           = quicklinks_options.patreon_label %}
+{% assign facebook_label          = quicklinks_options.facebook_label %}
+{% assign twitter_label           = quicklinks_options.twitter_label %}
+
+{% comment %} Action buttons
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign cookies_icon            = quicklinks_options.cookies_icon %}
+{% assign cookies_action          = quicklinks_options.cookies_action %}
+{% assign cookies_label           = quicklinks_options.cookies_label %}
+
+{% assign translate_icon          = quicklinks_options.translate_icon %}
+{% assign translate_action        = quicklinks_options.translate_action %}
+{% assign translate_label         = quicklinks_options.translate_label %}
+
+{% assign quicksearch_icon         = quicklinks_options.quicksearch_icon %}
+{% assign quicksearch_action       = quicklinks_options.quicksearch_action %}
+{% assign quicksearch_label        = quicklinks_options.quicksearch_label %}
+
+{% assign translator_icon         = quicklinks_options.translator_icon %}
+{% assign translator_action       = quicklinks_options.translator_action %}
+{% assign translator_label        = quicklinks_options.translator_label %}
+
+{% assign r_text_icon             = quicklinks_options.r_text_icon %}
+{% assign r_text_action           = quicklinks_options.r_text_action %}
+{% assign r_text_label            = quicklinks_options.r_text_label %}
+
+{% comment %} Legacy buttons
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign signin_icon             = auth_client_config.signin_icon %}
+{% assign signout_icon            = auth_client_config.signout_icon %}
 {% assign signin_modal_id         = auth_client_config.signin_modal_id %}
 
+{% assign control_center_icon     = cc_app_config_options.quicklinks_icon %}
+{% assign control_center_url      = cc_app_config_options.quicklinks_url %}
+
 
 {% comment %} Show|Hide Quicksearch icon
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if quick_search_options.enabled %}
-  {% assign show_quick_search_icon = true  %}
+  {% assign show_quicksearch_icon = true  %}
 {% else %}
-  {% assign show_quick_search_icon = false %}
+  {% assign show_quicksearch_icon = false %}
 {% endif %}
 
 {% comment %} Show|Hide Translator icon
@@ -154,19 +174,9 @@ exclude_from_search:                    true
   {% assign show_control_center_icon = false %}
 {% endif %}
 
-{% comment %} Show|Hide Sidebar icon
--------------------------------------------------------------------------------- {% endcomment %}
-{% if quicklinks_options.sidebar %}
-  {% assign show_sidebar_icon = true %}
-{% else %}
-  {% assign show_sidebar_icon = false %}
-{% endif %}
-
-{% assign show_sidebar_icon = false %}
-
 {% comment %} Show|Hide RSizer icon
 -------------------------------------------------------------------------------- {% endcomment %}
-{% if quicklinks_options.r_text_sizer %}
+{% if quicklinks_options.r_text_icon %}
   {% assign show_r_text_icon = true %}
 {% else %}
   {% assign show_r_text_icon = false %}
@@ -238,24 +248,29 @@ exclude_from_search:                    true
 
 <ul id="{{quicklinks_options.xhr_data_element}}" class="navbar-nav show">
 
-  {% if back_url != "none" %}<li id="quickLinksHomeButton" class="nav-item"><a id="page_back_id" class="nav-icon" href="{{back_url}}" aria-label="Page back"><i class="{{icon_family}} {{icon_family}}-{{back_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if home_url != "none" %}<li id="quickLinksHomeButton" class="nav-item"><a id="home_id" class="nav-icon" href="{{home_url}}" aria-label="Home"><i class="{{icon_family}} {{icon_family}}-{{home_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if disqus_url != "none" %}<li id="quickLinksDisqusButton" class="nav-item"><a id="disqus_id" class="nav-icon" href="{{disqus_url}}" aria-label="Disqus" target="blank"><i class="{{icon_family}} {{icon_family}}-{{disqus_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if github_url != "none" %}<li id="quickLinksGithubButton" class="nav-item"><a id="github_id" class="nav-icon" href="{{github_url}}" aria-label="Github" target="blank"><i class="{{icon_family}} {{icon_family}}-{{github_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if patreon_url != "none" %}<li id="quickLinksPatreonButton" class="nav-item"><a id="patreon_id" class="nav-icon" href="{{patreon_url}}" aria-label="Patreon" target="blank"><i class="{{icon_family}} {{icon_family}}-{{patreon_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if facebook_url != "none" %}<li id="quickLinksFacebookButton" class="nav-item"><a id="facebook_id" class="nav-icon" href="{{facebook_url}}" aria-label="Facebook" target="blank"><i class="{{icon_family}} {{icon_family}}-{{facebook_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if twitter_url != "none" %}<li id="quickLinksTwitterButton" class="nav-item"><a id="twitter_id" class="nav-icon" href="{{twitter_url}}" aria-label="Twitter" target="blank"><i class="{{icon_family}} {{icon_family}}-{{twitter_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_auth_manager_icon %}<li id="quickLinksSignInOutButton" class="nav-item" style="display: none;"><a class="nav-icon" id="navLinkSignInOut" aria-label="SignOut" href="#" data-bs-toggle="modal" data-bs-target="#{{signin_modal_id}}"><i id="iconSignInOut" class="{{icon_family}} {{icon_family}}-{{signin_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_cookieconsent_icon %}<li id="quickLinksCookieButton" class="nav-item" style="display: block;"><a href="#" aria-label="Cookie Consent"><i class="{{icon_family}} {{icon_family}}-{{cookies_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_quick_search_icon %}<li id="quickLinksSearchButton" class="nav-item search"><a class="nav-icon" href="#" aria-label="Search"><i class="{{icon_family}} {{icon_family}}-{{search_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_control_center_icon %}<li id="quickLinksControlCenterButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="{{control_center_url}}" aria-label="ControlCenter"><i class="{{icon_family}} {{icon_family}}-{{control_center_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_r_text_icon %}<li id="quickLinksRTextButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="#" aria-label="TextResizer" data-bs-toggle="modal" data-bs-target="#fluidModalRTextResizer"><i class="{{icon_family}} {{icon_family}}-{{r_text_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_google_translate_icon %}<li id="quickLinksTranslateButton" class="nav-item" style="display: block;"><a href="#" aria-label="Google Translate"><i class="{{icon_family}} {{icon_family}}-{{translate_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% comment %} Link buttons
+  ------------------------------------------------------------------------------ {% endcomment %}
+  {% if back_url != "none" %}<li id="quickLinksBackButton" class="nav-item"><a id="page_back_id" class="nav-icon" href="{{back_url}}" aria-label="{{back_label}}"><i class="{{icon_family}} {{icon_family}}-{{back_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if home_url != "none" %}<li id="quickLinksHomeButton" class="nav-item"><a id="home_id" class="nav-icon" href="{{home_url}}" aria-label="{{home_label}}"><i class="{{icon_family}} {{icon_family}}-{{home_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if disqus_url != "none" %}<li id="quickLinksDisqusButton" class="nav-item"><a id="disqus_id" class="nav-icon" href="{{disqus_url}}" aria-label="{{disqus_label}}" target="blank"><i class="nav-icon {{icon_family}} {{icon_family}}-{{disqus_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if github_url != "none" %}<li id="quickLinksGithubButton" class="nav-item"><a id="github_id" class="nav-icon" href="{{github_url}}" aria-label="{{github_label}}" target="blank"><i class="nav-icon {{icon_family}} {{icon_family}}-{{github_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if patreon_url != "none" %}<li id="quickLinksPatreonButton" class="nav-item"><a id="patreon_id" class="nav-icon" href="{{patreon_url}}" aria-label="{{patreon_label}}" target="blank"><i class="nav-icon {{icon_family}} {{icon_family}}-{{patreon_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if facebook_url != "none" %}<li id="quickLinksFacebookButton" class="nav-item"><a id="facebook_id" class="nav-icon" href="{{facebook_url}}" aria-label="{{facebook_label}}" target="blank"><i class="nav-icon {{icon_family}} {{icon_family}}-{{facebook_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if twitter_url != "none" %}<li id="quickLinksTwitterButton" class="nav-item"><a id="twitter_id" class="nav-icon" href="{{twitter_url}}" aria-label="{{twitter_label}}" target="blank"><i class="nav-icon {{icon_family}} {{icon_family}}-{{twitter_icon}} {{icon_size}}"></i></a></li>{% endif %}
+
+  {% comment %} Action buttons
+  ------------------------------------------------------------------------------ {% endcomment %}
+  {% if show_quicksearch_icon %}<li id="quickLinksSearchButton" class="nav-item {{quicksearch_action}}"><a class="nav-icon" href="#" aria-label="{{quicksearch_label}}"><i class="nav-icon {{icon_family}} {{icon_family}}-{{quicksearch_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_auth_manager_icon %}<li id="quickLinksSignInOutButton" class="nav-item sign-inout" style="display: none;"><a class="nav-icon" id="navLinkSignInOut" aria-label="SignOut" href="#" data-bs-toggle="modal" data-bs-target="#{{signin_modal_id}}"><i id="iconSignInOut" class="nav-icon {{icon_family}} {{icon_family}}-{{signin_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_cookieconsent_icon %}<li id="quickLinksCookieButton" class="nav-item {{cookies_action}}" style="display: block;"><a href="#" aria-label="{{cookies_label}}"><i class="nav-icon {{icon_family}} {{icon_family}}-{{cookies_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_r_text_icon %}<li id="quickLinksRTextButton" class="nav-item {{r_text_action}}" style="display: block;"><a class="nav-icon" href="#" aria-label="{{r_text_label}}" data-bs-toggle="modal" data-bs-target="#fluidModalRTextResizer"><i class="nav-icon {{icon_family}} {{icon_family}}-{{r_text_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_google_translate_icon %}<li id="quickLinksTranslateButton" class="nav-item {{translate_action}}" style="display: block;"><a href="#" aria-label="{{translate_label}}"><i class="nav-icon {{icon_family}} {{icon_family}}-{{translate_icon}} {{icon_size}}"></i></a></li>{% endif %}
 
   {% comment %} Unused
   --------------------------------------------------------------------------------
-  {% if show_translator_icon %}<li id="quickLinksLanguageButton" class="nav-item translator"><a class="nav-icon" href="#void" aria-label="Translator"><i class="{{icon_family}} {{icon_family}}-{{translator_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_google_translate_lang %}<li id="quickLinksTranslateLangButton" class="nav-item" style="display: block;"><a href="javascript:j1.translator.showDialog()" aria-label="Google Translate"><i class="flag-icon flag-icon-{{translate_lang}} rectangle size-md"></i></a></li>{% endif %}
+  {% if show_control_center_icon %}<li id="quickLinksControlCenterButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="{{control_center_url}}" aria-label="ControlCenter"><i class="{{icon_family}} {{icon_family}}-{{control_center_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_translator_icon %}<li id="quickLinksLanguageButton" class="nav-item translator"><a class="nav-icon" href="#void" aria-label="Translator"><i class="nav-icon {{icon_family}} {{icon_family}}-{{translator_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_google_translate_lang %}<li id="quickLinksTranslateLangButton" class="nav-item" style="display: block;"><a href="javascript:j1.translator.showDialog()" aria-label="Google Translate"><i class="nav-icon flag-icon flag-icon-{{translate_lang}} rectangle size-md"></i></a></li>{% endif %}
   -------------------------------------------------------------------------------- {% endcomment %}
 
 </ul>

data/assets/themes/j1/adapter/js/cookieConsent.js

@@ -190,10 +190,12 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
           logger.info('\n' + 'state: ' + _this.getState());
           logger.debug('\n' + 'module initialized successfully');
 
-          $('#quickLinksCookieButton').click(function(e) {
-            logger.info('\n' + 'call default action');
-            j1.cookieConsent.showDialog();
-          });
+          // Click events moved to Navigator (core)
+          //
+          // $('#quickLinksCookieButton').click(function(e) {
+          //   logger.info('\n' + 'call default action');
+          //   j1.cookieConsent.showDialog();
+          // });
 
           clearInterval(dependencies_met_page_ready);
         }
@@ -267,15 +269,18 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
         $('#quickLinksCookieButton').css('display', 'block');
       }
 
-      logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
-      j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
-      logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
-      gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
-
-      if (user_agent.includes('iPad'))  {
-        logger.warn('\n' + 'product detected : ' + platform.product);
-        logger.warn('\n' + 'skip deleting (unwanted) cookies for this platform');
-      }
+      // jadams, 2021-11-29: disabled additional logs to verify the existance
+      // of J1 and GA cookies (testing only)
+      //
+      // logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+      // j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+      // logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+      // gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
+      //
+      // if (user_agent.includes('iPad'))  {
+      //   logger.warn('\n' + 'product detected : ' + platform.product);
+      //   logger.warn('\n' + 'skip deleting (unwanted) cookies for this platform');
+      // }
 
       // Manage Google Analytics OptIn/Out
       // See: https://github.com/luciomartinez/gtag-opt-in/wiki

data/assets/themes/j1/adapter/js/j1.js

@@ -776,7 +776,7 @@ var j1 = (function () {
         }
       }  else {
         logText = '\n' + 'no banner found in site';
-        logger.warn(logText);
+        logger.debug(logText);
         return false;
       }
       return true;
@@ -879,7 +879,7 @@ var j1 = (function () {
         }
       } else {
         logText = '\n' + 'no panel found in site';
-        logger.warn(logText);
+        logger.debug(logText);
         return false;
       }
       return true;
@@ -931,7 +931,7 @@ var j1 = (function () {
         selector.load(footer_data_path, cb_load_closure(id));
       } else {
         logText = '\n' + 'data not loaded';
-        logger.warn(logText);
+        logger.debug(logText);
         j1.setXhrDataState(id, 'not loaded');
         j1.setXhrDomState(id, 'pending');
         return false;
@@ -1041,8 +1041,8 @@ var j1 = (function () {
           setTimeout (function() {
             // Manage providers for personalization OptIn/Out (Comments|Ads)
             if (!user_consent.personalization) {
-              logger.warn('\n' + 'disable comment provider: ' + comment_provider);
-              logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
+              logger.debug('\n' + 'disable comment provider: ' + comment_provider);
+              logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
               $('#leave-a-comment').remove();
               if (comment_provider === 'disqus') {
                 $('#dsq-count-scr').remove();
@@ -1079,7 +1079,7 @@ var j1 = (function () {
            // no dropcaps if translation enabled
            if (user_translate.translationEnabled) {
              logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
-             logger.warn('\n' + 'skipped processing of dropcaps');
+             logger.debug('\n' + 'skipped processing of dropcaps');
            } else {
              // initialize dropcaps
              logger.info('\n' + 'post processing: createDropCap');
@@ -1107,7 +1107,7 @@ var j1 = (function () {
                 logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
               }
             } else {
-              logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
+              logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
             }
 
             // show|hide cookie icon (should MOVED to Cookiebar ???)
@@ -1155,8 +1155,8 @@ var j1 = (function () {
             // for GDPR compliance, themes feature may disabled on
             // privacy settings
             if (!user_consent.personalization)  {
-              logger.warn('\n' + 'disable themes feature because of privacy settings');
-              logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
+              logger.debug('\n' + 'disable themes feature because of privacy settings');
+              logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
               $("#themes_menu").hide();
             } else {
               $("#themes_menu").show();
@@ -1198,8 +1198,8 @@ var j1 = (function () {
 
           // Manage providers for personalization OptIn/Out (Comments|Ads)
           if (!user_consent.personalization) {
-            logger.warn('\n' + 'disable comment provider: ' + comment_provider);
-            logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
+            logger.debug('\n' + 'disable comment provider: ' + comment_provider);
+            logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
             $('#leave-a-comment').remove();
             if (comment_provider === 'disqus') {
               $('#dsq-count-scr').remove();
@@ -1260,7 +1260,7 @@ var j1 = (function () {
           // no dropcaps if translation enabled
           if (user_translate.translationEnabled) {
             logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
-            logger.warn('\n' + 'skipped processing of dropcaps');
+            logger.debug('\n' + 'skipped processing of dropcaps');
           } else {
             // initialize dropcaps
             logger.info('\n' + 'post processing: createDropCap');
@@ -1289,7 +1289,7 @@ var j1 = (function () {
               logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
             }
           } else {
-            logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
+            logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
           }
 
           logger.info('\n' + 'mode detected: web');
@@ -1338,8 +1338,8 @@ var j1 = (function () {
           // for GDPR compliance, themes feature may disabled on
           // privacy settings
           if (!user_consent.personalization)  {
-            logger.warn('\n' + 'disable themes feature because of privacy settings');
-            logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
+            logger.debug('\n' + 'disable themes feature because of privacy settings');
+            logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
             $("#themes_menu").hide();
           } else {
             $("#themes_menu").show();
@@ -1594,7 +1594,7 @@ var j1 = (function () {
       if (options.xhr_data_element !== '') {
         logger.info('\n' + 'XHR data element found: ' + options.xhr_data_element);
       } else  {
-        logger.warn('\n' + 'no XHR data element found, loading data aborted');
+        logger.debug('\n' + 'no XHR data element found, loading data aborted');
         return;
       }
 
@@ -1626,7 +1626,7 @@ var j1 = (function () {
         // failsafe - prevent XHR load errors
         if (id != '#undefined') {
           logText = '\n' + 'data not loaded on id:' + id;
-          logger.warn(logText);
+          logger.debug(logText);
           j1.setXhrDataState(id, 'not loaded');
           j1.setXhrDomState(id, 'not loaded');
           // Set processing state to 'finished' to complete module load

data/assets/themes/j1/adapter/js/translator.js

@@ -98,7 +98,6 @@ j1.adapter['translator'] = (function (j1, window) {
   var secure;
   var logText;
   var cookie_written;
-  var modal_language;
   var navigator_language;
   var translation_language;
   var ddSourceLanguage;
@@ -171,7 +170,6 @@ j1.adapter['translator'] = (function (j1, window) {
       domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
       cookie_domain         = (domain.includes('.')) ? '.' + domain : domain;
       secure                = (url.protocol.includes('https')) ? true : false;
-      modal_language        = "{{site.language}}";
       navigator_language    = navigator.language || navigator.userLanguage;     // userLanguage for MS IE compatibility
       translation_language  = navigator_language.split('-')[0];
       cookie_names          = j1.getCookieNames();
@@ -270,6 +268,10 @@ j1.adapter['translator'] = (function (j1, window) {
             expires:  365
           });
 
+          if (moduleOptions.dialogLanguage === 'auto') {
+            moduleOptions.dialogLanguage = '{{contentLanguage}}';
+          }
+
           j1.translator = new Translator({
             contentURL:               moduleOptions.contentURL,                 // dialog content (modals) for all supported languages
             cookieName:               moduleOptions.cookieName,                 // the name of the User State Cookie (primary data)
@@ -302,10 +304,12 @@ j1.adapter['translator'] = (function (j1, window) {
             }
           }
 
-          $('#quickLinksTranslateButton').click(function(e) {
-            logger.info('\n' + 'call default action');
-            j1.translator.showDialog();
-          });
+          // Click events moved to Navigator (core)
+          //
+          // $('#quickLinksTranslateButton').click(function(e) {
+          //   logger.info('\n' + 'call default action');
+          //   j1.translator.showDialog();
+          // });
 
           _this.setState('finished');
           logger.info('\n' + 'state: ' + _this.getState());