blacklight 3.8.2 → 4.0.0.pre6

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

@@ -0,0 +1,23 @@
+.modal-header {
+	h1 {
+		font-size: 24px; line-height: 40px;
+	}
+}
+
+#ajax-modal {
+  #email_form {
+    width: auto;
+  }
+
+  .facet_pagination.top {
+  	display: none;
+  }
+
+  button.close {
+	display: block;
+  }
+}
+
+button.close {
+	display: none;
+}

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

@@ -33,13 +33,6 @@
 		top:0;
 	}
 
-	* html #search
-	{
-		left:1em;
-		position:absolute;
-		top:-4em;
-	}
-
 	body
 	{
 		background:none;

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

@@ -0,0 +1,3 @@
+@import "blacklight/responsive_partials/_catalog";
+@import "blacklight/responsive_partials/_facets";
+@import "blacklight/responsive_partials/_header";

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

@@ -1,7 +1,3 @@
-
-
-
-
 /* Search History */
 .search_history
 {
@@ -42,3 +38,5 @@
   }
 }
 
+
+

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

@@ -1,4 +1,3 @@
 /* This is the default blacklight theme. */
 
-@import 'blacklight/grids/susy_grid';
 @import 'blacklight/blacklight_base';

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

@@ -4,11 +4,18 @@
 
 $background_image: 'blacklight/bg.png' !default;
 $logo_image: 'blacklight/logo.png' !default;
+$header_background_border: 'blacklight/border.png' !default;
+
+$navbar_background_color: #000000 !default;
 
 /* Various elements of search customization share these colors */
 
-$search_ui_border_color: #AAAAAA !default;
-$search_ui_bg_color: #F0F0F0 !default;
+$well_bg_color: #F5F5F5 !default;
+
+$search_ui_border_color: #FFFFFF !default;
+$search_ui_bg_color: #FFFFFF !default;
+
+$main_container_bg_color: #FFFFFF !default;
 
 /* separates documents, facets */
 $dotted_border_color: #CCC !default;

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

@@ -0,0 +1,5 @@
+@media (max-width: 767px) {
+  #documents .documentFunctions {
+    margin-top: 0;
+  }
+}

data/app/assets/stylesheets/blacklight/responsive_partials/_facets.css.scss

@@ -0,0 +1,37 @@
+@media (max-width: 767px) {
+  #facets .btn-navbar {
+    display: block;
+  } 
+  .facets-collapse {
+    clear: both;
+    
+    &.in {
+
+    }
+
+    &, &.collapse {
+      overflow: hidden;
+      height: 0;
+    }
+
+    &.collapse.in {
+      height: auto !important;
+    }
+  }
+
+  .no-js .facets-collapse, .no-js .facets-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
+
+@media (min-width: 768px) {
+  .facets-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+
+  .facet-collapse-toggle {
+    display: none;
+  }
+}

data/app/assets/stylesheets/blacklight/responsive_partials/_header.css.scss

@@ -0,0 +1,30 @@
+@media (max-width: 979px) {
+  body {
+  	padding-top: 0;
+  }
+
+}
+@media (max-width: 979px) {
+  .submit-search-text {
+    display: none;
+  }
+
+
+  .navbar .brand {
+    width: 120px;
+  }
+
+  #search_field {
+    width: 50px;
+  }
+}
+
+@media (max-width: 480px) {
+  #search_field {
+    display: none;
+  }
+
+  .navbar .brand {
+    width: 35px;
+  }
+}

data/app/assets/stylesheets/improved-modal/bootstrap-modal.css

