j1-template 2023.0.12 → 2023.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca117550c5eef6203d3cbdc1932b7b1a2bac40091b40576845ef6a07e47b3823
-  data.tar.gz: 9e69e677e87008c9d60ef02cc9b1db7bf21936f229a1283f2eaaa5ef8d26a8c1
+  metadata.gz: d0d5cb7aeb15733944dff7b5d830e913c156fdf7cc515f3101153ec65665dbec
+  data.tar.gz: f9de89b7fcea2a7360fdd69666b945ccfa5fecd8fb00d1c29c30253c6a9b46bf
 SHA512:
-  metadata.gz: 0c3462a0e131c857028030f9660a4bd13086922f541293709a2f4a4af8ac32724ec15330598a2617a9288d12b017a2990bac0f68137f2a7b382ac0c196e3679d
-  data.tar.gz: 3753407ca6b0ffcc7fd472aa80ce82cdc9451397592240728351163b91c2eac9c1d2a874f88dd2058a6c28c76a30340934f814af2e4d85e0b88108715d3721ad
+  metadata.gz: 1979b9be4e118573f4c23cdd2d3cf2133dbcdbb4df75d2cc4fda37456d8ea7f7c41b65d0b3fdf8b44462e088624dd81451cf9d203d077bc9c95df36c2f2da47c
+  data.tar.gz: 207b6680b87bd6eb2935796379fa36ca67f0c85bc897e96b5f594c2e8b792c9ebd604b235bab579bc3c691119fbec105cd4649562d1e7d83be5b63a3401a1cad

data/_includes/themes/j1/modules/searcher/procedures/topsearch.proc

@@ -95,9 +95,9 @@
 
       <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
 
-        <!-- Content -->
+        <!-- MODAL Content -->
         <div class="modal-content">
-          <!-- Body -->
+          <!-- MODAL Body -->
           <div class="modal-body">
             <div id="navigator_nav_topsearch" class="top-search ml-4 mr-4">
               <div class="bmd-form-group">
@@ -105,7 +105,7 @@
                   <span class="input-group-addon"><i class="mdi mdi-magnify mdi-2x mb-2" style="color:#9E9E9E"></i></span>
                   <input id="search-query" type="text" name="q" placeholder="Your search expression" autocomplete="off" class="form-control">
                   <span id="clear-topsearch" class="form-clear form-clear-searcher d-none" style="margin-top: 0.75rem"> <i class="mdi mdi-format-clear mdi-2x" style="color:#9E9E9E"></i> </span>
-                  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" style="margin-top: 24px;"></button>
                 </div>
               </div>
               <!-- [INFO   ] [~/assets/data/top_search_modal.html                    ] [ place: results container ] -->
@@ -115,7 +115,7 @@
             </div>
           </div>
         </div>
-        <!-- END Content -->
+        <!-- END MODAL Content -->
 
       </div>
     </div>

data/assets/data/banner.html

@@ -162,7 +162,8 @@ exclude_from_search:                    true
         {% assign banner_options = banner_config_defaults.teaser | merge: banner_settings %}
         {% if debug %}<!-- banner_options:  {{banner_options}} -->{% endif %}
 
-        <section id="{{banner_settings.id}}">
+        <!-- section id="teaser_{{banner_settings.id}}" -->
+        <div id="{{banner_settings.id}}_content">
 
           {% if wave_properties.top.enabled %}
             {{banner_wave_top}}
@@ -258,8 +259,8 @@ exclude_from_search:                    true
                 		<img
                 			class="sticker-image"
                 			src="/assets/images/sticker/600x600/sticker-new-version.png"
-                			alt="Get new version 2023.0.12"
-                			title="Get new version 2023.0.12"
+                			alt="Get new version 2023.0.14"
+                			title="Get new version 2023.0.14"
                 			style="width: 140px; height: 120px;"
                 		>
                   </a>
@@ -312,7 +313,7 @@ exclude_from_search:                    true
             {{banner_wave_bottom}}
           {% endif %}
 
-        </section> <!-- End banner {{ id }} -->
+        </div> <!-- End banner {{ id }} -->
 
         {% comment %} Reset element variables (already processed)
         ------------------------------------------------------------------------ {% endcomment %}
