j1-template 2021.2.2 → 2021.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f7e03f8152b50d85ea0e9f0b046f35d0365971641373276ef4e7d66ee27a209
-  data.tar.gz: b925f2e885a906d8b7cda24cc49015d017fbf0eedb11d65b6f5361bf04a2f49a
+  metadata.gz: '028fe3d1a65d64d6219d163c9e489f63d482d48353f9e81a94d2779d3beffb58'
+  data.tar.gz: 35904d19f59636e14caaab87a0ca634fe4a1f4ac4b472434fe9f89bacf64d295
 SHA512:
-  metadata.gz: 4f3ce8cdca39ad83576131a23c280f7f44a9d952dbc99802d395d0225dd3ebd59eab0001ff15c473fa69a554cfc31e59a9fd102da3b62c006028037dea3bd519
-  data.tar.gz: d0fd423cb26fb97bb385390a20e834711fb2aeea64b2cf3bfc844006a9edc3960c0901bea53ce18832a36a1925fa788ce86ea45fe646d1a9a5be4da41b7cbfb7
+  metadata.gz: 1f091e1530a0efef1f34d3ee2bfae8d8d50f9fa8380ac1b4e7a2bfdb31b996cfeee6d87f8f51805b0f41f23ea3e3c20d2e22de4b1b7d1e2753f945fa9989187d
+  data.tar.gz: 5421e440efcdb3633a4233b449f32dbf21a23031a08b75a4ba8135eaa0bbe68e57a3cf510bcaf888140895ed371665f4183d03021c5a93365c1224204ac64d8c

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

@@ -60,7 +60,12 @@
 
 {% if template_config.translation.enabled %}
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ add google translator meta tag to enable customized translations ] -->
-<meta name="google-translate-customization" />
+<meta name="translation" content="enabled" />
+{% endif %}
+
+{% if template_config.translation.google %}
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ add google translator meta tag to enable customized translations ] -->
+<meta name="{{template_config.translation.google.meta_data}}" content="enabled" />
 {% endif %}
 
 {% if page.layout == 'home' %}

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

@@ -26,6 +26,12 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
+<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}}"
   $(document).ready(function() {
     var dependencies_met_page_finished = setInterval (function () {
@@ -35,6 +41,7 @@
       }
   }, 25); // END dependencies_met_page_finished
 </script>
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} to be checked
 --------------------------------------------------------------------------------

data/_includes/themes/j1/modules/connectors/translators/google-translator.html

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/modules/connectors/translators/google-translator.html
- #  Support of multiple languages by Google Translator for J1 Template
+ #  Connector for the Google Translator
  #
  #  Product/Info:
  #  http://jekyll.one
@@ -25,25 +25,13 @@
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- Google Translator, NOT shown by default -->
-<div id="google_translate_element" class="ml-5 mr-5 mb-4" style="display: none;"></div>
-
-  <script type="text/javascript">
-    var logger;
-    
-    function googleTranslateElementInit() {
-      logger = log4javascript.getLogger('j1.translator');
-      logger.info('initialize translator: google');
-      //includedLanguages: 'de,fr,es',
-      //layout: google.translate.TranslateElement.InlineLayout.SIMPLE
-      new google.translate.TranslateElement({
-        pageLanguage: 'en'        
-      }, 
-      'google_translate_element');
-    }
-  </script>
-    
-  <script type="text/javascript"
-    src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit">
-  </script>
-
+<!-- [INFO   ] [j1.modules.connectors.translation     ] [ place callback for the Google Translator API ] -->
+<script>
+  function googleTranslateElementInit() {
+    new google.translate.TranslateElement({
+      pageLanguage: 'en',
+      layout: google.translate.TranslateElement.FloatPosition.TOP_LEFT
+    },
+    'google_translate_element');
+  }
+</script>

data/_layouts/default.html

