blacklight 3.8.2 → 4.0.0.pre6

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -44,8 +44,10 @@ module Blacklight::CatalogHelperBehavior
       total_num = format_num(total_hits)
 
    # TODO: i18n the entry_name
-      entry_name = options[:entry_name] ||
-        (response.empty?? t('blacklight.entry_name.default') : response.docs.first.class.name.underscore.sub('_', ' '))
+      entry_name = options[:entry_name] 
+      entry_name ||= response.docs.first.class.name.underscore.sub('_', ' ') unless response.docs.empty?
+      entry_name ||= t('blacklight.entry_name.default')
+
 
       case response.total
         when 0; t('blacklight.search.pagination_info.no_items_found', :entry_name => entry_name.pluralize ).html_safe
@@ -70,7 +72,7 @@ module Blacklight::CatalogHelperBehavior
   end
   
   def current_sort_field
-    blacklight_config.sort_fields[params[:sort]] || blacklight_config.sort_fields.first.last
+    blacklight_config.sort_fields[params[:sort]] || (blacklight_config.sort_fields.first ? blacklight_config.sort_fields.first.last : nil )
   end
 
   # Export to Refworks URL, called in _show_tools

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -51,7 +51,7 @@ module Blacklight::FacetsHelperBehavior
   # solr field used for faceting. Can be over-ridden for custom
   # display on a per-facet basis. 
   #
-  # @param [RSolr::Ext::Response::Facets::FacetField] display_facet 
+  # @param [Blacklight::SolrResponse::Facets::FacetField] display_facet 
   # @param [Hash] options parameters to use for rendering the facet limit partial
   #
   def render_facet_limit(display_facet, options = {})
@@ -76,7 +76,7 @@ module Blacklight::FacetsHelperBehavior
   # Determine if Blacklight should render the display_facet or not
   #
   # By default, only render facets with items.
-  # @param [RSolr::Ext::Response::Facets::FacetField] display_facet 
+  # @param [Blacklight::SolrResponse::Facets::FacetField] display_facet 
   def should_render_facet? display_facet
     # display when show is nil or true
     display = facet_configuration_for_field(display_facet.name).show != false
@@ -89,7 +89,7 @@ module Blacklight::FacetsHelperBehavior
     name = facet_configuration_for_field(display_facet.name).try(:partial)
     name ||= "facet_limit"
   end
-
+ 
   #
   # facet param helpers ->
   #
@@ -101,19 +101,19 @@ module Blacklight::FacetsHelperBehavior
   # options consist of:
   # :suppress_link => true # do not make it a link, used for an already selected value for instance
   def render_facet_value(facet_solr_field, item, options ={})    