@@ -328,10 +329,10 @@ exclude_from_search:                    true
 
         {% comment %} Set image banner DEFAULTS
         gridifier:  {{ gridifier | debug }}
-        ------------------------------------------------------------------ {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
         {% assign gridifier = image_options.gridifier %}
 
-        <div id="{{banner_settings.id}}" class="{{banner_settings.properties}}">
+        <div id="{{banner_settings.id}}_content" class="{{banner_settings.properties}}">
         {% assign banner_options = banner_config_defaults.image | merge: banner_settings %}
         {% if debug %}<!-- banner_options:  {{banner_options}} -->{% endif %}
 
@@ -383,7 +384,7 @@ exclude_from_search:                    true
         {% comment %} Collect PARALLAX banner
         ------------------------------------------------------------------------ {% endcomment %}
         {% when 'parallax' %}
-        <div id="{{banner_settings.id}}" class="parallax">
+        <div id="{{banner_settings.id}}_content" class="parallax">
         {% assign banner_options = banner_config_defaults.parallax | merge: banner_settings %}
         {% if debug %}<!-- banner_options:  {{banner_options}} -->{% endif %}
 

data/assets/data/panel.html

@@ -47,14 +47,19 @@ exclude_from_search:                    true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign template_config           = site.data.j1_config %}
 {% assign blocks                    = site.data.blocks %}
+{% assign modules                   = site.data.modules %}
+
 {% assign panel_config_defaults     = blocks.defaults.panel %}
 {% assign panel_config_settings     = blocks.panel %}
+{% assign scroller_config_settings  = modules.scroller.settings %}
+{% assign scroller_config_scrollers = scroller_config_settings.scrollers %}
 {% assign bs_config                 = template_config.bootstrap %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign panel_config_defaults     = panel_config_defaults.defaults %}
 {% assign panel_config_settings     = panel_config_settings.settings %}
+{% assign scroller_config_settings  = panel_config_defaults.defaults %}
 {% assign bs_card_deck              = bs_config.cards.card_deck %}
 
 {% comment %} Set config options
@@ -109,6 +114,7 @@ exclude_from_search:                    true
   {% assign production = true %}
 {% endif %}
 
+
 {% comment %} Main
 ================================================================================ {% endcomment %}
 <!-- [INFO   ] [~/assets/data/panel.html              ] [ set meta data (robots) to exclude HTML datafiles from index ] -->
@@ -214,7 +220,7 @@ exclude_from_search:                    true
         {% if debug %}<!-- panel_options:  {{panel_options}} -->{% endif %}
 
         <!-- Panel {{panel_settings.id}} -->
-        <section id="{{panel_settings.id}}">
+        <div id="{{panel_settings.id}}_content">
 
           {% if wave_properties.top.enabled %}
             {{panel_wave_top}}
@@ -244,8 +250,35 @@ exclude_from_search:                    true
             <div class="{{description_properties}}">{{panel_settings.description}}</div>
             <!-- End Heading -->
 
+            {% comment %} extract scroller config (HoH)
+            -------------------------------------------------------------------- {% endcomment %}
+            {% assign scroller_config.enabled  = false %}
+            {% for scroller in scroller_config_scrollers %}
+              {% for element in scroller %}
+                {% assign elm_key   = element[0] %}
+                {% assign elm_value = element[1] %}
+
+                {% for setting in elm_value %}
+                  {% assign setting_key   = setting[0] %}
+                  {% assign setting_value = setting[1] %}
+                  {% if setting_value == panel_settings.id %}
+                    {% assign scroller_config  = elm_value %}
+                    {% break %}
+                  {% endif %}
+                {% endfor %}
+
+              {% endfor %}
+            {% endfor %}
+
             <!-- Cards -->
-            <div class="card-deck {{panel_settings.id}}" style="display: none;">
+            {% if scroller_config.enabled %}
+            <!-- Scroller ENABLED -->
+              <div class="card-deck {{panel_settings.id}}" style="display: none;">
+            {% else %}
+            <!-- Scroller DISABLED -->
+              <div class="card-deck {{panel_settings.id}}">
+            {% endif %}
+
               {% assign card_items = cards|size %}
               {% for card in cards %}
 
