j1-template 2022.0.8 → 2022.0.12

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

@@ -101,8 +101,7 @@ regenerate: true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-j1.adapter['mmenu'] = (function (j1, window) {
+j1.adapter.mmenu = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // globals
@@ -363,7 +362,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
                   logger.debug('\n' + 'hide|show the main nav menu');
                   // switch off|on the (main) nav menu
                   $('#' + navMenuOptions.nav_main_menu).toggle();
-                  $('#' + navMenuOptions.nav_quicklinks).toggle();                  
+                  $('#' + navMenuOptions.nav_quicklinks).toggle();
                 }
               });
 

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

@@ -148,8 +148,7 @@ ToDo: Remove configuration from j1_navigator.yml
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-j1.adapter['navigator'] = (function (j1, window) {
+j1.adapter.navigator = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // globals
@@ -400,11 +399,13 @@ j1.adapter['navigator'] = (function (j1, window) {
                     clearInterval(dependencies_met_page_finished);
                   }, 25);
                 }
-                _this.setState('initialized');
+//              _this.setState('initialized');
+                _this.setState('finished');
               }, 25); // END 'dependencies_met_page_finished'
             } else {
               logText = '\n' + 'theme switcher detected as: disabled';
               logger.info(logText);
+              _this.setState('finished');
             }
 
             // -----------------------------------------------------------------

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

