j1-template 2022.0.9 → 2022.0.10

data/lib/starter_web/pages/public/learn/roundtrip/_includes/google-ad.js

@@ -0,0 +1,130 @@
+<!-- Google Ad (Displayanzeige): horizontal-1 -->
+<ins class="adsbygoogle mb-5"
+     style="display:block"
+     data-ad-client="ca-pub-3885670015316130"
+     data-ad-slot="5128488466"
+     data-ad-format="auto"
+     data-adtest="on"
+     data-full-width-responsive="true">
+</ins>
+
+<!-- Google Ad (Displayanzeige): horizontal-2 -->
+<ins class="adsbygoogle"
+     style="display:block"
+     data-ad-client="ca-pub-3885670015316130"
+     data-ad-slot="7284712660"
+     data-ad-format="auto"
+     data-full-width-responsive="true"></ins>
+<script>
+     (adsbygoogle = window.adsbygoogle || []).push({});
+</script>
+
+// manage uncaught execeptions
+// ---------------------------------------------------------------------
+// window.onerror = function (msg, url, line) {
+//    alert("Message : " + msg );
+//    alert("url : " + url );
+//    alert("Line number : " + line );
+// }
+
+// From www.freeformatter.com
+// -----------------------------------------------------------------------------
+<script type="text/javascript">
+  window.googletag = window.googletag || {};
+  window.googletag.cmd = window.googletag.cmd || [];
+  window.googletag.cmd.push(function() {
+    window.googletag.pubads().enableAsyncRendering();
+    window.googletag.pubads().disableInitialLoad();
+  });
+  (adsbygoogle=window.adsbygoogle||[]).pauseAdRequests=1;
+
+  __tcfapi("addEventListener", 2, function(tcData, success) {
+    if (success && tcData.unicLoad  === true) {
+      if(!window._initAds) {
+        window._initAds = true;
+        var script = document.createElement('script');
+        script.async = true;
+        script.setAttribute('data-ad-client', 'ca-pub-2485708030241382');
+        script.src = 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js';
+        document.head.appendChild(script);
+      }
+    }
+  });
+</script>
+
+++++
+<!-- insert Google Ad (Displayanzeige): horizontal-2, adSlot="5128488466" -->
+<div class="5128488466 mb-5">
+  <ins class="adsbygoogle"
+    style="display: block;"
+    data-ad-client="ca-pub-3885670015316130"
+    data-ad-slot="5128488466"
+    data-ad-format="auto"
+    data-adtest="on"
+    data-full-width-responsive="true">
+  </ins>
+</div>
+++++
+
+<!-- insert Google Ad (In-Article-Anzeige): in-article-1, adSlot="7522184684" -->
+<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-3885670015316130"
+     crossorigin="anonymous"></script>
+<ins class="adsbygoogle"
+     style="display:block; text-align:center;"
+     data-ad-layout="in-article"
+     data-ad-format="fluid"
+     data-ad-client="ca-pub-3885670015316130"
+     data-ad-slot="7522184684"></ins>
+<script>
+     (adsbygoogle = window.adsbygoogle || []).push({});
+</script>
+
+
+
+++++
+<script>
+
+  $(document).ready(function() {
+    var logger              = log4javascript.getLogger('j1.google.ads');
+    var autoHideOnUnfilled  = false;
+
+    var dependencies_met_page_ready = setInterval (function (options) {
+      if ( j1.getState() === 'finished' ) {
+
+        // monitor for state changes on the ad
+        // ---------------------------------------------------------------------
+        $('.adsbygoogle').attrchange({
+          trackValues: true,
+          callback: function (event) {
+            if (event.newValue === 'unfilled') {
+              var elm = event.target.dataset;
+              if (elm.adClient) {
+                logger.warn('\n' + 'initialized ad detected as: ' + event.newValue);
+                if (autoHideOnUnfilled) {
+                  logger.info('\n' + ' hide ad for slot: ' + elm.adSlot);
+                  $('.' + elm.adSlot ).hide();
+                }
+              }
+            }
+          }
+        });
+
+        // manage uncaught execeptions
+        // ---------------------------------------------------------------------
+        // window.onerror = function (msg, url, line) {
+        //    alert("Message : " + msg );
+        //    alert("url : " + url );
+        //    alert("Line number : " + line );
+        // }
+
+        logger.info('\n' + 'initialize Google Ad on slot: ' + '5128488466');
+        (adsbygoogle = window.adsbygoogle || []).push({});
+
+        clearInterval(dependencies_met_page_ready);
+      }
+   });
+
+  });
+
+</script>
+++++

