blacklight 6.19.1 → 7.1.0

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

@@ -1,5 +1,5 @@
 <% if should_show_spellcheck_suggestions? @response %>
   <div id="spell">
-    <h4 class="suggest"><em><%= t('blacklight.did_you_mean', :options => safe_join(@response.spelling.words.map { |word| link_to_query(word) }, " #{t('blacklight.or')} ")).html_safe %></em></h4>
+    <h3 class="suggest"><em><%= t('blacklight.did_you_mean', :options => safe_join(@response.spelling.words.map { |word| link_to_query(word) }, " #{t('blacklight.or')} ")).html_safe %></em></h3>
   </div>
 <% end %>

data/app/views/catalog/{_document_default.atom.builder → _document.atom.builder}

@@ -1,45 +1,46 @@
+# frozen_string_literal: true
+
 xml.entry do
   xml.title index_presenter(document).label(document_show_link_field(document))
-  
+
   # updated is required, for now we'll just set it to now, sorry
   xml.updated Time.current.iso8601
-  
+
   xml.link    "rel" => "alternate", "type" => "text/html", "href" => polymorphic_url(url_for_document(document))
   # add other doc-specific formats, atom only lets us have one per
   # content type, so the first one in the list wins.
-  xml << show_presenter(document).link_rel_alternates(unique: true)      
-  
+  xml << show_presenter(document).link_rel_alternates(unique: true)
+
   xml.id polymorphic_url(url_for_document(document))
-  
-  
+
   if document.to_semantic_values.key? :author
     xml.author { xml.name(document.to_semantic_values[:author].first) }
   end
-  
+
   with_format("html") do
     xml.summary "type" => "html" do
       xml.text! render_document_partial(document,
       :index,
-      :document_counter => document_counter)
+      document_counter: document_counter)
     end
   end
-  
-  #If they asked for a format, give it to them. 
+
+  #If they asked for a format, give it to them.
   if (params["content_format"] &&
     document.export_formats[params["content_format"].to_sym])
-    
+
     type = document.export_formats[params["content_format"].to_sym][:content_type]
-    
-    xml.content :type => type do |content_element|
+
+    xml.content type: type do |content_element|
       data = document.export_as(params["content_format"])
-      
+
       # encode properly. See:
       # http://tools.ietf.org/html/rfc4287#section-4.1.3.3
       type = type.downcase
-      if (type.downcase =~ /\+|\/xml$/)
-        # xml, just put it right in              
+      if (type.downcase =~ %r{\+|/xml$})
+        # xml, just put it right in
         content_element << data
-      elsif (type.downcase =~ /text\//)
+      elsif (type.downcase =~ %r{text/})
         # text, escape
         content_element.text! data
       else
@@ -47,6 +48,6 @@ xml.entry do
         content_element << Base64.encode64(data)
       end
     end
-    
+
   end
 end

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

@@ -1,4 +1,6 @@
 <% # container for a single doc -%>
-<div class="document <%= render_document_class document %> document-position-<%= document_counter%> " data-document-counter="<%= document_counter %>" itemscope itemtype="<%= document.itemtype %>">
-  <%= render_document_partials document, blacklight_config.view_config(document_index_view_type).partials, :document_counter => document_counter %>
-</div>
+<article class="document <%= render_document_class document %> document-position-<%= document_counter%> " data-document-counter="<%= document_counter %>" itemscope itemtype="<%= document.itemtype %>">
+  <%= render_document_partials document,
+    blacklight_config.view_config(document_index_view_type).partials,
+    document_counter: document_counter %>
+</article>

data/app/views/catalog/{_document_default.rss.builder → _document.rss.builder}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml.item do  
   xml.title(index_presenter(document).label(document_show_link_field(document)) || (document.to_semantic_values[:title].first if document.to_semantic_values.key?(:title)))
   xml.link(polymorphic_url(url_for_document(document)))

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

@@ -1,4 +1,5 @@
 <%= link_to document_action_label(document_action_config.key, document_action_config),
             document_action_path(document_action_config, (local_assigns.has_key?(:url_opts) ? url_opts : {}).merge(({id: document} if document) || {})),
             id: document_action_config.fetch(:id, "#{document_action_config.key}Link"),
-            data: {}.merge(({ajax_modal: "trigger"} if document_action_config.modal != false) || {}) %>
+            class: 'nav-link',
+            data: {}.merge(({ blacklight_modal: "trigger" } if document_action_config.modal != false) || {}) %>

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

@@ -1,8 +1,12 @@
-<%= form_tag url_for(:controller => controller_name, :action => "email"), :id => 'email_form', :class => "form-horizontal ajax_form", :method => :post do %>
+<%= form_tag url_for(controller: controller_name, action: "email"),
+             data: { blacklight_modal: 'trigger' },
+             id: 'email_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.email.form.to') %>
       </label>
@@ -11,7 +15,7 @@
       </div>
     </div>
 
