diff --git a/ruby/lib/jam_ruby/lib/em_helper.rb b/ruby/lib/jam_ruby/lib/em_helper.rb index 3669e7491..2e8c46c55 100644 --- a/ruby/lib/jam_ruby/lib/em_helper.rb +++ b/ruby/lib/jam_ruby/lib/em_helper.rb @@ -91,7 +91,7 @@ module JamWebEventMachine Thread.abort_on_exception = true # create a new thread separate from the Rails main thread that EventMachine can run on - start + run end end end diff --git a/web/app/assets/javascripts/findBand.js b/web/app/assets/javascripts/findBand.js index e4c521467..3fcfb3960 100644 --- a/web/app/assets/javascripts/findBand.js +++ b/web/app/assets/javascripts/findBand.js @@ -101,7 +101,7 @@ if (pinstr in instrument_logo_map) { instr = instrument_logo_map[pinstr]; } - player_instrs += ' '; + player_instrs += ''; } playerVals = { @@ -182,7 +182,8 @@ processData: false, success: function(response) { // remove the orange look to indicate it's not selectable - $('div[data-band-id='+newFollowing.band_id+'] .search-m-follow').removeClass('button-orange'); +// @FIXME -- this will need to be tweaked when we allow unfollowing + $('div[data-band-id='+newFollowing.band_id+'] .search-m-follow').removeClass('button-orange').addClass('button-grey'); }, error: app.ajaxError }); diff --git a/web/app/assets/javascripts/findMusician.js b/web/app/assets/javascripts/findMusician.js index 3599826ed..91ecca218 100644 --- a/web/app/assets/javascripts/findMusician.js +++ b/web/app/assets/javascripts/findMusician.js @@ -128,7 +128,7 @@ musician_name: mm.name, musician_location: mm.city + ', ' + mm.state, instruments: instr_logos, - biography: mm['biography'] || 'Lorum Ipsum Nulla facilisi. In vel sem. Morbi id urna in diam dignissim feugiat. Proin molestie tortor eu velit. Aliquam erat volutpat. Nullam ultrices, diam tempus vulputate egestas, eros pede varius leo, sed imperdiet lectus est ornare odio.', + biography: mm['biography'], follow_count: mm['follow_count'], friend_count: mm['friend_count'], recording_count: mm['recording_count'], @@ -178,7 +178,8 @@ function friendRequestCallback(user_id) { // remove the orange look to indicate it's not selectable - $('div[data-musician-id='+user_id+'] .search-m-friend').removeClass('button-orange'); +// @FIXME -- this will need to be tweaked when we allow unfollowing + $('div[data-musician-id='+user_id+'] .search-m-friend').removeClass('button-orange').addClass('button-grey'); } function followMusician(evt) { @@ -203,7 +204,8 @@ processData: false, success: function(response) { // remove the orange look to indicate it's not selectable - $('div[data-musician-id='+newFollowing.user_id+'] .search-m-follow').removeClass('button-orange'); +// @FIXME -- this will need to be tweaked when we allow unfollowing + $('div[data-musician-id='+newFollowing.user_id+'] .search-m-follow').removeClass('button-orange').addClass('button-grey'); }, error: app.ajaxError }); diff --git a/web/app/assets/stylesheets/client/content.css.scss b/web/app/assets/stylesheets/client/content.css.scss index 5282c4209..440d926f2 100644 --- a/web/app/assets/stylesheets/client/content.css.scss +++ b/web/app/assets/stylesheets/client/content.css.scss @@ -313,8 +313,12 @@ a.arrow-down { padding:6px 0px 11px 0px; background-color:#4c4c4c; min-height:20px; - overflow-x:scroll; +// overflow-x:scroll; + select { + font-size:11px; + margin-top:4px; } +} #session-controls .searchbox { float:left; diff --git a/web/app/assets/stylesheets/client/musician.css.scss b/web/app/assets/stylesheets/client/musician.css.scss index 821b354cc..fffe5970b 100644 --- a/web/app/assets/stylesheets/client/musician.css.scss +++ b/web/app/assets/stylesheets/client/musician.css.scss @@ -35,28 +35,6 @@ padding-right: 5px; padding-left: 5px; - #result_instruments { - font-weight: normal; - > img { - margin-right: 4px; - height:24px; - width:24px; - } - } - .result-name { - font-size: 12px; - font-weight: bold; - margin-bottom: 2px; - } - .stats { - margin-top: 4px; - img { - vertical-align: middle; - } - } - .lcol { - width: 148px; - } table.musicians { margin-top:12px; } diff --git a/web/app/assets/stylesheets/client/profile.css.scss b/web/app/assets/stylesheets/client/profile.css.scss index b51f22bf6..25fd0d7bf 100644 --- a/web/app/assets/stylesheets/client/profile.css.scss +++ b/web/app/assets/stylesheets/client/profile.css.scss @@ -196,13 +196,48 @@ } .profile-band-list-result { - width:100%; - min-height:85px; - background-color:#242323; - position:relative; - margin:10px 0px 10px 0px; - padding-bottom:5px; - box-sizing:border-box; + width:100%; + min-height:85px; + background-color:#242323; + position:relative; + margin:10px 0px 10px 0px; + padding-bottom:5px; + box-sizing:border-box; + + .result-name { + font-size: 12px; + font-weight: bold; + margin-bottom: 2px; + } + .stats { + margin-top: 4px; + img { + vertical-align: middle; + } + } + .lcol { + width: 148px; + } + .instruments { + width:128px; + img { + height:24px; + width:24px; + margin-right:2px; + + &:last-child { + margin-right:0px; + } + + } + } + .button-row { + margin-top:10px; + margin-bottom:5px; + .result-list-button-wrapper { + margin:0; + } + } } .profile-social-left { diff --git a/web/app/views/clients/_band_setup.html.erb b/web/app/views/clients/_band_setup.html.erb index 2f66f7eb9..86bc29922 100644 --- a/web/app/views/clients/_band_setup.html.erb +++ b/web/app/views/clients/_band_setup.html.erb @@ -67,6 +67,7 @@ CANCEL   NEXT +
{biography}
diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb index 029292e0c..50828ba03 100644 --- a/web/app/views/clients/_profile.html.erb +++ b/web/app/views/clients/_profile.html.erb @@ -1,4 +1,4 @@ - +m
@@ -145,30 +145,41 @@
- diff --git a/web/config/initializers/dev_users.rb b/web/config/initializers/dev_users.rb index ed67ae501..8d81037fa 100644 --- a/web/config/initializers/dev_users.rb +++ b/web/config/initializers/dev_users.rb @@ -3,19 +3,19 @@ if Rails.env == "development" && Rails.application.config.bootstrap_dev_users # if we've run once before, don't run again unless User.find_by_email("seth@jamkazam.com") - # create one user per employee, +1 for peter2 because he asked for it - User.create_dev_user("Seth", "Call", "seth@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_seth.jpg') - User.create_dev_user("Brian", "Smith", "briansmith@jamkazam.com", "jam123", "Apex", "NC", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_brian.jpg') - User.create_dev_user("Peter", "Walker", "peter@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_peter.jpg') - User.create_dev_user("Peter", "Walker", "peter2@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_peter.jpg') - User.create_dev_user("David", "Wilson", "david@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_david.jpg') - User.create_dev_user("Jonathon", "Wilson", "jonathon@jamkazam.com", "jam123", "Bozeman", "MT", "US", [{:instrument_id => "keyboard", :proficiency_level => 4, :priority => 1}], 'http://www.jamkazam.com/assets/avatars/avatar_jonathon.jpg') - User.create_dev_user("Jonathan", "Kolyer", "jonathan@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) - User.create_dev_user("Oswald", "Becca", "os@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) - User.create_dev_user("Anthony", "Davis", "anthony@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) - User.create_dev_user("George", "Currie", "george@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) - User.create_dev_user("Chris", "Doughty", "chris@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) - User.create_dev_user("Daniel", "Weigh", "daniel@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) + # create one user per employee, +1 for peter2 because he asked for it + User.create_dev_user("Seth", "Call", "seth@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_seth.jpg') + User.create_dev_user("Brian", "Smith", "briansmith@jamkazam.com", "jam123", "Apex", "NC", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_brian.jpg') + User.create_dev_user("Peter", "Walker", "peter@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_peter.jpg') + User.create_dev_user("Peter", "Walker", "peter2@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_peter.jpg') + User.create_dev_user("David", "Wilson", "david@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_david.jpg') + User.create_dev_user("Jonathon", "Wilson", "jonathon@jamkazam.com", "jam123", "Bozeman", "MT", "US", [{:instrument_id => "keyboard", :proficiency_level => 4, :priority => 1}], 'http://www.jamkazam.com/assets/avatars/avatar_jonathon.jpg') + User.create_dev_user("Jonathan", "Kolyer", "jonathan@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) + User.create_dev_user("Oswald", "Becca", "os@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) + User.create_dev_user("Anthony", "Davis", "anthony@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) + User.create_dev_user("George", "Currie", "george@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) + User.create_dev_user("Chris", "Doughty", "chris@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) + User.create_dev_user("Daniel", "Weigh", "daniel@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil) end