diff --git a/app/components/trln_argon/search/sidebar_component.html.erb b/app/components/trln_argon/search/sidebar_component.html.erb new file mode 100644 index 00000000..d40d3d0a --- /dev/null +++ b/app/components/trln_argon/search/sidebar_component.html.erb @@ -0,0 +1,15 @@ +<% # TRLN override of BL8 sidebar component %> +<%= render 'catalog/local_filter', + local_button_id: 'toggle-local-btn-top', + trln_button_id: 'toggle-trln-btn-top' %> + + + <% facet_group_names.each do |groupname| %> + <% fields = facet_fields_in_group(groupname) %> + <%= render group_component_class.new(id: groupname, fields: fields, response: response) do |component| %> + <% component.with_body do %> + <%= render Blacklight::FacetComponent.with_collection(fields, response: response) %> + <% end %> + <% end %> + <% end %> + diff --git a/app/components/trln_argon/search/sidebar_component.rb b/app/components/trln_argon/search/sidebar_component.rb new file mode 100644 index 00000000..e1bb03c9 --- /dev/null +++ b/app/components/trln_argon/search/sidebar_component.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +module TrlnArgon + module Search + class SidebarComponent < Blacklight::Search::SidebarComponent + end + end +end diff --git a/app/views/catalog/_local_filter.html.erb b/app/views/catalog/_local_filter.html.erb index b065a3fc..89ad1ee3 100644 --- a/app/views/catalog/_local_filter.html.erb +++ b/app/views/catalog/_local_filter.html.erb @@ -1,42 +1,45 @@ -

<%= t("trln_argon.local_filter.showing_results") %>

- -<% query_state = query_state_from_search_state(search_state) %> -<% query_state.delete('page') %> -<% query_state.fetch('f', {}).delete(TrlnArgon::Fields::LOCATION_HIERARCHY_FACET.to_s) %> - -
- - <%= button_tag( type: "button", - id: local_button_id, - class: "btn btn-md #{local_search_button_class}", - title: "#{t("trln_argon.local_filter.search_verb")} #{t("trln_argon.local_filter.searching_local", local_institution_name: institution_long_name)}", - onclick: "window.location='#{search_catalog_path(query_state)}'" - ) do %> - - <% end %> - - <%= label_tag( local_button_id, - t("trln_argon.local_filter.searching_local", local_institution_name: institution_long_name), - class: "#{local_search_button_label_class}", - data: { count_only_path: trln_argon.catalog_count_only_path(query_state) }) %> - +<% inst = TrlnArgon::Engine.configuration.local_institution_code %> +<% instname = TrlnArgon::LookupManager.instance.map("#{inst}.facet.#{inst}") %> + +
- -
- - <%= button_tag( type: "button", - id: trln_button_id, - class: "btn btn-md #{trln_search_button_class}", - title: "#{t("trln_argon.local_filter.search_verb")} #{t("trln_argon.local_filter.searching_trln")}", - onclick: "window.location='#{search_trln_path(query_state)}'" - ) do %> - - <% end %> - - <%= label_tag( trln_button_id, - "#{t("trln_argon.local_filter.searching_trln")}", - class: "#{trln_search_button_label_class}", - data: { count_only_path: trln_argon.trln_count_only_path(query_state) }) %> - -
+
+ +
\ No newline at end of file diff --git a/app/views/catalog/_search_sidebar.html.erb b/app/views/catalog/_search_sidebar.html.erb deleted file mode 100644 index 5876f8d9..00000000 --- a/app/views/catalog/_search_sidebar.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -<% inst = TrlnArgon::Engine.configuration.local_institution_code #vs ENV["LOCAL_INSTITUTION_CODE"]%> -<% instname = TrlnArgon::LookupManager.instance.map("#{inst}.facet.#{inst}") %> - -
- - -
- - - -
- -<%= render 'facets' %> \ No newline at end of file diff --git a/config/initializers/blacklight_configuration.rb b/config/initializers/blacklight_configuration.rb index e5e6a291..6ecce0c3 100644 --- a/config/initializers/blacklight_configuration.rb +++ b/config/initializers/blacklight_configuration.rb @@ -3,7 +3,7 @@ module Blacklight class Configuration extend ActiveSupport::Autoload - + eager_autoload do autoload :HomeFacetField autoload :ShowSubHeaderField diff --git a/lib/generators/trln_argon/install_generator.rb b/lib/generators/trln_argon/install_generator.rb index 55dc0066..1cff5807 100644 --- a/lib/generators/trln_argon/install_generator.rb +++ b/lib/generators/trln_argon/install_generator.rb @@ -76,11 +76,11 @@ def inject_javascript_include say_status('info', '==============================', :magenta) say_status('info', 'Injecting TRLN Argon JS assets', :magenta) say_status('info', '==============================', :magenta) - if File.exist?('app/assets/javascripts/application.js') - return if IO.read('app/assets/javascripts/application.js').include?('trln_argon') - insert_into_file 'app/assets/javascripts/application.js', after: '//= require blacklight/blacklight' do - "\n//= require trln_argon/trln_argon\n" - end + return unless File.exist?('app/assets/javascripts/application.js') + return if IO.read('app/assets/javascripts/application.js').include?('trln_argon') + + insert_into_file 'app/assets/javascripts/application.js', after: '//= require blacklight/blacklight' do + "\n//= require trln_argon/trln_argon\n" end end diff --git a/lib/trln_argon/controller_override.rb b/lib/trln_argon/controller_override.rb index a131e273..f1be6d37 100644 --- a/lib/trln_argon/controller_override.rb +++ b/lib/trln_argon/controller_override.rb @@ -31,6 +31,9 @@ module ControllerOverride config.search_builder_class = DefaultLocalSearchBuilder config.default_per_page = 20 + # Sets the sidebar component for the index view in the TrlnArgon configuration. + config.index.sidebar_component = TrlnArgon::Search::SidebarComponent + # Use Solr search requestHandler for search requests config.http_method = :get config.solr_path = :select