Merge branch 'master' of github.com:ireapps/census

ireapps · Jun 22, 2011 · 0a92f71 · 0a92f71
2 parents 9b940db + 6858468
commit 0a92f71
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/censusweb/api/templates/base.html b/censusweb/api/templates/base.html
@@ -21,6 +21,19 @@
             window.API_URL = "{{ settings.API_URL }}";
             window.DEFAULT_TABLES = "{{ settings.DEFAULT_TABLES|join:',' }}";
         </script>
+        <script type="text/javascript">
+
+          var _gaq = _gaq || [];
+          _gaq.push(['_setAccount', 'UA-5895970-1']);
+          _gaq.push(['_trackPageview']);
+
+          (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';
+            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+          })();
+
+        </script>        
     </head>
     <body>
         <div id="ajax-loader"><img src="{{ MEDIA_URL }}images/ajax-loader.gif" /> Loading...</div>

diff --git a/censusweb/requirements.txt b/censusweb/requirements.txt
@@ -2,7 +2,7 @@ Django==1.3
 Fabric==0.9.4
 SQLAlchemy==0.6.6
 argparse==1.2.1
-csvkit==0.2
+csvkit==0.2.3
 django-boundaryservice==0.1.9
 django-debug-toolbar==0.8.4
 django-tastypie==0.9.9