blacklight 5.19.2 → 6.0.0.pre1

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

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

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

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

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

@@ -1,8 +1,7 @@
 <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| %>
+  <%= render_show_doc_actions document_list, document: nil, document_list: @document_list, url_opts: Blacklight::Parameters.sanitize(params) do |config, inner| %>
     <li>
       <%= inner %>
     </li>
   <% end %>
-  <%= render_marc_tools %>
 </ul>

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

@@ -1,11 +1,11 @@
 <% @page_title = t('blacklight.bookmarks.page_title', :application_name => application_name) %>
 
 <div id="content" class="col-md-12">
-<h1 class='page-heading'><%= t('blacklight.bookmarks.title') %></h1>
+<h2 class='page-heading'><%= t('blacklight.bookmarks.title') %></h2>
 
 <%- if current_or_guest_user.blank? -%>
 
-  <h2 class='section-heading'><%= t('blacklight.bookmarks.need_login') %></h2>
+  <h3 class='section-heading'><%= t('blacklight.bookmarks.need_login') %></h3>
 
 <%- elsif @document_list.blank? -%>
 

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

@@ -3,7 +3,7 @@ xml.entry do
   xml.title presenter(document).render_document_index_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.updated Time.now.strftime("%Y-%m-%dT%H:%M:%SZ")
   
   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
@@ -50,4 +50,6 @@ xml.entry do
     end
     
   end
-end
+  
+  
+end

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

