From 1eab45d6b231467a38fe67969034f1851272ea9f Mon Sep 17 00:00:00 2001
From: Uros Trebec <uros@trebec.org>
Date: Sat, 1 Oct 2011 22:14:56 +0200
Subject: [PATCH 1/6] Added a 'GOOGLE_ANALYTICS_PAGE_LOAD_TIME' option to
 insert '_trackPageLoadTime' in google_analytics.py templatetag

---
 analytical/templatetags/google_analytics.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/analytical/templatetags/google_analytics.py b/analytical/templatetags/google_analytics.py
index 0aad6f3..3ed6f52 100644
--- a/analytical/templatetags/google_analytics.py
+++ b/analytical/templatetags/google_analytics.py
@@ -49,6 +49,7 @@ NO_ALLOW_HASH_CODE = "_gaq.push(['_setAllowHash', false]);"
 ALLOW_LINKER_CODE = "_gaq.push(['_setAllowLinker', true]);"
 CUSTOM_VAR_CODE = "_gaq.push(['_setCustomVar', %(index)s, '%(name)s', " \
         "'%(value)s', %(scope)s]);"
+PAGE_LOAD_TIME_CODE = "_gaq.push(['_trackPageLoadTime']);"
 
 
 register = Library()
@@ -76,6 +77,7 @@ class GoogleAnalyticsNode(Node):
     def render(self, context):
         commands = self._get_domain_commands(context)
         commands.extend(self._get_custom_var_commands(context))
+        commands.extend(self._get_other_commands(context))
         html = SETUP_CODE % {'property_id': self.property_id,
                 'commands': " ".join(commands)}
         if is_internal_ip(context, 'GOOGLE_ANALYTICS'):
@@ -114,6 +116,12 @@ class GoogleAnalyticsNode(Node):
             commands.append(CUSTOM_VAR_CODE % locals())
         return commands
 
+    def _get_other_commands(self, context):
+        commands = []
+        page_load_time = getattr(settings, 'GOOGLE_ANALYTICS_PAGE_LOAD_TIME', False)
+        if page_load_time:
+            commands.append(PAGE_LOAD_TIME_CODE)
+        return commands
 
 def contribute_to_analytical(add_node):
     GoogleAnalyticsNode()  # ensure properly configured

From a4b076f9e803501b8c1b6b3b810319173553f842 Mon Sep 17 00:00:00 2001
From: Uros Trebec <uros@trebec.org>
Date: Mon, 3 Oct 2011 19:57:17 +0200
Subject: [PATCH 2/6] Added a 'test_track_page_load_time' to test
 '_trackPageLoadTime' enabled by GOOGLE_ANALYTICS_PAGE_LOAD_TIME

---
 analytical/tests/test_tag_google_analytics.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/analytical/tests/test_tag_google_analytics.py b/analytical/tests/test_tag_google_analytics.py
index 3885337..1dd795b 100644
--- a/analytical/tests/test_tag_google_analytics.py
+++ b/analytical/tests/test_tag_google_analytics.py
@@ -62,6 +62,11 @@ class GoogleAnalyticsTagTestCase(TagTestCase):
         self.assertTrue("_gaq.push(['_setCustomVar', 5, 'test2', 'bar', 1]);"
                 in r, r)
 
+    @override_settings(GOOGLE_ANALYTICS_PAGE_LOAD_TIME=True)
+    def test_track_page_load_time(self):
+        r = GoogleAnalyticsNode().render(Context())
+        self.assertTrue("_gaq.push(['_trackPageLoadTime']);" in r, r)
+        
     @override_settings(ANALYTICAL_INTERNAL_IPS=['1.1.1.1'])
     def test_render_internal_ip(self):
         req = HttpRequest()

From fa0e578fdd666950d9b60b52b50c8a56eb4d7161 Mon Sep 17 00:00:00 2001
From: Uros Trebec <uros@trebec.org>
Date: Mon, 3 Oct 2011 20:01:29 +0200
Subject: [PATCH 3/6] Added a default setting "PAGE_LOAD_TIME = False" in
 google_analytics.py templatetags

---
 analytical/templatetags/google_analytics.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/analytical/templatetags/google_analytics.py b/analytical/templatetags/google_analytics.py
index 3ed6f52..4e4f530 100644
--- a/analytical/templatetags/google_analytics.py
+++ b/analytical/templatetags/google_analytics.py
@@ -28,6 +28,8 @@ SCOPE_VISITOR = 1
 SCOPE_SESSION = 2
 SCOPE_PAGE = 3
 