@@ -274,7 +307,7 @@ exclude_from_search:                    true
                 {% assign icon_size = size %}
 
                 {% comment %} extract link for card icon
-                ------------------------------------------------------------------ {% endcomment %}
+                ---------------------------------------------------------------- {% endcomment %}
                 {% for items in card_buttons %} {% for item in items %}
                   {% if item[0] == 'button' %}
                     {% for elm in item[1] %}
@@ -369,7 +402,7 @@ exclude_from_search:                    true
             {{panel_wave_bottom}}
           {% endif %}
 
-        </section>
+        </div>
 
         <!-- END Panel {{panel_settings.id}} -->
 
@@ -393,8 +426,29 @@ exclude_from_search:                    true
           {% assign provider_url = 'https://deadlink.de/' %}
         {% endif %}
 
+
+        {% comment %} extract scroller config (HoH)
+        ------------------------------------------------------------------------ {% endcomment %}
+        {% assign scroller_config.enabled  = false %}
+        {% for scroller in scroller_config_scrollers %}
+          {% for element in scroller %}
+            {% assign elm_key   = element[0] %}
+            {% assign elm_value = element[1] %}
+
+            {% for setting in elm_value %}
+              {% assign setting_key   = setting[0] %}
+              {% assign setting_value = setting[1] %}
+              {% if setting_value == panel_settings.id %}
+                {% assign scroller_config  = elm_value %}
+                {% break %}
+              {% endif %}
+            {% endfor %}
+
+          {% endfor %}
+        {% endfor %}
+
         <!-- Panel {{panel_settings.id}} -->
-        <section id="{{panel_settings.id}}">
+        <div id="{{panel_settings.id}}_content">
 
           {% if wave_properties.top.enabled %}
             {{panel_wave_top}}
@@ -549,7 +603,7 @@ exclude_from_search:                    true
             {{panel_wave_bottom}}
           {% endif %}
 
-        </section> <!-- END Panel {{panel_settings.id}} -->
+        </div> <!-- END Panel {{panel_settings.id}} -->
 
         {% comment %} Reset element variables (already processed)
         ------------------------------------------------------------------------ {% endcomment %}
@@ -568,8 +622,29 @@ exclude_from_search:                    true
         {% assign panel_options = panel_config_defaults.service | merge: panel_settings %}
         {% if debug %}<!-- panel_options:  {{panel_options}} -->{% endif %}
 
+
+        {% comment %} extract scroller config (HoH)
+        ------------------------------------------------------------------------ {% endcomment %}
+        {% assign scroller_config.enabled  = false %}
+        {% for scroller in scroller_config_scrollers %}
+          {% for element in scroller %}
+            {% assign elm_key   = element[0] %}
+            {% assign elm_value = element[1] %}
+
+            {% for setting in elm_value %}
+              {% assign setting_key   = setting[0] %}
+              {% assign setting_value = setting[1] %}
+              {% if setting_value == panel_settings.id %}
+                {% assign scroller_config  = elm_value %}
+                {% break %}
+              {% endif %}
+            {% endfor %}
+
+          {% endfor %}
+        {% endfor %}
+
         <!-- Panel {{panel_settings.id}} -->
-        <section id="{{panel_settings.id}}">
+        <div id="{{panel_settings.id}}_content">
 
           {% if wave_properties.top.enabled %}
             {{panel_wave_top}}
@@ -621,96 +696,98 @@ exclude_from_search:                    true
 
             {% comment %} Set a scroller if enabled
             -------------------------------------------------------------------- {% endcomment %}
-            {% if panel_settings.scroller %}
+            <!-- Cards -->
+            {% if scroller_config.enabled %}
+            <!-- Scroller ENABLED -->
             <div class="noclass {{panel_settings.id}}" style="display: none;">
             {% else %}
+            <!-- Scroller DISABLED -->
             <div class="noclass {{panel_settings.id}}">
             {% endif %}
+              <ul id="{{panel_settings.id}}-scroll-group" class="scroll-group scroll-group-horizontal align-items-stretch flex-wrap">
+              {% for card in cards %}
 
