blacklight 4.3.0 → 4.4.0

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -1,12 +1,6 @@
 module Blacklight::FacetsHelperBehavior
 
-  #
-  # blacklight_config based helpers ->
-  #
-  
-  def facet_configuration_for_field(field)
-    blacklight_config.facet_fields[field] || Blacklight::Configuration::FacetField.new(:field => field).normalize!
-  end
+  include Blacklight::Facet
 
   # used in the catalog/_facets partial
   def facet_field_labels
@@ -14,37 +8,18 @@ module Blacklight::FacetsHelperBehavior
     Hash[*blacklight_config.facet_fields.map { |key, facet| [key, facet.label] }.flatten]
   end
   
-  # used in the catalog/_facets partial
-  def facet_field_names
-    blacklight_config.facet_fields.keys
-  end
 
   def has_facet_values? fields = facet_field_names, options = {}
-    solr_fields = fields.map { |solr_field| facet_by_field_name(solr_field) }.compact
-    solr_fields.any? { |display_facet| !display_facet.items.empty? }
+    facets_from_request(fields).any? { |display_facet| !display_facet.items.empty? }
   end
 
   # Render a collection of facet fields
   def render_facet_partials fields = facet_field_names, options = {}
-    solr_fields = fields.map { |solr_field| facet_by_field_name(solr_field) }.compact
-
-    solr_fields.map do |display_facet|
+    facets_from_request(fields).map do |display_facet|
       render_facet_limit(display_facet, options)
     end.compact.join("\n").html_safe
   end
 
-  # Get a FacetField object from the @response
-  def facet_by_field_name solr_field
-    case solr_field
-      when String, Symbol
-        extract_solr_facet_by_field_name(solr_field)
-      when Blacklight::Configuration::FacetField
-        extract_solr_facet_by_field_name(solr_field.field)
-      else
-        solr_field
-      end
-  end
-
 
   # used in the catalog/_facets partial and elsewhere
   # Renders a single section for facet limit with a specified
@@ -202,6 +177,10 @@ module Blacklight::FacetsHelperBehavior
     p[:f].delete(field) if p[:f][field].size == 0
     p
   end
+
+  def facet_field_in_params? field
+    params[:f] and params[:f][field]
+  end
   
   # true or false, depending on whether the field and value is in params[:f]
   def facet_in_params?(field, item)
@@ -211,7 +190,7 @@ module Blacklight::FacetsHelperBehavior
 
     value = facet_value_for_facet_item(item)
 
-    params[:f] and params[:f][field] and params[:f][field].include?(value)
+    facet_field_in_params?(field) and params[:f][field].include?(value)
   end
 
   def facet_display_value field, item
@@ -237,6 +216,7 @@ module Blacklight::FacetsHelperBehavior
     end
   end
 
+
   private
 
   def facet_value_for_facet_item item
@@ -247,50 +227,4 @@ module Blacklight::FacetsHelperBehavior
     end
   end
 
-  # Get the solr response for the solr field :field
-  def extract_solr_facet_by_field_name facet_name
-    facet_field = facet_configuration_for_field(facet_name)
-    case 
-      when (facet_field.respond_to?(:query) and facet_field.query)
-        create_rsolr_facet_field_response_for_query_facet_field facet_name, facet_field 
-      when (facet_field.respond_to?(:pivot) and facet_field.pivot)
-        create_rsolr_facet_field_response_for_pivot_facet_field facet_name, facet_field   
-      else
-        @response.facet_by_field_name(facet_name)
-    end
-  end
-
-  def create_rsolr_facet_field_response_for_query_facet_field facet_name, facet_field
-    salient_facet_queries = facet_field.query.map { |k, x| x[:fq] }
-    items = []
-    @response.facet_queries.select { |k,v| salient_facet_queries.include?(k) }.reject { |value, hits| hits == 0 }.map do |value,hits|
-      salient_fields = facet_field.query.select { |key, val| val[:fq] == value }
-      key = ((salient_fields.keys if salient_fields.respond_to? :keys) || salient_fields.first).first
-      items << Blacklight::SolrResponse::Facets::FacetItem.new(:value => key, :hits => hits, :label => facet_field.query[key][:label])
-    end
- 
-    Blacklight::SolrResponse::Facets::FacetField.new facet_name, items
-  end
-
-
-  def create_rsolr_facet_field_response_for_pivot_facet_field facet_name, facet_field
-    items = []
-    (@response.facet_pivot[facet_field.pivot.join(",")] || []).map do |lst|
-      items << construct_pivot_field(lst)
-    end
- 
-    Blacklight::SolrResponse::Facets::FacetField.new facet_name, items
-  end
-
-  def construct_pivot_field lst, parent_fq = {}
-    items = []
-
-    lst[:pivot].each do |i|
-      items << construct_pivot_field(i, parent_fq.merge({ lst[:field] => lst[:value] }))
-    end if lst[:pivot]
-
-    Blacklight::SolrResponse::Facets::FacetItem.new(:value => lst[:value], :hits => lst[:count], :field => lst[:field], :items => items, :fq => parent_fq)
-
-  end
-
 end

