j1_template_mde 2018.4.30 → 2018.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ed2b60f8afe427beec56560d691237da17a77f9
-  data.tar.gz: 51e893d2242403dbf5ee8bc3b70bbee468935ba7
+  metadata.gz: 86688175c8a20b73ee8747fb197c195f45c9ffbb
+  data.tar.gz: 639a02e41e1c5ce60ccf20c5caec2f2cbd1d57fc
 SHA512:
-  metadata.gz: e35a4c46752411fd637fe4e86dbe6f820d16474078b7e405de263fb04b12041f9df58aa603dcf7190316156218fcf300202b894698b85a53283ee5aaafd0cfc6
-  data.tar.gz: 21fe94753e594af43cdf7578898e5fddd44b73c3c34548b5bd6bf07cf495a2ea4ab4e4e7a61b97c8a9b061c730311138019eff84f83af8c2e3de5735bf924bb4
+  metadata.gz: fa189e0a6f73182c9dc5486065ccdeb5dbf7e232bdcb417de144c3fb3be124b97390fcc0ad9a67505e51c7dc63a7abc4b52ff44425f1ac8584f551e6bf8b62bf
+  data.tar.gz: 80e2f8f9f37fe3d17dbbc2ccf3559f8209b7e4f21b34c444e91478fc819b15cb96cf53209ddd6269a4d42028d0a91d6d2f703ba1196d5f3088b55e5b712ac564

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

@@ -41,7 +41,7 @@
 {% if page.layout == 'home' %}
   <title>{{site.slogan}}</title>
 {% else %}
-  <title>{{page.title}}</title>
+  <title>{{page.tagline}}</title>
 {% endif %}
 
 {% if page.layout == 'home' %}
@@ -98,8 +98,11 @@
   <meta name="robots" content="nofollow">
 {% endif %}
 
-{% if page.robots != 'true' and page.isHome == 'false' %}
+{% if page.robots.index != 'true' %}
   <meta name="robots" content="noindex">
+{% endif %}
+
+{% if page.robots.follow != 'true' %}
   <meta name="robots" content="nofollow">
 {% endif %}
 

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

@@ -26,14 +26,13 @@
 {% comment %} Main
 --------------------------------------------------------------- {% endcomment %}
 
-<div class="google-ads">
-    <script async src="http://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-    <!-- Made Mistakes 160x600 -->
-    <ins class="adsbygoogle"
-         style="display:inline-block;width:160px;height:600px"
-         data-ad-client="{{ site.data.j1_config.advertising.adsense.data_ad_client }}"
-         data-ad-slot="{{ site.data.j1_config.advertising.adsense.data_ad_slot }}"></ins>
-    <script>
-    (adsbygoogle = window.adsbygoogle || []).push({});
-    </script>
-</div><!-- /.google-ads -->
+<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 }}",
+    enable_page_level_ads: true
+  });
+</script>
+
+
+

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

@@ -25,10 +25,11 @@
 
 {% comment %} Main
 --------------------------------------------------------------- {% endcomment %}
-
-{% if site.safe and site.j1_config.analytics.provider and page.j1_config.analytics != false %}
-  {% case site.j1_config.analytics.provider %}
-    {% when "google" %}
-        {% themes/{{site.template.name}}/procedures/provider/ad/google-adsense %}
-  {% endcase %}
+          
+<!-- [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 %}
 {% endif %}
+<!-- [INFO   ] [j1.layout.connectors                  ] [End processing] -->
+

data/_includes/themes/j1/procedures/layouts/default_writer.proc

@@ -53,7 +53,6 @@
       {% endfor %}
     {% endfor %}
 
-
     {% comment %}  Skip all regions should NOT placed
     ---------------------------------------------------------------------------- {% endcomment %}
     {% unless region == placement %} {% continue %} {% endunless %}

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2018.4.30'
+  VERSION = '2018.4.31'
 end

data/lib/starter_web/Gemfile

@@ -46,7 +46,7 @@ gem 'jekyll', '~> 3.8.5'
 # Theme Rubies
 # Default: J1 Template
 #
-gem 'j1_template_mde', '~> 2018.4.30'
+gem 'j1_template_mde', '~> 2018.4.31'
 
 # --------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -145,6 +145,18 @@ end
 #
 # gem 'rake', '~> 12.0'
 
+# html-proofer. Automate the process of checking links on your site
+#
+#   bundle exec htmlproofer \ 
+#     --allow_missing_href \
+#     --allow_hash_href \
+#     --assume_extension \
+#     --directory_index_file \
+#     --directory_index_file \
+#     --empty_alt_ignore ./_site/index.html &> out.txt
+#
+#gem 'html-proofer', '~> 3.10'
+
 # --------------------------------------------------------------------
 # Define the build environment and the web server for J1 sites that
 # runs as an web application. To improve the production (run-time)

data/lib/starter_web/_config.yml

@@ -60,7 +60,7 @@ environment:                            development
 #   anything here because version information is bumped-in by
 #   the build process
 #
