diff --git a/ruby/lib/jam_ruby/models/band_search.rb b/ruby/lib/jam_ruby/models/band_search.rb index 2508bb543..0aa8ad5cc 100644 --- a/ruby/lib/jam_ruby/models/band_search.rb +++ b/ruby/lib/jam_ruby/models/band_search.rb @@ -28,6 +28,7 @@ module JamRuby BAND_TYPES = { BAND_TYPE_VAL_STRS[0] => BAND_TYPE_VAL_STRS[0].camelcase, BAND_TYPE_VAL_STRS[1] => BAND_TYPE_VAL_STRS[1].camelcase, + BAND_TYPE_VAL_STRS[2] => BAND_TYPE_VAL_STRS[2].camelcase, } SORT_VALS = %W{ distance latency } diff --git a/web/app/assets/javascripts/member_search_filter.js.coffee b/web/app/assets/javascripts/member_search_filter.js.coffee index 1fc4423d4..808828be9 100644 --- a/web/app/assets/javascripts/member_search_filter.js.coffee +++ b/web/app/assets/javascripts/member_search_filter.js.coffee @@ -628,8 +628,7 @@ context.JK.BandSearchFilter = class BandSearchFilter extends BaseSearchFilter when 'to_hire' then this._populateSearchFilterToHire() _populateSkill: () => - elem = $ '#'+@searchType+'-search-filter-builder select[name=band_type]' - this._populateSelectWithInt(@profileUtils.skillLevelMap, this.filterData().band_type.toString(), elem) + this._populateSelectIdentifier('band_type') _populateBandStatus: () => this._populateSelectIdentifier('band_status') diff --git a/web/app/assets/stylesheets/client/band.css.scss b/web/app/assets/stylesheets/client/band.css.scss index f69a571d1..6316fefe9 100644 --- a/web/app/assets/stylesheets/client/band.css.scss +++ b/web/app/assets/stylesheets/client/band.css.scss @@ -449,6 +449,12 @@ margin-right: auto; } + .band-search-filter-results-list { + .profile-band-list-result { + padding-top: 5px; + } + } + .builder-section { padding: 10px; margin-bottom: 20px; @@ -469,8 +475,7 @@ } #band-search-filter-builder { - margin-left: 20px; - padding-top: 20px; + margin-left: 5px; } .band-search-filter-builder-bottom { @@ -485,8 +490,29 @@ padding-bottom: 0; } + #band-search-filter-results-header { + padding: 10px 10px 10px 10px; + } + + #band-search-filter-description { + padding: 5px 5px 5px 5px; + display: inline; + margin-left: auto; + margin-right: auto; + } + + #btn-band-search-builder { + float: left; + margin-right: 20px; + } + + #btn-band-search-reset { + float: right; + margin-left: 20px; + } + #bands-filter-to_hire { - width: 60%; + width: 100%; .builder-selector { margin-top: 10px; @@ -507,7 +533,7 @@ .col-right { float: right; - width: 40%; + width: 45%; margin-left: auto; margin-right: auto; @@ -518,7 +544,7 @@ } #bands-filter-to_join { - width: 75%; + width: 100%; .builder-selector { margin-top: 10px; @@ -560,7 +586,11 @@ .search-filter-setup-genres { } - .search-filter-setup-instruments { + + .band-setup-genres { + .easydropdown-wrapper { + width: 100%; + } } .builder-section { padding: 10px; diff --git a/web/app/views/clients/_band_search_filter.html.slim b/web/app/views/clients/_band_search_filter.html.slim index 4b2af665d..dc64fbb52 100644 --- a/web/app/views/clients/_band_search_filter.html.slim +++ b/web/app/views/clients/_band_search_filter.html.slim @@ -5,6 +5,7 @@ div#band-search-filter-results-header #band-search-filter-results-blank a.button-orange#btn-band-search-builder-to_join href="#" SEARCH FOR BAND TO JOIN + | - or -  a.button-orange#btn-band-search-builder-to_hire href="#" SEARCH FOR BAND TO HIRE #band-search-filter-results-filtered a.button-orange#btn-band-search-builder href="#" SEARCH