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-3247 : Band profile - use classes instead of ids for embedded partials.

This commit is contained in:
Steven Miers 2015-06-11 17:33:04 -05:00
parent 4e8d563184
commit 9b24e0c05b
6 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,8 +214,8 @@
$('#band-profile-biography').text(band.biography); $('#band-profile-biography').text(band.biography);
renderMusicalExperience() renderMusicalExperience()
profileUtils.renderPerformanceSamples(band, $("#bandProfile"), isAdmin) profileUtils.renderPerformanceSamples(band, $root, isAdmin)
profileUtils.renderOnlinePresence(band, $("#bandProfile"), isAdmin) profileUtils.renderOnlinePresence(band, $root, isAdmin)
renderCurrentInterests() renderCurrentInterests()
// wire up Follow click // wire up Follow click

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

@ -30,21 +30,21 @@
var $studioCount = $screen.find('#studio-count'); var $studioCount = $screen.find('#studio-count');
// performance samples // performance samples
var $noSamples = $screen.find('#no-samples'); var $noSamples = $screen.find('.no-samples');
var $jamkazamSamples = $screen.find('#jamkazam-samples'); var $jamkazamSamples = $screen.find('.jamkazam-samples');
var $soundCloudSamples = $screen.find('#soundcloud-samples'); var $soundCloudSamples = $screen.find('.soundcloud-samples');
var $youTubeSamples = $screen.find('#youtube-samples'); var $youTubeSamples = $screen.find('.youtube-samples');
// online presence // online presence
var $noOnlinePresence = $screen.find('#no-online-presence'); var $noOnlinePresence = $screen.find('.no-online-presence');
var $userWebsite = $screen.find('#user-website'); var $userWebsite = $screen.find('.user-website');
var $soundCloudPresence = $screen.find('#soundcloud-presence'); var $soundCloudPresence = $screen.find('.soundcloud-presence');
var $reverbNationPresence = $screen.find('#reverbnation-presence'); var $reverbNationPresence = $screen.find('.reverbnation-presence');
var $bandCampPresence = $screen.find('#bandcamp-presence'); var $bandCampPresence = $screen.find('.bandcamp-presence');
var $fandalismPresence = $screen.find('#fandalism-presence'); var $fandalismPresence = $screen.find('.fandalism-presence');
var $youTubePresence = $screen.find('#youtube-presence'); var $youTubePresence = $screen.find('.youtube-presence');
var $facebookPresence = $screen.find('#facebook-presence'); var $facebookPresence = $screen.find('.facebook-presence');
var $twitterPresence = $screen.find('#twitter-presence'); var $twitterPresence = $screen.find('.twitter-presence');
// current interests // current interests
var $noInterests = $screen.find('#no-interests'); var $noInterests = $screen.find('#no-interests');

36
web/app/assets/javascripts/profile_utils.js
View File

