Merge branch 'main' into 3865-numismatics-keyword-label

app/assets/javascripts/orangelight.js

@@ -11,14 +11,6 @@ $(function () {
     }
   )
 
-  //tooltip for everything else
-  $('#main-container').tooltip({
-    selector: "[data-toggle='tooltip']",
-    placement: 'bottom',
-    container: 'body',
-    trigger: 'hover',
-  })
-
   // availability toggle journal current issues
   $('#availability').on('click', '.trigger', function (event) {
     event.preventDefault()

app/assets/stylesheets/components/availability.scss

@@ -365,13 +365,6 @@
       display: none;
     }
 
-    .icon-warning {
-      float: left;
-      font-size: 24px;
-      padding-top: 1px;
-      color: #e87511;
-    }
-
     .availability-icon {
       float: left;
       padding: 6px 5px;

app/assets/stylesheets/components/overrides.scss

@@ -150,10 +150,6 @@ address {
   margin-top: 8px;
 }
 
-.tooltip > .tooltip-inner {
-  max-width: 600px !important;
-}
-
 [dir="rtl"] {
   font-family: verdana, arial;
   text-align: right;

app/assets/stylesheets/icons/icons.scss

@@ -62,12 +62,6 @@
     }
 }
 
-.icon-warning {
-    &:before {
-        content: $icon-warning;
-    }
-}
-
 .icon-refresh {
     &:before {
         content: $icon-refresh;

app/assets/stylesheets/icons/variables.scss

@@ -65,6 +65,5 @@ $icon-toggle-collapsed: "\e608";
 $icon-unknown: "\e60f";
 $icon-video-projected-medium: "\e606";
 $icon-visual-material: "\e607";
-$icon-warning: "\e90e";
 $icon-web: "\efbe";
 $icon-windows: "\f0fd";

app/components/aeon_request_button_component.rb

@@ -12,10 +12,6 @@ def label
     'Reading Room Request'
   end
 
-  def tooltip
-    'Request to view in Reading Room'
-  end
-
   def url
     @url_class.new(document: @document, holding: @holding).to_s
   end

app/components/request_button_component.html.erb

@@ -1,5 +1 @@
-<%= link_to label, url,
-      class: 'request btn btn-xs btn-primary',
-      title: tooltip,
-      data: { toggle: 'tooltip' }
-%>
+<%= link_to label, url, class: 'request btn btn-xs btn-primary' %>

app/components/request_button_component.rb

@@ -14,11 +14,6 @@ def label
     'Request'
   end
 
-  def tooltip
-    return 'Request to view in Reading Room' if aeon?
-    'View Options to Request copies from this Location'
-  end
-
   def url
     query = { mfhd: @holding_id, aeon: aeon?.to_s }.compact.to_query
     URI::HTTP.build(path: "/requests/#{@doc_id}", query:).request_uri

app/helpers/application_helper.rb

@@ -183,12 +183,12 @@ def subjectify(args)
       full_sub = ''
       all_subjects[i].each_with_index do |subsubject, j|
         lnk = lnk_accum + link_to(subsubject,
-                                  "/?f[subject_facet][]=#{CGI.escape sub_array[i][j]}", class: 'search-subject', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{sub_array[i][j]}", title: "Search: #{sub_array[i][j]}")
+                                  "/?f[subject_facet][]=#{CGI.escape sub_array[i][j]}", class: 'search-subject', 'data-original-title' => "Search: #{sub_array[i][j]}")
         lnk_accum = lnk + content_tag(:span, SEPARATOR, class: 'subject-level')
         full_sub = sub_array[i][j]
       end
       lnk += '  '
-      lnk += link_to('[Browse]', "/browse/subjects?q=#{CGI.escape full_sub}", class: 'browse-subject', 'data-toggle' => 'tooltip', 'data-original-title' => "Browse: #{full_sub}", title: "Browse: #{full_sub}", dir: full_sub.dir.to_s)
+      lnk += link_to('[Browse]', "/browse/subjects?q=#{CGI.escape full_sub}", class: 'browse-subject', 'data-original-title' => "Browse: #{full_sub}", 'aria-label' => "Browse: #{full_sub}", dir: full_sub.dir.to_s)
       args[:document][args[:field]][i] = lnk.html_safe
     end
     content_tag :ul do
@@ -206,7 +206,7 @@ def title_hierarchy(args)
       title_links = []
       title.each_with_index do |part, index|
         link_accum = StringFunctions.trim_punctuation(title[0..index].join(' '))
-        title_links << link_to(part, "/?search_field=left_anchor&q=#{CGI.escape link_accum}", class: 'search-title', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{link_accum}", title: "Search: #{link_accum}")
+        title_links << link_to(part, "/?search_field=left_anchor&q=#{CGI.escape link_accum}", class: 'search-title', 'data-original-title' => "Search: #{link_accum}", title: "Search: #{link_accum}")
       end
       full_title = title.join(' ')
       dirtags << StringFunctions.trim_punctuation(full_title.dir.to_s)
@@ -252,14 +252,14 @@ def name_title_hierarchy(args)
         link_accum = StringFunctions.trim_punctuation(name_t[0..i].join(' '))
         if i.zero?
           next if args[:field] == 'name_uniform_title_1display'
-          name_title_links << link_to(part, "/?f[author_s][]=#{CGI.escape link_accum}", class: 'search-name-title', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{link_accum}", title: "Search: #{link_accum}")
+          name_title_links << link_to(part, "/?f[author_s][]=#{CGI.escape link_accum}", class: 'search-name-title', 'data-original-title' => "Search: #{link_accum}")
         else
-          name_title_links << link_to(part, "/?f[name_title_browse_s][]=#{CGI.escape link_accum}", class: 'search-name-title', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{link_accum}", title: "Search: #{link_accum}")
+          name_title_links << link_to(part, "/?f[name_title_browse_s][]=#{CGI.escape link_accum}", class: 'search-name-title', 'data-original-title' => "Search: #{link_accum}")
         end
       end
       full_name_title = name_t.join(' ')
       dirtags << StringFunctions.trim_punctuation(full_name_title.dir.to_s)
-      name_title_links << link_to('[Browse]', "/browse/name_titles?q=#{CGI.escape full_name_title}", class: 'browse-name-title', 'data-toggle' => 'tooltip', 'data-original-title' => "Browse: #{full_name_title}", title: "Browse: #{full_name_title}", dir: full_name_title.dir.to_s)
+      name_title_links << link_to('[Browse]', "/browse/name_titles?q=#{CGI.escape full_name_title}", class: 'browse-name-title', 'data-original-title' => "Browse: #{full_name_title}", dir: full_name_title.dir.to_s)
       all_links << name_title_links.join('<span> </span>').html_safe
     end
 

app/helpers/blacklight_helper.rb

@@ -88,8 +88,8 @@ def cjk_mm_val
   end
 
   def browse_related_name_hash(name)
-    link_to(name, "/?f[author_s][]=#{CGI.escape name}", class: 'search-related-name', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{name}", title: "Search: #{name}") + '  ' +
-      link_to('[Browse]', "/browse/names?q=#{CGI.escape name}", class: 'browse-related-name', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{name}", title: "Browse: #{name}")
+    link_to(name, "/?f[author_s][]=#{CGI.escape name}", class: 'search-related-name', 'data-original-title' => "Search: #{name}") + '  ' +
+      link_to('[Browse]', "/browse/names?q=#{CGI.escape name}", class: 'browse-related-name', 'data-original-title' => "Search: #{name}")
   end
 
   # render_document_heading from Blacklight v7.23.0.1

app/helpers/holdings_helper.rb

@@ -84,9 +84,7 @@ def empty_link_online_holding_block
     data = content_tag(
       :span,
       'Link Missing',
-      class: 'availability-icon badge badge-secondary',
-      title: 'Availability: Online',
-      data: { 'toggle': 'tooltip' }
+      class: 'availability-icon badge badge-secondary'
     )
     data << content_tag(
       :div,
@@ -99,9 +97,7 @@ def online_holding_block(links)
     data = content_tag(
       :span,
       'Online',
-      class: 'availability-icon badge badge-primary',
-      title: 'Electronic access',
-      data: { 'toggle': 'tooltip' }
+      class: 'availability-icon badge badge-primary'
     )
     data << links.shift
   end
@@ -110,68 +106,47 @@ def onsite_access_span
     content_tag(
       :span,
       'On-site access',
-      class: 'availability-icon badge badge-success',
-      title: 'Availability: On-site by request',
-      data: { 'toggle': 'tooltip' }
+      class: 'availability-icon badge badge-success'
     )
   end
 
-  def request_only_span
-    content_tag(
-      :span,
-      '',
-      class: 'icon-warning icon-request-reading-room',
-      title: 'Items at this location must be requested',
-      data: { 'toggle': 'tooltip' },
-      'aria-hidden': 'true'
-    )
-  end
-
-  def dspace_or_numismatics_holding_block(location)
-    data = onsite_access_span
-    data << request_only_span if aeon_location?(location)
-    data
+  def dspace_or_numismatics_holding_block(_location)
+    onsite_access_span
   end
 
   def scsb_item_block(holding)
     scsb_supervised_items?(holding) ? scsb_supervised_item : scsb_unsupervised_item(holding)
   end
 
   def scsb_supervised_item
-    onsite_access_span + request_only_span
+    onsite_access_span
   end
 
   def scsb_unsupervised_item(holding)
     content_tag(
       :span,
       '',
       class: 'availability-icon badge',
-      title: '',
       data: {
         'scsb-availability': 'true',
-        'toggle': 'tooltip',
         'scsb-barcode': holding['items'].first['barcode'].to_s
       }
     )
   end
 
-  def dspace_not_defined_block(location)
-    data = content_tag(
+  def dspace_not_defined_block(_location)
+    content_tag(
       :span,
       'Loading...',
       class: 'availability-icon badge badge-secondary'
     )
-    data << request_only_span if aeon_location?(location)
-    data
   end
 
   def under_embargo_block
     content_tag(
       :span,
       'Unavailable',
-      class: 'availability-icon badge badge-danger',
-      title: 'Availability: Material under embargo',
-      data: { 'toggle': 'tooltip' }
+      class: 'availability-icon badge badge-danger'
     )
   end
 
@@ -220,9 +195,7 @@ def view_record_for_full_avail_li(document)
       link_to(
         'View Record for Full Availability',
         solr_document_path(document['id']),
-        class: 'availability-icon badge badge-secondary more-info',
-        title: 'Click on the record for full availability info',
-        data: { 'toggle': 'tooltip' }
+        class: 'availability-icon badge badge-secondary more-info'
       )
     )
   end
@@ -233,9 +206,7 @@ def view_record_for_full_avail_li_two(document)
       link_to(
         '',
         solr_document_path(document['id']),
-        class: 'availability-icon more-info',
-        title: 'Click on the record for full availability info',
-        data: { 'toggle': 'tooltip' }
+        class: 'availability-icon more-info'
       ),
       class: 'empty',
       data: { record_id: document['id'] }

app/processors/orangelight/browse_link_processor.rb

@@ -36,8 +36,8 @@ def browse_class
 
       def add_links_to(value)
         return value unless should_render_links?(value)
-        link_to(value, "/?f[#{facet_field}][]=#{strip_tags(CGI.escape(strip_tags(value)))}", class: search_class, 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{strip_tags(value)}", title: "") + ' ' +
-          link_to('[Browse]', "/browse/#{browse_path}?q=#{CGI.escape(strip_tags(value))}", class: browse_class, 'data-toggle' => 'tooltip', 'data-original-title' => "Browse: #{strip_tags(value)}", title: "", dir: value.dir.to_s)
+        link_to(value, "/?f[#{facet_field}][]=#{strip_tags(CGI.escape(strip_tags(value)))}", class: search_class, 'data-original-title' => "Search: #{strip_tags(value)}") + ' ' +
+          link_to('[Browse]', "/browse/#{browse_path}?q=#{CGI.escape(strip_tags(value))}", class: browse_class, 'data-original-title' => "Browse: #{strip_tags(value)}", dir: value.dir.to_s)
       end
 
       def should_render_links?(value)

app/processors/orangelight/link_to_facet_processor.rb

@@ -3,7 +3,7 @@
 module Orangelight
   class LinkToFacetProcessor < Blacklight::Rendering::LinkToFacet
     def link(field, v)
-      context.link_to(v, search_path(field, v), class: 'search-name', data: { toggle: 'tooltip', original_title: "Search: #{v}" }, title: "Search: #{v}")
+      context.link_to(v, search_path(field, v), class: 'search-name', 'data-original_title' => "Search: #{v}")
     end
   end
 end

app/processors/orangelight/link_to_search_value_processor.rb

@@ -6,9 +6,8 @@ class LinkToSearchValueProcessor < Blacklight::Rendering::AbstractStep
 
     def render
       return next_step(values) unless config.link_to_search_value
-
       values.map! do |value|
-        link_to(value, "/?f[#{config.key}][]=#{CGI.escape value}", class: 'search-name', 'data-toggle' => 'tooltip', 'data-original-title' => "Search: #{value}")
+        link_to(value, "/?f[#{config.key}][]=#{CGI.escape value}", class: 'search-name', 'data-original-title' => "Search: #{value}")
       end
       next_step(values)
     end

app/processors/orangelight/series_link_processor.rb

@@ -22,8 +22,8 @@ def render
       def more_in_this_series_link(title)
         no_parens = authorized_form_of_title(title).gsub(/[()]/, '')
         link_to('[More in this series]', "/catalog?q1=#{CGI.escape no_parens}&f1=in_series&search_field=advanced",
-                class: 'more-in-series', 'data-toggle' => 'tooltip',
-                'data-original-title' => "More in series: #{title}", title: "",
+                class: 'more-in-series',
+                'data-original-title' => "More in series: #{title}",
                 dir: title.dir.to_s)
       end
 

app/services/online_holdings_markup_builder.rb

@@ -8,9 +8,7 @@ class OnlineHoldingsMarkupBuilder < HoldingRequestsBuilder
   def self.online_link(bib_id, holding_id)
     children = content_tag(
       :span, 'Link Missing',
-      class: 'availability-icon badge badge-secondary',
-      title: 'Availability: Online',
-      'data-toggle' => 'tooltip'
+      class: 'availability-icon badge badge-secondary'
     )
     # AJAX requests are made using availability.js here
     content_tag(:div, children.html_safe,

app/services/physical_holdings_markup_builder.rb

@@ -21,8 +21,6 @@ def call_number_link(holding, cn_value)
       cn_browse_link = link_to(children.html_safe,
                                "/browse/call_numbers?q=#{CGI.escape(cn_value)}",
                                class: 'browse-cn',
-                               title: "Browse: #{cn_value}",
-                               'data-toggle' => 'tooltip',
                                'data-original-title' => "Browse: #{cn_value}")
       cn = "#{holding['call_number']} #{cn_browse_link}"
     end
@@ -32,17 +30,13 @@ def call_number_link(holding, cn_value)
   def holding_location_repository
     children = content_tag(:span,
                            'On-site access',
-                           class: 'availability-icon badge badge-success',
-                           title: 'Availability: On-site by request',
-                           'data-toggle' => 'tooltip')
+                           class: 'availability-icon badge badge-success')
     content_tag(:td, children.html_safe)
   end
 
   def holding_location_scsb_span
     markup = content_tag(:span, '',
-                         title: '',
-                         class: 'availability-icon badge',
-                         data: { toggle: 'tooltip' })
+                         class: 'availability-icon badge')
     markup
   end
 
@@ -80,9 +74,7 @@ def holding_location_default(doc_id, holding_id, location_rules, temp_location_c
   def holding_location_unavailable
     children = content_tag(:span,
                            'Unavailable',
-                           class: 'availability-icon badge badge-danger',
-                           title: 'Availability: Embargoed',
-                           'data-toggle' => 'tooltip')
+                           class: 'availability-icon badge badge-danger')
     content_tag(:td, children.html_safe, class: 'holding-status')
   end
 
@@ -134,23 +126,12 @@ def self.scsb_use_label(restriction)
     "#{restriction} Only"
   end
 
-  def self.scsb_use_toolip(restriction)
-    if restriction == 'In Library Use'
-      I18n.t('blacklight.scsb.in_library_use')
-    else
-      I18n.t('blacklight.scsb.supervised_use')
-    end
-  end
-
   # Generate the markup for record restrictions
   # @param holding [Hash] the restrictions for all holdings
   # @return [String] the markup
   def self.restrictions_markup(restrictions)
     restricted_items = restrictions.map do |value|
-      content_tag(:td, scsb_use_label(value),
-                  class: 'icon-warning icon-request-reading-room',
-                  title: scsb_use_toolip(value),
-                  'data-toggle' => 'tooltip')
+      content_tag(:td, scsb_use_label(value))
     end
     if restricted_items.length > 1
       list = restricted_items.map { |value| content_tag(:li, value) }
@@ -356,7 +337,6 @@ def stackmap_url_markup(location, library, holding, call_number)
     child = %(<span class="link-text">#{I18n.t('blacklight.holdings.stackmap')}</span>\
     <span class="fa fa-map-marker" aria-hidden="true"></span>)
     link_to(child.html_safe, stackmap_url,
-              title: I18n.t('blacklight.holdings.stackmap'),
               class: 'find-it',
               data: {
                 'map-location' => location.to_s,

app/views/blacklight_advanced_search/_facet_limit.html.erb

@@ -7,7 +7,7 @@
         <li>
             <span class="selected"><%= h(value) %></span>
             <%= link_to(remove_advanced_facet_param(facet_field.key, value, params), :class => "remove") do %>
-                <i class="fa fa-times" aria-hidden="true" data-toggle="tooltip" data-original-title="Remove"></i><span class="sr-only">[remove]</span>
+                <i class="fa fa-times" aria-hidden="true" data-original-title="Remove"></i><span class="sr-only">[remove]</span>
             <% end %>
         </li>
     <% end %>