j1_template_mde 2018.4.31 → 2018.4.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86688175c8a20b73ee8747fb197c195f45c9ffbb
-  data.tar.gz: 639a02e41e1c5ce60ccf20c5caec2f2cbd1d57fc
+  metadata.gz: c4e73b02fca715662577367a96ab2d23950dd96a
+  data.tar.gz: f529656d2069e574f0b0da6dbe0e435a6ef444c7
 SHA512:
-  metadata.gz: fa189e0a6f73182c9dc5486065ccdeb5dbf7e232bdcb417de144c3fb3be124b97390fcc0ad9a67505e51c7dc63a7abc4b52ff44425f1ac8584f551e6bf8b62bf
-  data.tar.gz: 80e2f8f9f37fe3d17dbbc2ccf3559f8209b7e4f21b34c444e91478fc819b15cb96cf53209ddd6269a4d42028d0a91d6d2f703ba1196d5f3088b55e5b712ac564
+  metadata.gz: dd328c9301135fb93f04f593c91beb6a3fa1951aa16f5b3f84aa5d27780148bbffc293bc4e9a8e72e92902d8cf4594194d4d9e9470c0f32eb970789886b6218b
+  data.tar.gz: 5dad23f336048836b7a31181f2559627ead781620f05d7ead51f8d30cf1b0e12f4f6fd766257e2aba40d9e2e87a21f49c6d13fa7bd4cde72006091be64570f0e

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

@@ -14,7 +14,6 @@
  # -----------------------------------------------------------------------------
  # Test data:
  #  {{site.robots | debug}}
- #
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -27,15 +26,15 @@
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [j1.layout.meta_data_generator.html      ] [start processing: place meta tags (taken from site config|page frontmatter)] -->
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [start processing: place meta tags (taken from site config|page frontmatter)] -->
 
-<!-- [INFO   ] [j1.layout.meta_data_generator.html      ] [page|content encoding] -->
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [page|content encoding] -->
 <meta http-equiv="Content-Type" content="text/html;charset={{site.coding}}">
 
-<!-- [INFO   ] [j1.layout.meta_data_generator.html      ] [added for MS Edge Browser] -->
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [added for MS Edge Browser] -->
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-<!-- [INFO   ] [j1.layout.meta_data_generator.html      ] [initial zoom level when the page is first loaded by the browser] -->
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [initial zoom level when the page is first loaded by the browser] -->
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 {% if page.layout == 'home' %}
@@ -106,4 +105,4 @@
   <meta name="robots" content="nofollow">
 {% endif %}
 
-<!-- [INFO   ] [j1.layout.meta_data_generator.html      ] [end processing] -->
+<!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [end processing] -->

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

@@ -18,10 +18,22 @@
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign j1_apps               = site.data.apps %}
+{% assign nedb_config           = j1_apps.j1_nedb %}
+{% assign cookie_consent_config = site.data.modules.j1_cookie_consent %}
+{% assign consent_defaults      = cookie_consent_config.defaults %} %}
+{% assign consent_settings      = cookie_consent_config.consent %}
+{% assign consent_config        = consent_settings | merge: consent_defaults %} 
+
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign j1_apps     = site.data.apps %}
-{% assign nedb_config = j1_apps.j1_nedb %}
+{% if consent_config.enabled %} 
+{% assign cookie_consent   = true %}
+{% endif %}
+{% assign consent_modal_id = consent_config.consent_modal_id %}
+
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -107,3 +119,9 @@
   // var html;
 
 </script>
+
+{% if cookie_consent %}
+<!-- [INFO   ] [j1.layout_shim_generator.html         ] [place container for Cookie Consent Modals] -->
+<div id="{{consent_modal_id}}"></div>
+{% endif %}
+

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

@@ -16,7 +16,7 @@
  # Test data:
  #  liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
-{% endcomment %}
+{% endcomment %} 
 
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -60,7 +60,7 @@
     var j1_user_state_json;
     var j1_user_state_cookie;
 