-    (link_to_unless(options[:suppress_link], ((item.label if item.respond_to?(:label)) || item.value), add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select label") + " " + render_facet_count(item.hits)).html_safe
+    (link_to_unless(options[:suppress_link], ((item.label if item.respond_to?(:label)) || item.value), add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
   end
 
   # Standard display of a SELECTED facet value, no link, special span
   # with class, and 'remove' button.
   def render_selected_facet_value(facet_solr_field, item)
-    content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected label") +
-      link_to(t('blacklight.search.facets.selected.remove'), remove_facet_params(facet_solr_field, item.value, params), :class=>"remove")
+    #Updated class for Bootstrap Blacklight 
+    content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected") +
+      link_to(content_tag(:i, '', :class => "icon-remove") + content_tag(:span, '[remove]', :class => 'hide-text'), remove_facet_params(facet_solr_field, item.value, params), :class=>"remove")
   end
 
   # Renders a count value for facet limits. Can be over-ridden locally
-  # to change style, for instance not use parens. And can be called
-  # by plugins to get consistent display. 
+  # to change style. And can be called by plugins to get consistent display. 
   def render_facet_count(num)
     content_tag("span", t('blacklight.search.facets.count', :number => num), :class => "count") 
   end
@@ -229,6 +229,6 @@ module Blacklight::FacetsHelperBehavior
       items << OpenStruct.new(:value => key, :hits => hits, :label => facet_field.query[key][:label])
     end
  
-    RSolr::Ext::Response::Facets::FacetField.new facet_name, items
+    Blacklight::SolrResponse::Facets::FacetField.new facet_name, items
   end
 end

data/app/views/_flash_msg.html.erb

@@ -1,5 +1,10 @@
-<% [:notice, :error, :alert].each do |type| %>
-  <% if flash[type] %>
-    <div class="ui-state-<%= type == :error ? 'error' : 'highlight' %> ui-corner-all <%= type.to_s %>"><%= flash[type] %></div>
+<div class="flash_messages">
+  <% [:success, :notice, :error, :alert].each do |type| %>
+    <%- alert_class = type == :notice ? 'info' : type %>
+    <% if flash[type] %>
+      <div class="alert alert-<%=alert_class%>"><%= flash[type] %>
+         <a class="close" data-dismiss="alert" href="#">x</a>
+      </div>
+    <% end %>
   <% end %>
-<% end %>
+</div>

data/app/views/_user_util_links.html.erb

@@ -1,18 +1,24 @@
-<% if has_user_authentication_provider? %>
-<% if current_user %>
-  <%= link_to t('blacklight.header_links.logout'), destroy_user_session_path %> [<%= link_to current_user, edit_user_registration_path %>]
-<% else %>
-  <%= link_to t('blacklight.header_links.login'), new_user_session_path %>
-<% end %>
-    | 
-<% end %>
-<% if current_or_guest_user %>
-    <%= link_to t('blacklight.header_links.bookmarks'), bookmarks_path %>
-<% end %>
- <% if current_user %>
-    |
-    <%= link_to t('blacklight.header_links.saved_searches'), saved_searches_path %>
-<% end %>
-    |
-<%= link_to t('blacklight.header_links.search_history'), search_history_path %>
+<small>
+  <% if has_user_authentication_provider? %>
+    <div class="util-links-login">
+      <% if current_user %>
+        <%= link_to t('blacklight.header_links.logout'), destroy_user_session_path %> <%= "[#{ link_to current_user, edit_user_registration_path }]" unless current_user.to_s.blank? %>
+      <% else %>
+        <%= link_to t('blacklight.header_links.login'), new_user_session_path %>
+      <% end %>
+    </div>
 
+  <% end %>
+
+  <div class="util-links-other">
+    <% if current_or_guest_user %>
+      <%= link_to t('blacklight.header_links.bookmarks'), bookmarks_path %>
+    <% end %>
+    <% if has_user_authentication_provider? and current_user %>
+      |
+      <%= link_to t('blacklight.header_links.saved_searches'), saved_searches_path %>
+    <% end %>
+    |
+    <%= link_to t('blacklight.header_links.search_history'), search_history_path %>
+  </div>
+</small>

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

@@ -1,18 +1,18 @@
-    <ul class="tools">
+    <ul class="bookmarkTools">
       <li class="cite">
-        <%= 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'} %>
+        <%= 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 btn'} %>
       </li>
       <li class="refworks">
-        <%= render :partial => 'catalog/refworks_form', :locals => {:documents=>@bookmarks.collect{|doc| doc.document_id}} %>
+        <%= render :partial => 'catalog/refworks_form', :locals => {:documents=>@bookmarks} %>
       </li>
 
       <li class="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')%>
+        <%= 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'), {:class => 'btn'}%>
       </li>
       <li class="email">
-        <%= 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" %>
+        <%= 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 btn", :id => "emailLink" %>
       </li>
       <li>
-        <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') } %>
+        <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') }, :class => 'btn' %>
       </li>
-</ul>
+</ul>

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

@@ -1,25 +1,17 @@
 <h1><%= t('blacklight.bookmarks.title') %></h1>
 
 <%- if current_or_guest_user.blank? -%>
-  
+
   <h2><%= t('blacklight.bookmarks.need_login') %></h2>
-  
+
 <%- elsif @document_list.blank? -%>
-  
+
   <h3><%= t('blacklight.bookmarks.no_bookmarks') %></h3>
 <% else %>
-  
-  <div class="pageEntriesInfo">
-    <%= render_pagination_info @response, :entry_name=>'item' %>
-  </div>
-
   <%= render 'sort_and_per_page' %>
-  <%= render 'results_pagination' %>
-  
-	<% sidebar_items << capture do %>
+
   <%= render 'tools' %>
-	<% end %>  
-  <%= render :partial => 'catalog/document_list' %>
+  <%= render_document_index %>
   <%= render 'results_pagination' %>
 <% end %>
 

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

@@ -7,15 +7,13 @@
   -%>  
   <% unless existing_bookmark %>  
 
-      <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :title=> document[document_show_link_field] ) do %>        
-        <%= hidden_field(:bookmark, :title, :value => document[document_show_link_field] ) %>
+      <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id) 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, :title=> document[document_show_link_field]) do %>  
-        <%= hidden_field(:bookmark, :title, :value => document[document_show_link_field] ) %>
+      <%= form_tag( bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id) do %>  
         <%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove") %>
       <% end %>
       

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

@@ -3,6 +3,6 @@
     <%= hidden_field_tag "bookmarks[#{index}][document_id]", document.id %>
     <%= hidden_field_tag "bookmarks[#{index}][title]", h(document[document_show_link_field])%>
   <% end %>
-  <%= link_to_function t('blacklight.bookmarks.collection.add.button'), "document.bookmarks.submit()" %>
+  <%= link_to_function t('blacklight.bookmarks.collection.add.button'), "document.bookmarks.submit()",  :class => "btn" %>
   <%= submit_tag t('blacklight.bookmarks.collection.add.button'), :class => 'hide' %>
 <% end %>

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

@@ -1,20 +1,21 @@
-<% @documents.each do |document| %>
-
-<h1><%= citation_title(document) %></h1>
-
-<% if document.respond_to?(:export_as_mla_citation_txt) %>
-  <h4><%= t('blacklight.citation.mla') %></h4>
-  <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
-<% end %>
-
-<% if document.respond_to?(:export_as_apa_citation_txt) %>
-  <h4><%= t('blacklight.citation.apa') %></h4>
-  <%= document.send(:export_as_apa_citation_txt).html_safe %><br/><br/>
-<% end %>
-
-<%- if document.respond_to?(:export_as_chicago_citation_txt) -%>
-  <h4><%= t('blacklight.citation.chicago') %></h4>
-  <%= document.send(:export_as_chicago_citation_txt).html_safe %>
-<%- end -%>
-
-<% end %>
+
+<% @documents.each do |document| %>
+
+  <h3><%= citation_title(document) %></h3>
+
+<% if document.respond_to?(:export_as_mla_citation_txt) %>
+  <h4><%= t('blacklight.citation.mla') %></h4>
+  <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
+<% end %>
+
+<% if document.respond_to?(:export_as_apa_citation_txt) %>
+  <h4><%= t('blacklight.citation.apa') %></h4>
+  <%= document.send(:export_as_apa_citation_txt).html_safe %><br/><br/>
+<% end %>
+
+<%- if document.respond_to?(:export_as_chicago_citation_txt) -%>
+  <h4><%= t('blacklight.citation.chicago') %></h4>
+  <%= document.send(:export_as_chicago_citation_txt).html_safe %>
+<%- end -%>
+
+<% end %>

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

@@ -1,7 +1,9 @@
-<div id="appliedParams">
-
-	<h3 class="label"><%= t('blacklight.search.filters.title') %></h3>
+<% if query_has_constraints? %>
+      <div class="constraints-container">
+        <span class="constraints-label"><%= t('blacklight.search.filters.title') %></span>
   
-  <%= render_constraints(localized_params) %>  
-		
-</div>
+        <%=link_to t('blacklight.search.start_over'), url_for(:action=>'index'), :class => "catalog_startOverLink", :id=>"startOverLink" %>
+        <%= render_constraints(params) %>  
+
+      </div>
+<% end %>

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

@@ -1,13 +1,12 @@
      
       <% # header bar for doc items in index view -%>
-      <div class="documentHeader">
-        
-        <% # bookmark functions for items/docs -%>
-        <%= render_index_doc_actions document %>
+      <div class="documentHeader clearfix">
         
         <% # main title container for doc partial view -%>
-        <div class="yui-u">
-          <h3 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, :counter => (document_counter + 1 + @response.params[:start].to_i) %></h3>
-        </div>
+          <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, :counter => (document_counter + 1 + @response.params[:start].to_i) %></h5>
+
+        
+        <% # bookmark functions for items/docs -%>
+        <%= render_index_doc_actions document, :wrapping_class => "documentFunctions span2" %>
       </div>
       

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

@@ -1,10 +1,4 @@
 <% # container for all documents in index view -%>
 <div id="documents">
-  <% if Rails.version > "3.2.0" %>
-    <%= render @document_list, :as => :document %>
-  <% else %>
-    <% @document_list.each_with_index do |document, document_counter| %>
-      <%= render :partial => document.to_partial_path, :locals => { :document => document, :document_counter => document_counter } %>
-    <% end %>
-  <% end %>
+  <%= render documents, :as => :document %>
 </div>

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

@@ -1,17 +1,43 @@
-<h1><%= t('blacklight.email.form.title') %></h1>
-<%= form_tag url_for(:controller => "catalog", :action => "email"), :id => 'email_form', :method => :post do %>
-  <%= label_tag(:to, t('blacklight.email.form.to')) %><br/>
-  <%= text_field_tag :to %><br/>
-  <%= label_tag(:message, t('blacklight.email.form.message')) %><br/>
-  <%= text_area_tag :message %><br/>
-  <% @documents.each do |doc| %>
-    <%=hidden_field_tag "id[]", doc.get(:id)%>
-  <% end %>
-  <%- if params[:sort] -%>
-    <%= hidden_field_tag "sort", params[:sort] %>
-  <%- end -%>
-  <%- if params[:per_page] -%>
-    <%= hidden_field_tag "per_page", params[:per_page] %>
-  <%- end -%>
-  <%= submit_tag t('blacklight.email.form.submit') %>
+<%- 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">
+    <%= render :partial=>'/flash_msg' %>
+    <div class="control-group">
+      <label class="control-label" for="to">
+        <%= t('blacklight.email.form.to') %>
+      </label>
+      <div class="controls">
+
+        <%= text_field_tag :to, params[:to] %><br/>
+      </div>
+    </div>
+    <div class="control-group">
+      <label class="control-label" for="message">
+        <%= t('blacklight.email.form.message') %>
+      </label>
+      <div class="controls">
+      <%= text_area_tag :message, params[:message] %>
+       </div>
+    </div>
+
+    <% @documents.each do |doc| %>
+      <%=hidden_field_tag "id[]", doc.get(:id)%>
+    <% end %>
+    <%- if params[:sort] -%>
+      <%= hidden_field_tag "sort", params[:sort] %>
+    <%- end -%>
+    <%- if params[:per_page] -%>
+      <%= hidden_field_tag "per_page", params[:per_page] %>
+    <%- end -%>
+  </div>
+  <div class="modal-footer">
+  <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 %>">
-  <h3><%= facet_field.label -%></h3>
+  <h5><%= facet_field.label -%> <i class="icon-chevron"></i></h3>
   <%= yield %>
 </div>

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

@@ -14,7 +14,7 @@
   <% end %>
 
   <% if(paginator.has_next?)  %>
-    <li class="more_facets_link"><%= link_to(t('blacklight.search.facets.more'), params.merge(:id => solr_field, :action=>"facet"), :class => "more_facets_link") %></li>
+    <li class="more_facets_link"><%= link_to(t('blacklight.search.facets.more'), params.merge(:id => solr_field, :action=>"facet", :page => nil), :class => "more_facets_link") %></li>
   <% end %>
 
 </ul>

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

@@ -1,24 +1,21 @@
-  <% if @pagination.has_previous? || @pagination.has_next? %>
-    <div class="prev_next_links">
-      <%= 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>
+
+    <div class="prev_next_links btn-group pull-left">
+      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
+       <span class="disabled btn"><%= 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 %>
+      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
        
-       <span class="disabled ui-state-active next_page"><%= raw(t('views.pagination.next')) %></span>
+       <span class="disabled btn"><%= raw(t('views.pagination.next')) %></span>
       <% end %>
      
     </div>
-  <% end %>
-
-  <div class="sort_options">
+ 
+  <div class="sort_options btn-group pull-right">
     <% if @pagination.sort == 'index' -%>
-      <span class="disabled az"><%= 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") %>
+      <span class="active az btn"><%= 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") %>
     <% elsif @pagination.sort == 'count' -%>
       <%=  link_to(t('blacklight.search.facets.sort.index'), @pagination.params_for_resort_url('index', params), 
-        :class => "sort_change az") %><span class="disabled numeric"><%= t('blacklight.search.facets.sort.count') %></span>
+        :class => "sort_change az btn") %><span class="active numeric btn"><%= t('blacklight.search.facets.sort.count') %></span>
     <% end -%>    
   </div>
-
-

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

@@ -1,5 +1,19 @@
 <% # main container for facets/limits menu -%>
-<div id="facets" class="facets">
-  <h2><%= t('blacklight.search.facets.title') %></h2>
+<% if has_facet_values?  %>
+<div id="facets" class="facets sidenav">
+	
+ 
+  <h4 data-toggle="collapse" data-target=".facets-collapse">
+
+      <a class="btn btn-navbar">
+                      <span class="icon-bar"></span>
+                      <span class="icon-bar"></span>
+                    </a>
+  	<%= t('blacklight.search.facets.title') %>
+
+  </h4>
+  <div class="facets-collapse">
   <%= render_facet_partials %>
 </div>
+</div>
+<% end %>&nbsp;