@@ -0,0 +1,9 @@
+<nav class="alpha-filter">
+  <%= link_to t('blacklight.search.facets.clear'), @pagination.params_for_resort_url('index', params.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">
+    <% @facet.index_range.each do |letter| %>
+      <li class="<%= 'active' if @pagination.prefix == letter %>"><%= link_to(letter, @pagination.params_for_resort_url('index', params.merge(@pagination.request_keys[:prefix] => letter)), data: { ajax_modal: "preserve" }) %></li>
+    <% end %>
+  </ol>
+</nav>

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

@@ -1,9 +1,8 @@
 <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" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
-    <h5 class="panel-title facet-field-heading">
-
+    <h3 class="panel-title facet-field-heading">
       <%= link_to facet_field_label(facet_field.key), "#", :"data-no-turbolink" => true %>
-    </h5>
+    </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">

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

@@ -1,21 +1,19 @@
-    <div class="prev_next_links btn-group pull-left">
-      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), :params => params, :param_name => blacklight_config.facet_paginator_class.request_keys[:page], :class => 'btn btn-link', :data => {:ajax_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 => params, :param_name => blacklight_config.facet_paginator_class.request_keys[:page], :class => 'btn btn-link',  :data => {:ajax_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">
-    <% if @pagination.sort == 'index' -%>
-      <span class="active az btn btn-default"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'), 
-        @pagination.params_for_resort_url('count', params), :class => "sort_change numeric btn btn-default",  
-        :data => {:ajax_modal => "preserve"}) %>
-    <% elsif @pagination.sort == 'count' -%>
-      <%=  link_to(t('blacklight.search.facets.sort.index'), @pagination.params_for_resort_url('index', params), 
-        :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>
-    <% end -%>    
-  </div>
+<div class="prev_next_links btn-group pull-left">
+  <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), params: params, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link', data: { ajax_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: params, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link',  data: { ajax_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">
+  <% if @pagination.sort == 'index' -%>
+    <span class="active az btn btn-default"><%= t('blacklight.search.facets.sort.index') %></span>
+    <%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'), @pagination.params_for_resort_url('count', params), class: "sort_change numeric btn btn-default", data: {ajax_modal: "preserve"}) %>
+  <% elsif @pagination.sort == 'count' -%>
+    <%=  link_to(t('blacklight.search.facets.sort.index'), @pagination.params_for_resort_url('index', params), 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>
+  <% end -%>
+</div>

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

@@ -10,10 +10,9 @@
       <span class="icon-bar"></span>
     </button>
 
-  <h4 class='facets-heading'>
-
+  <h2 class='facets-heading'>
   	<%= t('blacklight.search.facets.title') %>
-  </h4>
+  </h2>
     </div>
 
   <div id="facet-panel-collapse" class="collapse panel-group">

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

@@ -1,5 +1,5 @@
 <div class="page-header row">
-  <h1 class="col-md-8 page-heading"><%= t('blacklight.welcome') %></h1>
+  <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>
@@ -7,11 +7,10 @@
     <li><a href="https://github.com/projectblacklight/blacklight/releases/tag/v<%= Blacklight::VERSION %>">Release Notes</a></li>
   </ul>
 
-
 </div>
 
 <div id="getting-started">
-  <h2 class='section-heading'>Here&rsquo;s how to get started:</h2>
+  <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>.

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

@@ -9,14 +9,14 @@
     <%= render_index_doc_actions document, wrapping_class: "index-document-functions col-sm-3 col-lg-2" %>
   <% end %>
 
-  <h5 class="index_title document-title-heading <%= document_actions.present? ? "col-sm-9 col-lg-10" : "col-md-12" %>">
+  <h3 class="index_title document-title-heading <%= document_actions.present? ? "col-sm-9 col-lg-10" : "col-md-12" %>">
     <% if counter = document_counter_with_offset(document_counter) %>
       <span class="document-counter">
         <%= t('blacklight.search.documents.counter', counter: counter) %>
       </span>
     <% end %>
     <%= link_to_document document, document_show_link_field(document), counter: counter %>
-  </h5>
+  </h3>
 
   <%= document_actions %>
 </div>

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

@@ -7,7 +7,7 @@
   </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>
+      <li><%= link_to(label, url_for(blacklight_path.params_for_search(per_page: count))) %></li>
     <%- end -%>
   </ul>
 </div>

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

@@ -1,20 +1,23 @@
-  <%= form_tag search_action_url, :method => :get, :class => 'search-query-form clearfix navbar-form' do %>
-    <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
-
-    <% unless search_fields.empty? %>
-      <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>
+<%= form_tag search_action_url, method: :get, class: 'search-query-form clearfix navbar-form', role: 'search' do %>
+  <%= render_hash_as_hidden_fields(blacklight_path.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+  <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>
+    <% elsif search_fields.length == 1 %>
+      <%= hidden_field_tag :search_field, search_fields.first.last %>
     <% end %>
-    <div class="input-group search-input-group">
-        <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? %>
 
-      <span class="input-group-btn">
-        <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>
-        </button>
-        </span>
-      </div>
-  <% 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?  %>
+
+    <span class="input-group-btn">
+      <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>
+      </button>
+    </span>
+  </div>
+<% end %>

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

@@ -6,7 +6,7 @@
 
   <ul class="dropdown-menu" role="menu">
       <%- active_sort_fields.each do |sort_key, field_config| %>
-        <li><%= link_to(field_config.label, url_for(params_for_search(:sort => sort_key))) %></li>
+        <li><%= link_to(field_config.label, url_for(blacklight_path.params_for_search(sort: sort_key))) %></li>
       <%- end -%>
   </ul>
 </div>

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

@@ -6,9 +6,9 @@
 
     <%- 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', field: blacklight_config.default_search_field.label), 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(blacklight_path.params_for_search(search_field: blacklight_config.default_search_field.key)) %>
       </li>
     <%- end %>
 
   </ul>
-</div>
+</div>

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

@@ -4,7 +4,10 @@
 
 <div class="modal-header">
   <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
+
   <h3 class="modal-title"><%= facet_field_label(@facet.key) %></h3>
+  <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
+
 </div>
 <div class="modal-body">
   <div class="facet_extended_list">

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

@@ -43,7 +43,7 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
   
   
   # updated is required, for now we'll just set it to now, sorry
-  xml.updated Time.current.iso8601
+  xml.updated Time.now.strftime("%Y-%m-%dT%H:%M:%SZ")
   
   @document_list.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))

data/app/views/layouts/blacklight.html.erb

@@ -18,7 +18,7 @@
 
     <title><%= render_page_title %></title>
     <%= opensearch_description_tag application_name, opensearch_catalog_url(:format => 'xml') %>
-    <%= favicon_link_tag %>
+    <%= favicon_link_tag 'favicon.ico' %>
     <%= stylesheet_link_tag "application", media: "all" %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>
@@ -35,7 +35,7 @@
 
   <%= render partial: 'shared/ajax_modal' %>
 
-  <div id="main-container" class="<%= container_classes %>">
+  <div id="main-container" class="container">
     <%= content_tag :h1, application_name, class: 'sr-only application-heading' %>
 
     <%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %>

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

@@ -2,28 +2,27 @@
 
 <div id="content" class="col-md-9">
 
-<h1 class='page-heading'><%= t('blacklight.saved_searches.title') %></h1>
+<h2 class='page-heading'><%= t('blacklight.saved_searches.title') %></h2>
 
 <%- if current_or_guest_user.blank? -%>
   
-  <h2 class='section-heading'><%= t('blacklight.saved_searches.need_login') %></h2>
+  <h3 class='section-heading'><%= t('blacklight.saved_searches.need_login') %></h3>
   
 <%- elsif @searches.blank? -%>
   
-  <h2 class='section-heading'><%= t('blacklight.saved_searches.no_searches') %></h2>
+  <h3 class='section-heading'><%= t('blacklight.saved_searches.no_searches') %></h3>
   
 <%- else -%>
   <p>
-  <%= link_to t('blacklight.saved_searches.clear.action_title'), clear_saved_searches_path, :method => :delete, :data => { :confirm => t('blacklight.saved_searches.clear.action_confirm') } %>
+  <%= link_to t('blacklight.saved_searches.clear.action_title'), blacklight.clear_saved_searches_path, :method => :delete, :data => { :confirm => t('blacklight.saved_searches.clear.action_confirm') } %>
   </p>
 
-  <h2 class='section-heading'><%= t('blacklight.saved_searches.list_title') %></h2>
-
+  <h3 class='section-heading'><%= t('blacklight.saved_searches.list_title') %></h3>
   <table class="table table-striped">
   <%- @searches.each do |search| -%>
     <tr>
       <td><%= link_to_previous_search(search.query_params) %></td>
-      <td><%= button_to t('blacklight.saved_searches.delete'), forget_search_path(search.id) %></td>
+      <td><%= button_to t('blacklight.saved_searches.delete'), blacklight.forget_search_path(search.id) %></td>
     </tr>
   <%- end -%>
   </table>

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

@@ -1,11 +1,11 @@
 <% @page_title = t('blacklight.search_history.page_title', :application_name => application_name) %>
 
 <div id="content" class="col-md-12">
-<h1 class='page-heading'><%=t('blacklight.search_history.title')%></h1>
+<h2 class='page-heading'><%=t('blacklight.search_history.title')%></h2>
 <%- if @searches.blank? -%>
-  <h2 class='section-heading'><%=t('blacklight.search_history.no_history')%></h2>
+  <h3 class='section-heading'><%=t('blacklight.search_history.no_history')%></h3>
 <%- else -%>
-    <%= link_to t('blacklight.search_history.clear.action_title'), clear_search_history_path, :method => :delete, :data => { :confirm => t('blacklight.search_history.clear.action_confirm') }, :class => 'btn btn-danger pull-right' %>
+    <%= link_to t('blacklight.search_history.clear.action_title'), blacklight.clear_search_history_path, :method => :delete, :data => { :confirm => t('blacklight.search_history.clear.action_confirm') }, :class => 'btn btn-danger pull-right' %>
   <h3 class='section-heading'><%=t('blacklight.search_history.recent')%></h3>
   <table class="table table-striped search_history">
     <%-  @searches.each_with_index do |search,index| -%>
@@ -14,9 +14,9 @@
       <%- if has_user_authentication_provider? -%>
         <td class="actions">
           <%- if current_or_guest_user && search.saved? -%>
-            <%= button_to t('blacklight.search_history.forget'), forget_search_path(search.id), :class => 'btn btn-default' %>
+            <%= button_to t('blacklight.search_history.forget'), blacklight.forget_search_path(search.id), :class => 'btn btn-default' %>
           <%- else -%>
-            <%= button_to t('blacklight.search_history.save'), save_search_path(search.id), :method => :put, :class => 'btn btn-default' %>
+            <%= button_to t('blacklight.search_history.save'), blacklight.save_search_path(search.id), :method => :put, :class => 'btn btn-default' %>
           <%- end -%>
         </td>
       <%- end -%>

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

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

data/blacklight.gemspec

@@ -17,20 +17,20 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails",     ">= 3.2.6", "< 5"
+  s.add_dependency "rails",     ">= 4.1", "< 5"
+  s.add_dependency "globalid"
   s.add_dependency "nokogiri",  "~>1.6"     # XML Parser
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
-  s.add_dependency "rsolr", "~> 1.0", ">= 1.0.11"  # Library for interacting with rSolr.
+  s.add_dependency "rsolr",     "~> 1.0.11"  # Library for interacting with rSolr.
   s.add_dependency "bootstrap-sass", "~> 3.2"
   s.add_dependency "deprecation"
 
-  s.add_development_dependency "jettywrapper", ">= 1.7.0"
-  s.add_development_dependency "blacklight-marc", "~> 5.0"
+  s.add_development_dependency "solr_wrapper"
   s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
   s.add_development_dependency "capybara"
   s.add_development_dependency "poltergeist"
-  s.add_development_dependency 'engine_cart', '~> 1.0'
+  s.add_development_dependency 'engine_cart', '~> 0.8.0'
   s.add_development_dependency "equivalent-xml"
 end

data/config/locales/blacklight.de.yml

@@ -166,8 +166,6 @@ de:
           label: 'Suchen in'
           title: 'gezeilte Suchoptionen'
           post_label: 'für'
-        # i18n key 'q' is deprecated and will be removed in Blacklight 6.0, use 'search.label' and 'search.placeholder'
-        q: 'Suchen...'
         search:
           label: 'suchen nach'
           placeholder: 'Suchen...'
@@ -187,12 +185,11 @@ de:
         counter: '%{counter}. '
       facets:
         title: 'Beschränken dein Suche'
+        clear: 'Löschen'
         sort:
           count: 'Numerisch ordnen'
           index: 'A-Z Ordnen'
         count: '%{number}'
-        # i18n key 'more' is deprecated and will be removed in Blacklight 6.0
-        more: 'mehr »'
         more_html: 'mehr <span class="sr-only">%{field_name}</span> »'
         selected:
           remove: '[entfernen]'

data/config/locales/blacklight.en.yml

@@ -84,8 +84,6 @@ en:
     tools:
       title: 'Tools'
       citation: 'Cite'
-      endnote: 'Export to EndNote'
-      refworks: 'Export to Refworks'
       email: 'Email'
       sms: 'SMS This'
       clear: 'Clear'
@@ -148,7 +146,7 @@ en:
         title: '%{constraints} - %{application_name} Search Results'
         constraint: '%{label}: %{value}'
         many_constraint_values: '%{values} selected'
-      search_results_header: 'Search'
+      search_results_header: 'Search Constraints'
       search_results: 'Search Results'
       errors:
         request_error: "Sorry, I don't understand your search."
@@ -166,8 +164,6 @@ en:
           label: 'Search in'
           title: 'Targeted search options'
           post_label: 'for'
-        # i18n key 'q' is deprecated and will be removed in Blacklight 6.0, use 'search.label' and 'search.placeholder'
-        q: 'Search...'
         search:
           label: 'search for'
           placeholder: 'Search...'
@@ -187,12 +183,11 @@ en:
         counter: '%{counter}. '
       facets:
         title: 'Limit your search'
+        clear: 'Clear Filter'
         sort:
           count: 'Numerical Sort'
           index: 'A-Z Sort'
         count: '%{number}'
-        # i18n key 'more' is deprecated and will be removed in Blacklight 6.0 
-        more: 'more »'
         more_html: 'more <span class="sr-only">%{field_name}</span> »'
         selected:
           remove: '[remove]'