new GA working

3 files changed, 44 insertions, 19 deletions

diff --git a/mkdocs/docs/js/google-analytics.js b/mkdocs/docs/js/google-analytics.js
index 05a139d..c8322a7 100644
--- a/mkdocs/docs/js/google-analytics.js
+++ b/mkdocs/docs/js/google-analytics.js
@@ -1,20 +1,3 @@
-(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', '//www.google-analytics.com/analytics.js', 'ga');
-
-ga('create', 'UA-48316355-1', 'auto');
-ga('require', 'displayfeatures');
-//ga('require', 'linkid', 'linkid.js');
-ga('send', 'pageview');
-
 // Monitor all download links in GA
 window.onload = function() {
     var a = document.getElementsByTagName('a');
@@ -25,7 +8,7 @@ window.onload = function() {
         if (x != -1) {
             url = url.substr(0, x);
         }
-        var url_test = url.match(/^https?:\/\/.+(\.rpm|\.deb|\/q|\.tar\.gz|\.zip|\.bat|\.exe)$/i);
+        var url_test = url.match(/^https?:\/\/.+(\/rpms\/.*\.rpm|\/deb\/.*\.deb|single-binary\/Darwin\/.*\/q|\/archive\/.*\.tar\.gz|\/archive\/.*\.zip|\/windows\/.*\.exe)$/i);
         if (url_test) {
             console.log("Converting url to be GA aware: " + url);
             if (url_test.length > 1) {
@@ -38,7 +21,8 @@ window.onload = function() {
             a[i].onclick = function() {
                 console.log("Sending GA event for link" + url);
                 var that = this;
-                ga('send', 'event', 'Downloads', 'Click on ' + this.event_action, this.getAttribute('href'));
+              //ga('send', 'event', 'Downloads', 'Click on ' + this.event_action, this.getAttribute('href'));
+                gtag('event','perform download', { 'event_category': 'Downloads', 'event_label': 'Download ' + this.event_action  , 'value': 1 });
                 setTimeout(function() {
                     location.href = that.href;
                 }, 500);
diff --git a/mkdocs/mkdocs.yml b/mkdocs/mkdocs.yml
index 21d11af..6cb5402 100644
--- a/mkdocs/mkdocs.yml
+++ b/mkdocs/mkdocs.yml
@@ -22,6 +22,7 @@ theme:
     code: 'Roboto Mono'
   favicon: 'img/q-logo1.ico'
   logo: 'img/q-logo1.ico'
+  custom_dir: 'theme'
 extra:
   social:
     - type: 'github'
@@ -42,3 +43,15 @@ markdown_extensions:
   - fenced_code
   - admonition
     #  - codehilite
+
+
+##<!-- Global site tag (gtag.js) - Google Analytics -->
+##<script async src="https://www.googletagmanager.com/gtag/js?id=UA-48316355-1"></script>
+##<script>
+##  window.dataLayer = window.dataLayer || [];
+##  function gtag(){dataLayer.push(arguments);}
+##  gtag('js', new Date());
+##
+##  gtag('config', 'UA-48316355-1');
+## </script>
+
diff --git a/mkdocs/theme/main.html b/mkdocs/theme/main.html
new file mode 100644
index 0000000..8fd1489
--- /dev/null
+++ b/mkdocs/theme/main.html
@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% block analytics %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+{% set analytics = config.google_analytics %}
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ analytics[0] }}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+gtag('config', '{{ analytics[0] }}');
+gtag('send','pageview');
+
+/* Register handler to log search on blur */
+  document.addEventListener("DOMContentLoaded", () => {
+    if (document.forms.search) {
+      var query = document.forms.search.query
+      query.addEventListener("blur", function() {
+        if (this.value) {
+          var path = document.location.pathname;
+          ga("send", "pageview", path + "?q=" + this.value)
+        }
+      })
+    }
+  });
+</script>
+{% endblock %}