blacklight 5.7.2 → 5.8.0

data/app/helpers/component_helper.rb

@@ -0,0 +1,3 @@
+module ComponentHelper
+  include Blacklight::ComponentHelperBehavior
+end

data/app/views/_user_util_links.html.erb

@@ -1,21 +1,8 @@
 <div class="navbar-right">
   <ul class="nav navbar-nav">
-    <% if render_bookmarks_control? %>
-    <li>
-      <%= link_to bookmarks_path, id:'bookmarks_nav' do %>
-        <%= t('blacklight.header_links.bookmarks') %>
-	(<span data-role='bookmark-counter'><%= current_or_guest_user.bookmarks.count %></span>)
-      <% end %>
-    </li>
-    <% end %>
-    <% if has_user_authentication_provider? and current_user %>
-      <li>
-      <%= link_to t('blacklight.header_links.saved_searches'), saved_searches_path %>
-      </li>
+    <%= render_nav_actions do |config, action|%>
+      <li><%= action %></li>
     <% end %>
-    <li>
-    <%= link_to t('blacklight.header_links.search_history'), search_history_path %>
-    </li>
   </ul>
 
   <% if has_user_authentication_provider? %>

data/app/views/blacklight/nav/_bookmark.html.erb

@@ -0,0 +1,4 @@
+<%= link_to bookmarks_path, id:'bookmarks_nav' do %>
+  <%= t('blacklight.header_links.bookmarks') %>
+(<span data-role='bookmark-counter'><%= current_or_guest_user.bookmarks.count %></span>)
+<% end %>

data/app/views/blacklight/nav/_saved_searches.html.erb

@@ -0,0 +1 @@
+<%= link_to t('blacklight.header_links.saved_searches'), saved_searches_path %>

data/app/views/blacklight/nav/_search_history.html.erb

@@ -0,0 +1 @@
+<%= link_to t('blacklight.header_links.search_history'), search_history_path %>

data/app/views/bookmarks/_tools.html.erb

@@ -1,11 +1,8 @@
-<ul class="bookmarkTools nav nav-pills">
-  <li class="cite">
-    <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @response.documents.map {|doc| doc.id}), {:id => 'citeLink', :name => 'citation', :class => 'btn btn-default', :data => {:ajax_modal => "trigger"}} %>
-  </li>
-
-  <li class="email">
-    <%= link_to t('blacklight.tools.email'), email_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @response.documents.map {|doc| doc.id}), :class=>"btn btn-default", :id => "emailLink", :data => {:ajax_modal => "trigger"} %>
-  </li>
-  
+<ul class="<%= controller_name %>Tools nav nav-pills">
+  <%= render_show_doc_actions document_list, document: nil, document_list: @document_list, url_opts: sanitize_search_params(params) do |config, inner| %>
+    <li>
+      <%= inner %>
+    </li>
+  <% end %>
   <%= render_marc_tools %>
 </ul>

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

@@ -11,7 +11,7 @@
 <% else %>
   <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') }, :class => 'clear-bookmarks btn btn-danger pull-right' %>
   <%= render 'sort_and_per_page' %>
-  <%= render 'tools' %>
+  <%= render partial: 'tools', locals: { document_list: @document_list } %>
 
   <%= render_document_index %>
   <%= render 'results_pagination' %>

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

@@ -1,21 +1,21 @@
 <% if current_or_guest_user %>
-  <%- 
-  # Note these two forms are pretty similar but for different :methods, classes, and labels. 
+  <%-
+  # Note these two forms are pretty similar but for different :methods, classes, and labels.
   # but it was simpler to leave them seperate instead of DRYing them, got confusing trying that.
   # the data-doc-id attribute is used by our JS that converts to a checkbox/label.
   -%>
-  <% if current_bookmarks.find { |x| x.document_id == document.id and x.document_type == document.class }.blank? %>  
+  <% if current_bookmarks.find { |x| x.document_id == document.id and x.document_type == document.class }.blank? %>
 
-      <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>   
+      <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
         <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add") %>
       <% end %>
-  
+
   <% else %>