@@ -188,7 +188,6 @@ layout:                                 compress
           <meta charset="utf-8" />
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1" />
-          <meta name="robots" content="noindex, nofollow">
           <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}" />
           <title>{{title}} · {{http_error}}</title>
           <style> .my { margin-top: 8.5rem !important;} </style>
@@ -212,16 +211,6 @@ layout:                                 compress
 
   </body>
 
-  {% comment %} Place|Initialize module components
-  ------------------------------------------------------------------------------
-  NOTE: xhr_container should be DYNAMICALLY placed by
-        the module using it !!!
-        Example CookieConsent
-  ------------------------------------------------------------------------------ {% endcomment %}
-
-  {% comment %} Place container for Cookiebar modals
-  ------------------------------------------------------------------------------ {% endcomment %}
-
   {% comment %} Place container for WebHook modals
   ------------------------------------------------------------------------------ {% endcomment %}
   {% if webhook_options.enabled %}
@@ -234,11 +223,14 @@ layout:                                 compress
   <!-- [INFO   ] [j1.layout.default.html                ] [ place container for the r-text resizer modal ] -->
   <div id="rtext_resizer_container"></div>
 
-  {% comment %} Initialize Tooltips|Popovers
+  {% comment %} Initialize global JS scripts
   ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize BS tooltips|popovers ] -->
+  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize global JS scripts ] -->
   <script>
     $(function() {
+    {% comment %} BS tooltips and popovers
+    ---------------------------------------------------------------------------- {% endcomment %}
+    // initialize BS tooltips and popovers
     {% if tooltips_options.enabled %}
       $('[data-toggle="tooltip"').tooltip({
         trigger: '{{tooltips_options.trigger}}'
@@ -249,25 +241,39 @@ layout:                                 compress
         trigger: '{{popovers_options.trigger}}'
       });
     {% endif %}
-    });
-  </script>
 
-  {% comment %} Initialize Window History (back on <ESC>)
-  ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize window.history.back ] -->
-  <script>
-  // Redirect on KEY <ESC>
-  window.onkeyup = function (e)
-  {
-   if (e.keyCode == 27) window.history.back();
-  }
+    {% comment %} Update cookie for lastpage
+    ---------------------------------------------------------------------------- {% endcomment %}
+      // save the current page to userstate cookie
+      var dependencies_met_page_ready = setInterval (function (options) {
+        if (j1.getState() === 'finished') {
+          var logger = log4javascript.getLogger('j1.layout.default');
+
+          function setLastPage() {
+            var cookie_names                = j1.getCookieNames();
+            const user_state_cookie_name    = cookie_names.user_session;
+            var user_state                  = j1.readCookie(user_state_cookie_name);
+            var user_state_last_page        = window.location.pathname;
+            user_state.last_page            = user_state_last_page;
+
+            j1.writeCookie({
+              name: user_state_cookie_name,
+              data: user_state,
+              samesite: 'Strict'
+            });
+            logger.debug('\n' + 'saved current page to cookie :' + user_state_last_page);
+          }
+          setLastPage();
+          clearInterval(dependencies_met_page_ready);
+        }
+      });
+    });
   </script>
   <!-- [INFO   ] [j1.layout.default.html                ] [ end page processing ] -->
 </html>
 
 {% endcapture %}
 
-
 {% comment %} POST processing of the generated page using (captured) cache
 -------------------------------------------------------------------------------- {% endcomment %}
 {% case environment %}
@@ -281,7 +287,6 @@ layout:                                 compress
       {{ j1_cache | strip_empty_lines | remove: '<p>excerpt__end</p>' }}
     {% endif %} {% comment %} END prettify {% endcomment %}
 
-
   {% comment %} PRODUCTION mode
   ------------------------------------------------------------------------------ {% endcomment %}
   {% when 'production' or 'prod' %}

data/assets/data/cookieconsent.html

