assets/data/quicklinks.html in j1-template-2021.1.4 vs assets/data/quicklinks.html in j1-template-2021.1.5
- old
+ new
@@ -31,17 +31,17 @@
{% assign apps = site.data.apps %}
{% assign modules = site.data.modules %}
{% 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 %}
{% comment %} Control Center disabled
--------------------------------------------------------------------------------
@@ -59,12 +59,14 @@
{% comment %} Set config options
-------------------------------------------------------------------------------- {% endcomment %}
{% 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
--------------------------------------------------------------------------------
{% assign cc_app_config_options = cc_app_config_defaults | merge: cc_app_config_settings %}
-------------------------------------------------------------------------------- {% endcomment %}
@@ -170,26 +172,26 @@
{% assign show_r_text_icon = false %}
{% endif %}
{% 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 %}
{% comment %} Select icon family and size (color set dynamically by adapter)
-------------------------------------------------------------------------------- {% endcomment %}
@@ -216,12 +218,12 @@
</head>
{% 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 }}] -->
<ul id="{{quicklinks_options.xhr_data_element}}" class="navbar-nav">
@@ -231,10 +233,10 @@
{% 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-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 %}
{% 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-toggle="modal" data-target="#fluidModalRTextResizer"><i class="{{icon_family}} {{icon_family}}-{{r_text_icon}} {{icon_size}}"></i></a></li>{% endif %}
</ul>