j1-template 2021.1.4 → 2021.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c90ad224441e01f362a466acfbc93a089fc9c1a91402b43fc8434476ffd433
-  data.tar.gz: 3e6110304061098be73fc59be51ab8356747e8d0c8acc965dc0609fd6934b0a2
+  metadata.gz: 0e93fb15ef56819b92a0d748c7e809c7381ac50e69868be5777ce21f01acf066
+  data.tar.gz: 2b710cb4d00181ee1b027fd6ea406a3e2c293a27cae544c3e72d5de055c43833
 SHA512:
-  metadata.gz: bc0aa9d6f7abe65be13a8d1f8568f259a66d9366ba54a5ba0ecf50f7ccb9b847e24310cb095d7d55a1ec1dc9c6344415c70143ec9a9e1264963c86edce03b8b4
-  data.tar.gz: 2a00b24f31e303fc2003ac5cb23b0715b203fcf377895cd13b67a9b8f3ee9c995f7baa0b1464120555d0ad38496b82ee25f49892b0e0c2c6be1261d96f598652
+  metadata.gz: 88e8c900a10010e9bc600663c22fb7b0f0b292ea71e3bc700022519c3929cdec359b5af9d07bdfafd970fafd70933548fcc819e808a34acfe0b97ddd9ee8485a
+  data.tar.gz: 4edee51b60f67d1066729ef1fce3e1106cd957e9f06fbfbcfbd232aa7bcedb7d173af6955a516f76b52724f22f4d194227826b59083cfe15c752c0ea86f6a624

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

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/procedures/provider/ad/google-adsense.html
- #  Support of Advertising Provider Google Adsense for J1 Template
+ #  Support of advertising provider Google Adsense for J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one
@@ -26,20 +26,6 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-<!-- Google Adsense -->
-<script data-ad-client="{{publisher_id}}"
-    async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
-</script>
-
-{% comment %} to be checked
---------------------------------------------------------------------------------
-<script data-ad-client="{{publisher_id}}"
-    async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
-</script>
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} to be checked
---------------------------------------------------------------------------------
 <script data-ad-client="{{publisher_id}}"
   $(document).ready(function() {
     var dependencies_met_page_finished = setInterval (function () {
@@ -49,6 +35,12 @@
       }
   }, 25); // END dependencies_met_page_finished
 </script>
+
+{% comment %} to be checked
+--------------------------------------------------------------------------------
+<script data-ad-client="{{publisher_id}}"
+    async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
+</script>
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Old Ads code

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

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/modules/connectors/analytic/google-analytics.html
- #  Support of Analytics Provider Google Analytics (V4) for J1 Template
+ #  Support of analytics provider Google Analytics for J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one
@@ -21,16 +21,20 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id }} %}
+{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-<!-- Google Analytics: provide global site tag (gtag.js) -->
+
+<!-- Google Analytics: load the GA library -->
 <script async src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>
-<script>
+<!-- Google Analytics: GA cookies disabled by default -->
+<!-- GA cookies disabled by default -->
+<!-- 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>
+</script-->

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

@@ -50,8 +50,8 @@
 {% assign navigator_defaults          = site.data.modules.defaults.navigator.defaults %}
 {% assign navigator_settings          = site.data.modules.navigator.settings %}
 
-{% assign cookiebar_defaults          = site.data.modules.defaults.cookiebar.defaults %}
-{% assign cookiebar_settings          = site.data.modules.cookiebar.settings %}
+{% assign consent_defaults            = site.data.modules.defaults.cookieconsent.defaults %}
+{% assign consent_settings            = site.data.modules.cookieconsent.settings %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}

data/_layouts/default.html

@@ -62,8 +62,6 @@ layout:                                 compress
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign cookiebar_settings  = modules.cookiebar.settings %}
-{% assign cookiebar_defaults  = modules.defaults.cookiebar.defaults %}
 
 {% comment %} Webhooks disabled
 --------------------------------------------------------------------------------
@@ -73,7 +71,6 @@ layout:                                 compress
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign cookiebar_options   = cookiebar_defaults | merge: cookiebar_settings %}
 {% assign tooltips_options    = template_config.bootstrap.tooltips %}
 {% assign popovers_options    = template_config.bootstrap.popovers %}
 
@@ -160,14 +157,14 @@ 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 %}
-  {% if cookiebar_options.enabled %}
-  <!-- [INFO   ] [j1.layout.default.html                ] [ place container for Cookiebar modals ] -->
-  <div id="{{cookiebar_options.xhr_container_id}}"></div>
-  {% endif %}
 
   {% comment %} Place container for WebHook modals
   ------------------------------------------------------------------------------ {% endcomment %}

data/assets/data/cookieconsent.html

