blacklight 6.14.0 → 7.0.0

data/app/views/catalog/_facet_pagination.html.erb

@@ -1,19 +1,19 @@
-<div class="prev_next_links btn-group pull-left">
-  <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), params: search_state.to_h, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link', data: { ajax_modal: "preserve" } do %>
+<div class="prev_next_links btn-group float-md-left">
+  <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), params: search_state.to_h, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link', data: { blacklight_modal: "preserve" } do %>
     <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
   <% end %>
 
-  <%= link_to_next_page @pagination, raw(t('views.pagination.next')), params: search_state.to_h, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link',  data: { ajax_modal: "preserve" } do %>
+  <%= link_to_next_page @pagination, raw(t('views.pagination.next')), params: search_state.to_h, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link',  data: { blacklight_modal: "preserve" } do %>
     <span class="disabled btn  btn-disabled"><%= raw(t('views.pagination.next')) %></span>
   <% end %>
 </div>
 
-<div class="sort_options btn-group pull-right">
+<div class="sort-options btn-group float-md-right">
   <% if @pagination.sort == 'index' -%>
-    <span class="active az btn btn-default"><%= t('blacklight.search.facets.sort.index') %></span>
-    <%= link_to(t('blacklight.search.facets.sort.count'), @pagination.params_for_resort_url('count', search_state.to_h), class: "sort_change numeric btn btn-default", data: { ajax_modal: "preserve" }) %>
+    <span class="active az btn btn-outline-secondary"><%= t('blacklight.search.facets.sort.index') %></span>
+    <%= link_to(t('blacklight.search.facets.sort.count'), @pagination.params_for_resort_url('count', search_state.to_h), class: "sort_change numeric btn btn-outline-secondary", data: { blacklight_modal: "preserve" }) %>
   <% elsif @pagination.sort == 'count' -%>
-    <%=  link_to(t('blacklight.search.facets.sort.index'), @pagination.params_for_resort_url('index', search_state.to_h), class: "sort_change az btn btn-default",  data: { ajax_modal: "preserve" }) %>
-    <span class="active numeric btn btn-default"><%= t('blacklight.search.facets.sort.count') %></span>
+    <%=  link_to(t('blacklight.search.facets.sort.index'), @pagination.params_for_resort_url('index', search_state.to_h), class: "sort_change az btn btn-outline-secondary",  data: { blacklight_modal: "preserve" }) %>
+    <span class="active numeric btn btn-outline-secondary"><%= t('blacklight.search.facets.sort.count') %></span>
   <% end -%>
 </div>

data/app/views/catalog/_facet_pivot.html.erb

@@ -10,9 +10,9 @@
     </span>
 
     <% unless item.items.blank? %>
-      <%= render partial: 'facet_pivot', locals: { display_facet: item, field_name: field_name, solr_field: field_name } %>
+      <%= render 'facet_pivot', display_facet: item, field_name: field_name %>
     <% end %>
     </li>
   <% end %>
 
-</ul>
+</ul>

data/app/views/catalog/_facets.html.erb

@@ -1,21 +1,18 @@
 <% # main container for facets/limits menu -%>
-<% if has_facet_values?  %>
-<div id="facets" class="facets sidenav">
+<% if has_facet_values? %>
+<div id="facets" class="facets sidenav facets-toggleable-sm">
 
-  <div class="top-panel-heading panel-heading">
-    <button type="button" class="facets-toggle" data-toggle="collapse" data-target="#facet-panel-collapse">
-      <span class="sr-only">Toggle facets</span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-    </button>
-
-    <h2 class='facets-heading'>
+  <div class="navbar">
+    <h2 class="facets-heading">
       <%= t('blacklight.search.facets.title') %>
     </h2>
+
+    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#facet-panel-collapse" aria-controls="facet-panel-collapse" aria-expanded="false" aria-label="Toggle facets">
+      <span class="navbar-toggler-icon"></span>
+    </button>
   </div>
 
-  <div id="facet-panel-collapse" class="collapse panel-group">
+  <div id="facet-panel-collapse" class="facets-collapse collapse">
     <%= render_facet_partials %>
   </div>
 </div>

data/app/views/catalog/_field.json.jbuilder

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+json.set!(field_name) do
+  json.id "#{document_url}##{field_name}"
+  json.type 'document_value'
+  json.attributes do
+    json.value doc_presenter.field_value(field)
+    json.label field.label
+  end
+end

data/app/views/catalog/{_group_default.html.erb → _group.html.erb}