data/lib/starter_web/pages/public/legal/en/100_copyright.adoc

@@ -20,7 +20,6 @@ fab_menu_id:                            page_ctrl_simple
 scrollbar:                              false
 toc:                                    true
 
-advertising:                            false
 comments:                               false
 
 permalink:                              /pages/public/legal/en/copyright/

data/lib/starter_web/pages/public/legal/en/200_impress.adoc

@@ -19,7 +19,6 @@ fab_menu_id:                            page_ctrl_simple
 scrollbar:                              false
 toc:                                    false
 
-advertising:                            false
 comments:                               false
 
 permalink:                              /pages/public/legal/en/impress/

data/lib/starter_web/pages/public/legal/en/400_comment_policy.adoc

@@ -21,7 +21,6 @@ fab_menu_id:                            page_ctrl_simple
 scrollbar:                              false
 toc:                                    true
 
-advertising:                            false
 comments:                               false
 
 permalink:                              /pages/public/legal/en/comment_policy/

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2022.0.9",
+  "version": "2022.0.10",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2022.0.9",
+  "version": "2022.0.10",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2022.0.9
+  version: 2022.0.10
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -269,11 +269,10 @@ files:
 - _includes/themes/j1/layouts/layout_metadata_generator.html
 - _includes/themes/j1/layouts/layout_module_generator.html
 - _includes/themes/j1/layouts/layout_resource_generator.html
+- _includes/themes/j1/modules/ads/google_ad_content_home.html
+- _includes/themes/j1/modules/ads/google_ad_top_home.html
 - _includes/themes/j1/modules/attics/generator.html
 - _includes/themes/j1/modules/boards/news_pin_board.html
-- _includes/themes/j1/modules/connectors/ad/custom-provider.html
-- _includes/themes/j1/modules/connectors/ad/google-adsense.html
-- _includes/themes/j1/modules/connectors/ads
 - _includes/themes/j1/modules/connectors/analytic/custom-provider.html
 - _includes/themes/j1/modules/connectors/analytic/google-analytics.html
 - _includes/themes/j1/modules/connectors/analytics
@@ -377,10 +376,13 @@ files:
 - assets/error_pages/HTTP444.html
 - assets/error_pages/HTTP445.html
 - assets/error_pages/HTTP446.html
+- assets/error_pages/HTTP447.html
+- assets/error_pages/HTTP448.html
 - assets/error_pages/HTTP500.html
 - assets/error_pages/HTTP501.html
 - assets/error_pages/HTTP502.html
 - assets/error_pages/HTTP503.html
+- assets/themes/j1/adapter/js/advertising.js
 - assets/themes/j1/adapter/js/algolia.js
 - assets/themes/j1/adapter/js/asciidoctor.js
 - assets/themes/j1/adapter/js/attic.js
@@ -1021,6 +1023,7 @@ files:
 - assets/themes/j1/core/js/template.js
 - assets/themes/j1/core/js/template.min.js
 - assets/themes/j1/core/js/template.min.js.map
+- assets/themes/j1/modules/advertising/js/google/adInitializer.js
 - assets/themes/j1/modules/backstretch/js/backstretch.js
 - assets/themes/j1/modules/backstretch/js/backstretch.min.js
 - assets/themes/j1/modules/bmd/js/bmd.js
@@ -1615,6 +1618,7 @@ files:
 - lib/starter_web/_data/modules/authentication.yml
 - lib/starter_web/_data/modules/cookieconsent.yml
 - lib/starter_web/_data/modules/cookies.yml
+- lib/starter_web/_data/modules/defaults/advertising.yml
 - lib/starter_web/_data/modules/defaults/attics.yml
 - lib/starter_web/_data/modules/defaults/authentication.yml
 - lib/starter_web/_data/modules/defaults/cookieconsent.yml
@@ -1655,6 +1659,8 @@ files:
 - lib/starter_web/_includes/documents/readme
 - lib/starter_web/_includes/tables/jekyll_variables.asciidoc
 - lib/starter_web/_includes/tables/template_variables.asciidoc