-version:                                2018.4.30
+version:                                2018.4.31
 
 
 # ==============================================================================
@@ -377,13 +377,15 @@ collections_dir:                        collections
 include:                                [.htaccess]
 exclude:                                [
                                           vendor, node_modules, "package*",
-                                          ".sass-cache",".vscode","*.ignore",
+                                          ".sass-cache", ".vscode", ".idea",
+                                          "*.ignore",
                                           "*.bat*", "*.sh", "*.tmp",
-                                          "*.ppt*", "*.zip","*.7z","*.a2p",
+                                          "*.txt", "*.log", "*.ppt*", 
+                                          "*.zip", "*.7z", "*.a2p",
                                           "*.asciidoc", "History.markdown",
                                           "README.md", "changelog.md",
                                           "Rakefile", "Gemfile", "Guardfile",
-                                          "Gemfile.lock", "yarn.lock","*.log"
+                                          "Gemfile.lock", "yarn.lock"
                                         ]
 keep_files:                             [ ".git", ".gitignore", node_modules, "package*" ]
 
@@ -556,11 +558,11 @@ j1_auth:
       - \W*((?i)premium(?-i))\W*
 
   providers:
-    activated:                          [ disqus, github, patreon ]
+    activated:                          [ disqus ]
 
     disqus:
       home_url:                         https://disqus.com
-      product_url:                      https://patreon.com/jekyll_one
+      product_url:                      http://localhost:5000
       strategy:                         member
       scope:                            []
       users:                            [ all ]
@@ -572,82 +574,82 @@ j1_auth:
           users:
             blacklist:                  []
 
-    facebook:
-      home_url:                         https://facebook.com
-      product_url:                      https://patreon.com/jekyll_one
-      strategy:                         member
-      scope:                            []
-      users:                            [ all ]
-      permissions:                      [ private ]
-      data_fields:                      []
-      conditions:
-        private:
-          enabled:                      true
-          users:
-            whitelist:                  [ all ]
-            blacklist:                  []
-
-    github:
-      home_url:                         https://github.com
-      product_url:                      https://patreon.com/jekyll_one
-      strategy:                         member
-      scope:                            []
-      users:                            [ all ]
-      permissions:                      [ private ]
-      data_fields:                      []
-      conditions:
-        private:
-          enabled:                      true
-          users:
-            whitelist:                  [ all ]
-            blacklist:                  []
-
-    patreon:
-      home_url:                         https://patreon.com
-      product_url:                      https://patreon.com/jekyll_one
-      strategy:                         member
-      scope:                            [ users, pledges-to-me ]
-      users:                            [ all ]
-      permissions:                      [ private, premium ]
-      data_fields:                      [
-                                          email, name, first_name, nickname,
-                                          amount_cents, created_at, declined_since
-                                        ]
-      conditions:
-        private:
-          enabled:                      true
-          users:
-            blacklist:                  []
-        premium:
-          enabled:                      true
-          users:
-            whitelist:                  []
-            blacklist:                  []
-          payment:
-            activated:                  [ "Premium Content", "Value Content" ]
-            tiers:
-              - tier:
-                  name:                 "Premium Content"
-                  amount:               500,
-                  state:                paid
-              - tier:
-                  name:                 "Value Content"
-                  amount:               100,
-                  state:                paid
-
-    twitter:
-      home_url:                         https://twitter.com
-      product_url:                      https://patreon.com/jekyll_one
-      strategy:                         member
-      scope:                            []
-      users:                            [ all ]
-      permissions:                      [ private, premium ]
-      data_fields:                      []
-      conditions:
-        private:
-          enabled:                      true
-          users:
-            blacklist:                  []
+  # facebook:
+  #   home_url:                         https://facebook.com
+  #   product_url:                      http://localhost:5000
+  #   strategy:                         member
+  #   scope:                            []
+  #   users:                            [ all ]
+  #   permissions:                      [ private ]
+  #   data_fields:                      []
+  #   conditions:
+  #     private:
+  #       enabled:                      true
+  #       users:
+  #         whitelist:                  [ all ]
+  #         blacklist:                  []
+  # 
+  # github:
+  #   home_url:                         https://github.com
+  #   product_url:                      http://localhost:5000
+  #   strategy:                         member
+  #   scope:                            []
+  #   users:                            [ all ]
+  #   permissions:                      [ private ]
+  #   data_fields:                      []
+  #   conditions:
+  #     private:
+  #       enabled:                      true
+  #       users:
+  #         whitelist:                  [ all ]
+  #         blacklist:                  []
+  # 
+  # patreon:
+  #   home_url:                         https://patreon.com
+  #   product_url:                      http://localhost:5000
+  #   strategy:                         member
+  #   scope:                            [ users, pledges-to-me ]
+  #   users:                            [ all ]
+  #   permissions:                      [ private, premium ]
+  #   data_fields:                      [
+  #                                       email, name, first_name, nickname,
+  #                                       amount_cents, created_at, declined_since
+  #                                     ]
+  #   conditions:
+  #     private:
+  #       enabled:                      true
+  #       users:
+  #         blacklist:                  []
+  #     premium:
+  #       enabled:                      true
+  #       users:
+  #         whitelist:                  [ juergen_adams ]
+  #         blacklist:                  []
+  #       payment:
+  #         activated:                  [ "Premium Content", "Value Content" ]
+  #         tiers:
+  #           - tier:
+  #               name:                 "Premium Content"
+  #               amount:               500,
+  #               state:                paid
+  #           - tier:
+  #               name:                 "Value Content"
+  #               amount:               100,
+  #               state:                paid
+  # 
+  # twitter:
+  #   home_url:                         https://twitter.com
+  #   product_url:                      http://localhost:5000
+  #   strategy:                         member
+  #   scope:                            []
+  #   users:                            [ all ]
+  #   permissions:                      [ private, premium ]
+  #   data_fields:                      []
+  #   conditions:
+  #     private:
+  #       enabled:                      true
+  #       users:
+  #         blacklist:                  []
 
 # ---------------------------------------------------------------
 # SAFEMODE
