Merge branch 'develop'

WHOIGit · Feb 2, 2021 · e1d4c09 · e1d4c09
2 parents 8ef291c + 49e6d03
commit e1d4c09
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/.envs.example/.production/.django b/.envs.example/.production/.django
@@ -54,6 +54,9 @@ DJANGO_SU_PASSWORD=admin
 # Site Domain
 RDB_SITE_URL=https://yourdomain.com
 
+# Google Analytics option
+RDB_GOOGLE_ANALYTICS_ID=
+
 # Settings for RDB serial number generation functions
 # ------------------------------------------------------------------------------
 # Default pattern - "1, 2, 3, ... etc."

diff --git a/README.rst b/README.rst
@@ -10,7 +10,7 @@ Django application to manage Part, Location, and Assembly Templates, and Invento
 Requirements
 ============
 
-Django 2.2
+Django 3.1
 ------------------
 - Based on Django Cookiecutter template and included apps (http://cookiecutter-django.readthedocs.io/en/latest/index.html)
 - django-mptt - Django app to use Modified Preorder Tree Traversal for hierarchical data models

diff --git a/roundabout/core/context_processors.py b/roundabout/core/context_processors.py
@@ -29,6 +29,7 @@
 def template_get_env_variables(request):
     data = {}
     data['rdb_site_url'] = env('RDB_SITE_URL', default='')
+    data['rdb_google_analytics_id'] = env('RDB_GOOGLE_ANALYTICS_ID', default=None)
     return data
 
 # Set sitewide template variable for headings/labels display

diff --git a/roundabout/templates/base.html b/roundabout/templates/base.html
@@ -26,6 +26,19 @@
 <html lang="en">
 
 <head>
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <!-- Optional, add a "Measurement ID" in environmental variables to use -->
+  {% if rdb_google_analytics_id %}
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ rdb_google_analytics_id }}"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', '{{ rdb_google_analytics_id }}');
+    </script>
+  {% endif %}
+
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <title>{% block title %}Roundabout DB{% endblock title %}</title>
@@ -184,7 +197,7 @@ <h5><span class="badge badge-pill badge-success">Editing Templates</span></h5>
 
     <!--Copyright-->
     <div class="footer-copyright py-3 text-center">
-        &copy; OOI-CGSN | Roundabout DB | <a href="https://github.com/WHOIGit/ooicgsn-roundabout" target="_blank">v1.6.2</a> 
+        &copy; OOI-CGSN | Roundabout DB | <a href="https://github.com/WHOIGit/ooicgsn-roundabout" target="_blank">v1.6.2</a>
     </div>
     <!--/.Copyright-->