+- lib/starter_web/_includes/themes/j1/modules/ads/google_ad_content_home.html
+- lib/starter_web/_includes/themes/j1/modules/ads/google_ad_top_home.html
 - lib/starter_web/_plugins/asciidoctor-extensions/admonition-block-answer.rb
 - lib/starter_web/_plugins/asciidoctor-extensions/admonition-block-question.rb
 - lib/starter_web/_plugins/asciidoctor-extensions/banner.rb
@@ -1949,48 +1955,6 @@ files:
 - lib/starter_web/favicon.ico
 - lib/starter_web/index.html
 - lib/starter_web/package.json
-- lib/starter_web/pages/_test_pages/100_side-bar-tester.adoc
-- lib/starter_web/pages/_test_pages/_includes/attributes.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/100_gistblock.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_bottom_info.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_bottom_left_warning.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_bottom_right_danger.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_central_success.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_full_height_left_info.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_full_height_right_success.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_table_bs_modal_examples.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_top_info.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_top_left_info.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/410_top_right_success.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/419_advanced_modals_demo.asciidoc
-- lib/starter_web/pages/_test_pages/_includes/documents/tables/bs_modal_examples.asciidoc
-- lib/starter_web/pages/_test_pages/accordion-01-tester.adoc
-- lib/starter_web/pages/_test_pages/accordion-02-tester.adoc
-- lib/starter_web/pages/_test_pages/accordion-03-tester.adoc
-- lib/starter_web/pages/_test_pages/attribute-changes-01-tester.adoc
-- lib/starter_web/pages/_test_pages/backdrop-tester.adoc
-- lib/starter_web/pages/_test_pages/button-tester-1.adoc
-- lib/starter_web/pages/_test_pages/card-tester.adoc
-- lib/starter_web/pages/_test_pages/cookieConsent.adoc
-- lib/starter_web/pages/_test_pages/deepl.0.adoc
-- lib/starter_web/pages/_test_pages/deepl.adoc
-- lib/starter_web/pages/_test_pages/desandro-button.adoc
-- lib/starter_web/pages/_test_pages/desandro.adoc
-- lib/starter_web/pages/_test_pages/flipcard-1-tester.adoc
-- lib/starter_web/pages/_test_pages/formular-01-tester.adoc
-- lib/starter_web/pages/_test_pages/formular-02-tester.adoc
-- lib/starter_web/pages/_test_pages/google-translate-tester.0.adoc
-- lib/starter_web/pages/_test_pages/google-translate-tester.1.adoc
-- lib/starter_web/pages/_test_pages/google-translate-tester.3.adoc
-- lib/starter_web/pages/_test_pages/google-translate-tester.4.adoc
-- lib/starter_web/pages/_test_pages/infinite-scroll-tester-2.adoc
-- lib/starter_web/pages/_test_pages/infinite-scroll-tester-3.adoc
-- lib/starter_web/pages/_test_pages/infinite-scroll-tester-4.adoc
-- lib/starter_web/pages/_test_pages/infinite-scroll-tester-5.adoc
-- lib/starter_web/pages/_test_pages/infinite-scroll-tester.1.adoc
-- lib/starter_web/pages/_test_pages/infinite-scroll-tester.adoc
-- lib/starter_web/pages/_test_pages/list-group-tester.adoc
-- lib/starter_web/pages/_test_pages/tictok.adoc
 - lib/starter_web/pages/private/readme
 - lib/starter_web/pages/protected/readme
 - lib/starter_web/pages/public/about/about_site.adoc
@@ -2024,6 +1988,8 @@ files:
 - lib/starter_web/pages/public/blog/navigator/index.html
 - lib/starter_web/pages/public/learn/quickstart.adoc
 - lib/starter_web/pages/public/learn/roundtrip/100_present_images.adoc
+- lib/starter_web/pages/public/learn/roundtrip/100_present_images.ads.asciidoc
+- lib/starter_web/pages/public/learn/roundtrip/100_present_images.no_ads.asciidoc
 - lib/starter_web/pages/public/learn/roundtrip/100_present_videos.adoc
 - lib/starter_web/pages/public/learn/roundtrip/200_typography.adoc
 - lib/starter_web/pages/public/learn/roundtrip/300_icon_fonts.adoc