@@ -0,0 +1,199 @@
+/*!
+ * Bootstrap Modal
+ *
+ * Copyright Jordan Schroter
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+
+.modal-open.has-modal-container {
+	position: relative; /* safari */
+	overflow: hidden;
+}
+
+
+/* add a scroll bar to stop page from jerking around */
+.modal-open.page-overflow .page-container,
+.modal-open.page-overflow .page-container .navbar-fixed-top,
+.modal-open.page-overflow .page-container .navbar-fixed-bottom,
+.modal-open.page-overflow .modal-container  {
+	overflow-y: scroll;
+}
+
+@media (max-width: 979px) {
+	.modal-open.page-overflow .page-container .navbar-fixed-top,
+	.modal-open.page-overflow .page-container .navbar-fixed-bottom  {
+		overflow-y: visible;
+	}
+}
+
+.modal-container {
+	display: none;
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	overflow: auto;
+	z-index: 9999;
+}
+
+.modal-open > .modal-container {
+	display: block;
+}
+
+.modal {
+	outline: none;
+	position: absolute;
+	margin-top: 0;
+	top: 50%;
+	overflow: visible; /* allow content to popup out (i.e tooltips) */
+}
+
+.modal.fade {
+	top: -100%;
+	-webkit-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;	
+	   -moz-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
+	     -o-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
+	        transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
+}
+
+.modal.fade.in {
+	top: 50%;
+}
+
+.modal-body {
+	max-height: none;
+	overflow: visible;
+}
+
+.modal.modal-absolute {
+	position: absolute;
+	z-index: 950;
+}
+
+.modal .loading-mask {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background: #fff;
+	border-radius: 6px;
+}
+
+.modal-spinner {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+}
+
+.modal-backdrop.modal-absolute{
+	position: absolute;
+	z-index: 940;
+}
+
+.modal-backdrop, 
+.modal-backdrop.fade.in{
+	opacity: 0.7;
+	filter: alpha(opacity=70);
+	background: #fff;
+}
+
+.modal.container {
+  width: 940px;
+  margin-left: -470px;
+}
+
+/* Modal Overflow */
+
+.modal-overflow.modal {
+	top: 1%;
+	/*bottom: 1%;*/
+}
+
+.modal-overflow.modal.fade {
+	top: -100%;
+}
+
+.modal-overflow.modal.fade.in {
+	top: 1%;
+	/*bottom: 1%;*/
+}
+
+.modal-overflow .modal-body {
+	overflow: auto;
+	-webkit-overflow-scrolling: touch;
+}
+
+/*.modal-overflow .modal-body {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	right: 0;
+	left: 0;
+	margin-top: 48px; // header height
+	margin-bottom: 60px; // footer height
+	overflow: auto;
+}
+
+
+.modal-overflow .modal-footer {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	left: 0;
+}*/
+
+/* Responsive */
+
+@media (min-width: 1200px) {
+	.modal.container {
+		width: 1170px;
+		margin-left: -585px;
+	}
+}
+
+@media (max-width: 979px) {
+	.modal, 
+	.modal.container,
+	.modal.modal-overflow 	{
+		top: 1%;
+		right: 1%;
+		left: 1%;
+		bottom: auto;
+		width: auto !important;
+		height: auto !important;
+		margin: 0 !important;
+		padding: 0 !important;
+	}
+	
+	.modal.fade.in, 
+	.modal.container.fade.in,
+	.modal.modal-overflow.fade.in {
+		top: 1%;
+		bottom: auto;
+	}
+	
+	.modal-body,
+	.modal-overflow .modal-body {
+		position: static;
+		margin: 0;
+		height: auto !important;
+		max-height: none !important;
+		overflow: visible !important;
+	}
+	
+	.modal-footer,
+	.modal-overflow .modal-footer {
+		position: static;
+	}
+}
+
+.loading-spinner {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin: -12px 0 0 -12px;
+}

data/app/controllers/bookmarks_controller.rb

@@ -2,11 +2,20 @@
 # 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 < CatalogController
+
+  ##
+  # Give Bookmarks access to the CatalogController configuration
   include Blacklight::Configurable
   include Blacklight::SolrHelper
 
   copy_blacklight_config_from(CatalogController)
-
+ 
+  # Blacklight uses #search_action_url to figure out the right URL for
+  # the global search box
+  def search_action_url
+    catalog_index_url
+  end
+  helper_method :search_action_url
 
   before_filter :verify_user
 
@@ -14,7 +23,7 @@ class BookmarksController < CatalogController
     @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)