@@ -73,10 +73,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['quicksearch'] = (function (j1, window) {
+j1.adapter.quicksearch = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -64,10 +64,7 @@ regenerate:                             false
 /* eslint quotes: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['rouge'] = (function (j1, window) {
+j1.adapter.rouge = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // globals
@@ -146,7 +143,7 @@ j1.adapter['rouge'] = (function (j1, window) {
       var dependencies_met_j1_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
          $('.dropdown-menu a').click(function(){
-            $('#selected').html("Current Selection: <div class='bg-primary mt-1 p-2'>"+$(this).text()+"</div>");
+            $('#selected-theme').html('Current selection: <div class="md-gray-900 mt-1 p-2" style="background-color: #BDBDBD; font-weight: 700;">' +$(this).text() + '</div>');
          });
           _this.setState('finished');
           logger.info('\n' + 'state: ' + _this.getState());

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

@@ -75,10 +75,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['rtable'] = (function (j1, window) {
+j1.adapter.rtable = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -89,10 +89,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['rtextResizer'] = (function (j1, window) {
+j1.adapter.rtextResizer = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -74,10 +74,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['scroller'] = (function (j1, window) {
+j1.adapter.scroller = (function (j1, window) {
 
 {% comment %} Set global variables
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -226,7 +223,7 @@ var lastPageInfo;
 
           clearInterval(dependencies_met_page_ready);
         }
-      });
+      }, 25);
       // END generate scrollers
     },
 

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

@@ -96,8 +96,8 @@ regenerate:                             true
 // -----------------------------------------------------------------------------
 
 'use strict';
+j1.adapter.themer = (function (j1, window) {
 
-j1.adapter['themer'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------

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

@@ -90,10 +90,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['toccer'] = (function () {
+j1.adapter.toccer = (function () {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -38,9 +38,11 @@ regenerate:                             true
 {% assign cookie_defaults     = modules.defaults.cookies.defaults %}
 {% assign cookie_settings     = modules.cookies.settings %}
 
+{% assign tracking_enabled    = modules.analytics.settings.enabled %}
+
 {% assign translator_defaults = modules.defaults.translator.defaults %}
 {% assign translator_settings = modules.translator.settings %}
-{% assign tracking_enabled    = template_config.analytics.enabled %}
+
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -81,9 +83,7 @@ regenerate:                             true
 // https://www.marghoobsuleman.com/image-dropdown/advanced-help
 'use strict';
 
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['translator'] = (function (j1, window) {
+j1.adapter.translator = (function (j1, window) {
 
   var environment       = '{{environment}}';
   var tracking_enabled  = ('{{tracking_enabled}}' === 'true') ? true: false;    // Analytics/GA enabled?
@@ -98,8 +98,7 @@ j1.adapter['translator'] = (function (j1, window) {
   var baseUrl;
   var hostname;
   var domain;
-  var cookie_domain;
-  var domain_enabled;
+  var cookie_option_domain;
   var secure;
   var logText;
   var cookie_written;
@@ -107,66 +106,10 @@ j1.adapter['translator'] = (function (j1, window) {
   var translation_language;
   var ddSourceLanguage;
   var head;
-  var script;
+  var gtTranslateScript;
+  var gtCallbackScript;
   var languageList;
-
-  // ---------------------------------------------------------------------------
-  // helper functions
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // setCookie()
-  // writes a FLAT cookie (not using an encoded JSON string)
-  // ---------------------------------------------------------------------------
-  function setCookie(options /*cName, cValue, expDays*/) {
-    var date            = new Date();
-    var timestamp_now   = date.toISOString()
-    var url             = new liteURL(window.location.href);
-    var baseUrl         = url.origin;;
-    var hostname        = url.hostname;
-    var domain          = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-    var domain_enabled  = '{{cookie_options.domain}}';
-    var defaults        = {};
-    var settings;
-    var document_cookie;
-    var stringifiedAttributes = '';
-
-    defaults = {
-        name: '',
-        path: '/',
-        expires: 0,
-        domain: true,
-        samesite: 'Lax',
-        http_only: false,
-        secure: false
-    };
-    settings = $.extend(defaults, options);
-
-    stringifiedAttributes += '; ' + 'path=' + settings.path;
-
-    if (settings.expires > 0) {
-      date.setTime(date.getTime() + (settings.expires * 24 * 60 * 60 * 1000));
-      stringifiedAttributes += '; ' + 'expires=' + date.toUTCString();
-    }
-
-    if (domain != hostname) {
-      settings.domain = domain_enabled ? '.' + domain : hostname;
-    } else {
-      settings.domain = hostname;
-    }
-    stringifiedAttributes += '; ' + 'domain=' + settings.domain;
-
-    stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
-
-    if (settings.secure) {
-      stringifiedAttributes += '; ' + 'secure=' + settings.secure;
-    }
-
-    // document_cookie = settings.name + '=' + settings.data  + '; path=' + settings.path + '; ' + 'domain=' + settings.domain + '; ' + 'SameSite=' + settings.samesite + ';';
-    document_cookie = settings.name + '=' + settings.data + stringifiedAttributes;
-
-    document.cookie = document_cookie;
-  };
+  var domainAttribute;
 
   // ---------------------------------------------------------------------------
   // Main object
@@ -187,15 +130,16 @@ j1.adapter['translator'] = (function (j1, window) {
       baseUrl               = url.origin;
       hostname              = url.hostname;
       domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-      domain_enabled        = '{{cookie_options.domain}}';
       secure                = (url.protocol.includes('https')) ? true : false;
       navigator_language    = navigator.language || navigator.userLanguage;     // userLanguage for MS IE compatibility
       translation_language  = navigator_language.split('-')[0];
       cookie_names          = j1.getCookieNames();
       head                  = document.getElementsByTagName('head')[0];
-      script                = document.createElement('script');
-      script.id             = 'google-translate';
-      script.src            = '//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit';
+      gtTranslateScript     = document.createElement('script');
+      gtTranslateScript.id  = 'gt-translate';
+      gtTranslateScript.src = '//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit';
+      gtCallbackScript      = document.createElement('script');
+      gtCallbackScript.id   = 'gt-callback';
 
       user_translate = {
         'translatorName':           'google',
@@ -229,33 +173,34 @@ j1.adapter['translator'] = (function (j1, window) {
         moduleOptions = j1.mergeData(moduleOptions, settings);
       }
 
+      // add GT callback script dynamically in the head section
+      // -----------------------------------------------------------------------
+      gtCallbackScript.text  = '\n';
+      gtCallbackScript.text += 'function googleTranslateElementInit() {' + '\n';
+      gtCallbackScript.text += '  var gtAPI = new google.translate.TranslateElement({' + '\n';
+      gtCallbackScript.text += '    pageLanguage: "{{translator_options.contentLanguage}}",' + '\n';
+      gtCallbackScript.text += '    layout:       google.translate.TranslateElement.FloatPosition.TOP_LEFT' + '\n';
+      gtCallbackScript.text += '  },' + '\n';
+      gtCallbackScript.text += '  "google_translate_element");' + '\n';
+      gtCallbackScript.text += '  j1.adapter.translator.postTranslateElementInit(gtAPI);' + '\n';
+      gtCallbackScript.text += '}' + '\n';
+      document.head.appendChild(gtCallbackScript);
+
       // -----------------------------------------------------------------------
       // initializer
       // -----------------------------------------------------------------------
       var dependencies_met_page_ready = setInterval (function (options) {
-        var expires   = '{{cookie_options.expires}}';
-        var same_site = '{{cookie_options.same_site}}';
-        user_consent    = j1.readCookie(cookie_names.user_consent);
+        var expires       = '{{cookie_options.expires}}';
+        var same_site     = '{{cookie_options.same_site}}';
+        var option_domain = '{{cookie_options.domain}}';
 
-        // set domain used by cookies
-        if (domain != hostname) {
-          cookie_domain = domain_enabled ? '.' + domain : hostname;
-        } else {
-          cookie_domain = hostname;
-        }
+        user_consent      = j1.readCookie(cookie_names.user_consent);
 
-        // load|initialize user translate cookie
-        if (j1.existsCookie(cookie_names.user_translate)) {
-          user_translate = j1.readCookie(cookie_names.user_translate);
-        } else {
-          logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
-          cookie_written = j1.writeCookie({
-            name:     cookie_names.user_translate,
-            data:     user_translate,
-            samesite: 'Strict',
-            secure:   secure,
-            expires:  365
-          });
+        // set domain used by cookies
+        if (option_domain == 'auto') {
+          domainAttribute = domain ;
+        } else  {
+          domainAttribute = '';
         }
 
         if ( j1.getState() === 'finished' ) {
@@ -263,6 +208,20 @@ j1.adapter['translator'] = (function (j1, window) {
           logger.info('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
+          // load|initialize user translate cookie
+          if (j1.existsCookie(cookie_names.user_translate)) {
+            user_translate = j1.readCookie(cookie_names.user_translate);
+          } else {
+            logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
+            cookie_written = j1.writeCookie({
+              name:     cookie_names.user_translate,
+              data:     user_translate,
+              samesite: same_site,
+              secure:   secure,
+              expires:  expires
+            });
+          }
+
           // hide the google translate element if exists
           if ($('google_translate_element')) {
             $('google_translate_element').hide();
@@ -285,7 +244,7 @@ j1.adapter['translator'] = (function (j1, window) {
           }
 
           // load|set user translate cookie
-          user_translate = j1.readCookie(cookie_names.user_translate);
+          user_consent = j1.readCookie(cookie_names.user_consent);
           if (!user_consent.analysis || !user_consent.personalization) {
             // disable translation service
             user_translate.translationEnabled = false;
@@ -316,7 +275,7 @@ j1.adapter['translator'] = (function (j1, window) {
             cookieName:               cookie_names.user_translate,              // name of the translator cookie
             cookieStorageDays:        expires,                                  // lifetime of a cookie [0..365], 0: session cookie
             cookieSameSite:           same_site,                                // restrict consent cookie
-            cookieDomain:             cookie_domain,                            // set domain (hostname|domain)
+            cookieDomain:             domainAttribute,                          // set domain (hostname|domain)
             cookieSecure:             secure,                                   // set
             cookieConsentName:        moduleOptions.cookieConsentName,          // the name of the Cookie Consent Cookie (secondary data)
             disableLanguageSelector:  moduleOptions.disableLanguageSelector,    // disable language dropdown for translation in dialog (modal)
@@ -333,7 +292,7 @@ j1.adapter['translator'] = (function (j1, window) {
           // enable|disable translation (after callback)
           if (user_translate.analysis && user_translate.personalization && user_translate.translationEnabled) {
             if (moduleOptions.translatorName === 'google') {
-              head.appendChild(script);
+              head.appendChild(gtTranslateScript);
               if ($('google_translate_element')) {
                 $('google_translate_element').hide();
               }
@@ -341,7 +300,7 @@ j1.adapter['translator'] = (function (j1, window) {
           } else {
             if (moduleOptions.translatorName === 'google') {
               // remove all googtrans cookies that POTENTIALLY exists
-              Cookies.remove('googtrans', { domain: cookie_domain });
+              Cookies.remove('googtrans', { domain: domainAttribute });
               Cookies.remove('googtrans', { domain: hostname });
               Cookies.remove('googtrans');
             }
@@ -357,7 +316,7 @@ j1.adapter['translator'] = (function (j1, window) {
 
           clearInterval(dependencies_met_page_ready);
         }
-      });
+      }, 25);
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -420,30 +379,30 @@ j1.adapter['translator'] = (function (j1, window) {
     // the selection for a translation|language
     // -------------------------------------------------------------------------
     cbGoogle: function () {
-      var logger         = log4javascript.getLogger('j1.adapter.translator.cbGoogle');
-      var cookie_names   = j1.getCookieNames();
-      var user_consent   = j1.readCookie(cookie_names.user_consent);
-      var user_translate = j1.readCookie(cookie_names.user_translate);
-      var msDropdown     = document.getElementById('dropdownJSON').msDropdown;
-      var url            = new liteURL(window.location.href);
-      var baseUrl        = url.origin;;
-      var hostname       = url.hostname;
-      var domain         = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-      var domain_enabled = '{{cookie_options.domain}}';
-      var same_site      = '{{cookie_options.same_site}}';
-
-      var selectedTranslationLanguage;
+      var logger                = log4javascript.getLogger('j1.adapter.translator.cbGoogle');
+      var msDropdown            = document.getElementById('dropdownJSON').msDropdown;
+//    var cookie_names          = j1.getCookieNames();
+//    var user_consent          = j1.readCookie(cookie_names.user_consent);
+//    var user_translate        = j1.readCookie(cookie_names.user_translate);
+//    var url                   = new liteURL(window.location.href);
+//    var baseUrl               = url.origin;;
+//    var hostname              = url.hostname;
+//    var domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+//    var cookie_option_domain  = '{{cookie_options.domain}}';
+//    var same_site             = '{{cookie_options.same_site}}';
       var srcLang;
       var destLang;
       var transCode;
-
+      var domainAttribute;
+      var selectedTranslationLanguage;
 
       // set domain used by cookies
-      if (domain != hostname) {
-        cookie_domain = domain_enabled ? '.' + domain : hostname;
-      } else {
-        cookie_domain = hostname;
-      }
+      // if (cookie_option_domain == 'auto') {
+      //   domainAttribute = domain ;
+      // } else  {
+      //   // domainAttribute = hostname;
+      //   domainAttribute = '';
+      // }
 
       selectedTranslationLanguage = msDropdown.value;
       logger.info('\n' + 'selected translation language: ' + selectedTranslationLanguage);
@@ -457,7 +416,7 @@ j1.adapter['translator'] = (function (j1, window) {
 
       // translation language MUST be DIFFERENT from content language
       if (srcLang == selectedTranslationLanguage ) {
-        Cookies.remove('googtrans', { domain: cookie_domain });
+        Cookies.remove('googtrans', { domain: domainAttribute });
         Cookies.remove('googtrans', { domain: hostname });
         Cookies.remove('googtrans');
         location.reload(true);
@@ -468,21 +427,17 @@ j1.adapter['translator'] = (function (j1, window) {
       transCode = '/' + srcLang + '/' + selectedTranslationLanguage;
 
       // remove all googtrans cookies that POTENTIALLY exists
-      Cookies.remove('googtrans', { domain: cookie_domain });
+      Cookies.remove('googtrans', { domain: domainAttribute });
       Cookies.remove('googtrans', { domain: hostname });
       Cookies.remove('googtrans');
 
       // -----------------------------------------------------------------------
       // NOTE: googtrans cookie will be rewritten (by Google!?) for
-      // attributes 'SameSite' and potentially 'Domain'. This results
-      // for 'SameSite' in an empty field!
+      // attributes 'SameSite' and 'Domain'. This results for 'SameSite'
+      // in an empty field and two cookies (host+domain) if domain option
+      // is enabled!!!
       // -----------------------------------------------------------------------
-
-      // write the googtrans cookie (w/o DOMAIN?!)
-      Cookies.set('googtrans', transCode, {
-        Domain:    cookie_domain,
-        sameSite:  'Lax'
-      });
+      Cookies.set('googtrans', transCode);
 
       // reload current page (skip cache)
       location.reload(true);

data/assets/themes/j1/core/css/themes/unolight/bootstrap.css

@@ -19278,6 +19278,12 @@ a.timeline-list-unstyled:hover {
 .hide {
   display: none; }
 
+.border--solid {
+  border: 1px solid #616161; }
+
+.border--dotted {
+  border: 1px dotted #616161; }
+
 .g-color-white-opacity-0_6, .g-color-white-opacity-0_6--hover:hover {
   color: rgba(255, 255, 255, 0.6) !important; }