blacklight 3.7.2 → 3.8.0

data/VERSION

@@ -1 +1 @@
-3.7.2
+3.8.0

data/app/assets/javascripts/blacklight/blacklight.js

@@ -7,7 +7,6 @@
 //= require blacklight/core
 //= require blacklight/bookmark_toggle
 //= require blacklight/facet_expand_contract
-//= require blacklight/folder_toggle
 //= require blacklight/lightbox_dialog
 //= require blacklight/more_facets
 //= require blacklight/search_context

data/app/assets/javascripts/blacklight/checkbox_submit.js

@@ -1,6 +1,6 @@
 /* A JQuery plugin (should this be implemented as a widget instead? not sure)
    that will convert a "toggle" form, with single submit button to add/remove
-   something, like used for Bookmarks/Folder, into an AJAXy checkbox instead. 
+   something, like used for Bookmarks, into an AJAXy checkbox instead. 
    
    Apply to a form. Does require certain assumption about the form:
     1) The same form 'action' href must be used for both ADD and REMOVE

data/app/assets/javascripts/blacklight/lightbox_dialog.js

@@ -2,7 +2,8 @@
 (function($) {
 Blacklight.do_lightbox_dialog = function() {    
       $("a.lightboxLink").ajaxyDialog({
-          chainAjaxySelector: false
+          chainAjaxySelector: false,
+          position: ['center', 50]
       });
       //But make the librarian link wider than 300px default. 
       $('a.lightboxLink#librarianLink').ajaxyDialog("option", "width", 650);

data/app/assets/javascripts/blacklight/more_facets.js

@@ -4,6 +4,7 @@
     Blacklight.do_more_facets_behavior = function () {
       $( Blacklight.do_more_facets_behavior.selector ).ajaxyDialog({
           width: $(window).width() / 2,  
+          position: ['center', 50],
           chainAjaxySelector: "a.next_page, a.prev_page, a.sort_change"        
       });
     };

data/app/assets/stylesheets/blacklight/_blacklight_base.css.scss

@@ -16,8 +16,8 @@
 @import "blacklight/formatting";
 @import "blacklight/header";
 @import "blacklight/catalog";
+@import "blacklight/bookmark";
 @import "blacklight/facets";
-@import "blacklight/folder";
 @import "blacklight/search_history";
 @import "blacklight/print";
 

data/app/assets/stylesheets/blacklight/_bookmark.css.scss

@@ -0,0 +1,20 @@
+ul.tools
+{
+  margin:0;
+  padding:0;
+  list-style: none;
+
+  li
+  {
+  	display: inline;
+    list-style: none;
+    margin: 0;
+    margin-right: 10px;
+  }
+}
+
+#sidebar .tools {
+  li {
+  	display: block;
+  }
+}

data/app/assets/stylesheets/blacklight/_catalog.css.scss

@@ -217,7 +217,7 @@
 	margin-bottom:0.5em;
 	margin-left:1em;
 
-  .folder_toggle,.bookmark_toggle
+  .bookmark_toggle
   {
     display:inline;
   }
@@ -349,7 +349,7 @@ label.checked
 	font-weight:700;
 }
 
-label.toggle_bookmark,label.toggle_folder
+label.toggle_bookmark
 {
 	color:inherit;
 	display:inline-block;
@@ -358,10 +358,6 @@ label.toggle_bookmark,label.toggle_folder
 	text-align:left;
 }
 
-label.toggle_folder
-{
-	min-width:6em;
-}
 
 span.page a,span.page.current
 {

data/app/controllers/bookmarks_controller.rb

@@ -1,12 +1,20 @@
 # -*- encoding : utf-8 -*-
 # note that while this is mostly restful routing, the #update and #destroy actions
 # take the Solr document ID as the :id, NOT the id of the actual Bookmark action. 
-class BookmarksController < ApplicationController
+class BookmarksController < CatalogController
+  include Blacklight::Configurable
+  include Blacklight::SolrHelper
+
+  copy_blacklight_config_from(CatalogController)
+
 
   before_filter :verify_user
 
   def index
-    @bookmarks = current_or_guest_user.bookmarks.page(params[:page])
+    @bookmarks = current_or_guest_user.bookmarks
+    bookmark_ids = @bookmarks.collect { |b| b.document_id.to_s }
+  
+    @response, @document_list = get_solr_response_for_field_values("id", bookmark_ids)
   end
 
   def update

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -284,16 +284,11 @@ module Blacklight::BlacklightHelperBehavior
     link_url = url_for(query_params)
     link_to opts[:label], link_url
   end
-  
-  # Create form input type=hidden fields representing the entire search context,
-  # for inclusion in a form meant to change some aspect of it, like
-  # re-sort or change records per page. Can pass in params hash
-  # as :params => hash, otherwise defaults to #params. Can pass
-  # in certain top-level params keys to _omit_, defaults to :page
-  def search_as_hidden_fields(options={})
-    
-    options = {:params => params, :omit_keys => [:page]}.merge(options)
-    my_params = options[:params].dup
+
+  def params_for_search(options={})
+    my_params = (options[:params] || params).dup
+    options[:omit_keys] ||= []
+
     options[:omit_keys].each do |omit_key|
       case omit_key
         when Hash
@@ -307,13 +302,26 @@ module Blacklight::BlacklightHelperBehavior
         else
           my_params.delete(omit_key)
       end
-    end
+    end    
+
     # removing action and controller from duplicate params so that we don't get hidden fields for them.
     my_params.delete(:action)
     my_params.delete(:controller)
     # commit is just an artifact of submit button, we don't need it, and
     # don't want it to pile up with another every time we press submit again!
     my_params.delete(:commit)
+
+    my_params
+  end
+  
+  # Create form input type=hidden fields representing the entire search context,
+  # for inclusion in a form meant to change some aspect of it, like
+  # re-sort or change records per page. Can pass in params hash
+  # as :params => hash, otherwise defaults to #params. Can pass
+  # in certain top-level params keys to _omit_, defaults to :page
+  def search_as_hidden_fields(options={})
+    my_params = params_for_search({:omit_keys => [:page]}.merge(options))
+
     # hash_as_hidden_fields in hash_as_hidden_fields.rb
     return hash_as_hidden_fields(my_params)
   end
@@ -341,7 +349,7 @@ module Blacklight::BlacklightHelperBehavior
     @template_format = old_format
     return result
   end
-  
+
   # puts together a collection of documents into one refworks export string
   def render_refworks_texts(documents)
     val = ''

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -9,8 +9,9 @@ module Blacklight::CatalogHelperBehavior
     per_page = 1 if per_page < 1
     current_page = (response.start / per_page).ceil + 1
     num_pages = (response.total / per_page.to_f).ceil
-    Struct.new(:current_page, :num_pages, :limit_value).new(current_page, num_pages, per_page)
-  end    
+
+    Struct.new(:current_page, :num_pages, :limit_value, :total_count, :first_page?, :last_page?).new(current_page, num_pages, per_page, response.total, current_page > 1, current_page < num_pages)
+  end
 
   # Equivalent to kaminari "paginate", but takes an RSolr::Response as first argument. 
   # Will convert it to something kaminari can deal with (using #paginate_params), and
@@ -46,7 +47,7 @@ module Blacklight::CatalogHelperBehavior
       entry_name = options[:entry_name] ||
         (response.empty?? t('blacklight.entry_name.default') : response.docs.first.class.name.underscore.sub('_', ' '))
 
-      case response.docs.length
+      case response.total
         when 0; t('blacklight.search.pagination_info.no_items_found', :entry_name => entry_name.pluralize ).html_safe
         when 1; t('blacklight.search.pagination_info.single_item_found', :entry_name => entry_name).html_safe
         else; t('blacklight.search.pagination_info.pages', :entry_name => entry_name.pluralize, :current_page => current_page, :num_pages => num_pages, :start_num => start_num, :end_num => end_num, :total_num => total_num, :count => num_pages).html_safe
@@ -67,6 +68,10 @@ module Blacklight::CatalogHelperBehavior
   def search_field_label(params)
     h( label_for_search_field(params[:search_field]) )
   end
+  
+  def current_sort_field
+    blacklight_config.sort_fields[params[:sort]] || blacklight_config.sort_fields.first.last
+  end
 
   # Export to Refworks URL, called in _show_tools
   def refworks_export_url(document = @document)

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -19,6 +19,11 @@ module Blacklight::FacetsHelperBehavior
     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? }
+  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

data/app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -7,6 +7,10 @@
 # search results page (render_constraints(_*))
 module Blacklight::RenderConstraintsHelperBehavior
 
+  def query_has_constraints?(localized_params = params)
+    !(localized_params[:q].blank? and localized_params[:f].blank?)
+  end
+
   # Render actual constraints, not including header or footer
   # info. 
   def render_constraints(localized_params = params)

data/app/views/{folder → bookmarks}/_tools.html.erb

@@ -1,23 +1,18 @@
-    <ul class="folderTools">
+    <ul class="tools">
       <li class="cite">
-        <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @documents.collect{|doc| doc.id}), {:id => 'citeLink', :name => 'citation'} %>
+        <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @bookmarks.collect{|doc| doc.document_id}), {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink'} %>
       </li>
       <li class="refworks">
-        <%= render :partial => 'catalog/refworks_form', :locals => {:documents=>@documents} %>
+        <%= render :partial => 'catalog/refworks_form', :locals => {:documents=>@bookmarks.collect{|doc| doc.document_id}} %>
       </li>
+
       <li class="endnote">
-        <%= link_to t('blacklight.tools.endnote'), endnote_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @documents.collect {|doc| doc.id}, :format => 'endnote')%>
+        <%= link_to t('blacklight.tools.endnote'), endnote_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @bookmarks.collect {|doc| doc.document_id}, :format => 'endnote')%>
       </li>
       <li class="email">
-        <%= link_to t('blacklight.tools.email'), email_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @documents.collect {|doc| doc.id}), :class=>"lightboxLink", :id => "emailLink" %>
+        <%= link_to t('blacklight.tools.email'), email_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @bookmarks.collect {|doc| doc.document_id}), :class=>"lightboxLink", :id => "emailLink" %>
       </li>
-      <% if has_user_authentication_provider? and current_user %>  
-        <li>
-          <%= render :partial=>'catalog/bookmark_form', :locals=>{:documents=>@documents} %>
-        </li>  
-      <% end %>
       <li>
-        <%= link_to t('blacklight.tools.clear'), clear_folder_path, :method => :delete %>
+        <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') } %>
       </li>
-    </ul>
-
+</ul>

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

@@ -4,30 +4,22 @@
   
   <h2><%= t('blacklight.bookmarks.need_login') %></h2>
   
-<%- elsif @bookmarks.blank? -%>
+<%- elsif @document_list.blank? -%>
   
-  <h2><%= t('blacklight.bookmarks.no_bookmarks') %></h2>
+  <h3><%= t('blacklight.bookmarks.no_bookmarks') %></h3>
+<% else %>
   
-<%- else -%>
-
-<%= paginate @bookmarks, :theme => 'blacklight' %>
-  <div id="userBookmarks">
-    <p>
-    <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') } %>
-    </p>
-    
-    <h2><%= t('blacklight.bookmarks.list_title') %></h2>
-    
-    <table class="zebra">
-      <% @bookmarks.each do |bm| %>
-      <tr>
-    	<td><%= link_to h(bm.title), polymorphic_path(bm.document) %></td>
-    	<td><%= button_to t('blacklight.bookmarks.delete'), {:controller => "bookmarks", :action => "destroy", :id => CGI.escape(bm.document_id)}, 
-        :method => :delete, :data => { :confirm => t('blacklight.bookmarks.remove.action_confirm') } %></td>
-      </tr>
-      <% end %>
-    </table>
+  <div class="pageEntriesInfo">
+    <%= render_pagination_info @response, :entry_name=>'item' %>
   </div>
 
-<% end %>
+  <%= render 'sort_and_per_page' %>
+  <%= render 'results_pagination' %>
   
+	<% sidebar_items << capture do %>
+  <%= render 'tools' %>
+	<% end %>  
+  <%= render :partial => 'catalog/document_list' %>
+  <%= render 'results_pagination' %>
+<% end %>
+

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

@@ -2,7 +2,7 @@
       <% # header bar for doc items in index view -%>
       <div class="documentHeader">
         
-        <% # bookmark/folder functions for items/docs -%>
+        <% # bookmark functions for items/docs -%>
         <%= render_index_doc_actions document %>
         
         <% # main title container for doc partial view -%>

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

@@ -1,17 +1,13 @@
   <% if @pagination.has_previous? || @pagination.has_next? %>
     <div class="prev_next_links">
-      <% if @pagination.has_previous? -%>        
-        <%= link_to(raw(t('views.pagination.previous')), catalog_facet_path( @pagination.params_for_previous_url( params) ) , :class=>:prev_page)  %>
-      <% else -%>
-        <span class="disabled ui-state-active prev_page"><%= raw(t 'views.pagination.previous') %></span> 
-      <% end -%>
-      
-      <% if @pagination.has_next? -%>
-        <%= link_to(raw(t('views.pagination.next')), catalog_facet_path( @pagination.params_for_next_url(params)), :class => :next_page ) %>
-      <% else -%>
-        <span class="disabled ui-state-active next_page"><%= raw(t 'views.pagination.next') %></span> 
-      <% end -%>
-               
+      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'ui-state-active next_page'  do %>
+       <span class="disabled ui-state-active prev_page"><%= raw(t('views.pagination.previous')) %></span>
+     <% end %>
+     <%= link_to_next_page @pagination, raw(t('views.pagination.next')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'ui-state-active prev_page' do %>
+       
+       <span class="disabled ui-state-active next_page"><%= raw(t('views.pagination.next')) %></span>
+      <% end %>
+     
     </div>
   <% end %>
 

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

@@ -0,0 +1,7 @@
+
+    <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
+		<%= form_tag params[:controller] == "folder" ? folder_index_path : url_for(:action=>'index'), :method=>:get, :class=>'sort', :id => "sort_form" do %>
+      <%= label_tag(:sort, t('blacklight.search.sort.label', :select => select_tag(:sort, options_for_select(sort_fields, h(params[:sort])))).html_safe) %>
+      <%= search_as_hidden_fields(:omit_keys => [:page, :sort]) %>
+			<%= submit_tag t('blacklight.search.sort.submit') %>
+		<% end unless sort_fields.empty? %>

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

@@ -1,5 +1,5 @@
 <div id="search" class="search">
-  <%= form_tag url_for(:action=>'index'), :method => :get do %>
+  <%= form_tag search_action_url, :method => :get do %>
     <h2 class="search"><%= label_tag(:q, t('blacklight.search.form.q')) %></h2>
     <%= text_field_tag :q, params[:q], :class => "q" %>
     <% unless search_fields.empty? %>

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

@@ -1,17 +1,7 @@
 <div id="sortAndPerPage">  
 	<% unless @response.total < 2 %>
-	  <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
-  	<%= form_tag params[:controller] == "folder" ? folder_index_path : url_for(:action=>'index'), :method=>:get, :class=>'per_page' do %>
-      <%= label_tag(:per_page, t('blacklight.search.per_page.label', :select => select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => t('blacklight.search.per_page.title'))).html_safe) %>
-      <%= search_as_hidden_fields(:omit_keys => [:page, :per_page]) %>
-      <%= submit_tag t('blacklight.search.per_page.submit') %>
-    <% end %>
+    <%= render :partial => 'sort_widget' %>
 
-    <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
-		<%= form_tag params[:controller] == "folder" ? folder_index_path : url_for(:action=>'index'), :method=>:get, :class=>'sort', :id => "sort_form" do %>
-      <%= label_tag(:sort, t('blacklight.search.sort.label', :select => select_tag(:sort, options_for_select(sort_fields, h(params[:sort])))).html_safe) %>
-      <%= search_as_hidden_fields(:omit_keys => [:page, :sort]) %>
-			<%= submit_tag t('blacklight.search.sort.submit') %>
-		<% end unless sort_fields.empty? %>
+    <%= render :partial => 'per_page_widget' %>
 	<% end %>
 </div>

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

@@ -0,0 +1,6 @@
+	  <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
+  	<%= form_tag params[:controller] == "folder" ? folder_index_path : url_for(:action=>'index'), :method=>:get, :class=>'per_page' do %>
+      <%= label_tag(:per_page, t('blacklight.search.per_page.label', :select => select_tag(:per_page, options_for_select(blacklight_config.per_page, h(params[:per_page])), :title => t('blacklight.search.per_page.title'))).html_safe) %>
+      <%= search_as_hidden_fields(:omit_keys => [:page, :per_page]) %>
+      <%= submit_tag t('blacklight.search.per_page.submit') %>
+    <% end %>

data/config/locales/blacklight.en.yml

@@ -66,15 +66,6 @@ en:
       complete:
         title: 'Thank-you for your feedback'
 
-    folder:
-      title: 'Selected Items'
-      add:
-        success: '%{title} successfully added to selected items'
-      remove:
-        success: '%{title} successfully removed from selected items'
-      clear:
-        success: 'Selected items cleared.'
-
     saved_searches:
       add:
         success: 'Successfully saved your search.'
@@ -192,9 +183,6 @@ en:
         other: 'Showing item <b>%{current} of %{total}</b> from your search.'
       documents:
         counter: '%{counter}. '
-      folder:
-        select: 'Select'
-        unselect: 'Unselect'
       facets:
         title: 'Limit your search'
         sort:

data/lib/blacklight/catalog.rb

@@ -10,6 +10,7 @@ module Blacklight::Catalog
   # The following code is executed when someone includes blacklight::catalog in their
   # own controller.
   included do  
+    helper_method :search_action_url
     before_filter :search_session, :history_session
     before_filter :delete_or_assign_search_session_params, :only => :index
     after_filter :set_additional_search_session_values, :only=>:index
@@ -24,6 +25,9 @@ module Blacklight::Catalog
     rescue_from RSolr::Error::Http, :with => :rsolr_request_error
   end
   
+  def search_action_url
+    url_for(:action => 'index', :only_path => true)
+  end
 
     # get search results from the solr index
     def index

data/lib/blacklight/configuration.rb

@@ -16,6 +16,7 @@ module Blacklight
       :index => OpenStructWithHashAccess.new(:show_link => SolrDocument.unique_key),
       :spell_max => 5,
       :max_per_page => 100,
+      :per_page => [10,20,50,100],
       :add_facet_fields_to_solr_request => false
     }
 

data/lib/blacklight/controller.rb

@@ -25,6 +25,7 @@ module Blacklight::Controller
     base.send :helper_method, :stylesheet_links
     base.send :helper_method, :javascript_includes
     base.send :helper_method, :has_user_authentication_provider?
+    base.send :helper_method, :blacklight_config
 
 
     # This callback runs when a user first logs in
@@ -32,6 +33,14 @@ module Blacklight::Controller
 
   end
 
+  def default_catalog_controller
+    CatalogController
+  end
+
+  def blacklight_config
+    default_catalog_controller.blacklight_config
+  end
+
     # test for exception notifier plugin
     def error
       raise RuntimeError, "Generating a test error..."

data/lib/blacklight/solr/facet_paginator.rb

@@ -17,7 +17,7 @@ module Blacklight::Solr
     # and need to make them accessible in a list so we can easily
     # strip em out before redirecting to catalog/index.
     # class variable (via class-level ivar)
-    @request_keys = {:sort => :'catalog_facet.sort', :offset => :'catalog_facet.offset', :limit => :'catalog_facet.limit'}
+    @request_keys = {:sort => :'facet.sort', :page => :'facet.page'}
     class << self; attr_accessor :request_keys end # create a class method
     def request_keys ; self.class.request_keys ; end # shortcut
     
@@ -49,34 +49,27 @@ module Blacklight::Solr
       end
     end
 
+    def current_page
+      1 + @offset/@limit
+    end
+   
     def has_next?
       @has_next
     end
 
-    # Pass in your current request params, returns a param hash
-    # suitable to passing to an ActionHelper method (resource-based url_for, or
-    # link_to or url_for) navigating to the next facet value batch. Returns nil 
-    # if there is no has_next?
-    def params_for_next_url(params)
-      return nil unless has_next?
-      
-      return params.merge(request_keys[:offset] => offset + limit )
-    end
-
     def has_previous?
       @has_previous
     end
-    
-    # Pass in your current request params, returns a param hash
-    # suitable to passing to an ActionHelper method (resource-based url_for, or
-    # link_to or url_for) navigating to the previous facet value batch. Returns
-    # nil if there is no has_previous?
-    def params_for_previous_url(params)
-      return nil unless has_previous?
 
-      return params.merge(request_keys[:offset] => offset - limit )
+    def last_page?
+      !has_next?
+    end
+
+    def first_page?
+      !has_previous?
     end
 
+
    # Pass in a desired solr facet solr key ('count' or 'index', see
    # http://wiki.apache.org/solr/SimpleFacetParameters#facet.limit
    # under facet.sort ), and your current request params.
@@ -85,8 +78,7 @@ module Blacklight::Solr
    def params_for_resort_url(sort_method, params)
      # When resorting, we've got to reset the offset to start at beginning,
      # no way to make it make sense otherwise.
-     return params.merge(request_keys[:sort] => sort_method,
-                         request_keys[:offset] => 0)
+     return params.merge(request_keys[:sort] => sort_method, request_keys[:page] => nil)
    end
     
   end

data/lib/blacklight/solr_helper.rb

@@ -436,17 +436,20 @@ module Blacklight::SolrHelper
     # Now override with our specific things for fetching facet values
     solr_params[:"facet.field"] = facet_field
 
-    # Need to set as f.facet_field.facet.limit to make sure we
-    # override any field-specific default in the solr request handler. 
-    solr_params[:"f.#{facet_field}.facet.limit"] = 
+
+    limit =  
       if respond_to?(:facet_list_limit)
-        facet_list_limit.to_s.to_i + 1  
+        facet_list_limit.to_s.to_i
       elsif solr_params["facet.limit"] 
-        solr_params["facet.limit"].to_i + 1
+        solr_params["facet.limit"].to_i
       else
-        20 + 1
+        20
       end
-    solr_params[:"f.#{facet_field}.facet.offset"] = input[  Blacklight::Solr::FacetPaginator.request_keys[:offset]  ].to_i # will default to 0 if nil
+
+    # Need to set as f.facet_field.facet.* to make sure we
+    # override any field-specific default in the solr request handler. 
+    solr_params[:"f.#{facet_field}.facet.limit"]  = limit + 1
+    solr_params[:"f.#{facet_field}.facet.offset"] = ( input.fetch(Blacklight::Solr::FacetPaginator.request_keys[:page] , 1).to_i - 1 ) * ( limit )
     solr_params[:"f.#{facet_field}.facet.sort"] = input[  Blacklight::Solr::FacetPaginator.request_keys[:sort] ] if  input[  Blacklight::Solr::FacetPaginator.request_keys[:sort] ]   
     solr_params[:rows] = 0
 
@@ -456,9 +459,9 @@ module Blacklight::SolrHelper
   # a solr query method
   # used to paginate through a single facet field's values
   # /catalog/facet/language_facet
-  def get_facet_pagination(facet_field, extra_controller_params={})
+  def get_facet_pagination(facet_field, user_params=params || {}, extra_controller_params={})
     
-    solr_params = solr_facet_params(facet_field, params, extra_controller_params)
+    solr_params = solr_facet_params(facet_field, user_params, extra_controller_params)
     
     # Make the solr call
     response =find(blacklight_config.solr_request_handler, solr_params)

data/lib/generators/blacklight/blacklight_generator.rb

@@ -123,7 +123,7 @@ EOF
     file_path = "app/models/#{model_name.underscore}.rb"
     if File.exists?(file_path) 
       inject_into_class file_path, model_name.classify do 
-        "# Connects this user object to Blacklights Bookmarks and Folders. " +
+        "# Connects this user object to Blacklights Bookmarks. " +
         "\n include Blacklight::User\n"        
       end
     else

data/test_support/features/bookmarks.feature

@@ -17,26 +17,10 @@ Feature: Bookmarks
       When I go to the bookmarks page
       Then I should see "You have no bookmarks"
         
-    Scenario: User Has Bookmarks
-      Given I am logged in as "user1"
-      And "user1" has bookmarked an item with title "foo bar"
-      When I go to the bookmarks page
-      Then I should see "Your Bookmarks"
-      And I should see "foo bar"
-
-    Scenario: Deleting a Bookmark
-      Given I am logged in as "user1"
-      And "user1" has bookmarked an item with title "foo bar"
-      And I am on the bookmarks page
-      Then I should see a "Remove" button
-      When I press "Remove"
-      Then I should see "Successfully removed bookmark."
-
     Scenario: Clearing Bookmarks
-      Given I am logged in as "user1"
-      And "user1" has bookmarked an item with title "foo bar"
-      And "user1" has bookmarked an item with title "boo baz"
-      And I am on the bookmarks page
+      Given I am on the document page for id 2007020969
+      And I press "Bookmark"
+      When I am on the bookmarks page
       Then I should see "Clear Bookmarks"
       When I follow "Clear Bookmarks"
       Then I should see "Cleared your bookmarks."
@@ -74,5 +58,5 @@ Feature: Bookmarks
       And I press "Bookmark"
       And I am logged in as "user1"
       When I go to the bookmarks page
-      Then I should see a "Remove" button
+      Then I should see a "Remove bookmark" button
       

data/test_support/features/support/paths.rb

@@ -17,8 +17,8 @@ module NavigationHelpers
       #catalog_index_path
       root_path
       
-    when /the folder page/
-      folder_index_path
+    when /the bookmarks page/
+      bookmarks_path
          
     when /the document page for id (.+)/ 
       catalog_path($1)

data/test_support/spec/helpers/facets_helper_spec.rb

@@ -6,6 +6,26 @@ describe FacetsHelper do
     helper.stub(:blacklight_config).and_return blacklight_config
   end
   
+  describe "has_facet_values?" do
+    it "should be true if there are any facets to display" do
+
+      a = mock(:items => [1,2])
+      b = mock(:items => ['b','c'])
+      empty = mock(:items => [])
+
+      fields = [a,b,empty]
+      helper.has_facet_values?(fields).should be_true
+    end
+
+    it "should be false if all facets are empty" do
+
+      empty = mock(:items => [])
+
+      fields = [empty]
+      helper.has_facet_values?(fields).should_not be_true
+    end
+  end
+
   describe "should_render_facet?" do
     before do
       @config = Blacklight::Configuration.new do |config|

data/test_support/spec/lib/facet_paginator_spec.rb

@@ -11,23 +11,16 @@ describe 'Blacklight::Solr::FacetPaginator' do
     @limit = 6
 
     @sort_key = Blacklight::Solr::FacetPaginator.request_keys[:sort]
-    @offset_key = Blacklight::Solr::FacetPaginator.request_keys[:offset]
-    @limit_key = Blacklight::Solr::FacetPaginator.request_keys[:limit]
+    @page_key = Blacklight::Solr::FacetPaginator.request_keys[:page]
   end
   context 'when there are limit+1 results' do
     before(:each) do
-      @paginator = Blacklight::Solr::FacetPaginator.new(@seven_facet_values, @offset_key => 0, :limit => 6)
+      @paginator = Blacklight::Solr::FacetPaginator.new(@seven_facet_values, :limit => 6)
     end
     it 'should have next' do
       @paginator.should be_has_next
     end
-    it 'should generate proper next params' do
-      next_params = @paginator.params_for_next_url(:original1 => "original1", :original2 => "original2")
 
-      next_params[:original1].should == "original1"
-      next_params[:original2].should == "original2"
-      next_params[@offset_key].should == 0 + @limit 
-    end
   end
   it 'should not have next when there are fewer results' do
     paginator = Blacklight::Solr::FacetPaginator.new(@six_facet_values, :offset => 0, :limit => @limit)
@@ -44,14 +37,6 @@ describe 'Blacklight::Solr::FacetPaginator' do
       @paginator.should be_has_previous
     end
 
-    it 'should generate proper previous params' do
-      next_params = @paginator.params_for_previous_url(:original1 => "original1", :original2 => "original2")
-
-      next_params[:original1].should == "original1"
-      next_params[:original2].should == "original2"
-      next_params[@offset_key].should == @offset - @limit 
-    end
-
   end
   it 'should not have previous when offset is 0' do
     paginator = Blacklight::Solr::FacetPaginator.new(@seven_facet_values, :offset => 0, :limit => @limit)
@@ -66,7 +51,7 @@ describe 'Blacklight::Solr::FacetPaginator' do
       click_params = paginator.params_for_resort_url('count', {})
 
       click_params[ @sort_key ].should == 'count'
-      click_params[ @offset_key ].to_s.should == "0"
+      click_params[ @page_key ].should be_nil
   end
   it 'should limit items to limit, if limit is smaller than items.length' do
     paginator = Blacklight::Solr::FacetPaginator.new(@seven_facet_values, :offset => 100, :limit => 6, :sort => 'index')

data/test_support/spec/lib/solr_helper_spec.rb

@@ -433,7 +433,7 @@ describe 'Blacklight::SolrHelper' do
       @generated_solr_facet_params = solr_facet_params(@facet_field)
 
       @sort_key = Blacklight::Solr::FacetPaginator.request_keys[:sort]
-      @offset_key = Blacklight::Solr::FacetPaginator.request_keys[:offset]
+      @page_key = Blacklight::Solr::FacetPaginator.request_keys[:page]
       @config = Blacklight::Configuration.new do |config|
         config.add_facet_fields_to_solr_request!
         config.add_facet_field 'format'
@@ -452,8 +452,8 @@ describe 'Blacklight::SolrHelper' do
       @generated_solr_facet_params[:"f.#{@facet_field}.facet.offset"].should == 0
     end
     it 'uses offset manually set, and converts it to an integer' do
-      solr_params = solr_facet_params(@facet_field, @offset_key => "100")
-      solr_params[:"f.#{@facet_field}.facet.offset"].should == 100
+      solr_params = solr_facet_params(@facet_field, @page_key => 2)
+      solr_params[:"f.#{@facet_field}.facet.offset"].should == 20
     end
     it 'defaults limit to 20' do
       solr_params = solr_facet_params(@facet_field)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -233,7 +233,6 @@ files:
 - app/assets/javascripts/blacklight/checkbox_submit.js
 - app/assets/javascripts/blacklight/core.js
 - app/assets/javascripts/blacklight/facet_expand_contract.js
-- app/assets/javascripts/blacklight/folder_toggle.js
 - app/assets/javascripts/blacklight/lightbox_dialog.js
 - app/assets/javascripts/blacklight/more_facets.js
 - app/assets/javascripts/blacklight/search_context.js
@@ -243,9 +242,9 @@ files:
 - app/assets/javascripts/jquery-ui-1.8.1.custom.min.js
 - app/assets/javascripts/jquery.uiExt.ajaxyDialog.js
 - app/assets/stylesheets/blacklight/_blacklight_base.css.scss
+- app/assets/stylesheets/blacklight/_bookmark.css.scss
 - app/assets/stylesheets/blacklight/_catalog.css.scss
 - app/assets/stylesheets/blacklight/_facets.css.scss
-- app/assets/stylesheets/blacklight/_folder.css.scss
 - app/assets/stylesheets/blacklight/_formatting.css.scss
 - app/assets/stylesheets/blacklight/_header.css.scss
 - app/assets/stylesheets/blacklight/_layout.css.scss
@@ -295,6 +294,7 @@ files:
 - app/models/search.rb
 - app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
+- app/views/bookmarks/_tools.html.erb
 - app/views/bookmarks/index.html.erb
 - app/views/catalog/_bookmark_control.html.erb
 - app/views/catalog/_bookmark_form.html.erb
@@ -315,6 +315,7 @@ files:
 - app/views/catalog/_index_default.html.erb
 - app/views/catalog/_marc_view.html.erb
 - app/views/catalog/_opensearch_response_metadata.html.erb
+- app/views/catalog/_per_page_widget.html.erb
 - app/views/catalog/_previous_next_doc.html.erb
 - app/views/catalog/_refworks_form.html.erb
 - app/views/catalog/_results_pagination.html.erb
@@ -324,6 +325,7 @@ files:
 - app/views/catalog/_show_tools.html.erb
 - app/views/catalog/_sms_form.html.erb
 - app/views/catalog/_sort_and_per_page.html.erb
+- app/views/catalog/_sort_widget.html.erb
 - app/views/catalog/citation.html.erb
 - app/views/catalog/email.erb
 - app/views/catalog/endnote.endnote.erb
@@ -341,8 +343,6 @@ files:
 - app/views/catalog/sms.erb
 - app/views/feedback/complete.html.erb
 - app/views/feedback/show.html.erb
-- app/views/folder/_tools.html.erb
-- app/views/folder/index.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
 - app/views/kaminari/blacklight/_gap.html.erb
 - app/views/kaminari/blacklight/_last_page.html.erb
@@ -508,7 +508,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3316550167436372560
+      hash: -3050377984529966753
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -517,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3316550167436372560
+      hash: -3050377984529966753
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.23

data/app/assets/javascripts/blacklight/folder_toggle.js

@@ -1,24 +0,0 @@
-//= require blacklight/core
-//= require blacklight/checkbox_submit
-(function($) {
-    Blacklight.do_folder_toggle_behavior = function() {
-      $( Blacklight.do_folder_toggle_behavior.selector ).bl_checkbox_submit({
-          checked_label: "Selected",
-          unchecked_label: "Select",
-          css_class: "toggle_folder",
-          success: function(new_state) {
-            
-            if (new_state) {
-               $("#folder_number").text(parseInt($("#folder_number").text()) + 1);
-            }
-            else {
-               $("#folder_number").text(parseInt($("#folder_number").text()) - 1);
-            }
-          }
-      });
-    };
-    Blacklight.do_folder_toggle_behavior.selector = "form.folder_toggle"; 
-$(document).ready(function() {
-  Blacklight.do_folder_toggle_behavior();  
-});
-})(jQuery);

data/app/assets/stylesheets/blacklight/_folder.css.scss

@@ -1,38 +0,0 @@
-ul.folderTools
-{
-  @include border-radius(0 0 4px 4px);
-	background-color: $search_ui_bg_color;
-	border-color: $search_ui_border_color;
-	border-style:solid;
-	border-width:0 1px 1px;
-	margin:0;
-	padding:0.66em;
-
-  li
-  {
-    display:inline-block;
-    margin:0 10px;
-  }
-
-  li form
-  {
-    display:inline;
-  }
-
-  li.refworks form input.submit
-  {
-    display:none;
-  }
-}
-
-ul.tools
-{
-  margin:0;
-  padding:0;
-
-  li
-  {
-    display:inline;
-    margin:0 10px;
-  }
-}

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

@@ -1,44 +0,0 @@
-<% sidebar_items << capture do %>
-  <p><%= link_back_to_catalog %></p>
-<% end %>
-<h1><%= t('blacklight.folder.title') %></h1>
-
-<% unless @documents.empty? %>
-  <%- # just adding pageEntriedInfo div to get the proper rounded corners at the top -%>
-  <div class="pageEntriesInfo"></div>
-  <%= render "catalog/sort_and_per_page" %>
-  <%= render "catalog/results_pagination" %>
-  
-  <%= render 'tools' %>  
-<% end %>
-
-<div id="documents">  
-  <% @documents.each_with_index do |document, i| %>
-    <% # container for a single doc -%>
-    <div class="document">
-      <% # header bar for doc items in index view -%>
-      <div class="documentHeader">
-        <div class="documentFunctions">          
-          <div class="in_folder">
-            <%= render :partial=>'catalog/folder_control', :locals=>{:document=>document} %>
-          </div>
-        </div>  
-      
-        <h3 class="index_title"><%= i + 1 + @response.params[:start].to_i%>. <%= link_to_document document, :label => document_show_link_field, :results_view => false %></h3>
-        
-              
-      </div>
-      
-	    <%= render_document_partial document, :index %>
-	    <% if document.respond_to?(:export_as_openurl_ctx_kev) %>
-        <!-- 
-             // COinS, for Zotero among others. 
-             // This document_partial_name(@document) business is not quite right,
-             // but has been there for a while. 
-        -->
-        <span class="Z3988" title="<%= document.export_as_openurl_ctx_kev(document_partial_name(document)) %>"></span>
-      <% end %>
-    </div>
-  
-  <% end %>
-</div>