data/app/models/record_mailer.rb

@@ -14,24 +14,9 @@ class RecordMailer < ActionMailer::Base
   end
   
   def sms_record(documents, details, url_gen_params)
-    if sms_mapping[details[:carrier]]
-      to = "#{details[:to]}@#{sms_mapping[details[:carrier]]}"
-    end
     @documents      = documents
     @url_gen_params = url_gen_params
-    mail(:to => to, :subject => "")
+    mail(:to => details[:to], :subject => "")
   end
 
-  protected
-  
-  def sms_mapping
-    {'virgin' => 'vmobl.com',
-    'att' => 'txt.att.net',
-    'verizon' => 'vtext.com',
-    'nextel' => 'messaging.nextel.com',
-    'sprint' => 'messaging.sprintpcs.com',
-    'tmobile' => 'tmomail.net',
-    'alltel' => 'message.alltel.com',
-    'cricket' => 'mms.mycricket.com'}
-  end
 end

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

@@ -1,3 +1,4 @@
+<div id="content" class="span12">
 <h1><%= t('blacklight.bookmarks.title') %></h1>
 
 <%- if current_or_guest_user.blank? -%>
@@ -14,4 +15,5 @@
   <%= render_document_index %>
   <%= render 'results_pagination' %>
 <% end %>
+</div>
 

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

@@ -1,19 +1,18 @@
 <% if current_or_guest_user %>
-  <%- existing_bookmark = current_or_guest_user.existing_bookmark_for(document.id) -%>
   <%- 
   # 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.
   -%>  
-  <% unless existing_bookmark %>  
+  <% unless current_or_guest_user.document_is_bookmarked? document.id %>  
 
-      <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id) 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) 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 %>
       

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

@@ -1,8 +1,9 @@
     <% # container for a single doc -%>
     <div class="document <%= render_document_class document %>">
-      
       <%= render :partial => 'document_header', :locals => { :document => document, :document_counter => document_counter } %>
 
+      <%= render_document_partial document, :thumbnail, :document_counter => document_counter %>
+
       <% # main container for doc partial view -%>
       <%= render_document_partial document, :index %>
 

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

@@ -2,10 +2,13 @@
       <% # header bar for doc items in index view -%>
       <div class="documentHeader clearfix">
         
-        <% # main title container for doc partial view -%>
-          <h5 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field(document), :counter => (document_counter + 1 + @response.params[:start].to_i) %></h5>
+        <%- # main title container for doc partial view -%>
+         <h5 class="index_title">
+         <% counter = document_counter_with_offset(document_counter) %>
+         <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
+         <%= link_to_document document, :label=>document_show_link_field(document), :counter => counter %>
+        </h5>
 
-        
         <% # bookmark functions for items/docs -%>
         <%= render_index_doc_actions document, :wrapping_class => "documentFunctions span2" %>
       </div>

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

@@ -1,4 +1,3 @@
-<%- unless flash[:success] %>
 <%= form_tag url_for(:controller => "catalog", :action => "email"), :id => 'email_form', :class => "form-horizontal ajax_form", :method => :post do %>
 
   <div class="modal-body">
@@ -35,9 +34,3 @@
   <button type="submit" class="btn btn-primary"> <%= t('blacklight.sms.form.submit') %></button>
   </div>
 <% end %>