@@ -69,12 +69,14 @@ exclude_from_search:                    true
 <div id="consent-data-en">
   <div id="modal-consent-en" class="modal-dialog modal-frame modal-top modal-notify modal-primary" role="document">
     <div class="modal-content">
+
       <div class="modal-header">
-        <p class="lead">{{consent_options.consent_modal_title.en}}</p>
+        <p class="lead">{{consent_options.modal_settings.title.en}}</p>
       </div>
+
       <div class="modal-body">
         <div class="bccs-body-text" style="font-size: 90%">
-          <p class="mb-4">{{consent_options.body_text.en}}</p>
+          <p class="mb-4">{{consent_options.modal_settings.body_text.en}}</p>
         </div>
         <p>
           <a href="#bccs-privacy" data-toggle="collapse" class="">Privacy Notice</a>
@@ -83,7 +85,7 @@ exclude_from_search:                    true
 
         <div id="bccs-privacy" class="collapse">
           <div class="bccs-body-text" style="font-size: 90%">
-            <p class="mb-4">{{consent_options.privacy_notice.en}}</p>
+            <p class="mb-4">{{consent_options.modal_settings.privacy_notice.en}}</p>
           </div>
         </div>
 
@@ -94,50 +96,52 @@ exclude_from_search:                    true
           <div class="bccs-option" data-name="necessary">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" disabled="" checked="">
+                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" checked="true" disabled>
                 <span class="bmd-switch-track"></span>
-                Necessary
+                Necessary (Session Cookies)
               </label>
               <ul>
                 <li>Required to run the website</li>
               </ul>
             </div>
           </div>
-          <div class="bccs-option" data-name="analyses">
+          <div class="bccs-option" data-name="analysis">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxAnalyses" type="checkbox" name="bccs-checkboxAnalyses" checked="">
+                <input id="bccs-checkboxAnalysis" type="checkbox" name="bccs-checkboxAnalysis" checked="true">
                 <span class="bmd-switch-track"></span>
-                Analyses
+                Analysis (Persistent Cookies)
               </label>
               <ul>
-                <li>Monitoring website usage</li>
-                <li>Optimizing the user experience</li>
+                <li>Usage monitoring for this site</li>
+                <li>Optimizing of the performance for this site</li>
+                <li>Optimizing of content for all visitors</li>
               </ul>
             </div>
           </div>
           <div class="bccs-option" data-name="personalization">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxPersonalization" type="checkbox"  name="bccs-checkboxPersonalization" checked="">
+                <input id="bccs-checkboxPersonalization" type="checkbox"  name="bccs-checkboxPersonalization" checked="true">
                 <span class="bmd-switch-track"></span>
-                Personalization
+                Personalization (Persistent Cookies)
               </label>
               <ul>
-                <li>Storage of your preferences from previous visits</li>
-                <li>Collecting user feedback to improve our website</li>
-                <li>Recording of your interests in order to provide customised content and offers</li>
+                <li>Collect user feedback for improvements</li>
+                <li>Storage of personal preferences from previous visits</li>
+                <li>Translation or comments to exchange visitor's experiences</li>
               </ul>
             </div>
           </div>
         </div>
       </div>
+
       <div class="modal-footer">
         <button id="bccs-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="">
-        I do not agree
+        I do not Agree
         </button>
         <button id="bccs-buttonAgree" type="button" class="btn btn-primary btn-raised" style="">
-        Agree
+        I Agree
         </button>
         <button id="bccs-buttonSave" type="button" class="btn btn-primary" style="display: none;">
         Save selection
@@ -146,6 +150,7 @@ exclude_from_search:                    true
         Agree on all
         </button>
       </div>
+
     </div>
   </div>
 </div>
@@ -158,12 +163,14 @@ exclude_from_search:                    true
 <div id="consent-data-de">
   <div id="modal-consent-de" class="modal-dialog modal-frame modal-top modal-notify modal-primary" role="document">
     <div class="modal-content">
+
       <div class="modal-header">
