From eaf4f49763e45afcd3f63de110d6785cc790a63c Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Fri, 8 May 2015 17:51:33 -0500 Subject: [PATCH] VRFS-3015 : Add list items as necessary and remove ordinal selectors. This prevents both some spacing issues and flash of empty list items seen when the form is loaded. --- web/app/assets/javascripts/profile.js | 31 ++++++------ .../client/accountProfileSamples.css.scss | 5 +- .../stylesheets/client/profile.css.scss | 5 +- web/app/views/clients/_profile.html.erb | 49 ++++++++----------- 4 files changed, 43 insertions(+), 47 deletions(-) diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js index 92ae29564..e6652d9d0 100644 --- a/web/app/assets/javascripts/profile.js +++ b/web/app/assets/javascripts/profile.js @@ -675,13 +675,14 @@ $paidGigSection.show(); var genreList = profileUtils.paidSessionGenreList(user.genres); - $paidGigDetails.find("ul li:nth-child(1)").html('Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT)); + $paidGigDetails.find("ul").html(""); + $paidGigDetails.find("ul").append('
  • Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT) + '
    • '); var hourlyRate = user.paid_sessions_hourly_rate; - $paidGigDetails.find("ul li:nth-child(2)").html('Hourly rate = ' + (hourlyRate ? hourlyRate : NOT_SPECIFIED_TEXT)); + $paidGigDetails.find("ul").append('
  • Hourly rate = ' + (hourlyRate ? hourlyRate : NOT_SPECIFIED_TEXT) + '
    • '); var dailyRate = user.paid_sessions_daily_rate; - $paidGigDetails.find("ul li:nth-child(3)").html('Day rate = ' + (dailyRate ? dailyRate : NOT_SPECIFIED_TEXT)); + $paidGigDetails.find("ul").append('
  • Day rate = ' + (dailyRate ? dailyRate : NOT_SPECIFIED_TEXT) + '
    • '); } else { $paidGigSection.hide(); } @@ -689,9 +690,9 @@ // free sessions if (user.free_sessions) { $freeGigSection.show(); - + $freeGigDetails.find("ul").html(""); var genreList = profileUtils.freeSessionGenreList(user.genres); - $freeGigDetails.find("ul li:nth-child(1)").html('Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT)); + $freeGigDetails.find("ul").append('
  • Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT) + '
    • '); } else { $freeGigSection.hide(); } @@ -699,12 +700,12 @@ // cowriting if (user.cowriting) { $cowritingSection.show(); - + $cowritingDetails.find("ul").html(""); var genreList = profileUtils.cowritingGenreList(user.genres); - $cowritingDetails.find("ul li:nth-child(1)").html('Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT)); + $cowritingDetails.find("ul").append('
  • Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT) + '
    • '); var purpose = user.cowriting_purpose; - $cowritingDetails.find("ul li:nth-child(2)").html('Purpose: ' + (purpose ? profileUtils.cowritingPurposeMap[purpose] : NOT_SPECIFIED_TEXT)); + $cowritingDetails.find("ul").append('
  • Purpose: ' + (purpose ? profileUtils.cowritingPurposeMap[purpose] : NOT_SPECIFIED_TEXT) + '
    • '); } else { $cowritingSection.hide(); } @@ -712,16 +713,16 @@ // traditional bands if (user.traditional_band) { $traditionalBandSection.show(); - + $traditionalBandDetails.find("ul").html(""); var genreList = profileUtils.traditionalBandGenreList(user.genres); - $traditionalBandDetails.find("ul li:nth-child(1)").html('Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT)); + $traditionalBandDetails.find("ul").append('
  • Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT) + '
    • '); var commitment = user.traditional_band_commitment; - $traditionalBandDetails.find("ul li:nth-child(2)").html('Commitment: ' + (commitment ? profileUtils.bandCommitmentMap[commitment] : NOT_SPECIFIED_TEXT)); + $traditionalBandDetails.find("ul").append('
  • Commitment: ' + (commitment ? profileUtils.bandCommitmentMap[commitment] : NOT_SPECIFIED_TEXT) + '
    • '); var canTour = user.traditional_band_touring; var canTourResponse = canTour ? "Yes" : (canTour === false ? "No" : NOT_SPECIFIED_TEXT); - $traditionalBandDetails.find("ul li:nth-child(3)").html('Touring: ' + canTourResponse); + $traditionalBandDetails.find("ul").append('
  • Touring: ' + canTourResponse + '
    • '); } else { $traditionalBandSection.hide(); } @@ -729,12 +730,12 @@ // virtual band if (user.virtual_band) { $virtualBandSection.show(); - + $virtualBandDetails.find("ul").html(""); var genreList = profileUtils.virtualBandGenreList(user.genres); - $virtualBandDetails.find("ul li:nth-child(1)").html('Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT)); + $virtualBandDetails.find("ul").append('
  • Genre(s): ' + (genreList.length > 0 ? genreList : NOT_SPECIFIED_TEXT) + '
    • '); var commitment = user.virtual_band_commitment; - $virtualBandDetails.find("ul li:nth-child(2)").html('Commitment: ' + (commitment ? profileUtils.bandCommitmentMap[commitment] : NOT_SPECIFIED_TEXT)); + $virtualBandDetails.find("ul").append('
  • Commitment: ' + (commitment ? profileUtils.bandCommitmentMap[commitment] : NOT_SPECIFIED_TEXT) + '
    • '); } else { $virtualBandSection.hide(); } diff --git a/web/app/assets/stylesheets/client/accountProfileSamples.css.scss b/web/app/assets/stylesheets/client/accountProfileSamples.css.scss index f00b31e5b..6fa2a5372 100644 --- a/web/app/assets/stylesheets/client/accountProfileSamples.css.scss +++ b/web/app/assets/stylesheets/client/accountProfileSamples.css.scss @@ -24,8 +24,7 @@ height: 1.5em; } .controls { - height: 1.75em; - overflow: hidden; + height: 2em; } input { @@ -41,7 +40,7 @@ } div.sample-list { - height: 250px; + min-height: 150px; width: auto; min-width: 100px; border: 2px solid #ccc; diff --git a/web/app/assets/stylesheets/client/profile.css.scss b/web/app/assets/stylesheets/client/profile.css.scss index 7a9ccbee5..a5a7cc70c 100644 --- a/web/app/assets/stylesheets/client/profile.css.scss +++ b/web/app/assets/stylesheets/client/profile.css.scss @@ -10,8 +10,11 @@ } } - div.logo { + + + div.logo, div.item { text-align: bottom; + margin-left: 1em; } img.logo { diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb index bc806b6f4..5cec630d9 100644 --- a/web/app/views/clients/_profile.html.erb +++ b/web/app/views/clients/_profile.html.erb @@ -65,7 +65,7 @@
    Bio

    -
    +
    Edit Bio

    @@ -73,23 +73,23 @@
    Musical Experience

    -
    +


    -
    +
    Status:
    -
    +
    Genres:
    -
    +
    Concert Gigs:
    -
    +
    Studio Gigs:
    @@ -161,67 +161,60 @@
    Current Interests

    -
    None specified
    +
    None specified
    -