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-2093 fixed formatting and band URL issues with band search and hover bubble

This commit is contained in:
Brian Smith 2014-08-28 00:31:22 -04:00
parent f39312662d
commit 7d5cfa4cd2
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/assets/javascripts/hoverBand.js
View File

@ -33,7 +33,7 @@
var instrumentHtml = '';
musicianHtml += '<tr><td width="50"><a user-id="' + val.id + '" profileaction="musician" class="avatar-tiny"><img src="' + context.JK.resolveAvatarUrl(val.photo_url) + '" /></a></td>';
musicianHtml += '<td width="75"><<a user-id="' + val.id + '" profileaction="musician">' + val.name + '</a></td>';
musicianHtml += '<td width="75"><a user-id="' + val.id + '" profileaction="musician">' + val.name + '</a></td>';
instrumentHtml = '<td><div class="nowrap">';
if (val.instruments) { // @FIXME: edge case for Test user that has no instruments?

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

@ -640,7 +640,7 @@
var bandHtml = context.JK.fillTemplate(template, {
bandId: val.id,
biography: val.biography,
band_url: "/client#/bandProfile/" + val.id,
profile_url: "/client#/bandProfile/" + val.id,
avatar_url: context.JK.resolveBandAvatarUrl(val.photo_url),
name: val.name,
location: val.location,

2
web/app/assets/javascripts/searchResults.js
View File

@ -151,7 +151,7 @@
var searchResultHtml = context.JK.fillTemplate($(template_name).html(), {
bandId: val.id,
avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
band_url: val.website,
profile_url: "/client#/bandProfile/" + val.id,
bandName: val.name,
location: val.location
});

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

@ -205,7 +205,7 @@
{session_count} <img src="../assets/content/icon_session_tiny.png" width="12" height="12" align="absmiddle" />
</div>
<div class="result-list-button-wrapper">
<a class="button-orange smallbutton" href="{band_url}">PROFILE</a>
<a class="button-orange smallbutton" href="{profile_url}">PROFILE</a>
<a id="btn-follow-band-2" class="button-orange smallbutton">FOLLOW</a>
</div>
</div>

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

@ -59,7 +59,7 @@
<img src="{avatar_url}" />
</a>
<div class="search-result-name">
<a band-id="{bandId}" hoveraction="band" href="{band_url}">{bandName}</a><br />
<a band-id="{bandId}" hoveraction="band" href="{profile_url}">{bandName}</a><br />
<span class="search-result-location">{location}</span>
</div>
<br clear="left" />

5
web/app/views/clients/_sidebar.html.erb
View File

@ -160,9 +160,10 @@
<img src="{avatar_url}" />
</a>
<div class="result-name">
<a band-id="{bandId}" hoveraction="band" href="{band_url}">{bandName}</a><br />
<a band-id="{bandId}" hoveraction="band" href="{profile_url}">{bandName}</a><br />
<span class="result-location">{location}</span>
</div><br />
</div>
<br clear="all" />
</div>
</script>