-            <ul id="{{panel_settings.id}}-scroll-group" class="scroll-group scroll-group-horizontal align-items-stretch flex-wrap">
-            {% for card in cards %}
-
-              {% comment %} extract card properties (AoH)
-              ------------------------------------------------------------------ {% endcomment %}
-              {% for items in card %}
-                {% for item in items[1] %}
-                  {% assign key   = item[0] %}
-                  {% assign value = item[1] %}
-                  {% if key == 'enabled' %}           {% assign card_enabled          = value %}                  {% endif %}
-                  {% if key == 'id' %}                {% assign card_id               = value %}                  {% endif %}
-                  {% if key == 'href' %}              {% assign card_href             = value %}                  {% endif %}
-                  {% if key == 'icon' %}              {% assign card_icon             = value %}                  {% endif %}
-                  {% if key == 'icon_family' %}       {% assign icon_family           = value | downcase %}       {% endif %}
-                  {% if key == 'icon_size' %}         {% assign icon_size             = value %}                  {% endif %}
-                  {% if key == 'icon_color' %}        {% assign icon_color            = value %}                  {% endif %}
-                  {% if key == 'title' %}             {% assign card_title            = value | strip_newlines %} {% endif %}
-                  {% if key == 'tagline' %}           {% assign card_tagline          = value | strip_newlines %} {% endif %}
-                  {% if key == 'header_translate' %}  {% assign card_header_translate = value %}                  {% endif %}
-                  {% if key == 'text' %}              {% assign card_text             = value | strip_newlines %} {% endif %}
-                  {% if key == 'services' %}          {% assign services                      = value %}                  {% endif %}
+                {% comment %} extract card properties (AoH)
+                ---------------------------------------------------------------- {% endcomment %}
+                {% for items in card %}
+                  {% for item in items[1] %}
+                    {% assign key   = item[0] %}
+                    {% assign value = item[1] %}
+                    {% if key == 'enabled' %}           {% assign card_enabled          = value %}                  {% endif %}
+                    {% if key == 'id' %}                {% assign card_id               = value %}                  {% endif %}
+                    {% if key == 'href' %}              {% assign card_href             = value %}                  {% endif %}
+                    {% if key == 'icon' %}              {% assign card_icon             = value %}                  {% endif %}
+                    {% if key == 'icon_family' %}       {% assign icon_family           = value | downcase %}       {% endif %}
+                    {% if key == 'icon_size' %}         {% assign icon_size             = value %}                  {% endif %}
+                    {% if key == 'icon_color' %}        {% assign icon_color            = value %}                  {% endif %}
+                    {% if key == 'title' %}             {% assign card_title            = value | strip_newlines %} {% endif %}
+                    {% if key == 'tagline' %}           {% assign card_tagline          = value | strip_newlines %} {% endif %}
+                    {% if key == 'header_translate' %}  {% assign card_header_translate = value %}                  {% endif %}
+                    {% if key == 'text' %}              {% assign card_text             = value | strip_newlines %} {% endif %}
+                    {% if key == 'services' %}          {% assign services                      = value %}                  {% endif %}
+                  {% endfor %}
                 {% endfor %}
-              {% endfor %}
 
-              {% if card_enabled %}
-              <li id="{{panel_settings.id}}-scroll-item" class="scroll-group-item items-{{card_items}} p-0">
-                <article class="card raised-z0 card-same-height mb-3">
-                  <div class="card-profile mb-0">
+                {% if card_enabled %}
+                <li id="{{panel_settings.id}}-scroll-item" class="scroll-group-item items-{{card_items}} p-0">
+                  <article class="card raised-z0 card-same-height mb-3">
+                    <div class="card-profile mb-0">
 
-                    <div class="card-icon mt-4">
-                      <a href="{{card_href}}" class="link-no-decoration">
-                        <i class="card-icon-circle raised-z0 {{icon_family}} {{icon_family}}-{{card_icon}} {{icon_size}} {{icon_color}} card-icon-background-color-primary"></i>
-                      </a>
-                    </div>
+                      <div class="card-icon mt-4">
+                        <a href="{{card_href}}" class="link-no-decoration">
+                          <i class="card-icon-circle raised-z0 {{icon_family}} {{icon_family}}-{{card_icon}} {{icon_size}} {{icon_color}} card-icon-background-color-primary"></i>
+                        </a>
+                      </div>
 