-    // Set|Detect J1 UserState
+    // Detect|Set J1 UserState
     user_state_detected = j1.existsCookie ( 'j1.user.state' );
     if ( user_state_detected ) {
       logger.info('Read UserState cookie');

data/_includes/themes/j1/modules/connectors/{analytic/google → ad/custom-provider.html}

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/procedures/provider/analytics/google
- #  Support of analytics provider google for J1 Template
+ #  ~/_includes/themes/j1/procedures/provider/ad/custom-provider.html
+ #  Support of your custom advertising provider
  #
  #  Product/Info:
  #  http://jekyll.one
@@ -23,20 +23,11 @@
 --------------------------------------------------------------- {% endcomment %}
 
 
+
 {% comment %} Main
 --------------------------------------------------------------- {% endcomment %}
 
-<script>
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '{{ site.xxj.analytics.google.tracking_id }}']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script');
-        ga.type = 'text/javascript';
-        ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(ga, s);
-    })();
-</script>
+<!-- Your code for the custom provider goes here -->
+
+
+

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

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/procedures/provider/ad/google-adsense
- #  Support of ad provider google-ads for J1 Template
+ #  ~/_includes/themes/j1/procedures/provider/ad/google-adsense.html
+ #  Support of advertising provider Google Adsense for J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one
@@ -11,8 +11,8 @@
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
  # -----------------------------------------------------------------------------
- # data-ad-client, e.g.: ca-pub-7328585512091257
- # data-ad-slot,   e.g.: 6991986330
+ # Test data:
+ #  liquid_var:  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -21,7 +21,7 @@
 
 {% comment %} Variables
 --------------------------------------------------------------- {% endcomment %}
-
+{% assign publisher_id = site.data.j1_config.advertising.google.publisher_id %}
 
 {% comment %} Main
 --------------------------------------------------------------- {% endcomment %}
@@ -29,7 +29,7 @@
 <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 <script>
   (adsbygoogle = window.adsbygoogle || []).push({
-    google_ad_client: "{{ site.data.j1_config.advertising.adsense.data_ad_client }}",
+    google_ad_client: "{{publisher_id}}",
     enable_page_level_ads: true
   });
 </script>

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

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/procedures/provider/ads
- #  Liquid CONNECTOR for ad providers supported by J1 Template
+ #  Liquid CONNECTOR for advertising providers supported by J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one
@@ -17,19 +17,34 @@
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign advertising           = site.data.j1_config.advertising.enabled %}
+{% assign advertising_provider  = site.data.j1_config.advertising.provider %}
 
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
-          
+-------------------------------------------------------------------------------- {% endcomment %}
+<!-- advertising:           {{ advertising}} -->
+<!-- page.advertising:      {{ page.advertising}} -->
+<!-- advertising_provider:  {{ advertising_provider}} -->
+
 <!-- [INFO   ] [j1.layout.connectors                  ] [Start processing load region head, layout: {{page.layout}}] -->
-{% if site.data.j1_config.advertising.adsense.enabled and page.adsense %}
-  <!-- [INFO   ] [j1.layout.connectors                  ] [Place Google Adsense ] -->
-  {% include themes/{{site.template.name}}/modules/connectors/ad/google-adsense.html %}
+{% if advertising and page.advertising %}
+
+  {% case advertising_provider %}
+    {% when "google" %}
+      <!-- [INFO   ] [j1.layout.connectors                  ] [Place Google Adsense ] -->
+      {% include themes/{{site.template.name}}/modules/connectors/ad/google-adsense.html %}
+    {% when "custom" %}
+      <!-- [INFO   ] [j1.layout.connectors                  ] [Place Custom Provider ] -->
+      {% include themes/{{site.template.name}}/modules/connectors/analytic/custom-analytics.html %}
+  {% endcase %}
+
 {% endif %}
 <!-- [INFO   ] [j1.layout.connectors                  ] [End processing] -->
+          
+
 

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

@@ -0,0 +1,32 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ #  ~/_includes/themes/j1/modules/connectors/analytic/custom-analytics.html
+ #  Support of your custom analytics provider
+ #
+ #  Product/Info:
+ #  http://jekyll.one
+ #
+ #  Copyright (C) 2019 Juergen Adams
+ #
+ #  J1 Template is licensed under the MIT License.
+ #  See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<!-- Your code for the custom provider goes here -->
+
+
+

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

@@ -0,0 +1,38 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ #  ~/_includes/themes/j1/modules/connectors/analytic/google-analytics.html
+ #  Support of analytics provider Google Analytics for J1 Template
+ #
+ #  Product/Info:
+ #  http://jekyll.one
+ #
+ #  Copyright (C) 2019 Juergen Adams
+ #
+ #  J1 Template is licensed under the MIT License.
+ #  See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id }} %}
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '{{tracking_id}}');
+</script>
+