+    @response, @document_list = get_solr_response_for_field_values(SolrDocument.unique_key, bookmark_ids)
   end
 
   def update
@@ -30,14 +39,11 @@ class BookmarksController < CatalogController
   # bookmark[title] and bookmark[document_id], but in that case #update
   # is simpler. 
   def create
-    @bookmarks = params[:bookmarks] || []
-
-    if params[:bookmark]
-      params[:bookmark][:document_id] ||= params[:id]
-      @bookmarks << params[:bookmark] if params[:bookmark]
-     end
-
-    current_or_guest_user.save! unless current_or_guest_user.persisted?
+    if params[:bookmarks]
+      @bookmarks = params[:bookmarks]
+    else
+      @bookmarks = [{ :document_id => params[:id] }]
+    end
 
     success = @bookmarks.all? do |bookmark|
       current_or_guest_user.bookmarks.create(bookmark) unless current_or_guest_user.existing_bookmark_for(bookmark[:document_id])

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -9,7 +9,7 @@ module Blacklight::BlacklightHelperBehavior
   include HtmlHeadHelper
   include FacetsHelper
 
-  
+
   def application_name
     return Rails.application.config.application_name if Rails.application.config.respond_to? :application_name
 
@@ -17,33 +17,33 @@ module Blacklight::BlacklightHelperBehavior
   end
 
   # Provide the full, absolute url for an image
-  def asset_url(*args) 
-    "#{request.protocol}#{request.host_with_port}#{asset_path(*args)}" 
+  def asset_url(*args)
+    "#{request.protocol}#{request.host_with_port}#{asset_path(*args)}"
   end
 
   # Create <link rel="alternate"> links from a documents dynamically
   # provided export formats. Currently not used by standard BL layouts,
   # but available for your custom layouts to provide link rel alternates.
   #
-  # Returns empty string if no links available. 
+  # Returns empty string if no links available.
   #
   # :unique => true, will ensure only one link is output for every
   # content type, as required eg in atom. Which one 'wins' is arbitrary.
   # :exclude => array of format shortnames, formats to not include at all.
   def render_link_rel_alternates(document=@document, options = {})
-    options = {:unique => false, :exclude => []}.merge(options)  
-  
-    return nil if document.nil?  
+    options = {:unique => false, :exclude => []}.merge(options)
+
+    return nil if document.nil?
 
     seen = Set.new
-    
+
     html = ""
     document.export_formats.each_pair do |format, spec|
       unless( options[:exclude].include?(format) ||
              (options[:unique] && seen.include?(spec[:content_type]))
              )
         html << tag(:link, {:rel=>"alternate", :title=>format, :type => spec[:content_type], :href=> polymorphic_url(document, :format => format)}) << "\n"
-        
+
         seen.add(spec[:content_type]) if options[:unique]
       end
     end
@@ -57,45 +57,60 @@ module Blacklight::BlacklightHelperBehavior
   def render_body_class
     extra_body_classes.join " "
   end
-  
+
   # collection of items to be rendered in the @sidebar
   def sidebar_items
     @sidebar_items ||= []
   end
 
+  # collection of items to be rendered in the @topbar
+  def topbar_items
+    @topbar_items ||= []
+  end
+
+  def render_search_bar
+    render :partial=>'catalog/search_form'
+  end
+
+  def search_action_url
+    catalog_index_url
+  end
+
   def extra_body_classes
     @extra_body_classes ||= ['blacklight-' + controller.controller_name, 'blacklight-' + [controller.controller_name, controller.action_name].join('-')]
   end
-  
-  
+
   def render_document_list_partial options={}
     render :partial=>'catalog/document_list'
   end
-  
+
   # Save function area for search results 'index' view, normally
-  # renders next to title. 
-  def render_index_doc_actions(document, options={})   
+  # renders next to title.
+  def render_index_doc_actions(document, options={})
+    wrapping_class = options.delete(:wrapping_class) || "documentFunctions"
+
     content = []
     content << render(:partial => 'catalog/bookmark_control', :locals => {:document=> document}.merge(options)) if has_user_authentication_provider? and current_or_guest_user
 