@@ -0,0 +1,249 @@
+---
+regenerate:                             true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/data/cookieconsent.html
+ # Liquid PROCEDURE to generate the HTML (data) portion of all modals used
+ # by J1 Cookie Consent module
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #   liquid_var: {{ liquid_var | debug }}
+ #   config: {{ config | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment     = site.environment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign modules         = site.data.modules %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign consent_defaults = modules.defaults.cookieconsent.defaults %}
+{% assign consent_settings = modules.cookieconsent.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign consent_options  = consent_defaults | merge: consent_settings %}
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+
+{% comment %} Main
+================================================================================ {% endcomment %}
+<!-- [INFO   ] [j1.assets.data.cookiebar.html             ] [ set meta data (robots) to exclude HTML datafiles from index ] -->
+<head>
+  <meta name="robots" content="noindex, nofollow" />
+</head>
+
+{% comment %} Modal cookie consent dialog (default: en-EN)
+-------------------------------------------------------------------------------- {% endcomment %}
+<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>
+      </div>
+      <div class="modal-body">
+        <div class="bccs-body-text" style="font-size: 90%">
+          <p class="mb-4">{{consent_options.body_text.en}}</p>
+        </div>
+        <p>
+          <a href="#bccs-privacy" data-toggle="collapse" class="">Privacy Notice</a>
+          <a href="#bccs-options" data-toggle="collapse" class="float-right">Settings</a>
+        </p>
+
+        <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>
+          </div>
+        </div>
+
+        <div id="bccs-options" class="collapse">
+          <p class="tagline mt-4 mb-1"><b>Your settings</b></p>
+          <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-3"></div>
+
+          <div class="bccs-option" data-name="necessary">
+            <div class="switch">
+              <label>
+                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" disabled="" checked="">
+                <span class="bmd-switch-track"></span>
+                Necessary
+              </label>
+              <ul>
+                <li>Required to run the website</li>
+              </ul>
+            </div>
+          </div>
+          <div class="bccs-option" data-name="analyses">
+            <div class="switch">
+              <label>
+                <input id="bccs-checkboxAnalyses" type="checkbox" name="bccs-checkboxAnalyses" checked="">
+                <span class="bmd-switch-track"></span>
+                Analyses
+              </label>
+              <ul>
+                <li>Monitoring website usage</li>
+                <li>Optimizing the user experience</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="">
+                <span class="bmd-switch-track"></span>
+                Personalization
+              </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>
+              </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
+        </button>
+        <button id="bccs-buttonAgree" type="button" class="btn btn-primary btn-raised" style="">
+        Agree
+        </button>
+        <button id="bccs-buttonSave" type="button" class="btn btn-primary" style="display: none;">
+        Save selection
+        </button>
+        <button id="bccs-buttonAgreeAll" type="button" class="btn btn-primary btn-raised" style="display: none;">
+        Agree on all
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% comment %} END Modal cookie consent dialog (en-EN)
+-------------------------------------------------------------------------------- {% endcomment %}
+
+
+
+{% comment %} Modal cookie consent dialog (de-DE)
+-------------------------------------------------------------------------------- {% endcomment %}
+<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>
+      </div>
+      <div class="modal-body">
+        <div class="bccs-body-text" style="font-size: 90%">
+          <p class="mb-4">{{consent_options.body_text.de}}</p>
+        </div>
+        <p>
+          <a href="#bccs-privacy" data-toggle="collapse" class="">Datenschutzerklärung</a>
+          <a href="#bccs-options" data-toggle="collapse" class="float-right">Einstellungen</a>
+        </p>
+
+        <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>
+          </div>
+        </div>
+
+        <div id="bccs-options" class="collapse">
+          <p class="tagline mt-4 mb-1"><b>Ihre Einstellungen</b></p>
+          <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-3"></div>
+
+          <div class="bccs-option" data-name="necessary">
+            <div class="switch">
+              <label>
+                <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" disabled="" checked="">
+                <span class="bmd-switch-track"></span>
+                Notwendig
+              </label>
+              <ul>
+                <li>Zum Betrieb der Website erforderlich</li>
+              </ul>
+            </div>
+          </div>
+          <div class="bccs-option" data-name="analyses">
+            <div class="switch">
+              <label>
+                <input id="bccs-checkboxAnalyses" type="checkbox" name="bccs-checkboxAnalyses" checked="">
+                <span class="bmd-switch-track"></span>
+                Analysen
+              </label>
+              <ul>
+                <li>Beobachtung der Website-Nutzung</li>
+                <li>Optimierung der Benutzererfahrung</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="">
+                <span class="bmd-switch-track"></span>
+                Personalisierung
+              </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>
+              </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
+        </button>
+        <button id="bccs-buttonSave" type="button" class="btn btn-primary" style="display: none;">
+        Auswahl speichern
+        </button>
+        <button id="bccs-buttonAgreeAll" type="button" class="btn btn-primary btn-raised" style="display: none;">
+        Allen zustimmen
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+{% comment %} END Modal cookie consent dialog (de-DE)
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% endcapture %}
+
+{% if production %}
+  {% capture _LINE_FEED %}{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ cache | strip_html_comments }}{% else %}{% capture _content %}{{ cache | strip_html_comments }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ cache | strip_html_comments | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}
+{% else %}
+  {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

data/assets/data/quicklinks.html

@@ -33,13 +33,13 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign j1_config       = site.data.j1_config %}
+{% assign j1_config               = site.data.j1_config %}
 {% assign authentication_defaults = modules.defaults.authentication.defaults %}
 {% assign authentication_settings = modules.authentication.settings %}
 {% assign navigator_defaults      = modules.defaults.navigator.defaults %}
 {% assign navigator_settings      = modules.navigator.settings %}