@@ -2046,6 +2012,7 @@ files:
 - lib/starter_web/pages/public/learn/roundtrip/_includes/documents/410_top_right_success.asciidoc
 - lib/starter_web/pages/public/learn/roundtrip/_includes/documents/419_advanced_modals_demo.asciidoc
 - lib/starter_web/pages/public/learn/roundtrip/_includes/documents/tables/bs_modal_examples.asciidoc
+- lib/starter_web/pages/public/learn/roundtrip/_includes/google-ad.js
 - lib/starter_web/pages/public/learn/where_to_go.adoc
 - lib/starter_web/pages/public/legal/de/100_copyright.adoc
 - lib/starter_web/pages/public/legal/de/100_impress.adoc

data/_includes/themes/j1/modules/connectors/ad/custom-provider.html

@@ -1,30 +0,0 @@
-{% comment %}
- # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/procedures/provider/ad/custom-provider.html
- #  Support of your custom advertising provider
- #
- #  Product/Info:
- #  http://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 }}
- # -----------------------------------------------------------------------------
-{% endcomment %}
-
-{% comment %} Liquid procedures
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} Variables
--------------------------------------------------------------------------------- {% endcomment %}
-
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-<script>
-  /* Your code for the custom provider goes here */
-</script>

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

@@ -1,62 +0,0 @@
-{% comment %}
- # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/procedures/provider/ad/google-adsense.html
- #  Support of advertising provider Google Adsense for J1 Template
- #
- #  Product/Info:
- #  http://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 }}
- # -----------------------------------------------------------------------------
-{% endcomment %}
-
-{% comment %} Liquid procedures
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} Variables
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign publisher_id = site.data.j1_config.advertising.google.publisher_id %}
-
-{% 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 () {
-      if (j1.getState() === 'finished') {
-        async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
-        clearInterval(dependencies_met_page_finished);
-      }
-  }, 25); // END dependencies_met_page_finished
-</script>
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% 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
---------------------------------------------------------------------------------
-<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-<script>
-  (adsbygoogle = window.adsbygoogle || []).push({
-    google_ad_client: "{{publisher_id}}",
-    enable_page_level_ads: true
-  });
-</script>
--------------------------------------------------------------------------------- {% endcomment %}

data/_includes/themes/j1/modules/connectors/ads

@@ -1,56 +0,0 @@
-{% comment %}
- # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/procedures/provider/ads
- #  Liquid CONNECTOR for Advertising Providers supported by J1 Template
- #
- #  Product/Info:
- #  http://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 }}
- # -----------------------------------------------------------------------------
-{% endcomment %}
-
-{% comment %} Liquid procedures
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} Variables
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign advertising           = site.data.j1_config.advertising.enabled %}
-{% assign advertising_page      = page.advertising.enabled %}
-{% assign advertising_provider  = site.data.j1_config.advertising.provider %}
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ Check ads settings from SITE configuration ] -->
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected ads (site): {{advertising}} ] -->
-
-{% comment %} Check ads settings from PAGE configuration
--------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ Check ads settings from PAGE configuration ] -->
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ detected ads (page): {{page.advertising}} ] -->
-
-{% if advertising_page <> nil %}
-  <!-- [INFO   ] [j1.modules.connectors.ads             ] [ overload ads settings from PAGE ] -->
-  {% assign advertising = advertising_page %}
-{% endif %}
-
-{% if advertising %}
-  <!-- [INFO   ] [j1.modules.connectors.ads               ] [ detected advertising provider (j1_config): {{advertising_provider}}} ] -->
-  <!-- [INFO   ] [j1.modules.connectors.ads               ] [ start processing load region head, layout: {{page.layout}} ] -->
-  {% case advertising_provider %}
-    {% when "google" %}
-      <!-- [INFO   ] [j1.modules.connectors.ads               ] [ place provider: Google Adsense ] -->
-      {% include themes/{{site.template.name}}/modules/connectors/ad/google-adsense.html %}
-    {% when "custom" %}
-      <!-- [INFO   ] [j1.modules.connectors.ads               ] [ place provider: Custom Provider ] -->
-      {% include themes/{{site.template.name}}/modules/connectors/ad/custom-provider.html %}
-  {% endcase %}
-
-{% endif %}
-<!-- [INFO   ] [j1.modules.connectors.ads             ] [ end processing ] -->