seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-2297 added tool tip to band tab of musician profile, couple of other bug fixes

This commit is contained in:
Brian Smith 2014-11-01 23:56:52 -04:00
parent 6b01415484
commit ba80b25727
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/app/assets/javascripts/profile.js
View File

@ -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 += '<img src="' + inst + '" width="24" height="24" />&nbsp;';
instrumentLogoHtml += '<img src="' + inst + '" title="' + toolTip + '" width="24" height="24" />&nbsp;';
}
}
// 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: ''
});
}
}

2
web/app/views/clients/_hoverRecording.html.erb
View File

@ -22,7 +22,7 @@
<br clear="all" />
<div class="f11 mt5 mb5">{description}</div>
<div class="small">
<span id="spnPlayCount">{play_count}</span> <img src="/assets/content/icon_arrow.png" title="plays" width="7" height="12" align="absmiddle" style="vertical-align:middle; margin-right:4px;" />>
<span id="spnPlayCount">{play_count}</span> <img src="/assets/content/icon_arrow.png" title="plays" width="7" height="12" align="absmiddle" style="vertical-align:middle; margin-right:4px;" />
<span id="spnCommentCount">{comment_count}</span> <img src="/assets/content/icon_comment.png" title="comments" width="13" height="12" align="absmiddle" style="vertical-align:middle; margin-right:4px;" />
<span id="spnLikeCount">{like_count}</span> <img src="/assets/content/icon_like.png" title="likes" width="12" height="12" align="absmiddle" style="vertical-align:middle; margin-right:4px;" />
</div>

2
web/app/views/users/_feed_recording_ajax.html.haml
View File

@ -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}