|
- <% [: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}") %>
+ <% [: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") %>
<% end %>
|
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/assets/stylesheets/web/welcome.css.scss b/web/app/assets/stylesheets/web/welcome.css.scss
index e78d9df34..c7ac49fbb 100644
--- a/web/app/assets/stylesheets/web/welcome.css.scss
+++ b/web/app/assets/stylesheets/web/welcome.css.scss
@@ -13,6 +13,12 @@ body.web {
}
}
}
+ .share_links {
+ position: absolute;
+ top: 116px;
+ left: 1100px;
+ z-index: 10;
+ }
.buzz {
width: 300px;
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 3a52f9e3b..ed67b405c 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 =<