blacklight 6.21.0 → 7.0.0

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" aria-expanded="false">
+<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.html.erb

@@ -1 +1 @@
-<%= render partial: 'citation' %>
+<%= render :partial => 'citation' -%>

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

@@ -1 +1,9 @@
-<%= render partial: 'citation' %>
+<div class="modal-header">
+  <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' -%>
+</div>

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

data/app/views/catalog/index.atom.builder

@@ -1,56 +1,53 @@
+# frozen_string_literal: true
+
 require 'base64'
 
-xml.instruct!(:xml, :encoding => "UTF-8")
+xml.instruct!(:xml, encoding: "UTF-8")
 
 xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
-         "xmlns:opensearch"=>"http://a9.com/-/spec/opensearch/1.1/") do
+         "xmlns:opensearch" => "http://a9.com/-/spec/opensearch/1.1/") do
 
-  xml.title   t('blacklight.search.title', :application_name => application_name)
+  xml.title   t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name)
   # an author is required, so we'll just use the app name
   xml.author { xml.name application_name }
   
   xml.link    "rel" => "self", "href" => url_for(search_state.to_h.merge(only_path: false))
-  xml.link    "rel" => "alternate", "href" => url_for(search_state.to_h.merge(:only_path => false, :format => "html")), "type" => "text/html"
+  xml.link    "rel" => "alternate", "href" => url_for(search_state.to_h.merge(only_path: false, format: "html")), "type" => "text/html"
   xml.id      url_for(search_state.to_h.merge(:only_path => false, :format => "html", :content_format => nil, "type" => "text/html"))
 
   # Navigational and context links
   
   xml.link( "rel" => "next", 
-            "href" => url_for(search_state.to_h.merge(:only_path => false, :page => @response.next_page.to_s))
+            "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.next_page.to_s))
            ) if @response.next_page
   
   xml.link( "rel" => "previous", 
-            "href" => url_for(search_state.to_h.merge(:only_path => false, :page => @response.prev_page.to_s))
+            "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s))
            ) if @response.prev_page
            
   xml.link( "rel" => "first", 
-            "href" => url_for(search_state.to_h.merge(:only_path => false, :page => "1")))
+            "href" => url_for(search_state.to_h.merge(only_path: false, page: "1")))
   
   xml.link( "rel" => "last",
-            "href" => url_for(search_state.to_h.merge(:only_path => false, :page => @response.total_pages.to_s)))
+            "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.total_pages.to_s)))
   
   # "search" doesn't seem to actually be legal, but is very common, and
   # used as an example in opensearch docs
   xml.link( "rel" => "search",
             "type" => "application/opensearchdescription+xml",
-            "href" =>  url_for(:controller=>'catalog',:action => 'opensearch', :format => 'xml', :only_path => false))
+            "href" => url_for(controller: 'catalog',action: 'opensearch', format: 'xml', only_path: false))
 
   # opensearch response elements
   xml.opensearch :totalResults, @response.total.to_s
   xml.opensearch :startIndex, @response.start.to_s
   xml.opensearch :itemsPerPage, @response.limit_value
-  xml.opensearch :Query, :role => "request", :searchTerms => params[:q], :startPage => @response.current_page
+  xml.opensearch :Query, role: "request", searchTerms: params[:q], startPage: @response.current_page
   
   
   # updated is required, for now we'll just set it to now, sorry
   xml.updated Time.current.iso8601
   
-  @document_list.each_with_index do |document, document_counter|
+  @response.documents.each_with_index do |document, document_counter|
     xml << Nokogiri::XML.fragment(render_document_partials(document, blacklight_config.view_config(:atom).partials, document_counter: document_counter))
   end
 end
-
-
-
-
-

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

@@ -1,13 +1,11 @@
-<div id="sidebar" class="<%= sidebar_classes %>">
+<% content_for(:sidebar) do %>
   <%= render 'search_sidebar' %>
-</div>
+<% end %>
 
-<div id="content" class="<%= main_content_classes %>">
-  <% unless has_search_parameters? %>
-    <%# if there are no input/search related params, display the "home" partial -%>
-    <%= render 'home' %>
-    <%= render 'shared/sitelinks_search_box' %>
-  <% else %>
-    <%= render 'search_results' %>
-  <% end %>
-</div>
+<% unless has_search_parameters? %>
+  <%# if there are no input/search related params, display the "home" partial -%>
+  <%= render 'home' %>
+  <%= render 'shared/sitelinks_search_box' %>
+<% else %>
+  <%= render 'search_results' %>
+<% end %>

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

@@ -1,5 +1,86 @@
-json.response do
-  json.docs @presenter.documents
-  json.facets @presenter.search_facets_as_json
+# frozen_string_literal: true
+json.links do
+  json.self url_for(search_state.to_h.merge(only_path: false))
+  json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page
+  json.next url_for(search_state.to_h.merge(only_path: false, page: @response.next_page.to_s)) if @response.next_page
+  json.last url_for(search_state.to_h.merge(only_path: false, page: @response.total_pages.to_s))
+end
+
+json.meta do
   json.pages @presenter.pagination_info
 end
+
+json.data do
+  json.array! @presenter.documents do |document|
+    document_url = polymorphic_url(url_for_document(document))
+    json.id document.id
+    json.type document[blacklight_config.view_config(:index).display_type_field]
+    json.attributes do
+      doc_presenter = index_presenter(document)
+
+      doc_presenter.fields_to_render.each do |field_name, field|
+        json.partial! 'field', field: field,
+                               field_name: field_name,
+                               document_url: document_url,
+                               doc_presenter: doc_presenter
+      end
+    end
+
+    json.links do
+      json.self document_url
+    end
+  end
+end
+
+json.included do
+  json.array! @presenter.search_facets do |facet|
+    json.type 'facet'
+    json.id facet.name
+    json.attributes do
+      facet_config = facet_configuration_for_field(facet.name)
+      json.label facet_field_label(facet_config.key)
+      json.items do
+        json.array! facet.items do |item|
+          json.id
+          json.attributes do
+            json.label item.label
+            json.value item.value
+            json.hits item.hits
+          end
+          json.links do
+            if facet_in_params?(facet.name, item.value)
+              json.remove search_action_path(search_state.remove_facet_params(facet.name, item.value))
+            else
+              json.self path_for_facet(facet.name, item.value, only_path: false)
+            end
+          end
+        end
+      end
+    end
+    json.links do
+      json.self search_facet_path(id: facet.name, only_path: false)
+    end
+  end
+
+  json.array! search_fields do |(label, key)|
+    json.type 'search_field'
+    json.id key
+    json.attributes do
+      json.label label
+    end
+    json.links do
+      json.self url_for(search_state.to_h.merge(search_field: key, only_path: false))
+    end
+  end
+
+  json.array! active_sort_fields do |key, field|
+    json.type 'sort'
+    json.id key
+    json.attributes do
+      json.label field.label
+    end
+    json.links do
+      json.self url_for(search_state.to_h.merge(sort: key, only_path: false))
+    end
+  end
+end