From 64257a7b2c9a860c02eacc35622dd12e882bd6b0 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Wed, 5 Mar 2014 15:45:24 +0000
Subject: [PATCH] testing out new google analytics

---
 .../web/app/coffee/Features/Email/EmailBuilder.coffee    | 2 +-
 services/web/app/views/layout.jade                       | 9 +++++++++
 services/web/public/coffee/forms.coffee                  | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee
index 3ea111764e..720e6e7bfb 100644
--- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee
+++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee
@@ -47,7 +47,7 @@ templates.passwordReset =
 <h1 class="h1">Password Reset</h1>
 <p>
 Your password has been reset, the new password is <p> {{newPassword}}
-<p> 
+<p>
 please <a href="https://www.sharelatex.com/login">login here</a> and then change your password <a href=#{Settings.siteUrl}/user/settings> in your user settings</a>
 
 </p>
diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index bbd213fb40..944d1214b0 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -26,6 +26,15 @@ html(itemscope, itemtype='http://schema.org/Product')
 					var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 				})();
 
+				// this is the new google analytics https://developers.google.com/analytics/devguides/collection/analyticsjs/
+				(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+				(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+				m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+				})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+				ga('create', '#{gaToken}', 'auto');
+				ga('send', 'pageview');
+
 		- if (typeof(mixpanelToken) != "undefined")
 			script(type="text/javascript")
 				(function(c,a){window.mixpanel=a;var b,d,h,e;b=c.createElement("script");
diff --git a/services/web/public/coffee/forms.coffee b/services/web/public/coffee/forms.coffee
index c96a7606a6..ae8d3d100b 100644
--- a/services/web/public/coffee/forms.coffee
+++ b/services/web/public/coffee/forms.coffee
@@ -31,7 +31,9 @@ require [
 				success: (data)->
 					if data.message?
 						new Message data.message
+						ga('send', 'event', 'register', 'failure')
 					else
+						ga('send', 'event', 'register', 'success')
 						window.location = data.redir || "/project"
 				
 
@@ -79,9 +81,12 @@ require [
 			success: (data)->
 				if data.message
 					new Message data.message
+					ga('send', 'event', 'login', 'failure')
 				else if data.redir
 					window.location.href = data.redir
+					ga('send', 'event', 'login', 'success')
 				else
+					ga('send', 'event', 'login', 'success')
 					window.location.href = '/project'
 
 	$('form#passwordReset').submit (event)->