Merge 7ce41dad5c368e2515c08507cd46e5c6a816dee9 into 7b7303abefd44daf037249f1f9281d46ee1e1a91

README.md

@@ -38,8 +38,11 @@ Additionally, you may choose to set the following optional variables:
 ```yml
 show_downloads: ["true" or "false" to indicate whether to provide a download URL]
 google_analytics: [Your Google Analytics tracking ID]
+google_analytics_v4: [Your Google Analytics v4 (gtags) tracking ID]
 ```
 
+`google_analytics` and `google_analytics_v4` are incompatible, you have to choose one of them, if both are set the later takes precedence.
+
 ### Stylesheet
 
 If you'd like to add your own custom styles:

_layouts/default.html

@@ -4,6 +4,17 @@
     <meta charset='utf-8'>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    {% if site.google_analytics_v4 %}
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics_v4 }}"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', '{{ site.google_analytics_v4 }}');
+    </script>
+    {% endif %}
     <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
 
 {% seo %}
@@ -35,6 +46,7 @@
     </div>
 
     {% if site.google_analytics %}
+      {% unless site.google_analytics_v4 %}
       <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),
@@ -43,6 +55,7 @@
         ga('create', '{{ site.google_analytics }}', 'auto');
         ga('send', 'pageview');
       </script>
+      {% endunless %}
     {% endif %}
   </body>
 </html>