From ba80b257271b64a4d1ac21883e8caacfcef032a4 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sat, 1 Nov 2014 23:56:52 -0400 Subject: [PATCH] VRFS-2297 added tool tip to band tab of musician profile, couple of other bug fixes --- web/app/assets/javascripts/profile.js | 7 +++++-- web/app/views/clients/_hoverRecording.html.erb | 2 +- web/app/views/users/_feed_recording_ajax.html.haml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js index 01816475c..a7b27526b 100644 --- a/web/app/assets/javascripts/profile.js +++ b/web/app/assets/javascripts/profile.js @@ -619,10 +619,12 @@ for (var j = 0; j < musician.instruments.length; j++) { var instrument = musician.instruments[j]; var inst = '/assets/content/icon_instrument_default24.png'; + var toolTip = ''; if (instrument.instrument_id in instrument_logo_map) { inst = instrument_logo_map[instrument.instrument_id].asset; + toolTip = instrument.instrument_id; } - instrumentLogoHtml += ' '; + instrumentLogoHtml += ' '; } } // this template is in _findSession.html.erb @@ -632,7 +634,8 @@ avatar_url: context.JK.resolveAvatarUrl(musician.photo_url), profile_url: "/client#/profile/" + musician.id, musician_name: musician.name, - instruments: instrumentLogoHtml + instruments: instrumentLogoHtml, + more_link: '' }); } } diff --git a/web/app/views/clients/_hoverRecording.html.erb b/web/app/views/clients/_hoverRecording.html.erb index 5e9dbed9a..fc8054056 100644 --- a/web/app/views/clients/_hoverRecording.html.erb +++ b/web/app/views/clients/_hoverRecording.html.erb @@ -22,7 +22,7 @@
{description}
- {play_count} > + {play_count} {comment_count} {like_count}
diff --git a/web/app/views/users/_feed_recording_ajax.html.haml b/web/app/views/users/_feed_recording_ajax.html.haml index 351901f58..4040bb9d8 100644 --- a/web/app/views/users/_feed_recording_ajax.html.haml +++ b/web/app/views/users/_feed_recording_ajax.html.haml @@ -96,7 +96,7 @@ .nowrap = '{% if(track.instrument_ids) { %}' = '{% _.each(_.uniq(track.instrument_ids), function(instrument_id) { %}' - %img.instrument-icon{'instrument-id' =>'{{instrument_id}}','title' =>'{{instrument_id}}', height:24, width:24} + %img.instrument-icon{'instrument-id' =>'{{instrument_id}}', 'title' =>'{{instrument_id}}', height:24, width:24} = '{% }) %}' = '{% } else { %}' %img.instrument-icon{'instrument-id' =>'default', height:24, width:24}