diff --git a/app/assets/stylesheets/components/search--advanced.scss b/app/assets/stylesheets/components/search--advanced.scss index 8f4315156..1d63ceff0 100644 --- a/app/assets/stylesheets/components/search--advanced.scss +++ b/app/assets/stylesheets/components/search--advanced.scss @@ -100,17 +100,6 @@ white-space: normal; } -.dropdown-item.divider { - pointer-events: none; - border-bottom: 1px solid black; - margin-bottom: 4px; -} - -.row .range_limit input.range_begin, -.row .range_limit input.range_end { - width: 5em; -} - @include media-breakpoint-up(md) { .two-columns-md { display: flex; diff --git a/app/components/numismatics_search_form_component.html.erb b/app/components/numismatics_search_form_component.html.erb index 5da3ade6e..dd2bff0cb 100644 --- a/app/components/numismatics_search_form_component.html.erb +++ b/app/components/numismatics_search_form_component.html.erb @@ -15,11 +15,8 @@ <% end %>
<%= label_tag pub_date_field.parameterize, :class => "col-sm-4 control-label advanced-facet-label" do %>Year<% end %> -
- +
<%= render BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter) %> – - - <%= render BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter) %>
diff --git a/app/components/numismatics_search_form_component.rb b/app/components/numismatics_search_form_component.rb index 953fac6b5..4e67c60b8 100644 --- a/app/components/numismatics_search_form_component.rb +++ b/app/components/numismatics_search_form_component.rb @@ -22,8 +22,12 @@ def pub_date_field blacklight_config.facet_fields['pub_date_start_sort'] end + def pub_date_field_display_facet + @response.aggregations[pub_date_field] + end + def pub_date_presenter - view_context.facet_field_presenter(pub_date_field, {}) + view_context.facet_field_presenter(pub_date_field, pub_date_field_display_facet) end def initialize_constraints diff --git a/app/components/orangelight/advanced_search_form_component.html.erb b/app/components/orangelight/advanced_search_form_component.html.erb index 87e7dfb37..037501693 100644 --- a/app/components/orangelight/advanced_search_form_component.html.erb +++ b/app/components/orangelight/advanced_search_form_component.html.erb @@ -37,10 +37,7 @@ <% end %>
<%= label_tag pub_date_field.parameterize, :class => "col-sm-4 control-label advanced-facet-label" do %>Publication year<% end %> -
- - <%= render BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter) %> – - +
<%= render BlacklightRangeLimit::RangeFormComponent.new(facet_field: pub_date_presenter) %>
diff --git a/app/components/orangelight/advanced_search_form_component.rb b/app/components/orangelight/advanced_search_form_component.rb index a34c68b1c..173385689 100644 --- a/app/components/orangelight/advanced_search_form_component.rb +++ b/app/components/orangelight/advanced_search_form_component.rb @@ -15,8 +15,12 @@ def pub_date_field blacklight_config.facet_fields['pub_date_start_sort'] end + def pub_date_field_display_facet + @response.aggregations[pub_date_field] + end + def pub_date_presenter - view_context.facet_field_presenter(pub_date_field, {}) + view_context.facet_field_presenter(pub_date_field, pub_date_field_display_facet) end def initialize_search_field_controls diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 683c4275a..1333bf89f 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -124,7 +124,6 @@ class CatalogController < ApplicationController segments: true, chart_segment_border_color: 'rgb(255, 217, 96)', chart_segment_bg_color: 'rgba(255, 217, 96, 0.5)', - chart_segment_bg_color: 'rgba(255, 217, 96, 0.5)', show_missing_link: false } config.add_facet_field 'language_facet', label: 'Language', limit: true, include_in_advanced_search: true