-                    <div class="content mt-4">
+                      <div class="content mt-4">
 
-                      <div class="card-header">
-                        <h6 class="notoc category text-gray {{card_header_translate}}">{{card_title}}</h6>
-                        <h4 class="notoc card-title {{card_header_translate}}">{{card_tagline}}</h4>
-                      </div>
-                      <div class="card-body g-min-height-350 r-text-300 mt-0">{{card_text}}</div>
-
-                      <div class="card-footer">
-                        <div class="row {{panel_settings.id}}">
-                        	<div id="{{card_id}}" class="accordion">
-                            {% for list in services %}
-                        	  <div class="card">
-                          		<div class="card-header" id="headingOne">
-                          		  <h2 class="clearfix mb-0">
-                            			<a class="btn btn-link card-profile collapsed" href="#void" data-bs-toggle="collapse" data-bs-target="#{{list.service.id}}" aria-expanded="false" aria-controls="{{list.service.id}}">
-                                    <!-- i class="fa fa-chevron-circle-down"></i -->
-                                    <i class="fa fa-chevron-circle-right"></i>
-                                    {{list.service.title}}
-                                  </a>
-                          		  </h2>
-                          		</div>
-                          		<div id="{{list.service.id}}" class="collapse mb-4" aria-labelledby="{{list.service.id}}" data-bs-parent="#{{card_id}}">
-                          		  <div class="footer-body ml-5 r-text-200">
-                                  {{list.service.description}}
-                                  <hr>
-                                  <a class="card-link text-lowercase" href="{{list.service.href}}">
-                                    {{readmore_text}} · {{list.service.title}}
-                                  </a>
-                                </div>
-                          		</div>
-                        	  </div>
-                            {% endfor %}
-                        	</div>
+                        <div class="card-header">
+                          <h6 class="notoc category text-gray {{card_header_translate}}">{{card_title}}</h6>
+                          <h4 class="notoc card-title {{card_header_translate}}">{{card_tagline}}</h4>
+                        </div>
+                        <div class="card-body g-min-height-350 r-text-300 mt-0">{{card_text}}</div>
+
+                        <div class="card-footer">
+                          <div class="row {{panel_settings.id}}">
+                          	<div id="{{card_id}}" class="accordion">
+                              {% for list in services %}
+                          	  <div class="card">
+                            		<div class="card-header" id="headingOne">
+                            		  <h2 class="clearfix mb-0">
+                              			<a class="btn btn-link card-profile collapsed" href="#void" data-bs-toggle="collapse" data-bs-target="#{{list.service.id}}" aria-expanded="false" aria-controls="{{list.service.id}}">
+                                      <!-- i class="fa fa-chevron-circle-down"></i -->
+                                      <i class="fa fa-chevron-circle-right"></i>
+                                      {{list.service.title}}
+                                    </a>
+                            		  </h2>
+                            		</div>
+                            		<div id="{{list.service.id}}" class="collapse mb-4" aria-labelledby="{{list.service.id}}" data-bs-parent="#{{card_id}}">
+                            		  <div class="footer-body ml-5 r-text-200">
+                                    {{list.service.description}}
+                                    <hr>
+                                    <a class="card-link text-lowercase" href="{{list.service.href}}">
+                                      {{readmore_text}} · {{list.service.title}}
+                                    </a>
+                                  </div>
+                            		</div>
+                          	  </div>
+                              {% endfor %}
+                          	</div>
+                          </div>
                         </div>
+
                       </div>
 
                     </div>
+                  </article>
+                </li>
+                <!-- end service card -->
+                {% endif %}
 
-                  </div>
-                </article>
-              </li>
-              <!-- end service card -->
-              {% endif %}
-
-            {% endfor %}
-            {% comment %} END cards
-            -------------------------------------------------------------------- {% endcomment %}
-            </ul>
+              {% endfor %}
+              {% comment %} END cards
+              ----------------------------------------------------------------- {% endcomment %}
+              </ul>
             </div>
             <!-- End Cards -->
           </div>