-    content_tag("div", content.join("\n").html_safe, :class=>"documentFunctions")
+    content_tag("div", content.join("\n").html_safe, :class=> wrapping_class)
   end
-  
+
   # Save function area for item detail 'show' view, normally
   # renders next to title. By default includes 'Bookmarks'
   def render_show_doc_actions(document=@document, options={})
+    wrapping_class = options.delete(:documentFunctions) || "documentFunctions"
     content = []
     content << render(:partial => 'catalog/bookmark_control', :locals => {:document=> document}.merge(options)) if has_user_authentication_provider? and current_or_guest_user
 
     content_tag("div", content.join("\n").html_safe, :class=>"documentFunctions")
   end
-  
+
   # used in the catalog/_index_partials/_default view
   def index_fields
     blacklight_config.index_fields
   end
 
-  def should_display_index_field? document, solr_field
+  def should_render_index_field? document, solr_field
     document.has?(solr_field.field) ||
       (document.has_highlight_field? solr_field.field if solr_field.highlight)
   end
@@ -109,7 +124,7 @@ module Blacklight::BlacklightHelperBehavior
     # XXX DEPRECATED
     Hash[*index_fields.map { |key, field| [key, field.label] }.flatten]
   end
-  
+
   def spell_check_max
     blacklight_config.spell_max
   end
@@ -121,68 +136,80 @@ module Blacklight::BlacklightHelperBehavior
 
   def render_index_field_value args
     value = args[:value]
-    value ||= send(blacklight_config.index_fields[args[:field]][:helper_method], args) if args[:field] and blacklight_config.index_fields[args[:field]] and blacklight_config.index_fields[args[:field]][:helper_method]
+
+    if args[:field] and blacklight_config.index_fields[args[:field]]
+      field_config = blacklight_config.index_fields[args[:field]]
+      value ||= send(blacklight_config.index_fields[args[:field]][:helper_method], args) if field_config.helper_method
+      value ||= args[:document].highlight_field(args[:field]) if field_config.highlight
+    end
+
     value ||= args[:document].get(args[:field], :sep => nil) if args[:document] and args[:field]
     render_field_value value
   end
-  
+
   # Used in the show view for displaying the main solr document heading
   def document_heading
     @document[blacklight_config.show.heading] || @document.id
   end
   def render_document_heading
-    content_tag(:h1, document_heading)
+    content_tag(:h4, document_heading, :class => "show-document-title")
   end
-  
+
   # Used in the show view for setting the main html document title
   def document_show_html_title
     @document[blacklight_config.show.html_title]
   end
-  
+
   # Used in citation view for displaying the title
   def citation_title(document)
     document[blacklight_config.show.html_title]
   end
-  
+
   # Used in the document_list partial (search view) for building a select element
   def sort_fields
     blacklight_config.sort_fields.map { |key, x| [x.label, x.key] }
   end
-  
+
   # Used in the document list partial (search view) for creating a link to the document show action
   def document_show_link_field
     blacklight_config.index.show_link.to_sym
   end
-  
+
   # Used in the search form partial for building a select tag
   def search_fields
     search_field_options_for_select
   end
-  
+
   # used in the catalog/_show/_default partial
   def document_show_fields
     blacklight_config.show_fields
   end
-  
+
   # used in the catalog/_show/_default partial
   def document_show_field_labels
     # XXX DEPRECATED
     Hash[*blacklight_config.show_fields.map { |key, field| [key, field.label] }.flatten]
   end
 
-  def render_document_show_field_label args 
+  def render_document_show_field_label args
     field = args[:field]
     html_escape blacklight_config.show_fields[field].label
   end
 
   def render_document_show_field_value args
     value = args[:value]
