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

Merge branch 'develop' into ftue_redux

This commit is contained in:
Jonathon Wilson 2013-11-05 19:51:30 -07:00
parent c6802c4e40 cfb6a6133f
commit a544aba19a
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/Gemfile
View File

@ -41,6 +41,7 @@ gem 'rails3-jquery-autocomplete'
gem 'activeadmin'
gem "meta_search", '>= 1.1.0.pre'
gem 'fog', "~> 1.3.1"
gem 'unf' #optional fog dependency
gem 'country-select'
gem 'aasm', '3.0.16'
gem 'postgres-copy'

1
web/Gemfile
View File

@ -47,6 +47,7 @@ gem 'aws-sdk', '1.8.0'
gem 'aasm', '3.0.16'
gem 'carrierwave'
gem 'fog'
gem 'unf' #optional fog dependency
gem 'devise', '>= 1.1.2'
#gem 'thin' # the presence of this gem on mac seems to prevent normal startup of rails.
gem 'postgres-copy'

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

@ -245,7 +245,7 @@
$('#band-profile-biography').html(band.biography);
}
else {
logger.debug("No band found with bandId = " + bandId);
}
}
@ -266,7 +266,7 @@
function bindSocial() {
// FOLLOWERS
url = "/api/bands/" + bandId + "/followers";
var url = "/api/bands/" + bandId + "/followers";
$.ajax({
type: "GET",
dataType: "json",

8
web/app/assets/javascripts/jam_rest.js
View File

@ -168,6 +168,14 @@
});
}
function getMusicianFollowers(userId) {
}
function getBandFollowers(bandId) {
}
function getClientDownloads(options) {
return $.ajax({

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

@ -307,22 +307,22 @@
$('#profile-location').html(user.location);
// stats
var text = user.friend_count > 1 || user.friend_count == 0 ? " Friends" : " Friend";
var text = user.friend_count > 1 || user.friend_count === 0 ? " Friends" : " Friend";
$('#profile-friend-stats').html(user.friend_count + text);
text = user.follower_count > 1 || user.follower_count == 0 ? " Followers" : " Follower";
text = user.follower_count > 1 || user.follower_count === 0 ? " Followers" : " Follower";
$('#profile-follower-stats').html(user.follower_count + text);
text = user.session_count > 1 || user.session_count == 0 ? " Sessions" : " Session";
text = user.session_count > 1 || user.session_count === 0 ? " Sessions" : " Session";
$('#profile-session-stats').html(user.session_count + text);
text = user.recording_count > 1 || user.recording_count == 0 ? " Recordings" : " Recording";
text = user.recording_count > 1 || user.recording_count === 0 ? " Recordings" : " Recording";
$('#profile-recording-stats').html(user.recording_count + text);
$('#profile-biography').html(user.biography);
}
else {
logger.debug("No user found with userId = " + userId);
}
}