-    <div class="form-group">
+    <div class="form-group row">
       <label class="control-label col-sm-2" for="message">
         <%= t('blacklight.email.form.message') %>
       </label>

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

@@ -0,0 +1,19 @@
+<% # main container for facets/limits menu -%>
+<% if has_facet_values? facet_field_names(groupname) %>
+<div id="facets<%= "-#{groupname}" unless groupname.nil? %>" class="facets sidenav facets-toggleable-sm">
+
+  <div class="navbar">
+    <h2 class="facets-heading">
+      <%= groupname.blank? ? t('blacklight.search.facets.title') : t("blacklight.search.facets-#{groupname}.title") %>
+    </h2>
+
+    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#facet-panel<%= "-#{groupname}" unless groupname.nil? %>-collapse" aria-controls="facet-panel<%= "-#{groupname}" unless groupname.nil? %>-collapse" aria-expanded="false" aria-label="Toggle facets">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+  </div>
+
+  <div id="facet-panel<%= "-#{groupname}" unless groupname.nil? %>-collapse" class="facets-collapse collapse">
+    <%= render_facet_partials facet_field_names(groupname) %>
+  </div>
+</div>
+<% end %>

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

@@ -1,9 +1,10 @@
 <nav class="alpha-filter">
-  <%= link_to t('blacklight.search.facets.clear'), @pagination.params_for_resort_url('index', search_state.to_h.except(@pagination.request_keys[:prefix])), data: { ajax_modal: "preserve" }, class: ['btn btn-default btn-xs', ('disabled' unless @pagination.prefix.present?)].join(' ') %>
-
-  <ol class="pagination pagination-xs">
+  <ol class="pagination pagination-sm justify-content-center">
+    <li class="page-item <%= 'active' if @pagination.prefix.blank? %>">
+      <%= link_to t('blacklight.search.facets.all'), @pagination.params_for_resort_url('index', search_state.to_h.except(@pagination.request_keys[:prefix])), data: { blacklight_modal: "preserve" }, class: 'page-link' %>
+    </li>
     <% @facet.index_range.each do |letter| %>
-      <li class="<%= 'active' if @pagination.prefix == letter %>"><%= link_to(letter, @pagination.params_for_resort_url('index', search_state.to_h.merge(@pagination.request_keys[:prefix] => letter)), data: { ajax_modal: "preserve" }) %></li>
+      <li class="page-item <%= 'active' if @pagination.prefix == letter %>"><%= link_to(letter, @pagination.params_for_resort_url('index', search_state.to_h.merge(@pagination.request_keys[:prefix] => letter)), class: 'page-link', data: { blacklight_modal: "preserve" }) %></li>
     <% end %>
   </ol>
 </nav>

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

@@ -1,11 +1,9 @@
-<div class="panel panel-default facet_limit blacklight-<%= facet_field.key.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.key) %>">
-  <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" aria-expanded="false" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
-    <h3 class="panel-title facet-field-heading">
-      <%= link_to facet_field_label(facet_field.key), "#", :"data-turbolinks" => false, :"data-no-turbolink" => true %>
-    </h3>
-  </div>
-  <div id="<%= facet_field_id(facet_field) %>" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'in' %>">
-    <div class="panel-body">
+<div class="card facet-limit blacklight-<%= facet_field.key.parameterize %> <%= 'facet-limit-active' if facet_field_in_params?(facet_field.key) %>">
+  <h3 class="card-header <%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle facet-field-heading" aria-expanded="false" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>" id="<%= facet_field_id(facet_field) %>-header">
+    <%= link_to facet_field_label(facet_field.key), "##{ facet_field_id(facet_field)}", "data-turbolinks": false %>
+  </h3>
+  <div id="<%= facet_field_id(facet_field) %>" aria-labelledby="<%= facet_field_id(facet_field) %>-header" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'show' %>">
+    <div  class="card-body">
       <%= yield %>
     </div>
   </div>

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

@@ -3,9 +3,10 @@
   <%= render_facet_limit_list paginator, facet_field.key %>
 
   <% unless paginator.last_page? || params[:action] == "facet" %>
-    <li class="more_facets_link">
+    <li class="more_facets">
       <%= link_to t("more_#{field_name}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: facet_field.label), 
-        search_facet_path(id: facet_field.key), class: "more_facets_link" %>
+        search_facet_path(id: facet_field.key),
+        data: { blacklight_modal: 'trigger' } %>
     </li>
   <% end %>
 </ul>

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,22 +1,4 @@
-<% # main container for facets/limits menu -%>
-<% if has_facet_values?  %>
-<div id="facets" class="facets sidenav">
-
-  <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'>
-      <%= t('blacklight.search.facets.title') %>
-    </h2>
-  </div>
-
-  <div id="facet-panel-collapse" class="collapse panel-group">
-    <%= render_facet_partials %>
-  </div>
-</div>
+<% # container for facet groups -%>
+<% facet_group_names.each do |groupname| %>
+  <%= render partial: "facet_group", locals: {groupname: groupname} %>
 <% end %>

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