From 6a8df758cf6b2d4bc2a56c99a520a4f2eb2cbabe Mon Sep 17 00:00:00 2001
From: Pat Mellon <pat@shiftlabny.com>
Date: Wed, 28 Oct 2020 16:02:23 -0400
Subject: [PATCH] Update analytics

---
 _templates/layout.html | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/_templates/layout.html b/_templates/layout.html
index ee2aa0e547d..082b2f262cc 100644
--- a/_templates/layout.html
+++ b/_templates/layout.html
@@ -2,17 +2,6 @@
 
 {% block footer %}
 {{ super() }}
-<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', 'UA-90545585-2', 'auto');
-  ga('send', 'pageview');
-
-</script>
-
 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-117752657-2"></script>
 
 <script>
@@ -45,12 +34,12 @@
       tutorialLink: window.location.href,
       downloadTitle: $(this).attr("data-response")
     });
-    ga('send', {
-      hitType: 'event',
-      eventCategory: 'Download',
-      eventAction: 'click',
-      eventLabel: $(this).attr("data-response")
+
+    gtag('event', 'click', {
+      'event_category': 'Download',
+      'event_label': $(this).attr("data-response")
     });
+
     gtag('event', 'click', {
       'event_category': $(this).attr("data-response"),
       'event_label': $("h1").first().text(),
@@ -61,17 +50,18 @@
    $("[data-behavior='was-this-helpful-event']").on('click', function(){
     $(".helpful-question").hide();
     $(".was-helpful-thank-you").show();
+
     fbq('trackCustom', "Was this Helpful?", {
       tutorialLink: window.location.href,
       tutorialTitle: $('h1:first').text(),
       helpful: $(this).attr("data-response")
     });
-    ga('send', {
-      hitType: 'event',
-      eventCategory: 'Was this Helpful?',
-      eventAction: 'click',
-      eventLabel: $(this).attr("data-response")
+
+    gtag('event', $(this).attr("data-response"), {
+      'event_category': 'Was this Helpful?',
+      'event_label': $(this).attr("data-response")
     });
+
     gtag('event', $(this).attr("data-response"), {
       'event_category': 'Was this Helpful?',
       'event_label': $("h1").first().text()