-        <p class="lead">{{consent_options.consent_modal_title.de}}</p>
+        <p class="lead">{{consent_options.modal_settings.title.de}}</p>
       </div>
+
       <div class="modal-body">
         <div class="bccs-body-text" style="font-size: 90%">
-          <p class="mb-4">{{consent_options.body_text.de}}</p>
+          <p class="mb-4">{{consent_options.modal_settings.body_text.de}}</p>
         </div>
         <p>
           <a href="#bccs-privacy" data-toggle="collapse" class="">Datenschutzerklärung</a>
@@ -172,7 +179,7 @@ exclude_from_search:                    true
 
         <div id="bccs-privacy" class="collapse">
           <div class="bccs-body-text" style="font-size: 90%">
-            <p class="mb-4">{{consent_options.privacy_notice.de}}</p>
+            <p class="mb-4">{{consent_options.modal_settings.privacy_notice.de}}</p>
           </div>
         </div>
 
@@ -183,50 +190,52 @@ exclude_from_search:                    true
           <div class="bccs-option" data-name="necessary">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" disabled="" checked="">
+                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" checked="true" disabled>
                 <span class="bmd-switch-track"></span>
-                Notwendig
+                Notwendig (Sitzungscookies)
               </label>
               <ul>
                 <li>Zum Betrieb der Website erforderlich</li>
               </ul>
             </div>
           </div>
-          <div class="bccs-option" data-name="analyses">
+          <div class="bccs-option" data-name="analysis">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxAnalyses" type="checkbox" name="bccs-checkboxAnalyses" checked="">
+                <input id="bccs-checkboxAnalysis" type="checkbox" name="bccs-checkboxAnalysis" checked="true">
                 <span class="bmd-switch-track"></span>
-                Analysen
+                Analysen (dauerhafte Cookies)
               </label>
               <ul>
-                <li>Beobachtung der Website-Nutzung</li>
-                <li>Optimierung der Benutzererfahrung</li>
+                <li>Nutzungsüberwachung für diese Website</li>
+                <li>Optimierung der Leistung für diese Website</li>
+                <li>Optimierung des Inhalts für alle Besucher</li>
               </ul>
             </div>
           </div>
           <div class="bccs-option" data-name="personalization">
             <div class="switch">
               <label>
-                <input id="bccs-checkboxPersonalization" type="checkbox"  name="bccs-checkboxPersonalization" checked="">
+                <input id="bccs-checkboxPersonalization" type="checkbox"  name="bccs-checkboxPersonalization" checked="true">
                 <span class="bmd-switch-track"></span>
-                Personalisierung
+                Personalisierung (dauerhafte Cookies)
               </label>
               <ul>
-                <li>Speicherung Ihrer Präfererenzen aus frühreren Besuchen</li>
-                <li>Sammeln von Benutzer-Feedback zur Verbesserung unserer Website</li>
-                <li>Erfassung Ihrer Interessen, um maßgeschneiderte Inhalte und Angebote anzubieten</li>
+                <li>Sammeln von Benutzer-Feedback für Verbesserungen</li>
+                <li>Speicherung Ihrer Präferenzen aus frühreren Besuchen</li>
+                <li>Übersetzungen oder Kommentare zum Austausch von Erfahrungen der Besucher</li>
               </ul>
             </div>
           </div>
         </div>
       </div>
+
       <div class="modal-footer">
         <button id="bccs-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="">
         Ich bin nicht einverstanden
         </button>
         <button id="bccs-buttonAgree" type="button" class="btn btn-primary btn-raised" style="">
-        Einverstanden
+        Ich bin Einverstanden
         </button>
         <button id="bccs-buttonSave" type="button" class="btn btn-primary" style="display: none;">
         Auswahl speichern
@@ -235,6 +244,7 @@ exclude_from_search:                    true
         Allen zustimmen
         </button>
       </div>
+
     </div>
   </div>
 </div>