diff --git a/web/app/assets/javascripts/bandProfile.js b/web/app/assets/javascripts/bandProfile.js index 05db1463d..824d14106 100644 --- a/web/app/assets/javascripts/bandProfile.js +++ b/web/app/assets/javascripts/bandProfile.js @@ -214,8 +214,8 @@ $('#band-profile-biography').text(band.biography); renderMusicalExperience() - profileUtils.renderPerformanceSamples(band, $("#bandProfile"), isAdmin) - profileUtils.renderOnlinePresence(band, $("#bandProfile"), isAdmin) + profileUtils.renderPerformanceSamples(band, $root, isAdmin) + profileUtils.renderOnlinePresence(band, $root, isAdmin) renderCurrentInterests() // wire up Follow click diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js index 15e7b287d..fe616b7d7 100644 --- a/web/app/assets/javascripts/profile.js +++ b/web/app/assets/javascripts/profile.js @@ -30,21 +30,21 @@ var $studioCount = $screen.find('#studio-count'); // performance samples - var $noSamples = $screen.find('#no-samples'); - var $jamkazamSamples = $screen.find('#jamkazam-samples'); - var $soundCloudSamples = $screen.find('#soundcloud-samples'); - var $youTubeSamples = $screen.find('#youtube-samples'); + var $noSamples = $screen.find('.no-samples'); + var $jamkazamSamples = $screen.find('.jamkazam-samples'); + var $soundCloudSamples = $screen.find('.soundcloud-samples'); + var $youTubeSamples = $screen.find('.youtube-samples'); // online presence - var $noOnlinePresence = $screen.find('#no-online-presence'); - var $userWebsite = $screen.find('#user-website'); - var $soundCloudPresence = $screen.find('#soundcloud-presence'); - var $reverbNationPresence = $screen.find('#reverbnation-presence'); - var $bandCampPresence = $screen.find('#bandcamp-presence'); - var $fandalismPresence = $screen.find('#fandalism-presence'); - var $youTubePresence = $screen.find('#youtube-presence'); - var $facebookPresence = $screen.find('#facebook-presence'); - var $twitterPresence = $screen.find('#twitter-presence'); + var $noOnlinePresence = $screen.find('.no-online-presence'); + var $userWebsite = $screen.find('.user-website'); + var $soundCloudPresence = $screen.find('.soundcloud-presence'); + var $reverbNationPresence = $screen.find('.reverbnation-presence'); + var $bandCampPresence = $screen.find('.bandcamp-presence'); + var $fandalismPresence = $screen.find('.fandalism-presence'); + var $youTubePresence = $screen.find('.youtube-presence'); + var $facebookPresence = $screen.find('.facebook-presence'); + var $twitterPresence = $screen.find('.twitter-presence'); // current interests var $noInterests = $screen.find('#no-interests'); diff --git a/web/app/assets/javascripts/profile_utils.js b/web/app/assets/javascripts/profile_utils.js index 90c385eec..6c226b9e8 100644 --- a/web/app/assets/javascripts/profile_utils.js +++ b/web/app/assets/javascripts/profile_utils.js @@ -18,7 +18,7 @@ var COWRITING_GENRE_TYPE = 'cowriting'; var NOT_SPECIFIED_TEXT = 'Not specified'; - + var proficiencyDescriptionMap = { "1": "BEGINNER", "2": "INTERMEDIATE", @@ -291,7 +291,7 @@ if (band.instruments) { for (var i = 0; i < band.instruments.length; i++) { var instrument = band.instruments[i] - var description = instrument.instrument_id + var description = instrument.instrument_id if (msg.length > 0) { msg += ", " @@ -361,10 +361,10 @@ profileUtils.renderPerformanceSamples = function(player, $root, isOwner) { // performance samples var performanceSamples = player.performance_samples; - var $noSamples = $root.find('#no-samples'); - var $jamkazamSamples = $root.find('#jamkazam-samples'); - var $soundCloudSamples = $root.find('#soundcloud-samples'); - var $youTubeSamples = $root.find('#youtube-samples'); + var $noSamples = $root.find('.no-samples'); + var $jamkazamSamples = $root.find('.jamkazam-samples'); + var $soundCloudSamples = $root.find('.soundcloud-samples'); + var $youTubeSamples = $root.find('.youtube-samples'); var $btnAddRecordings = $root.find('.add-recordings'); if (!performanceSamples || performanceSamples.length === 0) { @@ -383,15 +383,21 @@ var jamkazamSamples = profileUtils.jamkazamSamples(player.performance_samples); if (!jamkazamSamples || jamkazamSamples.length === 0) { $jamkazamSamples.hide() + } else { + $jamkazamSamples.show() } var soundCloudSamples = profileUtils.soundCloudSamples(player.performance_samples); if (!soundCloudSamples || soundCloudSamples.length === 0) { + $soundCloudSamples.hide() + } else { $soundCloudSamples.show() } var youTubeSamples = profileUtils.youTubeSamples(player.performance_samples); if (!youTubeSamples || youTubeSamples.length === 0) { + $youTubeSamples.hide() + } else { $youTubeSamples.show() } @@ -410,15 +416,15 @@ }// function renderPerformanceSamples profileUtils.renderOnlinePresence = function(player, $root, isOwner) { - var $noOnlinePresence = $root.find('#no-online-presence'); - var $userWebsite = $root.find('#user-website'); - var $soundCloudPresence = $root.find('#soundcloud-presence'); - var $reverbNationPresence = $root.find('#reverbnation-presence'); - var $bandCampPresence = $root.find('#bandcamp-presence'); - var $fandalismPresence = $root.find('#fandalism-presence'); - var $youTubePresence = $root.find('#youtube-presence'); - var $facebookPresence = $root.find('#facebook-presence'); - var $twitterPresence = $root.find('#twitter-presence'); + var $noOnlinePresence = $root.find('.no-online-presence'); + var $userWebsite = $root.find('.user-website'); + var $soundCloudPresence = $root.find('.soundcloud-presence'); + var $reverbNationPresence = $root.find('.reverbnation-presence'); + var $bandCampPresence = $root.find('.bandcamp-presence'); + var $fandalismPresence = $root.find('.fandalism-presence'); + var $youTubePresence = $root.find('.youtube-presence'); + var $facebookPresence = $root.find('.facebook-presence'); + var $twitterPresence = $root.find('.twitter-presence'); var $btnAddSites = $root.find('.add-sites'); diff --git a/web/app/assets/stylesheets/client/band.css.scss b/web/app/assets/stylesheets/client/band.css.scss index 82fd2799b..a9645cd01 100644 --- a/web/app/assets/stylesheets/client/band.css.scss +++ b/web/app/assets/stylesheets/client/band.css.scss @@ -200,7 +200,7 @@ font-size: 1.1em; margin: 0.25em 0em 0.25em 0em; } - margin: 0em 0em 1.0em 0em; + margin: 0em 0em 1.5em 0em; } // .band-name, .band-photo { diff --git a/web/app/views/clients/_profile_summary_online_presence.html.slim b/web/app/views/clients/_profile_summary_online_presence.html.slim index ec7b48f42..6ac228902 100644 --- a/web/app/views/clients/_profile_summary_online_presence.html.slim +++ b/web/app/views/clients/_profile_summary_online_presence.html.slim @@ -1,26 +1,26 @@ -#no-online-presence.left.online-presence-option +.no-online-presence.left.online-presence-option | None specified -#user-website.left.logo.online-presence-option +.user-website.left.logo.online-presence-option a rel="external" 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" 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" 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" 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" 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" 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" 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" img.logo src="/assets/content/twitter-logo.png" diff --git a/web/app/views/clients/_profile_summary_performance_samples.html.slim b/web/app/views/clients/_profile_summary_performance_samples.html.slim index 03fba205c..071f28dcd 100644 --- a/web/app/views/clients/_profile_summary_performance_samples.html.slim +++ b/web/app/views/clients/_profile_summary_performance_samples.html.slim @@ -1,11 +1,11 @@ -#no-samples.left.performance-sample-option None specified -#jamkazam-samples.left.logo.performance-sample-option +.no-samples.left.performance-sample-option None specified +.jamkazam-samples.left.logo.performance-sample-option img.logo src="/assets/header/logo.png" br/ -#soundcloud-samples.left.logo.performance-sample-option +.soundcloud-samples.left.logo.performance-sample-option img.logo src="/assets/content/soundcloud-logo.png" br/ -#youtube-samples.left.logo.performance-sample-option +.youtube-samples.left.logo.performance-sample-option img.logo src="/assets/content/youtube-logo.png" br/