@@ -1,7 +1,7 @@
 <% # container for all groups in index view -%>
 <div id="groups">
   <%- @response.groups.each do |g| %>
-    <h3 class="group-key"><%= g.key %></h3>
+    <h2 class="group-key"><%= g.key %></h2>
     <div class="grouped-documents">
       <%= render_document_index g.docs %>
     </div>

data/app/views/catalog/_home_text.html.erb

@@ -1,48 +1,44 @@
-<div class="page-header row">
-  <h2 class="col-md-8 page-heading"><%= t('blacklight.welcome') %></h2>
-  
-  <ul class="nav nav-pills col-md-4">
-    <li><a href="https://github.com/projectblacklight/blacklight/">Github</a></li>
-    <li><a href="https://github.com/projectblacklight/blacklight/wiki">Wiki</a></li>
-    <li><a href="https://github.com/projectblacklight/blacklight/releases/tag/v<%= Blacklight::VERSION %>">Release Notes</a></li>
-  </ul>
+<div class="jumbotron text-center">
+  <h1 class="jumbotron-heading"><%= t('blacklight.welcome') %></h1>
 
+  <p class="lead">Blacklight is a multi-institutional open-source collaboration building a better discovery platform framework.</p>
+
+  <p>
+    <%= link_to 'Read the Documentation', 'https://github.com/projectblacklight/blacklight/wiki', class: 'btn btn-primary' %>
+    <%= link_to 'See Examples', 'http://projectblacklight.org', class: 'btn btn-outline-secondary' %>
+  </p>
 </div>
 
 <div id="getting-started">
-  <h3 class='section-heading'>Here&rsquo;s how to get started:</h3>
-  
-  <ol>
-    <li>To modify this text, you need to <a href="http://guides.rubyonrails.org/engines.html#improving-engine-functionality">override the Blacklight-provided view</a>.
-You can copy this file, located in the blacklight gem: <br />
-<%= Blacklight.root %>/app/views/catalog/_home_text.html.erb <br />
-to your own application: <br />
- <%= Rails.root %>/app/views/catalog/_home_text.html.erb 
-    </li>
-    <li><a href="https://github.com/projectblacklight/blacklight/wiki/Indexing-your-data-into-solr">Index your own data</a> into Solr</li>
-    <li><a href="https://github.com/projectblacklight/blacklight/wiki#blacklight-configuration">Configure Blacklight</a> to match your data and user-experience needs</li>
-    <li><a href="https://github.com/projectblacklight/blacklight/wiki#support">Get in touch</a> with your comments, questions, and ideas</li>
-  </ol>
+  <h2>Here’s how to get started customizing your application:</h2>
+
+  <p>There are many ways to override specific behaviors and views in Blacklight. Because Blacklight is distributed as a Rails engine-based gem, all customization of Blacklight behavior should be done within your application by overriding Blacklight-provided behaviors with your own.</p>
+
+  <p>
+    <ol>
+      <li>To modify this text, you need to <a href="http://guides.rubyonrails.org/engines.html#improving-engine-functionality">override the Blacklight-provided view</a>.
+  You can copy this file, located in the blacklight gem: <br />
+  <%= Blacklight.root %>/app/views/catalog/_home_text.html.erb <br />
+  to your own application: <br />
+   <%= Rails.root %>/app/views/catalog/_home_text.html.erb
+      </li>
+      <li><a href="https://github.com/projectblacklight/blacklight/wiki/Indexing-your-data-into-solr">Index your own data</a> into Solr</li>
+      <li><a href="https://github.com/projectblacklight/blacklight/wiki#blacklight-configuration">Configure Blacklight</a> to match your data and user-experience needs</li>
+      <li><a href="https://github.com/projectblacklight/blacklight/wiki#support">Get in touch</a> with your comments, questions, and ideas</li>
+    </ol>
+  </p>
 </div>
 
 <%# This is the same panel shown in the Rails welcome template %>
-<div id="about">
-  <h3 class='section-heading'><a href="/rails/info/properties">About your application&rsquo;s environment</a></h3>
-  <div id="about-content" class="well" style="display: none"></div>
+<div id="about" class="card">
+  <h2 class='card-header collapsed collapse-toggle' data-toggle="collapse" data-target="#about-content"><a href="/rails/info/properties">About your application&rsquo;s environment</a></h2>
+  <div id="about-content" class="card-body collapse"></div>
 </div>
 
 <script>