-    value ||= send(blacklight_config.show_fields[args[:field]][:helper_method], args) if args[:field] and blacklight_config.show_fields[args[:field]] and blacklight_config.show_fields[args[:field]][:helper_method]
+
+    if args[:field] and blacklight_config.show_fields[args[:field]]
+      field_config = blacklight_config.show_fields[args[:field]]
+      value ||= send(blacklight_config.show_fields[args[:field]][:helper_method], args) if field_config.helper_method
+      value ||= args[:document].highlight_field(args[:field]).map { |x| x.html_safe } if field_config.highlight
+    end
+
     value ||= args[:document].get(args[:field], :sep => nil) if args[:document] and args[:field]
     render_field_value value
   end
 
-  def should_display_show_field? document, solr_field
+  def should_render_show_field? document, solr_field
     document.has?(solr_field.field) ||
       (document.has_highlight_field? solr_field.field if solr_field.highlight)
   end
@@ -191,12 +218,40 @@ module Blacklight::BlacklightHelperBehavior
     value = [value] unless value.is_a? Array
     value = value.collect { |x| x.respond_to?(:force_encoding) ? x.force_encoding("UTF-8") : x}
     return value.map { |v| html_escape v }.join(field_value_separator).html_safe
-  end  
+  end
 
   def field_value_separator
     ', '
   end
-  
+
+  def document_index_view_type
+    params.fetch(:view, 'list')
+  end
+
+  def render_document_index documents = nil, locals = {}
+    documents ||= @document_list
+
+    document_index_path_templates.each do |str|
+      # XXX rather than handling this logic through exceptions, maybe there's a Rails internals method
+      # for determining if a partial template exists..
+      begin
+        return render(:partial => (str % [document_index_view_type]), :locals => { :documents => documents })
+      rescue ActionView::MissingTemplate
+        nil
+      end
+    end
+
+    return ""
+  end
+
+  # a list of document partial templates to try to render for #render_document_index
+  def document_index_path_templates
+    # first, the legacy template names for backwards compatbility
+    # followed by the new, inheritable style
+    # finally, a controller-specific path for non-catalog subclasses
+    @document_index_path_templates ||= ["document_%s", "catalog/document_%s", "catalog/document_list"]
+  end
+
   # Return a normalized partial name that can be used to contruct view partial path
   def document_partial_name(document)
     # .to_s is necessary otherwise the default return value is not always a string
@@ -221,8 +276,8 @@ module Blacklight::BlacklightHelperBehavior
       # XXX rather than handling this logic through exceptions, maybe there's a Rails internals method
       # for determining if a partial template exists..
       begin
-        return render :partial => (str % [action_name, format]), :locals=>locals.merge({:document=>doc})  
-      rescue ActionView::MissingTemplate 
+        return render :partial => (str % [action_name, format]), :locals=>locals.merge({:document=>doc})
+      rescue ActionView::MissingTemplate
         nil
       end
     end
@@ -232,7 +287,7 @@ module Blacklight::BlacklightHelperBehavior
 
   # a list of document partial templates to try to render for #render_document_partial
   #
-  # (NOTE: I suspect #document_partial_name, #render_document_partial and #document_partial_path_templates 
+  # (NOTE: I suspect #document_partial_name, #render_document_partial and #document_partial_path_templates
   # should be more succinctly refactored in the future)
   def document_partial_path_templates
     # first, the legacy template names for backwards compatbility
@@ -241,21 +296,21 @@ module Blacklight::BlacklightHelperBehavior
     @partial_path_templates ||= ["catalog/_%s_partials/%s", "catalog/_%s_partials/default", "%s_%s", "%s_default", "catalog/%s_%s", "catalog/%s_default"]
   end
 
-  
+
   # Search History and Saved Searches display
   def link_to_previous_search(params)
     link_to(raw(render_search_to_s(params)), catalog_index_path(params)).html_safe
   end
-    
+
   #
   # shortcut for built-in Rails helper, "number_with_delimiter"
   #
   def format_num(num); number_with_delimiter(num) end
-  
+
   #
   # link based helpers ->
   #
-  
+
   # create link to query (e.g. spelling suggestion)
   def link_to_query(query)
     p = params.dup
@@ -265,7 +320,7 @@ module Blacklight::BlacklightHelperBehavior
     link_url = catalog_index_path(p)
     link_to(query, link_url)
   end
