j1-template 2022.0.5 → 2022.0.9

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

@@ -35,6 +35,9 @@ regenerate:                             true
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign cookie_defaults     = modules.defaults.cookies.defaults %}
+{% assign cookie_settings     = modules.cookies.settings %}
+
 {% assign translator_defaults = modules.defaults.translator.defaults %}
 {% assign translator_settings = modules.translator.settings %}
 {% assign tracking_enabled    = template_config.analytics.enabled %}
@@ -42,6 +45,7 @@ regenerate:                             true
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign translator_options  = translator_defaults | merge: translator_settings %}
+{% assign cookie_options      = cookie_defaults | merge: cookie_settings %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -94,7 +98,7 @@ j1.adapter['translator'] = (function (j1, window) {
   var baseUrl;
   var hostname;
   var domain;
-  var cookie_domain;
+  var cookie_option_domain;
   var secure;
   var logText;
   var cookie_written;
@@ -104,6 +108,7 @@ j1.adapter['translator'] = (function (j1, window) {
   var head;
   var script;
   var languageList;
+  var domainAttribute;
 
   // ---------------------------------------------------------------------------
   // helper functions
@@ -111,43 +116,58 @@ j1.adapter['translator'] = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // setCookie()
-  // writes a flat cookie (not using an encoded JSON string)
+  // writes a FLAT cookie (not using an encoded JSON string)
   // ---------------------------------------------------------------------------
-  function setCookie(options /*cName, cValue, expDays*/) {
-    var defaults = {};
-    var settings;
-    var document_cookie;
-    var stringifiedAttributes = '';
-
-    defaults = {
-        name: '',
-        path: '/',
-        expires: 0,
-        domain: 'localhost',
-        samesite: 'Strict',
-        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();
-    }
-
-    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;
-  };
+//   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;
+//       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;
+//   };
 
   // ---------------------------------------------------------------------------
   // Main object
@@ -168,7 +188,6 @@ j1.adapter['translator'] = (function (j1, window) {
       baseUrl               = url.origin;
       hostname              = url.hostname;
       domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-      cookie_domain         = (domain.includes('.')) ? '.' + domain : 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];
@@ -188,23 +207,8 @@ j1.adapter['translator'] = (function (j1, window) {
         'translationLanguage':      translation_language,
       };
 
-      // 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
-        });
-      }
-
       // initialize state flag
       _this.state = 'pending';
-      // _this.settings.languageList = '/assets/data/ms_select.json';
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -229,7 +233,32 @@ j1.adapter['translator'] = (function (j1, window) {
       // initializer
       // -----------------------------------------------------------------------
       var dependencies_met_page_ready = setInterval (function (options) {
-        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}}';
+
+        user_consent      = j1.readCookie(cookie_names.user_consent);
+
+        // set domain used by cookies
+        if (option_domain == 'auto') {
+          domainAttribute = domain ;
+        } else  {
+          domainAttribute = '';
+        }
+
+        // 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
+          });
+        }
 
         if ( j1.getState() === 'finished' ) {
           _this.setState('started');
@@ -257,16 +286,28 @@ j1.adapter['translator'] = (function (j1, window) {
             }
           }
 
-          // update user_translate cookie
-          user_translate.analysis         = user_consent.analysis;
-          user_translate.personalization  = user_consent.personalization;
-          cookie_written = j1.writeCookie({
-            name:     cookie_names.user_translate,
-            data:     user_translate,
-            samesite: 'Strict',
-            secure:   secure,
-            expires:  365
-          });
+          // load|set user translate cookie
+          user_consent = j1.readCookie(cookie_names.user_consent);
+          if (!user_consent.analysis || !user_consent.personalization) {
+            // disable translation service
+            user_translate.translationEnabled = false;
+            cookie_written = j1.writeCookie({
+              name:     cookie_names.user_translate,
+              data:     user_translate,
+              secure:   secure
+            });
+
+            // expire permanent cookie to session
+            j1.expireCookie({ name: 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,
+              secure:   secure,
+              expires:  365
+            });
+          }
 
           if (moduleOptions.dialogLanguage === 'auto') {
             moduleOptions.dialogLanguage = '{{contentLanguage}}';
@@ -274,7 +315,11 @@ j1.adapter['translator'] = (function (j1, window) {
 
           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)
+            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:             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)
             dialogContainerID:        moduleOptions.dialogContainerID,          // dest container, the dialog modal is loaded (dynamically)
@@ -288,7 +333,7 @@ j1.adapter['translator'] = (function (j1, window) {
           });
 
           // enable|disable translation (after callback)
-          if (user_consent.analysis && user_consent.personalization && user_translate.translationEnabled) {
+          if (user_translate.analysis && user_translate.personalization && user_translate.translationEnabled) {
             if (moduleOptions.translatorName === 'google') {
               head.appendChild(script);
               if ($('google_translate_element')) {
@@ -298,18 +343,15 @@ 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');
             }
           }
 
-          // Click events moved to Navigator (core)
-          //
-          // $('#quickLinksTranslateButton').click(function(e) {
-          //   logger.info('\n' + 'call default action');
-          //   j1.translator.showDialog();
-          // });
+          // -------------------------------------------------------------------
+          // NOTE: Click events moved to Navigator (core)
+          // -------------------------------------------------------------------
 
           _this.setState('finished');
           logger.info('\n' + 'state: ' + _this.getState());
@@ -376,36 +418,38 @@ j1.adapter['translator'] = (function (j1, window) {
 
     // -------------------------------------------------------------------------
     // cbGoogle()
-    // Called by the translator CORE module after the user made the
-    // selection for a translation|language
+    // Called by the translator CORE module after the user has made
+    // the selection for a translation|language
     // -------------------------------------------------------------------------
     cbGoogle: function () {
-      var logger         = log4javascript.getLogger('j1.adapter.translator.cbGoogle');
-      var cookie_names   = j1.getCookieNames();
-      var user_state     = j1.readCookie(cookie_names.user_state);
-      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 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 (cookie_option_domain == 'auto') {
+      //   domainAttribute = domain ;
+      // } else  {
+      //   // domainAttribute = hostname;
+      //   domainAttribute = '';
+      // }
 
       selectedTranslationLanguage = msDropdown.value;
       logger.info('\n' + 'selected translation language: ' + selectedTranslationLanguage);
 
-      // update cookie consent settings
-      user_consent.analysis         = user_translate.analysis;
-      user_consent.personalization  = user_translate.personalization;
-
-      cookie_written = j1.writeCookie({
-        name:     cookie_names.user_consent,
-        data:     user_consent,
-        samesite: 'Strict',
-        secure:   secure,
-        expires:  365
-      });
-
       // set content language
       if (moduleOptions.contentLanguage === 'auto') {
         srcLang = '{{contentLanguage}}';
@@ -415,7 +459,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);
@@ -426,11 +470,16 @@ 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');
 
-      // write the googtrans cookie w/o DOMAIN!
+      // -----------------------------------------------------------------------
+      // NOTE: googtrans cookie will be rewritten (by Google!?) for
+      // attributes 'SameSite' and 'Domain'. This results for 'SameSite'
+      // in an empty field and two cookies (host+domain) if domain option
+      // is enabled!!!
+      // -----------------------------------------------------------------------
       Cookies.set('googtrans', transCode);
 
       // reload current page (skip cache)

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

@@ -8557,6 +8557,12 @@ table tr.even, table tr.alt, table tr:nth-of-type(even) {
   color: #bdbdbd;
   border-bottom: 1px dotted #424242 !important; }
 
+.series-exerpt {
+  color: #e0e0e0; }
+
+.series-navigation ul li a {
+  background-color: #e0e0e0; }
+
 /*
  # -----------------------------------------------------------------------------
  # ~/100_template_css/scss/theme_uno_dark/extentions/_tags.scss