-{% assign cookie_defaults         = modules.defaults.cookiebar.defaults %}
-{% assign cookie_settings         = modules.cookiebar.settings %}
+{% assign consent_defaults        = modules.defaults.cookieconsent.defaults %}
+{% assign consent_settings        = modules.cookieconsent.settings %}
 {% assign quick_search_defaults   = modules.defaults.quicksearch.defaults %}
 {% assign quick_search_settings   = modules.quicksearch.settings %}
 
@@ -61,7 +61,9 @@ regenerate:                             true
 {% assign authentication_options  = authentication_defaults | merge: authentication_settings %}
 {% assign quick_search_options    = quick_search_defaults | merge: quick_search_settings %}
 {% assign quicklinks_options      = nav_quicklinks_defaults | merge: nav_quicklinks_settings %}
-{% assign cookie_options          = cookie_defaults | merge: cookie_settings %}
+{% assign consent_options         = consent_defaults | merge: consent_settings %}
+
+consent_options: {{ consent_options | debug }}
 
 {% comment %} Control Center disabled
 --------------------------------------------------------------------------------
@@ -172,22 +174,22 @@ regenerate:                             true
 
 {% comment %} Show|Hide CookieConsent icon
 -------------------------------------------------------------------------------- {% endcomment %}
-{% if cookie_options.enabled %}
-  {% assign cookie_enabled = true %}
+{% if consent_options.enabled %}
+  {% assign consent_enabled = true %}
 {% else %}
-  {% assign cookie_enabled = false %}
+  {% assign consent_enabled = false %}
 {% endif %}
 
-{% if cookie_options.show_cookie_icon %}
-  {% assign cookie_icon_enabled  = true %}
+{% if consent_options.show_cookie_icon %}
+  {% assign consent_icon_enabled  = true %}
 {% else %}
-  {% assign cookie_icon_enabled = false %}
+  {% assign consent_icon_enabled = false %}
 {% endif %}
 
-{% if cookie_enabled and cookie_icon_enabled %}
-  {% assign show_cookiebar_icon = true %}
+{% if consent_enabled and consent_icon_enabled %}
+  {% assign show_cookieconsent_icon = true %}
 {% else %}
-  {% assign show_cookiebar_icon = false %}
+  {% assign show_cookieconsent_icon = false %}
 {% endif %}
 
 
@@ -218,8 +220,8 @@ regenerate:                             true
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [AuthManager detected as: {{ show_auth_manager_icon }}] -->
-<!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [CookieConsent detected as: {{ cookie_enabled }}] -->
-<!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [Show CookieConsent icon detected as: {{ show_cookiebar_icon }}] -->
+<!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [CookieConsent detected as: {{ consent_enabled }}] -->
+<!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [Show CookieConsent icon detected as: {{ show_cookieconsent_icon }}] -->
 <!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [Show ControlCenter icon detected as: {{ show_control_center_icon }}] -->
 <!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [Set icon familiy as: {{ icon_family }}] -->
 <!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [Set icon size as: {{ icon_size }}] -->
@@ -233,7 +235,7 @@ regenerate:                             true
   {% 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-toggle="modal" data-target="#{{signin_modal_id}}"><i id="iconSignInOut" class="{{icon_family}} {{icon_family}}-{{signin_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_cookiebar_icon %}<li id="quickLinksCookieButton" class="nav-item" style="display: none;"><a id="cookie-state" class="nav-icon" href="#" aria-label="Cookies" data-toggle="modal" data-target="#cookieRevokeCentralDanger"><i class="{{icon_family}} {{icon_family}}-{{cookies_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_cookieconsent_icon %}<li id="quickLinksCookieButton" class="nav-item" style="display: block;"><a href="javascript:j1.cookieConsent.showDialog()" aria-label="Cookie Consent"><i class="{{icon_family}} {{icon_family}}-{{cookies_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if show_translator_icon %}<li id="quickLinksLanguageButton" class="nav-item translator"><a class="nav-icon" href="#" aria-label="Translator"><i class="{{icon_family}} {{icon_family}}-{{translator_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 %}