diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js index 20efadbf6..e59fb8f9d 100644 --- a/web/app/assets/javascripts/profile.js +++ b/web/app/assets/javascripts/profile.js @@ -39,9 +39,9 @@ var $reverbNationPresence = $screen.find('#reverbnation-presence'); var $bandCampPresence = $screen.find('#bandcamp-presence'); var $fandalismPresence = $screen.find('#fandalism-presence'); - var $soundCloudPresence = $screen.find('#youtube-presence'); - var $soundCloudPresence = $screen.find('#facebook-presence'); - var $youTubePresence = $screen.find('#twitter-presence'); + var $youTubePresence = $screen.find('#youtube-presence'); + var $facebookPresence = $screen.find('#facebook-presence'); + var $twitterPresence = $screen.find('#twitter-presence'); // current interests var $noInterests = $screen.find('#no-interests'); @@ -519,15 +519,67 @@ $noOnlinePresence.show(); } else { - $noOnlinePresence.hide(); + $noOnlinePresence.hide(); - if (user.website) { - $userWebsite.append(""); - } + if (user.website) { + $userWebsite.find('a').attr('href', user.website); + } - $.each(onlinePresences, function(index, presence) { + var soundCloudPresences = profileUtils.soundCloudPresences(onlinePresences); + if (soundCloudPresences && soundCloudPresences.length > 0) { + $soundCloudPresence.find('a').attr('href', 'http://www.soundcloud.com/' + soundCloudPresences[0].username); + } + else { + $soundCloudPresence.hide(); + } - }); + var reverbNationPresences = profileUtils.reverbNationPresences(onlinePresences); + if (reverbNationPresences && reverbNationPresences.length > 0) { + $reverbNationPresence.find('a').attr('href', 'http://www.reverbnation.com/' + reverbNationPresences[0].username); + } + else { + $reverbNationPresence.hide(); + } + + var bandCampPresences = profileUtils.bandCampPresences(onlinePresences); + if (bandCampPresences && bandCampPresences.length > 0) { + $bandCampPresence.find('a').attr('href', 'http://' + bandCampPresences[0].username + '.bandcamp.com/'); + } + else { + $bandCampPresence.hide(); + } + + var fandalismPresences = profileUtils.fandalismPresences(onlinePresences); + if (fandalismPresences && fandalismPresences.length > 0) { + $fandalismPresence.find('a').attr('href', 'http://www.fandalism.com/' + fandalismPresences[0].username); + } + else { + $fandalismPresence.hide(); + } + + var youTubePresences = profileUtils.youTubePresences(onlinePresences); + if (youTubePresences && youTubePresences.length > 0) { + $youTubePresence.find('a').attr('href', 'http://www.youtube.com/' + youTubePresences[0].username); + } + else { + $youTubePresence.hide(); + } + + var facebookPresences = profileUtils.facebookPresences(onlinePresences); + if (facebookPresences && facebookPresences.length > 0) { + $facebookPresence.find('a').attr('href', 'http://www.facebook.com/' + facebookPresences[0].username); + } + else { + $facebookPresence.hide(); + } + + var twitterPresences = profileUtils.twitterPresences(onlinePresences); + if (twitterPresences && twitterPresences.length > 0) { + $twitterPresence.find('a').attr('href', 'http://www.twitter.com/' + twitterPresences[0].username); + } + else { + $twitterPresence.hide(); + } } // current interests diff --git a/web/app/assets/javascripts/profile_utils.js b/web/app/assets/javascripts/profile_utils.js index 32b5ce542..57b51448f 100644 --- a/web/app/assets/javascripts/profile_utils.js +++ b/web/app/assets/javascripts/profile_utils.js @@ -232,7 +232,7 @@ profileUtils.twitterPresences = function(presences) { var matches = $.grep(presences, function(p) { - return s.service_type === ONLINE_PRESENCE_TYPES.TWITTER.description; + return p.service_type === ONLINE_PRESENCE_TYPES.TWITTER.description; }); return matches; diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb index e95e22c45..a51f9fedb 100644 --- a/web/app/views/clients/_profile.html.erb +++ b/web/app/views/clients/_profile.html.erb @@ -137,28 +137,36 @@
None specified
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+