-<%- else %>
-<div class="modal-body">
-  <%= render :partial=>'/flash_msg' %>
-    <span class="ajax-close-modal"/>
-    </div>
-<%- end %>

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

@@ -1,4 +1,4 @@
 <div class="facet_limit blacklight-<%= facet_field.field.parameterize %>">
-  <h5><%= facet_field.label -%> <i class="icon-chevron"></i></h5>
+  <h5><%= link_to facet_field.label, "#", "data-no-turbolink" => true -%> <i class="icon-chevron"></i></h5>
   <%= yield %>
 </div>

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

@@ -0,0 +1,12 @@
+<% # container for all groups in index view -%>
+<div id="groups">
+  <%- @response.groups.each do |g| %>
+    <h3 class="group-key"><%= g.key %></h3>
+    <div class="grouped-documents">
+      <%= render_document_index g.docs %>
+    </div>
+    <%- if g.total > @response.group_limit %>
+      <%= link_to t('blacklight.search.group.more'), add_group_facet_params_and_redirect(g), :class => 'more-in-group' %>
+    <%- end %>
+  <%- end %>
+</div>

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

@@ -1,5 +1,5 @@
 <%# default partial to display solr document fields in catalog index view -%>
-<dl class="dl-horizontal dl-invert">
+<dl class="document-metadata dl-horizontal dl-invert">
   
   <% index_fields(document).each do |solr_fname, field| -%>
     <% if should_render_index_field? document, field %>

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

@@ -1,4 +1,3 @@
-<% page_info = paginate_params(@response) %>
 <%= tag :meta, :name => "totalResults", :content => @response.total %>
-<%= tag :meta, :name => "startIndex", :content => (page_info.current_page == 1 ? 1 : @response.start ) %>
-<%= tag :meta, :name => "itemsPerPage", :content => page_info.limit_value %>
+<%= tag :meta, :name => "startIndex", :content => @response.start %>
+<%= tag :meta, :name => "itemsPerPage", :content => @response.limit_value %>

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

@@ -1,5 +1,5 @@
-<% if paginate_params(@response).num_pages > 1 %>
-<%= paginate_rsolr_response @response, :theme => :blacklight_compact %>
+<% if @response.total_pages > 1 %>
+<%= paginate @response, :theme => :blacklight_compact %>
 <% else %>
 <%= render_pagination_info(@response) %>
 <% end %>

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

@@ -1,8 +1,8 @@
-<% if paginate_params(@response).num_pages > 1 %>
+<% if @response.total_pages > 1 %>
  <div class="row record-padding">
   <div class="span9"> 
     <div class="pagination">
-      <%= paginate_rsolr_response @response, :outer_window => 2, :theme => 'blacklight' %>
+      <%= paginate @response, :outer_window => 2, :theme => 'blacklight' %>
     </div>
   </div>
  </div>

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

@@ -10,7 +10,7 @@
       <% end %>
        <div class="input-append pull-left">
         <label for="q" class="hide-text"><%= t('blacklight.search.form.q') %></label>
-         <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.q'), :class => "search_q q", :id => "q"%>
+         <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.q'), :class => "search_q q", :id => "q", :autofocus => should_autofocus_on_search_box? %>
         <button type="submit" class="btn btn-primary search-btn" id="search">
           <span class="submit-search-text"><%=t('blacklight.search.form.submit')%></span>
           <i class="icon-search icon-white"></i>

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

@@ -1,17 +1,3 @@
-<% carriers = 
-{
-'AT&T' => 'att',
-'Verizon' => 'verizon',
-'T Mobile' => 'tmobile',
-'Sprint' => 'sprint',
-'Nextel' => 'nextel',
-'Virgin Mobile' => 'virgin',
-'Alltel' => 'alltel',
-'Cricket' => 'cricket'
-}
-%>
-<%- unless flash[:success] %>
-  
   <%= form_tag url_for(:controller => "catalog", :action => "sms"), :id => 'sms_form', :class => "form-horizontal ajax_form", :method => :post do %>
 <div class="modal-body">
   <%= render :partial=>'/flash_msg' %>