@@ -759,6 +761,10 @@ defaults:
       scrollbar:                        false
       indexed:                          true
 
+      robots:
+        index:                          true
+        follow:                         true
+
       icons:
         family:                         MDI
         color:                          md-indigo
@@ -791,6 +797,10 @@ defaults:
       adsense:                          true
       comments:                         true
 
+      robots:
+        index:                          true
+        follow:                         true
+
       icons:
 #       category-icon:                  comment-text-outline
         family:                         MDI
@@ -821,6 +831,10 @@ defaults:
       adsense:                          true
       comments:                         true
 
+      robots:
+        index:                          true
+        follow:                         true
+
       icons:
   #     category-icon:                  comment-text-outline
         family:                         MDI
@@ -848,6 +862,10 @@ defaults:
       adsense:                          true
       comments:                         true
 
+      robots:
+        index:                          true
+        follow:                         true
+
       icons:
 #       category-icon:                  dots-horizontal-circle
         family:                         MDI
@@ -876,6 +894,10 @@ defaults:
       adsense:                          true
       comments:                         false
 
+      robots:
+        index:                          false
+        follow:                         false
+
       icons:
 #       category-icon:                  wikipedia
         family:                         MDI
@@ -902,6 +924,10 @@ defaults:
       adsense:                          true
       scrollbar:                        false
 
+      robots:
+        index:                          true
+        follow:                         true
+
   # --------------------------------------------------------
   # BIOGRAPHY (Book Shelf)
   #
@@ -914,6 +940,10 @@ defaults:
       adsense:                          true
       scrollbar:                        false
 
+      robots:
+        index:                          true
+        follow:                         true
+
   # --------------------------------------------------------
   # FANTASY (Book Shelf)
   #
@@ -938,6 +968,10 @@ defaults:
       adsense:                          true
       scrollbar:                        false
 
+      robots:
+        index:                          true
+        follow:                         true
+
 
 # ==============================================================================
 # 6. LAYOUT configuration

data/lib/starter_web/_data/j1_config.yml

@@ -159,6 +159,16 @@ analytics:
     baseURL:                            'myserver.tld/piwik' # Piwik installation address (without protocol)
     idsite:                             '1'
 
+# -------------------------------------------------------------------------
+# ADVERTISING connector settings
+#
+# Set 'provider' to the analytics provider you want to use.
+# Set 'provider' to false to turn analytics off globally.
+#
+advertising:
+  adsense:
+    enabled:                            true
+    data_ad_client:                     ca-pub-6537273267695855
 
 # -------------------------------------------------------------------------
 # SHARING connector settings

data/lib/starter_web/_data/layouts/default.yml

@@ -113,6 +113,16 @@ lanes:
       path:                             layouts
       file:                             layout_metadata_generator.html
 
+  # ------------------------------------------------------------------
+  # CONNECTORS (Google Ads)
+  - lane:
+      enabled:                          true
+      region:                           head
+      type:                             sync
+      base:                             _includes/themes/j1
+      path:                             modules/connectors
+      file:                             ads
+
   # ------------------------------------------------------------------
   # Module RESOURCE loader (head)
   - lane:

data/lib/starter_web/_data/modules/j1_cookiebar.yml

@@ -17,7 +17,7 @@
 enabled:                            true
 load:                               sync
 autoEnable:                         true
-background_color:                   '#354A60'
+background_color:                   '#212121'
 text_color:                         '#EEEEEE'
 
 message: >
@@ -41,7 +41,7 @@ stopScrolling:                      true
 acceptText:                         I understand and agree
 acceptText_de:                      Ich habe den Hinweis verstanden und stimme zu
 acceptFunction:                     null
-declineButton:                      false
+declineButton:                      true
 declineText:                        Disable Cookies
 declineFunction:                    null
 policyButton:                       true