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-1012-fixing any URLs that don't start with /client

This commit is contained in:
Seth Call 2014-02-04 13:48:13 +00:00
parent 7797b6907c
commit 5df00b2883
8 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
View File

@ -13,7 +13,7 @@
<% end %>
</td>
<td width="70%"><font color="#ccc"><%= user.biography %></font><br /><br />
<a style="<%= link_style %>" href="http://<%= @host %>/#/profile/<%= user.id %>">Profile</a>&nbsp;&nbsp;<!--<a style="<%= link_style %>" href="">Friend</a>-->
<a style="<%= link_style %>" href="http://<%= @host %>/client#/profile/<%= user.id %>">Profile</a>&nbsp;&nbsp;<!--<a style="<%= link_style %>" href="">Friend</a>-->
</td>
</tr>
<tr><td colspan="3"></td></tr>

2
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
View File

@ -1,7 +1,7 @@
New JamKazam Musicians in your Area
<% @new_nearby.each do |user| %>
<%= user.name %> (http://<%= @host %>/#/profile/<%= user.id %>)
<%= user.name %> (http://<%= @host %>/client#/profile/<%= user.id %>)
<%= user.location %>
<% user.instruments.collect { |inst| inst.description }.join(', ') %>
<%= user.biography %>

11
web/app/assets/javascripts/bandProfile.js
View File

@ -152,12 +152,14 @@
$('#btn-follow-band').text('STOP FOLLOWING');
$('#btn-follow-band').click(function() {
removeFollowing(true, bandId);
return false;
});
}
else {
$('#btn-follow-band').text('FOLLOW');
$('#btn-follow-band').click(function() {
addFollowing(true, bandId);
return false;
});
}
}
@ -176,12 +178,14 @@
$btnFollowMember.text('UN-FOLLOW');
$btnFollowMember.click(function() {
removeFollowing(false, userId);
return false;
});
}
else {
$btnFollowMember.text('FOLLOW');
$btnFollowMember.click(function() {
addFollowing(false, userId);
return false;
});
}
}
@ -385,7 +389,7 @@
var template = $('#template-band-profile-members').html();
var memberHtml = context.JK.fillTemplate(template, {
userId: musician.id,
profile_url: "/#/profile/" + musician.id,
profile_url: "/client#/profile/" + musician.id,
avatar_url: context.JK.resolveAvatarUrl(musician.photo_url),
name: musician.name,
location: musician.location,
@ -424,6 +428,8 @@
$divMember.remove();
})
.fail(app.ajaxError);
return false;
});
}
else {
@ -475,7 +481,8 @@
$("#btn-edit-band-profile").click(function() {
$('div[layout-id="band/setup"] .hdn-band-id').val(bandId);
context.location = "#/band/setup";
context.location = "/client#/band/setup";
return false;
});
}

4
web/app/assets/javascripts/findBand.js
View File

@ -106,7 +106,7 @@
playerVals = {
player_name: aPlayer.name,
profile_url: '/#/profile/' + aPlayer.user_id,
profile_url: '/client#/profile/' + aPlayer.user_id,
avatar_url: context.JK.resolveAvatarUrl(aPlayer.photo_url),
player_instruments: player_instrs
};
@ -126,7 +126,7 @@
bVals = {
avatar_url: context.JK.resolveAvatarUrl(bb.photo_url),
profile_url: "/#/profile/" + bb.id,
profile_url: "/client#/profile/" + bb.id,
band_name: bb.name,
band_location: bb.city + ', ' + bb.state,
genres: bgenres,

6
web/app/assets/javascripts/findMusician.js
View File

@ -106,14 +106,14 @@
aFollow = mm['followings'][jj];
followVals = {
musician_name: aFollow.name,
profile_url: '/#/profile/' + aFollow.user_id,
profile_url: '/client#/profile/' + aFollow.user_id,
avatar_url: context.JK.resolveAvatarUrl(aFollow.photo_url),
};
follows += context.JK.fillTemplate(fTemplate, followVals);
if (2 == jj) break;
}
var actionVals = {
profile_url: "/#/profile/" + mm.id,
profile_url: "/client#/profile/" + mm.id,
friend_class: 'button-' + (mm['is_friend'] ? 'grey' : 'orange'),
friend_caption: (mm.is_friend ? 'DIS':'')+'CONNECT',
follow_class: 'button-' + (mm['is_following'] ? 'grey' : 'orange'),
@ -124,7 +124,7 @@
mVals = {
avatar_url: context.JK.resolveAvatarUrl(mm.photo_url),
profile_url: "/#/profile/" + mm.id,
profile_url: "/client#/profile/" + mm.id,
musician_name: mm.name,
musician_location: mm.city + ', ' + mm.state,
instruments: instr_logos,

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

@ -88,7 +88,7 @@
events();
$('.profile').on('click', function() {
context.location = '#/profile/' + context.JK.currentUserId;
context.location = '/client#/profile/' + context.JK.currentUserId;
});
};

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

@ -91,7 +91,7 @@
var args = {
userId: val.id,
avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
profile_url: "/#/profile/" + val.id,
profile_url: "/client#/profile/" + val.id,
userName: val.name,
location: val.location,
instruments: getInstrumentHtml(val.instruments)
@ -104,7 +104,7 @@
var invitationSentHtml = context.JK.fillTemplate($(selector).html(), {
userId: val.id,
first_name: val.first_name,
profile_url: "/#/profile/" + val.id
profile_url: "/client#/profile/" + val.id
});
selector = isSidebar ? '#sidebar-search-results' : '#search-results';
@ -154,7 +154,7 @@
var searchResultHtml = context.JK.fillTemplate($(template_name).html(), {
userId: val.id,
avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
profile_url: "/#/profile/" + val.id,
profile_url: "/client#/profile/" + val.id,
userName: val.name,
location: val.location
});

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

@ -93,7 +93,7 @@
var photoUrl = context.JK.resolveAvatarUrl(participant.user.photo_url);
var musicianVals = {
avatar_url: photoUrl,
profile_url: "/#/profile/" + id,
profile_url: "/client#/profile/" + id,
musician_name: name,
instruments: instrumentLogoHtml
};