@@ -720,7 +797,7 @@ exclude_from_search:                    true
             {{panel_wave_bottom}}
           {% endif %}
 
-        </section>
+        </div>
         <!-- END Panel {{panel_settings.id}} -->
 
         {% comment %} Reset element variables (already processed)
@@ -737,10 +814,28 @@ exclude_from_search:                    true
 
         {% assign panel_options = panel_config_defaults.news|merge: panel_settings %}
 
-        {% if debug %}<!-- panel_options:  {{panel_options}} -->{% endif %}
+        {% comment %} extract scroller config (HoH)
+        ------------------------------------------------------------------------ {% endcomment %}
+        {% assign scroller_config.enabled  = false %}
+        {% for scroller in scroller_config_scrollers %}
+          {% for element in scroller %}
+            {% assign elm_key   = element[0] %}
+            {% assign elm_value = element[1] %}
+
+            {% for setting in elm_value %}
+              {% assign setting_key   = setting[0] %}
+              {% assign setting_value = setting[1] %}
+              {% if setting_value == panel_settings.id %}
+                {% assign scroller_config  = elm_value %}
+                {% break %}
+              {% endif %}
+            {% endfor %}
+
+          {% endfor %}
+        {% endfor %}
 
         <!-- Panel {{panel_settings.id}} -->
-        <section id="{{panel_settings.id}}">
+        <div id="{{panel_settings.id}}_content">
 
           {% if wave_properties.top.enabled %}
             {{panel_wave_top}}
@@ -957,7 +1052,7 @@ exclude_from_search:                    true
             {{panel_wave_bottom}}
           {% endif %}
 
-        </section>
+        </div>
         <!-- End news panel: {{panel_settings.id}} -->
 
         {% comment %} Reset element variables (already processed)
@@ -971,8 +1066,8 @@ exclude_from_search:                    true
         {% comment %} Collect EXCEPTION panel: given type NOT found
         ------------------------------------------------------------------------ {% endcomment %}
         {% unless panel_settings.id == 'exception_container' %}
-        <div id="exception_container">
-          <div id="{{panel_settings.id}}" class="container-fluid no-padding">
+        <div id="{{panel_settings.id}}_content">
+          <div class="container-fluid no-padding">
             <div class="col-md-12 col-sm-12 col-xs-12 no-padding">
               <div class="box">
                 <div class="content content-danger">

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

@@ -35,9 +35,9 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.j1_config %}
-{% assign blocks            = site.data.blocks %}
-{% assign modules           = site.data.modules %}
+{% assign template_config      = site.data.j1_config %}
+{% assign blocks               = site.data.blocks %}
+{% assign modules              = site.data.modules %}
 
 {% comment %} Set config data (settings only)
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -95,10 +95,13 @@ var date                    = new Date();
 var timestamp_now           = date.toISOString();
 var gadScript               = document.createElement('script');
 var adInitializerScript     = document.createElement('script');
-var autoHideOnUnfilled      = {{advertising_options.google.autoHideOnUnfilled}};
-var addBorderOnUnfilled     = {{advertising_options.google.addBorderOnUnfilled}};
-var checkTrackingProtection = {{advertising_options.google.checkTrackingProtection}};
-var showErrorPageOnBlocked  = {{advertising_options.google.showErrorPageOnBlocked}};
+var advertisingDefaults;
+var aadvertisingSettings;
+var advertisingOptions;
+var autoHideOnUnfilled;
+var addBorderOnUnfilled;
+var checkTrackingProtection;
+var showErrorPageOnBlocked;
 var adInitializerScriptText;
 var tracking_protection;
 var url;
@@ -128,6 +131,16 @@ var logText;
       // [INFO   ] [j1.adapter.advertising                  ] [ detected advertising provider (j1_config): {{advertising_provider}}} ]
       // [INFO   ] [j1.adapter.advertising                  ] [ start processing load region head, layout: {{page.layout}} ]
 
