From 91ca1af98bcfb3a13ee83c1498fcdc12a5bbb7bd Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Sun, 11 May 2014 06:42:20 +0000
Subject: [PATCH] VRFS-736 like us GA support

---
 .../app/views/layouts/user_mailer.html.erb         |  4 ++--
 web/app/assets/javascripts/ga.js                   |  9 ++++++---
 web/app/assets/javascripts/utils.js                |  5 ++++-
 web/app/controllers/users_controller.rb            | 14 +++++++++++++-
 web/app/views/clients/_footer.html.erb             |  7 -------
 web/app/views/users/welcome.html.haml              | 12 ++++++++++++
 6 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb b/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb
index 159221f5b..d12abf802 100644
--- a/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb
+++ b/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb
@@ -49,8 +49,8 @@
 <table align="center" width="650" cellpadding="10" bgcolor="#156572" cellspacing="0">
   <tr>
     <td align="center" valign="top">
-    <% [:twitter, :facebook, :google].each do |src| %>
-       <%= link_to(image_tag("http://www.jamkazam.com/assets/content/icon_#{src}.png", :style => "vertical-align:top"), "http://www.jamkazam.com/endorse/@USERID/#{src}") %>&nbsp;
+    <% [:twitter, :facebook, :google].each do |site| %>
+       <%= link_to(image_tag("http://www.jamkazam.com/assets/content/icon_#{site}.png", :style => "vertical-align:top"), "http://www.jamkazam.com/endorse/@USERID/#{site}?src=email") %>&nbsp;
     <% end %>
     </td>
   </tr>
diff --git a/web/app/assets/javascripts/ga.js b/web/app/assets/javascripts/ga.js
index a2d30f72b..9b5ea6d24 100644
--- a/web/app/assets/javascripts/ga.js
+++ b/web/app/assets/javascripts/ga.js
@@ -79,7 +79,10 @@
         band : 'Band',
         fan : 'Fan',
         recording : 'Recording',
-        session : 'Session'
+        session : 'Session',
+        facebook: 'facebook',
+        twitter: 'twitter',
+        google: 'google',
     };
 
     var categories = {
@@ -271,11 +274,11 @@
         context.ga('send', 'event', categories.band, bandAction);
     }
 
-    function trackJKSocial(category, target) {
+    function trackJKSocial(category, target, data) {
         assertOneOf(category, categories);
         assertOneOf(target, jkSocialTargets);
 
-        context.ga('send', 'event', category, target);
+        context.ga('send', 'event', category, target, data);
     }
 
 
diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js
index fd689608d..9ba52282f 100644
--- a/web/app/assets/javascripts/utils.js
+++ b/web/app/assets/javascripts/utils.js
@@ -608,7 +608,10 @@
   };
 
   context.JK.clientType = function () {
-    return context.jamClient.IsNativeClient() ? 'client' : 'browser';
+      if (context.jamClient) {
+          return context.jamClient.IsNativeClient() ? 'client' : 'browser';
+      } 
+      return 'browser';
   }
   /**
    * Returns 'MacOSX' if the os appears to be macintosh,
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 3a52f9e3b..b27fbfae6 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -386,7 +386,19 @@ class UsersController < ApplicationController
     elsif 'google'==service
       url = "https://plus.google.com/share?url=#{url}"
     end
-    redirect_to url 
+    if 'email'==params[:src]
+      js =<<JS
+<script type="text/javascript">
+$(function() {
+  JK.GA.trackJKSocial(JK.GA.Categories.jkLike, '#{service}', 'browser');
+  window.location = "#{url}";
+});
+</script>
+JS
+      render :inline => js, :layout => 'landing'
+    else
+      redirect_to url 
+    end
   end
 
   private
diff --git a/web/app/views/clients/_footer.html.erb b/web/app/views/clients/_footer.html.erb
index 5ac12e675..5c4fee259 100644
--- a/web/app/views/clients/_footer.html.erb
+++ b/web/app/views/clients/_footer.html.erb
@@ -1,10 +1,3 @@
-<div style="width:100%; text-align:center">
-  <div style="margin:0 auto; display: inline-block">
-    <% [:twitter, :facebook, :google].each do |src| %>
-       <%= link_to(image_tag("content/icon_#{src}.png", :style => "vertical-align:top"), "/endorse/0/#{src}") %>&nbsp;
-    <% end %>
-  </div>
-</div>
 <!-- start footer -->
 <div id="footer">
 
diff --git a/web/app/views/users/welcome.html.haml b/web/app/views/users/welcome.html.haml
index dcad67dd0..69df20f0c 100644
--- a/web/app/views/users/welcome.html.haml
+++ b/web/app/views/users/welcome.html.haml
@@ -6,6 +6,12 @@
     .clearleft
     = link_to "Already have an account?", signin_path, class: "signin", id: "signin"
 
+  %div{:style => "width:100%; text-align:center"}
+    %div{:style => "margin:0 auto; display: inline-block"}
+      - [:twitter, :facebook, :google].each do |site|
+        = link_to(image_tag("content/icon_#{site}.png", :style => "vertical-align:top"), "javascript:void(0)", {'data-site' => site, :class => 'like-link'}) 
+        = ' '
+
 - content_for :after_black_bar do
   - if @jamfest_2014
     .jamfest{style: 'top:-70px;position:relative'}
@@ -24,6 +30,12 @@
   :javascript
     $(function () {
       window.JK.WelcomePage();
+
+      $('.like-link').click(function() {
+        var like_site = $(this).data('site');
+        JK.GA.trackJKSocial(JK.GA.Categories.jkLike, like_site, JK.clientType());
+        window.open("/endorse/0/"+like_site, '_blank');
+      });
     })
 
 - content_for :extra_dialogs do