-  
-      <%= form_tag( bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>  
+
+      <%= form_tag( bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
         <%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove") %>
       <% end %>
-      
+
   <% end %>
 <% else %>
   &nbsp;

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

@@ -13,7 +13,7 @@
       <span class="filterName"><%= label %></span>
     <% end %>
     <% unless value.blank? %>
-      <span class="filterValue"><%= value %></span>
+      <%= content_tag :span, value, class: 'filterValue', title: value %>
     <% end %>
   </span>
   <% unless options[:remove].blank? %>

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

@@ -0,0 +1,4 @@
+<%= 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) || {}) %>

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

@@ -1,4 +1,4 @@
-<%= form_tag url_for(:controller => "catalog", :action => "email"), :id => 'email_form', :class => "form-horizontal ajax_form", :method => :post do %>
+<%= form_tag url_for(:controller => controller_name, :action => "email"), :id => 'email_form', :class => "form-horizontal ajax_form", :method => :post do %>
 
   <div class="modal-body">
     <%= render :partial=>'/flash_msg' %>

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

@@ -4,6 +4,6 @@
 
   <% unless paginator.last_page? || params[:action] == "facet" %>
     <li class="more_facets_link"><%= link_to t('blacklight.search.facets.more'), 
-       params.merge(id: solr_field, action: "facet", page: nil), class: "more_facets_link" %></li>
+       search_facet_url(id: solr_field), class: "more_facets_link" %></li>
   <% end %>
 </ul>

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

@@ -1,20 +1,19 @@
-     
+
       <% # header bar for doc items in index view -%>
       <div class="documentHeader row">
-        
-        <%# main title container for doc partial view 
+
+        <%# main title container for doc partial view
             How many bootstrap columns need to be reserved
-            for bookmarks control depends on size. 
+            for bookmarks control depends on size.
         -%>
          <h5 class="index_title col-sm-9 col-lg-10">
          <% counter = document_counter_with_offset(document_counter) %>
          <span class="document-counter">
          <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
          </span>
-         <%= link_to_document document, :label=>document_show_link_field(document), :counter => counter %>
+         <%= link_to_document document, document_show_link_field(document), :counter => counter %>
         </h5>
 
         <% # bookmark functions for items/docs -%>
         <%= render_index_doc_actions document, :wrapping_class => "index-document-functions col-sm-3 col-lg-2" %>
       </div>
-      

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

@@ -2,7 +2,9 @@
 
   <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"><%= link_to(t(:'blacklight.search.per_page.button_label', :count => current_per_page), "#") %> <span class="caret"></span></button>
+  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+    <%= t(:'blacklight.search.per_page.button_label', :count => current_per_page) %> <span class="caret"></span>
+  </button>
   <ul class="dropdown-menu" role="menu">
     <%- per_page_options_for_select.each do |(label, count)| %>
       <li><%= link_to(label, url_for(params_for_search(:per_page => count))) %></li>

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

@@ -1,4 +1,4 @@
-<% if @response.total_pages > 1 %>
+<% if show_pagination? and @response.total_pages > 1 %>
  <div class="row record-padding">
   <div class="col-md-9"> 
     <div class="pagination">

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

@@ -1,15 +1,12 @@
   <%= form_tag search_action_url, :method => :get, :class => 'search-query-form form-inline clearfix navbar-form' do %>
     <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
 
-    <div class="input-group">
     <% unless search_fields.empty? %>
-
-      <span class="input-group-addon">
-        <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'), :class=>"search_field") %>
-        <span class="sr-only"><%= t('blacklight.search.form.search_field.post_label') %></span>
-        </span>
-      <% end %>
+      <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'), :class=>"search_field form-control") %>
+      <span class="sr-only"><%= t('blacklight.search.form.search_field.post_label') %></span>
+    <% end %>
+    <div class="input-group search-input-group">
         <label for="q" class="sr-only"><%= t('blacklight.search.form.q') %></label>
          <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.q'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
 

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, :label=>document_show_link_field(document) %></span>
-</li>
+  <span class="mlt_title"><%= link_to_document document, document_show_link_field(document) %></span>
+</li>

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

@@ -13,41 +13,12 @@
   </div>
 
   <div class="panel-body">