@@ -28,7 +14,7 @@
         <%= t('blacklight.sms.form.carrier') %> 
       </label>
       <div class="controls">
-          <%= select_tag(:carrier, options_for_select(carriers.to_a.sort.unshift([t('blacklight.sms.form.carrier_prompt'),'']), params[:carrier])) %><br/>
+          <%= select_tag(:carrier, options_for_select(sms_mappings.to_a.sort.unshift([t('blacklight.sms.form.carrier_prompt'),'']), params[:carrier])) %><br/>
       </div>
 
     </div>
@@ -40,9 +26,3 @@
 <button type="submit" class="btn btn-primary"> <%= t('blacklight.sms.form.submit') %></button>
 </div>
   <% end %>
-<%- else %>
-<div class="modal-body">
-  <%= render :partial=>'/flash_msg' %>
-    <span class="ajax-close-modal"/>
-    </div>
-<%- end %>

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

@@ -0,0 +1,5 @@
+<%- if has_thumbnail?(document) && tn = render_thumbnail_tag(document, nil, :counter => document_counter + 1 + @response.params[:start].to_i) %>
+<div class="document-thumbnail">
+  <%= tn %>
+</div>  
+<%- end %>

data/app/views/catalog/email_sent.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/index.atom.builder

@@ -1,5 +1,4 @@
 require 'base64'
-page_info = paginate_params(@response)
 
 xml.instruct!(:xml, :encoding => "UTF-8")
 
@@ -17,18 +16,18 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
   # Navigational and context links
   
   xml.link( "rel" => "next", 
-            "href" => url_for(params.merge(:only_path => false, :page => (page_info.current_page + 1).to_s))
-           ) if  page_info.num_pages > page_info.current_page
+            "href" => url_for(params.merge(:only_path => false, :page => @response.next_page.to_s))
+           ) if @response.next_page
   
   xml.link( "rel" => "previous", 
-            "href" => url_for(params.merge(:only_path => false, :page => (page_info.current_page - 1).to_s))
-           ) if page_info.current_page > 1
+            "href" => url_for(params.merge(:only_path => false, :page => @response.prev_page.to_s))
+           ) if @response.prev_page
            
   xml.link( "rel" => "first", 
             "href" => url_for(params.merge(:only_path => false, :page => "1")))
   
   xml.link( "rel" => "last",
-            "href" => url_for(params.merge(:only_path => false, :page => page_info.num_pages.to_s)))
+            "href" => url_for(params.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
@@ -39,8 +38,8 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
   # opensearch response elements
   xml.opensearch :totalResults, @response.total.to_s
   xml.opensearch :startIndex, @response.start.to_s
-  xml.opensearch :itemsPerPage, page_info.limit_value
-  xml.opensearch :Query, :role => "request", :searchTerms => params[:q], :startPage => page_info.current_page
+  xml.opensearch :itemsPerPage, @response.limit_value
+  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

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

@@ -20,11 +20,14 @@
 
       <%= render :partial => 'constraints' %>
 
-	    <%= render 'sort_and_per_page' %>
-
+      <%= render :partial => 'sort_and_per_page' %>
       <h2 class="hide-text"><%= t('blacklight.search.search_results') %></h2>
-	    <%= render_document_index %>
 
+      <%- if render_grouped_response? %>
+        <%= render_grouped_document_index %>
+      <%- else %>
+        <%= render_document_index %>
+      <%- end %>
 
 	    <%= render 'results_pagination' %>
 

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

@@ -6,5 +6,5 @@
 <%- if @document.respond_to?(:to_marc) -%>
   <%= render "marc_view" %>
 <%- else %>
-      No MARC data found.
+  <%= t('blacklight.search.librarian_view.empty') %>
 <%- end -%>

data/app/views/catalog/sms_sent.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.sms.form.title') %></h1>
+</div>
+
+<div class="modal-body">
+  <%= render :partial=>'/flash_msg' %>
+  <span class="ajax-close-modal"></span>
+</div>

data/app/views/feedback/complete.html.erb

@@ -1,3 +1,5 @@
+<div id="content" class="span9">
 <h1><%= t('blacklight.feedback.complete.title') %></h1>
 
 <%= link_to t('blacklight.back_to_search'), catalog_index_path %>
+</div>