Merge pull request #466 from CDLUC3/main

Move develop forward
CDLUC3 · Sep 13, 2023 · 155babd · 155babd
2 parents c49dba8 + 5a01782
commit 155babd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/impl/ui_common.py b/impl/ui_common.py
@@ -40,6 +40,8 @@ def render(request, template, context={}):
         "feed_cache": [],  # ezidapp.management.commands.newsfeed.getLatestItems(),
         "google_analytics_id": django.conf.settings.GOOGLE_ANALYTICS_ID,
         "debug": django.conf.settings.DEBUG,
+        "matomo_site_url": django.conf.settings.MATOMO_SITE_URL,
+        "matomo_site_id": django.conf.settings.MATOMO_SITE_ID,
     }
     ctx.update(context)
     templ = django.template.loader.get_template(f'{template}.html')
@@ -140,6 +142,8 @@ def error(request, code, content_custom=None):
         "feed_cache": [],  # ezidapp.management.commands.newsfeed.getLatestItems(),
         "google_analytics_id": django.conf.settings.GOOGLE_ANALYTICS_ID,
         "content_custom": content_custom,
+        "matomo_site_url": django.conf.settings.MATOMO_SITE_URL,
+        "matomo_site_id": django.conf.settings.MATOMO_SITE_ID,
     }
     # TODO: Remove this temporary workaround and modify dynamically generated HTML
     # instead.

diff --git a/settings/settings.py.j2 b/settings/settings.py.j2
@@ -380,6 +380,9 @@ ADMIN_GROUP_PID = '{{ admin_search_group_pid }}'
 
 GOOGLE_ANALYTICS_ID = None
 
+MATOMO_SITE_ID = 21
+MATOMO_SITE_URL = 'https://matomo.cdlib.org/'
+
 GZIP_COMMAND = '/usr/bin/gzip'
 ZIP_COMMAND = '/usr/bin/zip'
 

diff --git a/templates/layouts/base.html b/templates/layouts/base.html
@@ -65,6 +65,24 @@
       {% endfor %}
     {% endif %}
   {% endif %}
+
+  <!-- Matomo -->
+  <script>
+    var _paq = window._paq = window._paq || [];
+    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+
+    (function() {
+      var u='{{ matomo_site_url }}';
+      _paq.push(['setTrackerUrl', u+'matomo.php']);
+      _paq.push(['setSiteId', '{{ matomo_site_id }}']);
+      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+      g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    })();
+  </script>
+  <!-- End Matomo Code -->
+
   </head>
   <body>
     <!--[if lt IE 10]>