From: Clint Ecker <clintecker@clint-eckers-macbook.local>
Date: Fri, 4 Dec 2009 22:26:12 +0000 (-0500)
Subject: Adding in a lot of cool tests and making the async GA code optional.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d28bca4de2dc2a955138d36f2ae7ea86917e4867;p=django-google-tools.git

Adding in a lot of cool tests and making the async GA code optional.
How to use one or the other is explained in the docs.  Thanks to
Cliff Dyer for the awesome updates and tests!

Merge remote branch 'jcdyer/master'

Conflicts:
	google_analytics/models.py
	google_analytics/templates/google_analytics/analytics_template.html
---

d28bca4de2dc2a955138d36f2ae7ea86917e4867
diff --cc .gitignore
index 0b37ad5,0b37ad5..71bc41a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,3 @@@
  *.pyc
--build
++build
++*.swp
diff --cc AUTHORS
index 0000000,0000000..482e586
new file mode 100644
--- /dev/null
+++ b/AUTHORS
@@@ -1,0 -1,0 +1,9 @@@
++The primary author of thie app is:
++
++ * Clint Ecker <me@clintecker.com>
++
++There are a number of other, awesome contributors:
++
++ * Kevin Fricovsky <http://github.com/howiworkdaily>
++ * J. Cliff Dyer <http://github.com/jcdyer>
++ * Chris Adams <http://github.com/acdha>
diff --cc google_analytics/templates/google_analytics/analytics_async_template.html
index 0000000,2c255c3..f92b7b1
mode 000000,100644..100644
--- a/google_analytics/templates/google_analytics/analytics_async_template.html
+++ b/google_analytics/templates/google_analytics/analytics_async_template.html
@@@ -1,0 -1,11 +1,13 @@@
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', '{{ analytics_code }}']);
+ _gaq.push(['_trackPageview']);
+ (function() {
+  var ga=document.createElement('script');
+  ga.src=('https:'==document.location.protocol ? 
+    'https://ssl' : 'http://www')+'.google-analytics.com/ga.js';
+  ga.setAttribute('async','true');
 - document.documentElement.firstChild.appendChild(ga);})();
++ // Avoid problems if the document doesn't actually contain a HEAD element:
++ var container = document.getElementsByTagName("head")[0] || document.body;
++ container.appendChild(ga); 
+ </script>
diff --cc google_analytics/templates/google_analytics/analytics_template.html
index 4cf0288,5fb5df1..42a832f
--- a/google_analytics/templates/google_analytics/analytics_template.html
+++ b/google_analytics/templates/google_analytics/analytics_template.html
@@@ -1,15 -1,9 +1,9 @@@
  <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', '{{ analytics_code }}']);
- _gaq.push(['_trackPageview']);
- 
- (function() {
- var ga = document.createElement('script');
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- ga.setAttribute('async', 'true');
- 
- // Avoid problems if the document doesn't actually contain a HEAD element:
- var container = document.getElementsByTagName("head")[0] || document.body;
- container.appendChild(ga);
- })();
- </script>
+ var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+ </script>
+ <script type="text/javascript">
+ var pageTracker = _gat._getTracker("{{ analytics_code }}");
+ pageTracker._initData();
+ pageTracker._trackPageview();
 -</script>
++</script>