-  
+
   def render_document_index_label doc, opts
     label = nil
     label ||= doc.get(opts[:label], :sep => nil) if opts[:label].instance_of? Symbol
@@ -276,7 +331,7 @@ module Blacklight::BlacklightHelperBehavior
   end
 
   # link_to_document(doc, :label=>'VIEW', :counter => 3)
-  # Use the catalog_path RESTful route to create a link to the show page for a specific item. 
+  # Use the catalog_path RESTful route to create a link to the show page for a specific item.
   # catalog_path accepts a HashWithIndifferentAccess object. The solr query params are stored in the session,
   # so we only need the +counter+ param here. We also need to know if we are viewing to document as part of search results.
   def link_to_document(doc, opts={:label=>nil, :counter => nil, :results_view => true})
@@ -287,11 +342,17 @@ module Blacklight::BlacklightHelperBehavior
 
   # link_back_to_catalog(:label=>'Back to Search')
   # Create a link back to the index screen, keeping the user's facet, query and paging choices intact by using session.
-  def link_back_to_catalog(opts={:label=>t('blacklight.back_to_search')})
+  def link_back_to_catalog(opts={:label=>nil})
     query_params = session[:search] ? session[:search].dup : {}
     query_params.delete :counter
     query_params.delete :total
     link_url = url_for(query_params)
+    if link_url =~ /bookmarks/
+      opts[:label] ||= t('blacklight.back_to_bookmarks')
+    end
+
+    opts[:label] ||= t('blacklight.back_to_search')
+
     link_to opts[:label], link_url
   end
 
@@ -312,7 +373,7 @@ 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)
@@ -323,7 +384,7 @@ module Blacklight::BlacklightHelperBehavior
 
     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
@@ -335,29 +396,31 @@ module Blacklight::BlacklightHelperBehavior
     # hash_as_hidden_fields in hash_as_hidden_fields.rb
     return hash_as_hidden_fields(my_params)
   end
-  
-    
+
+
 
   def link_to_previous_document(previous_document)
-    return if previous_document == nil
-    link_to raw(t('views.pagination.previous')), previous_document, :class => "previous", :'data-counter' => session[:search][:counter].to_i - 1
+    link_to_unless previous_document.nil?, raw(t('views.pagination.previous')), previous_document, :class => "previous", :rel => 'prev', :'data-counter' => session[:search][:counter].to_i - 1 do
+      content_tag :span, raw(t('views.pagination.previous')), :class => 'previous'
+    end
   end
 
   def link_to_next_document(next_document)
-    return if next_document == nil
-    link_to raw(t('views.pagination.next')), next_document, :class => "next", :'data-counter' => session[:search][:counter].to_i + 1
+    link_to_unless next_document.nil?, raw(t('views.pagination.next')), next_document, :class => "next", :rel => 'next', :'data-counter' => session[:search][:counter].to_i + 1 do
+      content_tag :span, raw(t('views.pagination.next')), :class => 'next'
+    end
   end
 
   # Use case, you want to render an html partial from an XML (say, atom)
-  # template. Rails API kind of lets us down, we need to hack Rails internals 
+  # template. Rails API kind of lets us down, we need to hack Rails internals
   # a bit. code taken from:
-  # http://stackoverflow.com/questions/339130/how-do-i-render-a-partial-of-a-different-format-in-rails
+  # http://stackoverflow.com/questions/339130/how-do-i-render-a-partial-of-a-different-format-in-rails (zgchurch)
   def with_format(format, &block)
-    old_format = @template_format
-    @template_format = format
-    result = block.call
-    @template_format = old_format
-    return result
+    old_formats = formats
+    self.formats = [format]
+    block.call
+    self.formats = old_formats
+    nil
   end
 
   # puts together a collection of documents into one refworks export string
@@ -370,7 +433,7 @@ module Blacklight::BlacklightHelperBehavior
     end
     val
   end
-  
+
   # puts together a collection of documents into one endnote export string
   def render_endnote_texts(documents)
     val = ''