jekyll-material-theme 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6f6addee3ddd5667332eb319a90edc83ed53084
-  data.tar.gz: 0360cd8ee3c337ce047a758a9991d49d331ff72b
+  metadata.gz: 984ed8c7d84326b87c845dbc7887a12d4d583f07
+  data.tar.gz: 7f2b0a627f199b988df66c6e731b8fa6fe367fd0
 SHA512:
-  metadata.gz: d8f1097a9f05ade8f5d5611e132e8f6c7f9138650b3af808b29f3a7237d8a74281fa727526ce8b6c4d11485775967bd7775a0b92e8029550f9289964eaa237eb
-  data.tar.gz: 8096707e0a7a0d718b5f2018120938b9a3c14ef3ec4603e8c7096b7142252a0814d1b32d805bc5b461088b27c81db12f0c5b79bb602793f28e6fa17a1bc9beda
+  metadata.gz: eb095731084ce0d98fb7d1d93117b123eb7f95b0424bd86d1b841b63ac6b7ba217cd10dde9ae69126c8e4b19462c575d19ebedc408e747caf2cc06fdcca72968
+  data.tar.gz: d05dd87497f3a9b36b4fc403035b5af264de40d00e8cce3234ccb449b6418aa3b85a9a85802e415c98b57be5bfbbb349072e20eab2cbe60a9571c23e912b2f82

data/README.md

@@ -208,6 +208,8 @@ medium: https://medium.com
 baseurl: # If your site is located at /blog or /home, change it here, otherwise leave it empty
 url: http://localhost:4000/ # The URL of your site
 
+# Google tracking, if both are filled, tag manager will prevail. Set up GA through GTM in that case
+tag_manager_id: # This looks something like GTM-XXXXXXX
 google_analytics_tracking_id: # This looks something like UA-000000000-0 Head over to https://analytics.google.com/ to setup.
 
 cookie_accept_message: Thanks! # The pop-up dialog that appears after accepting the cookie notice.
@@ -230,7 +232,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/jamesh
 
 ## Development
 
-To set up your environment to develop and further customise this theme, fork the repo and explore the ```_assets``` directory, which includes all the ```css, js``` and ```font``` folders. If you're adding a feature, please add some tests in the ```spec``` directory to ensure everyhting works as intended. 
+To set up your environment to develop and further customise this theme, fork the repo and explore the ```_assets``` directory, which includes all the ```css, js``` and ```font``` folders. If you're adding a feature, please add some tests in the ```spec``` directory to ensure everyhting works as intended.
 
 ## Contributors
 

data/_config.yml

@@ -3,6 +3,9 @@ name: Your Name
 email: your-email@example.com
 description: Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description.
 
+baseurl: "/blog"
+url: ""
+
 parallax_image_one: assets/images/startup3.jpg # These are the images used for the parallax background
 parallax_image_two: assets/images/startup3.jpg
 
@@ -147,6 +150,8 @@ medium: https://medium.com
 baseurl: # if your site is located at /blog or /home, enter it here, otherwise leave it empty
 url: http://localhost:4000/ #the url of your site
 
+# Google tracking, if both are filled, tag manager will prevail. Set up GA through GTM in that case
+tag_manager_id: # This looks something like GTM-XXXXXXX
 google_analytics_tracking_id: # This looks something like UA-000000000-0 Head over to https://analytics.google.com/ to setup.
 
 cookies_banner: show # The value "show" will show the cookies banner, the value "none" will hide the banner.

data/_includes/google_analytics.html

@@ -1,9 +1,11 @@
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{site.google_analytics_tracking_id}}"></script>
+<!-- Google Analytics -->
 <script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', '{{site.google_analytics_tracking_id}}');
-</script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+    
+    ga('create', '{{ site.google_analytics_tracking_id }}', 'auto');
+    ga('send', 'pageview');
+    </script>
+<!-- End Google Analytics -->

data/_includes/google_tag_manager.html

@@ -0,0 +1,8 @@
+<!-- Google Tag Manager -->
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer','{{site.tag_manager_id}}');
+    </script>
+<!-- End Google Tag Manager -->

data/_includes/head.html

@@ -1,6 +1,14 @@
 <!DOCTYPE html>
 <html>
     <head>
+      {% if jekyll.environment == 'production' %}
+        {% if site.tag_manager_id %}
+          {% include google_tag_manager.html %}
+        {% elsif site.google_analytics_tracking_id %}
+          {% include google_analytics.html %}
+        {% endif %}
+      {% endif %}
+
       <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1">
       <link rel="stylesheet" type="text/css" href="{{site.baseurl}}/assets/css/materialize.css">
@@ -9,10 +17,13 @@
       {% endif %}
       <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
       <link rel="stylesheet" href="https://cdn.rawgit.com/konpa/devicon/df6431e323547add1b4cf45992913f15286456d3/devicon.min.css">
-      {% if site.google_analytics_tracking_id and jekyll.environment == 'production' %}
-        {% include google_analytics.html %}
-      {% endif %}
       <title>{{site.title}}</title>
-
     </head>
     <body>
+      {% if site.tag_manager_id and jekyll.environment == 'production' %}
+        <!-- Google Tag Manager (noscript) -->
+          <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{site.tag_manager_id}}"
+            height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+        <!-- End Google Tag Manager (noscript) -->
+      {% endif %}
+

data/_layouts/post.html

@@ -4,7 +4,7 @@ layout: default
   <div class="container">
     <div class="col s10">
     <div class="row" style="padding:10px;">
-      <a id="home" class="waves-effect waves-light btn white-text darken-2 grey z-depth-4" href="/#blog"><i class="material-icons">arrow_back</i></a>
+      <a id="home" class="waves-effect waves-light btn white-text darken-2 grey z-depth-4" href="{{site.baseurl}}/#blog"><i class="material-icons">arrow_back</i></a>
     </div>
     <h3 class="post-title" itemprop="name headline" style="text-align:center">{{ page.title | escape }}</h3>
 

data/assets/main.scss

@@ -1,3 +1,6 @@
+---
+# Only the main Sass file needs front matter (the dashes are enough)
+---
 // Syntax highlighting sass properties and inclusion
 $base-font-size: 1em;
 $spacing-unit:     30px !default;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-material-theme
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - James Hamann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -165,6 +165,7 @@ files:
 - _includes/cookies.html
 - _includes/footer.html
 - _includes/google_analytics.html
+- _includes/google_tag_manager.html
 - _includes/head.html
 - _includes/nav-bar.html
 - _includes/nav-burger.html