+      // Load  module DEFAULTS|CONFIG
+      advertisingDefaults     = $.extend({},   {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      aadvertisingSettings    = $.extend({},   {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      advertisingOptions      = $.extend(true, {}, advertisingDefaults, aadvertisingSettings);
+
+      autoHideOnUnfilled      = analyticsOptions.google.autoHideOnUnfilled;
+      addBorderOnUnfilled     = analyticsOptions.google.addBorderOnUnfilled;
+      checkTrackingProtection = analyticsOptions.google.checkTrackingProtection;
+      showErrorPageOnBlocked  = analyticsOptions.google.showErrorPageOnBlocked;
+
       // -----------------------------------------------------------------------
       // Default module settings
       // -----------------------------------------------------------------------
@@ -159,7 +172,7 @@ var logText;
       var dependencies_met_page_ready = setInterval(function() {
         if (j1.getState() == 'finished') {
 
-          providerID          = '{{advertising_options.google.publisherID}}';
+          providerID          = advertisingOptions.publisherID;
           advertisingProvider = 'Google Adsense';
           validProviderID = (providerID.includes('your')) ? false : true;
           if (!validProviderID) {

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

@@ -60,6 +60,9 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+{% comment %} analytics_options:  {{ analytics_options | debug }} {% endcomment %}
+
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/analytics.js
@@ -91,15 +94,18 @@ var url               = new liteURL(window.location.href);
 var hostname          = url.hostname;
 var environment       = '{{environment}}';
 var gaScript          = document.createElement('script');
-var providerID        = '{{analytics_options.google.trackingID}}';
-var skipAllHosts      = '{{analytics_options.google.skipAllHosts}}';
-var validProviderID   = (providerID.includes('your')) ? false : true;
-var optInOut          = {{analytics_options.google.optInOut}};
-var anonymizeIP       = {{analytics_options.google.anonymizeIP}};
 var cookie_names      = j1.getCookieNames();
 var date              = new Date();
 var timestamp_now     = date.toISOString();
 var skipHost          = false;
+var analyticsDefaults;
+var analyticsSettings;
+var analyticsOptions;
+var providerID;
+var skipAllHosts;
+var optInOut;
+var anonymizeIP;
+var validProviderID;
 var skipHosts;
 var gaCookies;
 var user_consent;
@@ -120,12 +126,22 @@ var logText;
     init: function (options) {
 
     {% if analytics %}
+
+      // Load  module DEFAULTS|CONFIG
+      analyticsDefaults = $.extend({}, {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      analyticsSettings = $.extend({}, {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      analyticsOptions  = $.extend(true, {}, analyticsDefaults, analyticsSettings);
+
       // [INFO   ] [j1.adapter.analytics                    ] [ detected analytics provider (j1_config): {{analytics_provider}}} ]
       // [INFO   ] [j1.adapter.analytics                    ] [ start processing load region head, layout: {{page.layout}} ]
-
       {% case analytics_provider %}
       {% when "google" %}
       // [INFO   ] [j1.adapter.analytics                    ] [ place provider: Google Adsense ]
+      providerID        = analyticsOptions.google.trackingID;
+      skipAllHosts      = analyticsOptions.google.skipAllHosts;
+      optInOut          = analyticsOptions.google.optInOut;
+      anonymizeIP       = analyticsOptions.google.anonymizeIP;
+      validProviderID   = (providerID.includes('your')) ? false : true;
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -162,7 +178,7 @@ var logText;
       var dependencies_met_page_ready = setInterval(function() {
         if (j1.getState() == 'finished') {
 
-          gaExists  = document.getElementById('google-tag-manager');
+          gaExists  = document.getElementById('google-tag-manager') === null ? false : true;
           skipHosts = skipAllHosts.replace(/,/g, ' ');
           skipHost = skipHosts.includes(hostname);
 
@@ -183,7 +199,7 @@ var logText;
           }
 
           user_consent  = j1.readCookie(cookie_names.user_consent);
-          if (user_consent.analysis) {
+          if (user_consent.analysis && !skipHost ) {
             if (validProviderID) {
               logger.info('\n' + 'user consent on analytics: ' + user_consent.analysis);
               logger.info('\n' + 'enable Google Analytics on ID: ' + providerID);