-  <ul class="nav">
-      <li>
-        <%= render_show_doc_actions @document %>
-      </li>
-      <% if (@document.respond_to?(:export_as_mla_citation_txt) || @document.respond_to?(:export_as_apa_citation_txt)) %>
-        <li class="cite">
-         <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:id => @document), {:id => 'citeLink', :data => {:ajax_modal => "trigger"}} %>
+    <ul class="nav">
+      <%= render_show_doc_actions @document do |config, inner| %>
+        <li class="<%= config.key %>">
+          <%= inner %>
         </li>
       <% end %>
-      <% if @document.export_formats.keys.include?( :refworks_marc_txt ) %>
-        <li class="refworks">
-        <%= link_to t('blacklight.tools.refworks'), refworks_export_url(url: polymorphic_url(url_for_document(@document), format: :refworks_marc_txt, only_path: false))  %>        
-        </li>
-     <% end %>
-     <% if @document.export_formats.keys.include?( :endnote ) %>
-      <li class="endnote">
-      <%= link_to t('blacklight.tools.endnote'), catalog_path(@document, :format => 'endnote') %>
-      </li>
-    <% end %>
-    <% if @document.respond_to?( :to_email_text ) %>
-      <li class="email">
-      <%= link_to t('blacklight.tools.email'), email_catalog_path(:id => @document), {:id => 'emailLink', :data => {:ajax_modal => "trigger"}} %>
-      </li>
-    <%- end -%>
-    <%- if @document.respond_to?( :to_sms_text ) -%>
-      <li class="sms">
-      <%= link_to t('blacklight.tools.sms'), sms_catalog_path(:id => @document), {:id => 'smsLink', :data => {:ajax_modal => "trigger"}} %>
-      </li>
-    <%- end -%>
-    
-    <% if respond_to? :librarian_view_catalog_path and @document.respond_to?(:to_marc) %>
-      <li class="librarian_view">
-        <%= link_to t('blacklight.tools.librarian_view'), librarian_view_catalog_path(@document), {:id => 'librarianLink', :data => {:ajax_modal => "trigger"}} %>
-      </li>
-    <% end %>
-  </ul>
+    </ul>
   </div>
 </div>

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

@@ -1,4 +1,4 @@
-  <%= form_tag url_for(:controller => "catalog", :action => "sms"), :id => 'sms_form', :class => "form-horizontal ajax_form", :method => :post do %>
+  <%= form_tag url_for(:controller => controller_name, :action => "sms"), :id => 'sms_form', :class => "form-horizontal ajax_form", :method => :post do %>
 <div class="modal-body">
   <%= render :partial=>'/flash_msg' %>
     <div class="form-group">

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

@@ -1,8 +1,4 @@
 <div id="sortAndPerPage" class="clearfix">
-  <%= render :partial => "paginate_compact", :object => @response %>
-  <div class="search-widgets pull-right">
-    <%= render :partial => 'sort_widget' %>
-    <%= render :partial => 'per_page_widget' %>
-    <%= render :partial => 'view_type_group' %>
-  </div>
+  <%= render :partial => "paginate_compact", :object => @response if show_pagination? %>
+  <%= render_results_collection_tools wrapping_class: "search-widgets pull-right" %>
 </div>

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

@@ -1,7 +1,7 @@
 <% if show_sort_and_per_page? and !active_sort_fields.blank? %>
 <div id="sort-dropdown" class="btn-group">
   <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-      <%= link_to(t('blacklight.search.sort.label', :field =>current_sort_field.label), "#") %> <span class="caret"></span>
+      <%= t('blacklight.search.sort.label', :field =>current_sort_field.label) %> <span class="caret"></span>
   </button>
 
   <ul class="dropdown-menu" role="menu">

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

@@ -4,9 +4,9 @@
   <ul>
     <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 -%>
+    <%- 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) %> - 
-      <%= link_to t('blacklight.search.zero_results.search_everything'), url_for(params_for_search(:search_field=>blacklight_config.default_search_field.key)) %>
+      <%= link_to t('blacklight.search.zero_results.search_everything', field: blacklight_config.default_search_field.label), url_for(params_for_search(:search_field=>blacklight_config.default_search_field.key)) %>
       </li>
     <%- end %>
 

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

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

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