-  $(function() {
-    $('#about a').on('click', function(e) {
-      e.preventDefault();
-
-      if ($('#about-content').html() == "") {
-        $('#about-content').load($(this).attr("href"), function() {
-          $('#about-content').show();
-        });
-      } else {
-        $('#about-content').toggle();
-      }
+  Blacklight.onLoad(function() {
+    $('#about .card-header').one('click', function() {
+      $($(this).data('target')).load($(this).find('a').attr('href'));
     });
   });
-</script>
+</script>

data/app/views/catalog/_index.html.erb

@@ -0,0 +1,10 @@
+<% doc_presenter = index_presenter(document) %>
+<%# default partial to display solr document fields in catalog index view -%>
+<dl class="document-metadata dl-invert row">
+
+  <% doc_presenter.fields_to_render.each do |field_name, field| -%>
+    <dt class="blacklight-<%= field_name.parameterize %> col-md-3"><%= render_index_field_label document, field: field_name %></dt>
+    <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field %></dd>
+  <% end -%>
+
+</dl>

data/app/views/catalog/{_index_header_default.html.erb → _index_header.html.erb}

@@ -1,5 +1,5 @@
 <%# header bar for doc items in index view -%>
-<div class="documentHeader row">
+<header class="documentHeader row">
   <%# main title container for doc partial view
       How many bootstrap columns need to be reserved
       for bookmarks control depends on size.
@@ -15,8 +15,8 @@
         <%= t('blacklight.search.documents.counter', counter: counter) %>
       </span>
     <% end %>
-    <%= link_to_document document, document_show_link_field(document), counter: counter %>
+    <%= link_to_document document, counter: counter %>
   </h3>
 
   <%= document_actions %>
-</div>
+</header>

data/app/views/catalog/_per_page_widget.html.erb

@@ -1,14 +1,13 @@
 <% if show_sort_and_per_page? and !blacklight_config.per_page.blank? %>
-
-  <span class="sr-only"><%= t('blacklight.search.per_page.title') %></span>
-<div id="per_page-dropdown" class="btn-group">
-  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+<span class="sr-only"><%= t('blacklight.search.per_page.title') %></span>
+<div id="per_page-dropdown" class="per-page-dropdown btn-group">
+  <button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
     <%= t(:'blacklight.search.per_page.button_label', :count => current_per_page) %> <span class="caret"></span>
   </button>
-  <ul class="dropdown-menu" role="menu">
+  <div class="dropdown-menu dropdown-menu-right" role="menu">
     <%- per_page_options_for_select.each do |(label, count)| %>
-      <li><%= link_to(label, url_for(search_state.params_for_search(per_page: count))) %></li>
+      <%= link_to(label, url_for(search_state.params_for_search(per_page: count)), class: 'dropdown-item') %>
     <%- end -%>
-  </ul>
+  </div>
 </div>
 <% end %>

data/app/views/catalog/_previous_next_doc.html.erb

@@ -1,20 +1,12 @@
-<% #Using the Bootstrap Pagination class  -%>
-<% #DEPRECATED - using id="previousNextDocument" as a selector is deprecated and will be removed in Blacklight 6.0 %>
-<div id='previousNextDocument' class='pagination-search-widgets'>
-  <% if @previous_document || @next_document %>
-    <div class="page_links">
-      <%= link_to_previous_document @previous_document %> |
+<% # Using the Bootstrap Pagination class  -%>
+<div class='pagination-search-widgets'>
+  <% if @search_context[:prev] || @search_context[:next] %>
+    <div class="page-links">
+      <%= link_to_previous_document @search_context[:prev] %> |
 
       <%= item_page_entry_info %> |
 
-      <%= link_to_next_document @next_document %>
-    </div>
-  <% end %>
-  <% if current_search_session %>
-    <div class="pull-right search-widgets">
-      <%= link_back_to_catalog class: 'btn' %>
-
-      <%=link_to t('blacklight.search.start_over'), start_over_path(current_search_session.try(:query_params) || {}), id: 'startOverLink', class: 'btn' %>
+      <%= link_to_next_document @search_context[:next] %>
     </div>
   <% end %>
 </div>

data/app/views/catalog/_results_pagination.html.erb

@@ -1,9 +1,9 @@
 <% if show_pagination? and @response.total_pages > 1 %>
  <div class="row record-padding">
   <div class="col-md-12">
-    <div class="pagination">
+    <nav class="pagination" role="region" aria-label="<%= t('views.pagination.aria.container_label') %>">
       <%= paginate @response, :outer_window => 2, :theme => 'blacklight' %>
-    </div>
+    </nav>
   </div>
  </div>
 <% end %>

data/app/views/catalog/_search_form.html.erb

@@ -1,22 +1,26 @@
-<%= form_tag search_action_url, method: :get, class: 'search-query-form clearfix navbar-form', role: 'search' do %>
+<%= form_tag search_action_url, method: :get, class: 'search-query-form', role: 'search' do %>
   <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+  <% if search_fields.length > 1 %>
+    <label for="search_field" class="sr-only"><%= t('blacklight.search.form.search_field.label') %></label>
+  <% end %>
   <div class="input-group">
     <% if search_fields.length > 1 %>
-      <span class="input-group-addon for-search-field">
-        <label for="search_field" class="sr-only"><%= t('blacklight.search.form.search_field.label') %></label>
-        <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), title: t('blacklight.search.form.search_field.title'), id: "search_field", class: "search_field") %>
-      </span>
+        <%= select_tag(:search_field,
+                       options_for_select(search_fields, h(params[:search_field])),
+                       title: t('blacklight.search.form.search_field.title'),
+                       id: "search_field",
+                       class: "custom-select search-field") %>
     <% elsif search_fields.length == 1 %>
       <%= hidden_field_tag :search_field, search_fields.first.last %>
     <% end %>
 
     <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
-    <%= text_field_tag :q, params[:q], placeholder: t('blacklight.search.form.search.placeholder'), class: "search_q q form-control", id: "q", autofocus: should_autofocus_on_search_box?, data: { autocomplete_enabled: autocomplete_enabled?, autocomplete_path: blacklight.suggest_index_path }  %>
+    <%= text_field_tag :q, params[:q], placeholder: t('blacklight.search.form.search.placeholder'), class: "search-q q form-control", id: "q", autofocus: presenter.autofocus?, data: { autocomplete_enabled: presenter.autocomplete_enabled?, autocomplete_path: search_action_path(action: :suggest) }  %>
 
-    <span class="input-group-btn">
+    <span class="input-group-append">
       <button type="submit" class="btn btn-primary search-btn" id="search">
         <span class="submit-search-text"><%= t('blacklight.search.form.submit') %></span>
-        <span class="glyphicon glyphicon-search"></span>
+        <%= blacklight_icon :search %>
       </button>
     </span>
   </div>

data/app/views/catalog/_search_header.html.erb

@@ -1,5 +1,2 @@
 <%= render 'did_you_mean' %>
-
-<%= render 'constraints' %>
-
 <%= render 'sort_and_per_page' %>

data/app/views/catalog/_search_results.html.erb

@@ -1,5 +1,3 @@
-<h2 class="sr-only top-content-title"><%= t('blacklight.search.search_results_header') %></h2>
-
 <% @page_title = t('blacklight.search.page_title.title', :constraints => render_search_to_page_title(params), :application_name => application_name) %>
 
 <% content_for(:head) do -%>
@@ -9,6 +7,12 @@
   <%= json_api_link_tag %>
 <% end %>
 
+<% content_for(:container_header) do -%>
+  <h1 class="sr-only top-content-title"><%= t('blacklight.search.header') %></h1>
+
+  <%= render 'constraints' %>
+<% end %>
+
 <%= render 'search_header' %>
 
 <h2 class="sr-only"><%= t('blacklight.search.search_results') %></h2>

data/app/views/catalog/_show.html.erb

@@ -0,0 +1,8 @@
+<% doc_presenter = show_presenter(document) %>
+<%# default partial to display solr document fields in catalog show view -%>
+<dl class="row dl-invert document-metadata">
+  <% doc_presenter.fields_to_render.each do |field_name, field| -%>
+    <dt class="blacklight-<%= field_name.parameterize %> col-md-3"><%= render_document_show_field_label document, field: field_name %></dt>
+    <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field %></dd>
+  <% end -%>
+</dl>

data/app/views/catalog/_show_main_content.html.erb

@@ -1,4 +1,4 @@
-<%= render 'previous_next_doc' %>
+<%= render 'previous_next_doc' if @search_context %>
 
 <% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name).html_safe %>
 <% content_for(:head) { render_link_rel_alternates } %>
@@ -10,10 +10,10 @@
 </div>
 
 <% if @document.respond_to?(:export_as_openurl_ctx_kev) %>
-  <!-- 
-       // COinS, for Zotero among others. 
+  <!--
+       // COinS, for Zotero among others.
        // This document_partial_name(@document) business is not quite right,
-       // but has been there for a while. 
+       // but has been there for a while.
   -->
   <span class="Z3988" title="<%= @document.export_as_openurl_ctx_kev(document_partial_name(@document)) %>"></span>
 <% end %>

data/app/views/catalog/_show_more_like_this.html.erb

@@ -1,3 +1,3 @@
 <li class="more_like_this_document">
-  <span class="mlt_title"><%= link_to_document document, document_show_link_field(document) %></span>
+  <span class="mlt_title"><%= link_to_document document %></span>
 </li>

data/app/views/catalog/_show_sidebar.html.erb

@@ -1,9 +1,9 @@
 <%= render :partial => 'show_tools' %>
   
 <% unless @document.more_like_this.empty? %>
-  <div class="panel panel-default">
-    <div class="panel-heading">More Like This</div>
-    <div class="panel-body">
+  <div class="card">
+    <div class="card-header">More Like This</div>
+    <div class="card-body">
       <%= render :collection => @document.more_like_this, :partial => 'show_more_like_this', :as => :document %>
     </div>
   </div>

data/app/views/catalog/_show_tools.html.erb

@@ -8,19 +8,17 @@
 
 -%>
 <% if show_doc_actions? %>
-  <div class="panel panel-default show-tools">
-    <div class="panel-heading">
-      <%= t('blacklight.tools.title') %>
+  <div class="card show-tools">
+    <div class="card-header">
+      <h2 class="mb-0 h6"><%= t('blacklight.tools.title') %></h2>
     </div>
 
-    <div class="panel-body">
-      <ul class="nav">
-        <%= render_show_doc_actions @document do |config, inner| %>
-          <li class="<%= config.key %>">
-            <%= inner %>
-          </li>
-        <% end %>
-      </ul>
-    </div>
+    <ul class="list-group list-group-flush">
+      <%= render_show_doc_actions @document do |config, inner| %>
+        <li class="list-group-item <%= config.key %>">
+          <%= inner %>
+        </li>
+      <% end %>
+    </ul>
   </div>
 <% end %>

data/app/views/catalog/_sms_form.html.erb

@@ -1,7 +1,11 @@
-  <%= form_tag url_for(:controller => controller_name, :action => "sms"), :id => 'sms_form', :class => "form-horizontal ajax_form", :method => :post do %>
+<%= form_tag url_for(controller: controller_name, action: "sms"),
+             data: { blacklight_modal: 'trigger' },
+             id: 'sms_form',
+             class: "modal_form",
+             method: :post do %>
 <div class="modal-body">
-  <%= render :partial=>'/flash_msg' %>
-    <div class="form-group">
+  <%= render '/shared/flash_msg' %>
+    <div class="form-group row">
       <label class="control-label col-sm-2" for="to"> 
         <%= t('blacklight.sms.form.to') %>
       </label>
@@ -9,7 +13,7 @@
         <%= telephone_field_tag :to, params[:to], class: 'form-control' %>
       </div>
     </div>
-    <div class="form-group">
+    <div class="form-group row">
       <label class="control-label col-sm-2" for="carrier">
         <%= t('blacklight.sms.form.carrier') %> 
       </label>

data/app/views/catalog/_sort_and_per_page.html.erb

@@ -1,4 +1,4 @@
-<div id="sortAndPerPage" class="clearfix">
-  <%= render :partial => "paginate_compact", :object => @response if show_pagination? %>
-  <%= render_results_collection_tools wrapping_class: "search-widgets pull-right" %>
+<div id="sortAndPerPage" class="sort-pagination clearfix">
+  <%= render partial: "paginate_compact", object: @response if show_pagination? %>
+  <%= render_results_collection_tools wrapping_class: "search-widgets float-md-right" %>
 </div>

data/app/views/catalog/_sort_widget.html.erb

@@ -1,13 +1,13 @@
 <% if show_sort_and_per_page? and active_sort_fields.many? %>
-<div id="sort-dropdown" class="btn-group">
-  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+<div id="sort-dropdown" class="sort-dropdown btn-group">
+  <button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
       <%= t('blacklight.search.sort.label', :field =>sort_field_label(current_sort_field.key)) %> <span class="caret"></span>
   </button>
 
-  <ul class="dropdown-menu" role="menu">
-      <%- active_sort_fields.each do |sort_key, field_config| %>
-        <li><%= link_to(sort_field_label(sort_key), url_for(search_state.params_for_search(sort: sort_key))) %></li>
-      <%- end -%>
-  </ul>
+  <div class="dropdown-menu" role="menu">
+    <%- active_sort_fields.each do |sort_key, field_config| %>
+      <%= link_to(sort_field_label(sort_key), url_for(search_state.params_for_search(sort: sort_key)), class: 'dropdown-item') %>
+    <%- end -%>
+  </div>
 </div>
 <% end %>

data/app/views/catalog/_thumbnail.html.erb

@@ -0,0 +1,5 @@
+<% if presenter(document).thumbnail.exists? && tn = presenter(document).thumbnail.thumbnail_tag({}, counter: document_counter_with_offset(document_counter)) %>
+<div class="document-thumbnail">
+  <%= tn %>
+</div>
+<% end %>

data/app/views/catalog/_view_type_group.html.erb

@@ -2,8 +2,8 @@
 <div class="view-type">
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
-    <%  document_index_view_controls.each do |view, config| %>
-      <%= link_to url_for(search_state.to_h.merge(view: view)), title: view_label(view), class: "btn btn-default view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
+    <% document_index_view_controls.each do |view, config| %>
+      <%= link_to url_for(search_state.to_h.merge(view: view)), title: view_label(view), class: "btn btn-outline-secondary view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
         <%= render_view_type_group_icon view %>
         <span class="caption"><%= view_label(view) %></span>
       <% end %>

data/app/views/catalog/_zero_results.html.erb

@@ -5,7 +5,7 @@
     <li><%= t 'blacklight.search.zero_results.use_fewer_keywords' %></li>
 
     <%- if params[:q] and params[:search_field] and params[:search_field] != blacklight_config.default_search_field.try(:key) -%>
-      <li><%= t 'blacklight.search.zero_results.search_fields', :search_fields => search_field_label(params) %> - 
+      <li><%= t 'blacklight.search.zero_results.search_fields', :search_fields => search_field_label(params) %> -
       <%= link_to t('blacklight.search.zero_results.search_everything', field: blacklight_config.default_search_field.label), url_for(search_state.params_for_search(search_field: blacklight_config.default_search_field.key)) %>
       </li>
     <%- end %>

data/app/views/catalog/citation.js.erb

@@ -1,6 +1,8 @@
 <div class="modal-header">
-  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h3><%= t('blacklight.tools.citation') %></h3>
+  <h1><%= t('blacklight.tools.citation') %></h1>
+  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
 </div>
 <div class="modal-body">
 <%= render :partial => 'citation' -%>

data/app/views/catalog/email.html.erb

@@ -1,5 +1,7 @@
 <div class="modal-header">
-<button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
-<h1 class="modal-title"><%= t('blacklight.email.form.title') %></h1>
-  </div>
+  <h1 class="modal-title"><%= t('blacklight.email.form.title') %></h1>
+  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
 <%= render :partial => 'email_form' %>

data/app/views/catalog/email_success.html.erb

@@ -1,9 +1,13 @@
-<div class="modal-header">
-  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h1><%= t('blacklight.email.form.title') %></h1>
-</div>
+<div data-blacklight-modal="container">
+  <div class="modal-header">
+    <h1><%= t('blacklight.email.form.title') %></h1>
+    <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
 
-<div class="modal-body">
-  <%= render :partial=>'/flash_msg' %>
-  <span class="ajax-close-modal"></span>
-</div>
+  <div class="modal-body">
+    <%= render partial: '/shared/flash_msg' %>
+    <span data-blacklight-modal="close"></span>
+  </div>
+</div>

data/app/views/catalog/facet.html.erb

@@ -1,23 +1,25 @@
-<div class="facet_pagination top">
+<div class="facet-pagination top">
   <%= render :partial=>'facet_pagination' %>
 </div>
 
 <div class="modal-header">
-  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h1 class="modal-title"><%= facet_field_label(@facet.key) %></h1>
+  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
 
-  <h3 class="modal-title"><%= facet_field_label(@facet.key) %></h3>
+<div class="modal-body">
   <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
 
-</div>
-<div class="modal-body">
-  <div class="facet_extended_list">
+  <div class="facet-extended-list">
   <%= render_facet_limit(@display_facet, layout: false) %>
   </div>
 </div>
-  
+
 <div class="modal-footer">
 
-  <div class="facet_pagination bottom">
+  <div class="facet-pagination bottom">
     <%= render :partial=>'facet_pagination' %>
   </div>
 </div>

data/app/views/catalog/facet.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.response do
   json.facets @pagination
 end