diff --git a/web/app/assets/javascripts/member_search_filter.js.coffee b/web/app/assets/javascripts/member_search_filter.js.coffee index 822b00f80..e45e5fb4f 100644 --- a/web/app/assets/javascripts/member_search_filter.js.coffee +++ b/web/app/assets/javascripts/member_search_filter.js.coffee @@ -544,6 +544,7 @@ context.JK.BandSearchFilter = class BandSearchFilter extends BaseSearchFilter @searchSubType = 'to_join' this.showBuilder() this._loadSearchFilter() if @searchFilter + @screen.find('.band-search-filter-builder-top-to_join h2').html('search bands') showBuilderToHire: () => @screen.find('.band-search-filter-builder-top-to_join').hide() @@ -551,6 +552,7 @@ context.JK.BandSearchFilter = class BandSearchFilter extends BaseSearchFilter @searchSubType = 'to_hire' this.showBuilder() this._loadSearchFilter() if @searchFilter + @screen.find('.band-search-filter-builder-top-to_hire h2').html('search bands to hire') searchMetaData: () => @searchMeta[@searchSubType] diff --git a/web/app/assets/stylesheets/client/band.css.scss b/web/app/assets/stylesheets/client/band.css.scss index d5246e6a4..1c40d16b6 100644 --- a/web/app/assets/stylesheets/client/band.css.scss +++ b/web/app/assets/stylesheets/client/band.css.scss @@ -1,6 +1,6 @@ @import "client/common.css.scss"; -#band-setup, #band-profile { +#band-setup, #band-profile, #bands-filter-to_hire, #bands-filter-to_join { font-family: Raleway, Arial, Helvetica, verdana, arial, sans-serif; .band-field { input[type="text"], select, textarea { @@ -433,33 +433,82 @@ } } -#band-screen { +#bands-screen { + + .col-left { + float: left; + width: 50%; + margin-left: auto; + margin-right: auto; + } + + .col-right { + float: right; + width: 50%; + margin-left: auto; + margin-right: auto; + } .builder-section { padding: 10px; margin-bottom: 20px; } + #bands-filter-to_hire { + + } - #bands-filter-to-join { + #bands-filter-to_join { + .builder-sort-order { + .text-label { + float: right; + margin-right: 10px; + padding-top: 5px; + } + .sort-order-selector { + float: right; + .easydropdown-wrapper { + width: 140px; + } + } + } + .col-left { + float: left; + width: 30%; + margin-left: auto; + margin-right: auto; + padding-right: 20px; + + .easydropdown-wrapper { + width: 100%; + } + + } + + .col-right { + float: right; + width: 66%; + margin-left: auto; + margin-right: auto; + + .easydropdown-wrapper { + width: 40%; + } + } + + .search-filter-setup-genres { + } + .search-filter-setup-instruments { + } + .band-search-filter-builder-bottom { + text-align: right; + width: 80%; + } .builder-section { padding: 10px; margin-bottom: 20px; } - .col-left { - float: left; - width: 50%; - margin-left: auto; - margin-right: auto; - } - - .col-right { - float: right; - width: 50%; - margin-left: auto; - margin-right: auto; - } } } \ No newline at end of file diff --git a/web/app/views/api_search/index.rabl b/web/app/views/api_search/index.rabl index 9941f867e..155f9e365 100644 --- a/web/app/views/api_search/index.rabl +++ b/web/app/views/api_search/index.rabl @@ -10,19 +10,19 @@ if @search.is_a?(BaseSearch) current_user.last_jam_audio_latency.round if current_user.last_jam_audio_latency end - node :is_blank_filter do |foo| - @search.is_blank?(params[:subtype]) - end - node :filter_json do |foo| @search.to_json end - node :description do |foo| - @search.description(params[:subtype]) - end - if @search.is_a? MusicianSearch + node :description do |foo| + @search.description + end + + node :is_blank_filter do |foo| + @search.is_blank? + end + child(:results => :musicians) { attributes :id, :first_name, :last_name, :name, :city, :state, :country, :online, :musician, :photo_url, :biography, :regionname, :score, :full_score @@ -63,6 +63,14 @@ if @search.is_a?(BaseSearch) elsif @search.is_a?(BandSearch) + node :is_blank_filter do |foo| + @search.is_blank?(params[:subtype]) + end + + node :description do |foo| + @search.description(params[:subtype]) + end + child(:results => :bands) { attributes :id, :name, :city, :state, :country, :photo_url, :biography, :logo_url, :website diff --git a/web/app/views/clients/_band_search_filter.html.slim b/web/app/views/clients/_band_search_filter.html.slim index 0e976c208..ed08f39c3 100644 --- a/web/app/views/clients/_band_search_filter.html.slim +++ b/web/app/views/clients/_band_search_filter.html.slim @@ -26,9 +26,10 @@ script#template-band-search-filter-to_join type="text/template" .col-left h2 search bands .col-right.builder-sort-order - .text-label Sort Results By: + .sort-order-selector select.easydropdown name="sort_order" option selected="selected" value="{sort_order}" {sort_order} + .text-label Sort Results By: .clearall .band-search-filter-builder-middle1.builder-section @@ -79,8 +80,8 @@ script#template-band-search-filter-to_join type="text/template" .clearall .band-search-filter-builder-bottom.builder-section.builder-action-buttons .col-right - a#btn-perform-band-search.builder-button.button-orange href="#" SEARCH a#btn-band-search-cancel.builder-button.button-grey href="#" CANCEL + a#btn-perform-band-search.builder-button.button-orange href="#" SEARCH script#template-band-search-filter-to_hire type="text/template" #bands-filter-to_hire @@ -116,23 +117,23 @@ script#template-band-search-filter-to_hire type="text/template" select.easydropdown name="performance_samples" option selected="selected" value="{performance_samples}" {performance_samples} - .field.builder-selector - Find bands to play a paid gig at a cost not to exceed - input type="text" id="max_cost_amount" name="max_cost" value="{max_cost}" - - .field.builder-selector - Find bands that will play free gigs - .clearall .band-search-filter-builder-middle2.builder-section + .field.builder-selector + Find bands to play a paid gig at a cost not to exceed + input type="text" id="max_cost_amount" name="max_cost" value="{max_cost}" + + .field.builder-selector + Find bands that will play free gigs + .clearall .clearall .band-search-filter-builder-bottom.builder-section.builder-action-buttons .col-right - a#btn-perform-band-search.builder-button.button-orange href="#" SEARCH a#btn-band-search-cancel.builder-button.button-grey href="#" CANCEL + a#btn-perform-band-search.builder-button.button-orange href="#" SEARCH script#template-search-filter-setup-instrument type="text/template" tr data-instrument-id="{id}"