@@ -1,9 +1,2 @@
-<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 class="modal-body">
-  <%= render :partial=>'/flash_msg' %>
-  <span class="ajax-close-modal"></span>
-</div>
+<% Deprecation.warn controller, "The template catalog/email_sent.html.erb is deprecated; use email_success instead" %>
+<%= render template: "catalog/email_success" %>

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

@@ -0,0 +1,9 @@
+<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 class="modal-body">
+  <%= render :partial=>'/flash_msg' %>
+  <span class="ajax-close-modal"></span>
+</div>

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

@@ -1,9 +1,2 @@
-<div class="modal-header">
-  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
-</div>
-
-<div class="modal-body">
-  <%= render :partial=>'/flash_msg' %>
-  <span class="ajax-close-modal"></span>
-</div>
+<% Deprecation.warn controller, "The template catalog/sms_sent.html.erb is deprecated; use sms_success instead" %>
+<%= render template: "catalog/sms_success" %>

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

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

data/app/views/kaminari/blacklight/_gap.html.erb

@@ -6,6 +6,6 @@
     remote:        data-remote
 -%>
 <li class="disabled">
-  <%= link_to raw(t 'views.pagination.truncate'), "" %>
+  <span><%= raw(t 'views.pagination.truncate') %></span>
 </li>
 

data/app/views/kaminari/blacklight/_page.html.erb

@@ -8,6 +8,10 @@
     remote:        data-remote
 -%>
 <li class="<%= 'active' if page.current? %>">
- <%= link_to number_with_delimiter(page.to_s), url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+  <% if page.current? %>
+    <span><%= number_with_delimiter(page.to_s) %></span>
+  <% else %>
+    <%= link_to number_with_delimiter(page.to_s), url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+  <% end %>
 </li>
 

data/app/views/shared/_header_navbar.html.erb

@@ -1,7 +1,7 @@
 <div id="header-navbar" class="navbar navbar-inverse navbar-static-top" role="navigation">
   <div class="container">
     <div class="navbar-header">
-    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#user-util-collapse">
+    <button type="button" class="navbar-toggle btn collapsed" data-toggle="collapse" data-target="#user-util-collapse">
       <span class="sr-only">Toggle navigation</span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>

data/config/locales/blacklight.en.yml

@@ -80,7 +80,7 @@ en:
 
     tools:
       title: 'Tools'
-      cite: 'Cite'
+      citation: 'Cite'
       endnote: 'Export to EndNote'
       refworks: 'Export to Refworks'
       email: 'Email'

data/config/locales/blacklight.es.yml

@@ -80,7 +80,7 @@ es:
 
     tools:
       title: 'Herramientas'
-      cite: 'Cité'
+      citation: 'Cité'
       endnote: 'Exportar a EndNote'
       refworks: 'Exportar a Refworks'
       email: 'Correo electrónico'

data/config/locales/blacklight.fr.yml

@@ -90,7 +90,7 @@ fr:
 
     tools:
       title: 'Outils'
-      cite: 'Citer'
+      citation: 'Citer'
       endnote: 'Exporter vers EndNote ou Zotero'
       refworks: 'Exporter vers Refworks'
       email: 'Envoyer'

data/config/locales/blacklight.pt-BR.yml

@@ -101,7 +101,7 @@ pt-BR:
 
     tools:
       title: 'Ferramentas'
-      cite: 'Citar'
+      citation: 'Citar'
       endnote: 'Exportar para EndNote'
       refworks: 'Exportar para Refworks'
       email: 'Email'

data/lib/blacklight.rb

@@ -10,6 +10,7 @@ module Blacklight
   autoload :Solr, 'blacklight/solr'
   
   autoload :SolrHelper, 'blacklight/solr_helper'
+  autoload :SolrRepository, 'blacklight/solr_repository'
   autoload :RequestBuilders, 'blacklight/request_builders'
   
   autoload :Exceptions, 'blacklight/exceptions'
@@ -19,6 +20,8 @@ module Blacklight
   autoload :Controller,        'blacklight/controller'
   autoload :Base,              'blacklight/base'
   autoload :Catalog,           'blacklight/catalog'
+  autoload :TokenBasedUser,     'blacklight/token_based_user'
+  autoload :Bookmarks,         'blacklight/bookmarks'
   autoload :DocumentPresenter, 'blacklight/document_presenter'
 
   autoload :Routes, 'blacklight/routes'