@ -18,7 +18,7 @@
var COWRITING_GENRE_TYPE = 'cowriting'; var COWRITING_GENRE_TYPE = 'cowriting';
var NOT_SPECIFIED_TEXT = 'Not specified'; var NOT_SPECIFIED_TEXT = 'Not specified';
var proficiencyDescriptionMap = { var proficiencyDescriptionMap = {
"1": "BEGINNER", "1": "BEGINNER",
"2": "INTERMEDIATE", "2": "INTERMEDIATE",
@ -291,7 +291,7 @@
if (band.instruments) { if (band.instruments) {
for (var i = 0; i < band.instruments.length; i++) { for (var i = 0; i < band.instruments.length; i++) {
var instrument = band.instruments[i] var instrument = band.instruments[i]
var description = instrument.instrument_id var description = instrument.instrument_id
if (msg.length > 0) { if (msg.length > 0) {
msg += ", " msg += ", "
@ -361,10 +361,10 @@
profileUtils.renderPerformanceSamples = function(player, $root, isOwner) { profileUtils.renderPerformanceSamples = function(player, $root, isOwner) {
// performance samples // performance samples
var performanceSamples = player.performance_samples; var performanceSamples = player.performance_samples;
var $noSamples = $root.find('#no-samples'); var $noSamples = $root.find('.no-samples');
var $jamkazamSamples = $root.find('#jamkazam-samples'); var $jamkazamSamples = $root.find('.jamkazam-samples');
var $soundCloudSamples = $root.find('#soundcloud-samples'); var $soundCloudSamples = $root.find('.soundcloud-samples');
var $youTubeSamples = $root.find('#youtube-samples'); var $youTubeSamples = $root.find('.youtube-samples');
var $btnAddRecordings = $root.find('.add-recordings'); var $btnAddRecordings = $root.find('.add-recordings');
if (!performanceSamples || performanceSamples.length === 0) { if (!performanceSamples || performanceSamples.length === 0) {
@ -383,15 +383,21 @@
var jamkazamSamples = profileUtils.jamkazamSamples(player.performance_samples); var jamkazamSamples = profileUtils.jamkazamSamples(player.performance_samples);
if (!jamkazamSamples || jamkazamSamples.length === 0) { if (!jamkazamSamples || jamkazamSamples.length === 0) {
$jamkazamSamples.hide() $jamkazamSamples.hide()
} else {
$jamkazamSamples.show()
} }
var soundCloudSamples = profileUtils.soundCloudSamples(player.performance_samples); var soundCloudSamples = profileUtils.soundCloudSamples(player.performance_samples);
if (!soundCloudSamples || soundCloudSamples.length === 0) { if (!soundCloudSamples || soundCloudSamples.length === 0) {
$soundCloudSamples.hide()
} else {
$soundCloudSamples.show() $soundCloudSamples.show()
} }
var youTubeSamples = profileUtils.youTubeSamples(player.performance_samples); var youTubeSamples = profileUtils.youTubeSamples(player.performance_samples);
if (!youTubeSamples || youTubeSamples.length === 0) { if (!youTubeSamples || youTubeSamples.length === 0) {
$youTubeSamples.hide()
} else {
$youTubeSamples.show() $youTubeSamples.show()
} }
@ -410,15 +416,15 @@
}// function renderPerformanceSamples }// function renderPerformanceSamples
profileUtils.renderOnlinePresence = function(player, $root, isOwner) { profileUtils.renderOnlinePresence = function(player, $root, isOwner) {
var $noOnlinePresence = $root.find('#no-online-presence'); var $noOnlinePresence = $root.find('.no-online-presence');
var $userWebsite = $root.find('#user-website'); var $userWebsite = $root.find('.user-website');
var $soundCloudPresence = $root.find('#soundcloud-presence'); var $soundCloudPresence = $root.find('.soundcloud-presence');
var $reverbNationPresence = $root.find('#reverbnation-presence'); var $reverbNationPresence = $root.find('.reverbnation-presence');
var $bandCampPresence = $root.find('#bandcamp-presence'); var $bandCampPresence = $root.find('.bandcamp-presence');
var $fandalismPresence = $root.find('#fandalism-presence'); var $fandalismPresence = $root.find('.fandalism-presence');
var $youTubePresence = $root.find('#youtube-presence'); var $youTubePresence = $root.find('.youtube-presence');
var $facebookPresence = $root.find('#facebook-presence'); var $facebookPresence = $root.find('.facebook-presence');
var $twitterPresence = $root.find('#twitter-presence'); var $twitterPresence = $root.find('.twitter-presence');
var $btnAddSites = $root.find('.add-sites'); var $btnAddSites = $root.find('.add-sites');

2
web/app/assets/stylesheets/client/band.css.scss
View File

@ -200,7 +200,7 @@
font-size: 1.1em; font-size: 1.1em;
margin: 0.25em 0em 0.25em 0em; margin: 0.25em 0em 0.25em 0em;
} }
margin: 0em 0em 1.0em 0em; margin: 0em 0em 1.5em 0em;
} }
// .band-name, .band-photo { // .band-name, .band-photo {

18
web/app/views/clients/_profile_summary_online_presence.html.slim
View File

@ -1,26 +1,26 @@
#no-online-presence.left.online-presence-option .no-online-presence.left.online-presence-option
| None specified | None specified
#user-website.left.logo.online-presence-option .user-website.left.logo.online-presence-option
a rel="external" a rel="external"
img.logo src="/assets/content/website-logo.png" img.logo src="/assets/content/website-logo.png"
#soundcloud-presence.left.logo.online-presence-option .soundcloud-presence.left.logo.online-presence-option
a rel="external" a rel="external"
img.logo src="/assets/content/soundcloud-logo.png" img.logo src="/assets/content/soundcloud-logo.png"
#reverbnation-presence.left.logo.online-presence-option .reverbnation-presence.left.logo.online-presence-option
a rel="external" a rel="external"
img.logo src="/assets/content/reverbnation-logo.png" img.logo src="/assets/content/reverbnation-logo.png"
#bandcamp-presence.left.logo.online-presence-option .bandcamp-presence.left.logo.online-presence-option
a rel="external" a rel="external"
img.logo src="/assets/content/bandcamp-logo.png" img.logo src="/assets/content/bandcamp-logo.png"
#fandalism-presence.left.logo.online-presence-option .fandalism-presence.left.logo.online-presence-option
a rel="external" a rel="external"
img.logo src="/assets/content/fandalism-logo.png" img.logo src="/assets/content/fandalism-logo.png"
#youtube-presence.left.logo.online-presence-option .youtube-presence.left.logo.online-presence-option
a rel="external" a rel="external"
img.logo src="/assets/content/youtube-logo.png" img.logo src="/assets/content/youtube-logo.png"
#facebook-presence.left.logo.online-presence-option .facebook-presence.left.logo.online-presence-option
a rel="external" a rel="external"
img.logo src="/assets/content/facebook-logo.png" img.logo src="/assets/content/facebook-logo.png"
#twitter-presence.left.logo.online-presence-option .twitter-presence.left.logo.online-presence-option
a rel="external" a rel="external"
img.logo src="/assets/content/twitter-logo.png" img.logo src="/assets/content/twitter-logo.png"

8
web/app/views/clients/_profile_summary_performance_samples.html.slim
View File

@ -1,11 +1,11 @@
#no-samples.left.performance-sample-option None specified .no-samples.left.performance-sample-option None specified
#jamkazam-samples.left.logo.performance-sample-option .jamkazam-samples.left.logo.performance-sample-option
img.logo src="/assets/header/logo.png" img.logo src="/assets/header/logo.png"
br/ br/
#soundcloud-samples.left.logo.performance-sample-option .soundcloud-samples.left.logo.performance-sample-option
img.logo src="/assets/content/soundcloud-logo.png" img.logo src="/assets/content/soundcloud-logo.png"
br/ br/
#youtube-samples.left.logo.performance-sample-option .youtube-samples.left.logo.performance-sample-option
img.logo src="/assets/content/youtube-logo.png" img.logo src="/assets/content/youtube-logo.png"
br/ br/