+PAGE_LOAD_TIME = False
+
 PROPERTY_ID_RE = re.compile(r'^UA-\d+-\d+$')
 SETUP_CODE = """
     <script type="text/javascript">
@@ -118,7 +120,8 @@ class GoogleAnalyticsNode(Node):
 
     def _get_other_commands(self, context):
         commands = []
-        page_load_time = getattr(settings, 'GOOGLE_ANALYTICS_PAGE_LOAD_TIME', False)
+        page_load_time = getattr(settings, 'GOOGLE_ANALYTICS_PAGE_LOAD_TIME', 
+                                 PAGE_LOAD_TIME)
         if page_load_time:
             commands.append(PAGE_LOAD_TIME_CODE)
         return commands

From d78f5f7264763273a0ff13f749c35e37a0bdbac5 Mon Sep 17 00:00:00 2001
From: Joost Cassee <joost@cassee.net>
Date: Thu, 6 Oct 2011 18:15:31 +0200
Subject: [PATCH 4/6] Improve Google Analytics variable test

---
 analytical/tests/test_tag_google_analytics.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/analytical/tests/test_tag_google_analytics.py b/analytical/tests/test_tag_google_analytics.py
index 1dd795b..cadf6dd 100644
--- a/analytical/tests/test_tag_google_analytics.py
+++ b/analytical/tests/test_tag_google_analytics.py
@@ -6,7 +6,8 @@ from django.http import HttpRequest
 from django.template import Context
 
 from analytical.templatetags.google_analytics import GoogleAnalyticsNode, \
-        TRACK_SINGLE_DOMAIN, TRACK_MULTIPLE_DOMAINS, TRACK_MULTIPLE_SUBDOMAINS
+        TRACK_SINGLE_DOMAIN, TRACK_MULTIPLE_DOMAINS, TRACK_MULTIPLE_SUBDOMAINS,\
+        SCOPE_VISITOR, SCOPE_SESSION, SCOPE_PAGE
 from analytical.tests.utils import TestCase, TagTestCase, override_settings, \
         without_apps, SETTING_DELETED
 from analytical.utils import AnalyticalException
@@ -54,12 +55,20 @@ class GoogleAnalyticsTagTestCase(TagTestCase):
         self.assertTrue("_gaq.push(['_setAllowLinker', true]);" in r, r)
 
     def test_custom_vars(self):
-        context = Context({'google_analytics_var1': ('test1', 'foo'),
-                'google_analytics_var5': ('test2', 'bar', 1)})
+        context = Context({
+            'google_analytics_var1': ('test1', 'foo'),
+            'google_analytics_var2': ('test2', 'bar', SCOPE_VISITOR),
+            'google_analytics_var4': ('test4', 'baz', SCOPE_SESSION),
+            'google_analytics_var5': ('test5', 'qux', SCOPE_PAGE),
+        })
         r = GoogleAnalyticsNode().render(context)
         self.assertTrue("_gaq.push(['_setCustomVar', 1, 'test1', 'foo', 3]);"
                 in r, r)
-        self.assertTrue("_gaq.push(['_setCustomVar', 5, 'test2', 'bar', 1]);"
+        self.assertTrue("_gaq.push(['_setCustomVar', 2, 'test2', 'bar', 1]);"
+                in r, r)
+        self.assertTrue("_gaq.push(['_setCustomVar', 4, 'test4', 'baz', 2]);"
+                in r, r)
+        self.assertTrue("_gaq.push(['_setCustomVar', 5, 'test5', 'qux', 3]);"
                 in r, r)
 
     @override_settings(GOOGLE_ANALYTICS_PAGE_LOAD_TIME=True)

From 9d701f5d34b3aa1c666017874536b6feeff69838 Mon Sep 17 00:00:00 2001
From: Joost Cassee <joost@cassee.net>
Date: Thu, 6 Oct 2011 18:29:52 +0200
Subject: [PATCH 5/6] Cosmetic changes to site speed tracking

---
 analytical/templatetags/google_analytics.py   | 14 +++++---------
 analytical/tests/test_tag_google_analytics.py |  2 +-
 docs/services/google_analytics.rst            | 13 +++++++++++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/analytical/templatetags/google_analytics.py b/analytical/templatetags/google_analytics.py
index 4e4f530..375a4e8 100644
--- a/analytical/templatetags/google_analytics.py
+++ b/analytical/templatetags/google_analytics.py
@@ -28,8 +28,6 @@ SCOPE_VISITOR = 1
 SCOPE_SESSION = 2
 SCOPE_PAGE = 3
 
-PAGE_LOAD_TIME = False
-
 PROPERTY_ID_RE = re.compile(r'^UA-\d+-\d+$')
 SETUP_CODE = """
     <script type="text/javascript">
@@ -51,7 +49,7 @@ NO_ALLOW_HASH_CODE = "_gaq.push(['_setAllowHash', false]);"
 ALLOW_LINKER_CODE = "_gaq.push(['_setAllowLinker', true]);"
 CUSTOM_VAR_CODE = "_gaq.push(['_setCustomVar', %(index)s, '%(name)s', " \
         "'%(value)s', %(scope)s]);"
-PAGE_LOAD_TIME_CODE = "_gaq.push(['_trackPageLoadTime']);"
+SITE_SPEED_CODE = "_gaq.push(['_trackPageLoadTime']);"
 
 
 register = Library()
@@ -95,8 +93,8 @@ class GoogleAnalyticsNode(Node):
         else:
             domain = get_domain(context, 'google_analytics')
             if domain is None:
-                raise AnalyticalException("tracking multiple domains with Google"
-                        " Analytics requires a domain name")
+                raise AnalyticalException("tracking multiple domains with"
+                        " Google Analytics requires a domain name")
             commands.append(DOMAIN_CODE % domain)
             commands.append(NO_ALLOW_HASH_CODE)
             if tracking_type == TRACK_MULTIPLE_DOMAINS:
@@ -120,10 +118,8 @@ class GoogleAnalyticsNode(Node):
 
     def _get_other_commands(self, context):
         commands = []
-        page_load_time = getattr(settings, 'GOOGLE_ANALYTICS_PAGE_LOAD_TIME', 
-                                 PAGE_LOAD_TIME)
-        if page_load_time:
-            commands.append(PAGE_LOAD_TIME_CODE)
+        if getattr(settings, 'GOOGLE_ANALYTICS_SITE_SPEED', False):
+            commands.append(SITE_SPEED_CODE)
         return commands
 
 def contribute_to_analytical(add_node):
diff --git a/analytical/tests/test_tag_google_analytics.py b/analytical/tests/test_tag_google_analytics.py
index cadf6dd..c833bf3 100644
--- a/analytical/tests/test_tag_google_analytics.py
+++ b/analytical/tests/test_tag_google_analytics.py
@@ -71,7 +71,7 @@ class GoogleAnalyticsTagTestCase(TagTestCase):
         self.assertTrue("_gaq.push(['_setCustomVar', 5, 'test5', 'qux', 3]);"
                 in r, r)
 
-    @override_settings(GOOGLE_ANALYTICS_PAGE_LOAD_TIME=True)
+    @override_settings(GOOGLE_ANALYTICS_SITE_SPEED=True)
     def test_track_page_load_time(self):
         r = GoogleAnalyticsNode().render(Context())
         self.assertTrue("_gaq.push(['_trackPageLoadTime']);" in r, r)
diff --git a/docs/services/google_analytics.rst b/docs/services/google_analytics.rst
index 5b9b940..cfebdd0 100644
--- a/docs/services/google_analytics.rst
+++ b/docs/services/google_analytics.rst
@@ -99,6 +99,19 @@ or set it in the project :file:`settings.py` file using
 :const:`GOOGLE_ANALYTICS_DOMAIN` (fallback: :const:`ANALYTICAL_DOMAIN`).
 
 
+Tracking site speed
+-------------------
+
+You can view page load times in the `Site Speed report`_ by setting the
+:const:`GOOGLE_ANALYTICS_SITE_SPEED` configuration setting::
+
+    GOOGLE_ANALYTICS_SITE_SPEED = True
+
+By default, page load times are not tracked.
+
+.. _`Site Speed report`: http://www.google.com/support/analyticshelp/bin/answer.py?answer=1205784&topic=1282106
+
+
 .. _google-analytics-internal-ips:
 
 Internal IP addresses

From 9e9aa950e8073a98123282dc17e4d512c82fd4e6 Mon Sep 17 00:00:00 2001
From: Joost Cassee <joost@cassee.net>
Date: Thu, 6 Oct 2011 18:30:42 +0200
Subject: [PATCH 6/6] Update changelog and add Uros Trebec to authors

---
 AUTHORS.rst   | 4 +++-
 CHANGELOG.rst | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 85489bc..73c4b11 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,5 +1,6 @@
 The django-analytical package was written by `Joost Cassee`_, with
-contributions from `Eric Davis`_, `Paul Oswald`_ and others.
+contributions from `Eric Davis`_, `Paul Oswald`_, `Uros Trebec`_ and
+others.
 
 Included Javascript code snippets for integration of the analytics
 services were written by the respective service providers.
@@ -12,5 +13,6 @@ The work on Crazy Egg was made possible by `Bateau Knowledge`_.
 .. _`Joost Cassee`: mailto:joost@cassee.net
 .. _`Eric Davis`: https://github.com/edavis
 .. _`Paul Oswald`: https://github.com/poswald
+.. _`Uros Trebec`: https://github.com/failedguidedog
 .. _Analytical: https://github.com/jkrall/analytical
 .. _`Bateau Knowledge`: http://www.bateauknowledge.nl/
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f7bf710..ba70d2f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,8 @@
 Version 0.11.0
 --------------
 * Allow sending events and properties to KISSmetrics (Paul Oswald).
+* Add support for the Site Speed report in Google Analytics (Uros 
+  Trebec).
 
 Version 0.10.0
 --------------
@@ -19,8 +21,8 @@ Version 0.9.1
 Version 0.9.0
 -------------
 * Updated Clicky tracking code to support multiple site ids.
-* Fixed Chartbeat auto-domain bug when the Sites framework is not used (Eric
-  Davis).
+* Fixed Chartbeat auto-domain bug when the Sites framework is not used 
+  (Eric Davis).
 * Improved testing code (Eric Davis).
 
 Version 0.8.1