Merge pull request #3420 from rtfd/support-dashboard-analytics-code

Add concept of dashboard analytics code
readthedocs · Dec 19, 2017 · 6fd8282 · 6fd8282
2 parents 2f8f4c2 + 919d93e
commit 6fd8282
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/docs/ethical-advertising.rst b/docs/ethical-advertising.rst
@@ -9,7 +9,7 @@ Instead of using an existing ad network, we are building the model we want to ex
 We don't track you, sell your data, or anything else.
 We simply show ads to users, based on the content of the pages you look at.
 We also give 10% of our ad space to :ref:`community projects <community-ads>`,
-as our way of saying thanks to the open source community
+as our way of saying thanks to the open source community.
 
 We talk a bit below about :ref:`our worldview on advertising <ethical-info>`,
 if you want to know more.

diff --git a/readthedocs/core/context_processors.py b/readthedocs/core/context_processors.py
@@ -10,7 +10,8 @@ def readthedocs_processor(request):
         'PUBLIC_DOMAIN': getattr(settings, 'PUBLIC_DOMAIN', None),
         'PRODUCTION_DOMAIN': getattr(settings, 'PRODUCTION_DOMAIN', None),
         'USE_SUBDOMAINS': getattr(settings, 'USE_SUBDOMAINS', None),
-        'GLOBAL_ANALYTICS_CODE': getattr(settings, 'GLOBAL_ANALYTICS_CODE', 'UA-17997319-1'),
+        'GLOBAL_ANALYTICS_CODE': getattr(settings, 'GLOBAL_ANALYTICS_CODE'),
+        'DASHBOARD_ANALYTICS_CODE': getattr(settings, 'DASHBOARD_ANALYTICS_CODE'),
         'SITE_ROOT': getattr(settings, 'SITE_ROOT', '') + '/',
         'TEMPLATE_ROOT': getattr(settings, 'TEMPLATE_ROOT', '') + '/',
     }

diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
@@ -312,7 +312,8 @@ def INSTALLED_APPS(self):  # noqa
     STRIPE_PUBLISHABLE = None
 
     # Misc application settings
-    GLOBAL_ANALYTICS_CODE = 'UA-17997319-1'
+    GLOBAL_ANALYTICS_CODE = None
+    DASHBOARD_ANALYTICS_CODE = None  # For the dashboard, not docs
     GRAVATAR_DEFAULT_IMAGE = 'https://media.readthedocs.org/images/silhouette.png'  # NOQA
     OAUTH_AVATAR_USER_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE
     OAUTH_AVATAR_ORG_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE

diff --git a/readthedocs/templates/base.html b/readthedocs/templates/base.html
@@ -187,13 +187,21 @@ <h4>{%  trans "Read the Docs" %}</h4>
 
 </body>
 
+{% if GLOBAL_ANALYTICS_CODE %}
 <!-- BEGIN google analytics -->
 <script type="text/javascript">
 
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', '{{ GLOBAL_ANALYTICS_CODE }}']);
   _gaq.push(['_trackPageview']);
 
+  {% if DASHBOARD_ANALYTICS_CODE %}
+  // Dashboard Analytics Code
+  _gaq.push(['user._setAccount', '{{ DASHBOARD_ANALYTICS_CODE }}']);
+  _gaq.push(['user._trackPageview']);
+  // End Dashboard Analytics Code
+  {% endif %}
+
   (function() {
     var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
@@ -204,5 +212,6 @@ <h4>{%  trans "Read the Docs" %}</h4>
 
 </script>
 <!-- END google analytics -->
+{% endif %}
 
 </html>