data/_includes/themes/j1/modules/connectors/analytics

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_includes/themes/j1/procedures/provider/analytics
- #  Liquid CONNECTOR for analytics providers supported by J1 Template
+ #  ~/_includes/themes/j1/modules/connectors/analytics
+ #  Liquid CONNECTOR for analytic providers supported by J1 Template
  #
  #  Product/Info:
  #  http://jekyll.one
@@ -17,30 +17,29 @@
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign analytics           = site.data.j1_config.analytics.enabled %}
+{% assign analytics_provider  = site.data.j1_config.analytics.provider %}
 
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
-{% if site.safe and site.j1_config.analytics.provider and page.j1_config.analytics != false %}
+<!-- [INFO   ] [j1.layout.connectors                  ] [Start processing load region head, layout: {{page.layout}}] -->
+{% if analytics and page.analytics %}
 
-  {% case site.j1_config.analytics.provider %}
+  {% case analytics_provider %}
     {% when "google" %}
-      {% include themes/{{site.template.name}}/procedures/provider/analytics/provider/google %}
-    {% when "googleUA" %}
-      {% include themes/{{site.template.name}}/procedures/provider/analytics/googleUA %}
-    {% when "getclicky" %}
-      {% include themes/{{site.template.name}}/procedures/provider/analytics/getclicky %}
-    {% when "mixpanel" %}
-      {% include themes/{{site.template.name}}/procedures/provider/analytics/mixpanel %}
-    {% when "piwik" %}
-      {% include themes/{{site.template.name}}/procedures/provider/analytics/piwik %}
+      <!-- [INFO   ] [j1.layout.connectors                  ] [Place Google Analytics ] -->
+      {% include themes/{{site.template.name}}/modules/connectors/analytic/google-analytics.html %}
     {% when "custom" %}
-      {% include custom/analytics %}
+      <!-- [INFO   ] [j1.layout.connectors                  ] [Place Custom Provider ] -->
+      {% include themes/{{site.template.name}}/modules/connectors/analytic/custom-analytics.html %}
   {% endcase %}
 
 {% endif %}
+<!-- [INFO   ] [j1.layout.connectors                  ] [End processing] -->
+

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

@@ -0,0 +1,31 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ #  ~/_includes/themes/j1/modules/connectors/comments/custom-provider.html
+ #  Support of custom comment provider for J1 Template
+ #
+ #  Product/Info:
+ #  https://jekyll-one.com
+ #
+ #  Copyright (C) 2019 Juergen Adams
+ #
+ #  J1 Template is licensed under the MIT License.
+ #  See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+
+
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<!-- Your code for the custom provider goes here -->
+

data/_includes/themes/j1/modules/connectors/comment/disqus.html

@@ -21,7 +21,7 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign disqusFlickerTimeout = site.data.j1_config.comment.disqus.flicker_timeout %}
+{% assign disqus_short_name = site.data.j1_config.comments.disqus.short_name %}
 
 
 {% comment %} Main
@@ -31,7 +31,7 @@
 
   <div id="disqus_thread" class="disqus-thread">
      <script>
-        var disqus_shortname = '{{ site.data.j1_config.comment.disqus.short_name }}';
+        var disqus_shortname = '{{disqus_short_name}}';
 
         /**
          *  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
@@ -56,6 +56,6 @@
   </div>
 
   <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-  <script id="dsq-count-scr" src="//{{site.data.j1_config.comment.disqus.short_name}}.disqus.com/count.js" async></script>
+  <script id="dsq-count-scr" src="//{{disqus_short_name}}.disqus.com/count.js" async></script>
 
 </div>

data/_includes/themes/j1/modules/connectors/comment/facebook.html

@@ -0,0 +1,31 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ #  ~/_includes/themes/j1/modules/connectors/comments/custom-provider.html
+ #  Support of comment provider Facebookfor J1 Template
+ #
+ #  Product/Info:
+ #  https://jekyll-one.com
+ #
+ #  Copyright (C) 2019 Juergen Adams
+ #
+ #  J1 Template is licensed under the MIT License.
+ #  See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+
+
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+<!-- Your code for the custom provider goes here -->
+