blacklight 4.9.0 → 5.0.0.pre1

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

@@ -1,7 +1,7 @@
 
 <% @documents.each do |document| %>
 
-  <h3><%= Deprecation.silence(Blacklight::BlacklightHelperBehavior) { citation_title(document) } %></h3>
+  <h3 class="modal-title"><%= citation_title(document) %></h3>
 
 <% if document.respond_to?(:export_as_mla_citation_txt) %>
   <h4><%= t('blacklight.citation.mla') %></h4>

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

@@ -2,7 +2,7 @@
       <div id="appliedParams" class="constraints-container">
         <span class="constraints-label"><%= t('blacklight.search.filters.title') %></span>
   
-          <%=link_to t('blacklight.search.start_over'), start_over_path, :class => "catalog_startOverLink btn btn-sm btn-text", :id=>"startOverLink" %>
+        <%=link_to t('blacklight.search.start_over'), url_for(:action=>'index'), :class => "catalog_startOverLink", :id=>"startOverLink" %>
         <%= render_constraints(params) %>  
 
       </div>

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

@@ -9,24 +9,28 @@
     options[:escape_value] = true unless options.has_key?(:escape_value)
 -%>
 
-<span class="appliedFilter constraint <%= options[:classes].join(" ") if options[:classes] %>">
+<span class="btn-group appliedFilter constraint <%= options[:classes].join(" ") if options[:classes] %>">
+<a href="#" class="constraint-value btn btn-sm btn-default btn-disabled">
       <%- unless label.blank? -%>
         <span class="filterName"><%= options[:escape_label] ? h(label) : raw(label) %></span> 
       <%- end -%>
       <%- unless value.blank? -%>
         <span class="filterValue"><%= options[:escape_value] ? h(value) : raw(value) %></span>
-      <%- end -%>
+      <%- end -%>          
+        </a>
+
       <%- unless options[:remove].blank? -%>
-        <% accessible_remove_label =               
+        <% accessible_remove_label = content_tag :span, :class => 'sr-only' do               
                 if label.blank?
                   t('blacklight.search.filters.remove.value', :value => (options[:escape_value] ? h(value) : value))
                 else
                   t('blacklight.search.filters.remove.label_value', :label => (options[:escape_label] ? h(label) : label), :value => (options[:escape_value] ? h(value) : value))
-                end              
-        %>                
-        <%= link_to(accessible_remove_label.html_safe,
-					options[:remove],
-					:class=>'btnRemove imgReplace'
+                end 
+                end             
+        %>    
+
+        <%= link_to(content_tag(:span, '', :class => 'glyphicon glyphicon-remove') + accessible_remove_label,
+					options[:remove], :class => 'btn btn-default btn-sm remove dropdown-toggle'
 				) %>
       <%- end -%>
 </span>

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

@@ -1,5 +1,5 @@
-<% if should_show_spellcheck_suggestions? @response %>
+<% if @response.total <= spell_check_max and @response.spelling.words.size > 0 %>
   <div id="spell">
-    <h4 class="suggest"><em><%= t('blacklight.did_you_mean', :options =>  @response.spelling.words.map { |word| link_to_query(word) }.join(" #{t('blacklight.or')} ")).html_safe %></em></h4>
+    <h4 class="suggest"><em><%= t('blacklight.did_you_mean', :options => safe_join(@response.spelling.words.map { |word| link_to_query(word) }, " #{t('blacklight.or')} ".html_safe)).html_safe %></em></h4>
   </div>
 <% end %>

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

@@ -1,15 +1,15 @@
      
       <% # header bar for doc items in index view -%>
-      <div class="documentHeader clearfix">
+      <div class="documentHeader row">
         
         <%- # main title container for doc partial view -%>
-         <h5 class="index_title">
+         <h5 class="index_title col-sm-10">
          <% 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" %>
+        <%= render_index_doc_actions document, :wrapping_class => "documentFunctions col-sm-2" %>
       </div>
       

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

@@ -2,22 +2,22 @@
 
   <div class="modal-body">
     <%= render :partial=>'/flash_msg' %>
-    <div class="control-group">
-      <label class="control-label" for="to">
+    <div class="form-group">
+      <label class="control-label col-sm-2" for="to">
         <%= t('blacklight.email.form.to') %>
       </label>
-      <div class="controls">
-
-        <%= text_field_tag :to, params[:to] %><br/>
+      <div class="col-sm-10">
+        <%= text_field_tag :to, params[:to], class: 'form-control' %>
       </div>
     </div>
-    <div class="control-group">
-      <label class="control-label" for="message">
+
+    <div class="form-group">
+      <label class="control-label col-sm-2" for="message">
         <%= t('blacklight.email.form.message') %>
       </label>
-      <div class="controls">
-      <%= text_area_tag :message, params[:message] %>
-       </div>
+      <div class="col-sm-10">
+        <%= text_area_tag :message, params[:message], class: 'form-control' %>
+      </div>
     </div>
 
     <% @documents.each do |doc| %>

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

@@ -1,4 +1,12 @@
-<div class="facet_limit blacklight-<%= facet_field.field.parameterize %>">
-  <h5><%= link_to facet_field.label, "#", "data-no-turbolink" => true -%> <i class="icon-chevron"></i></h5>
-  <%= yield %>
+<div class="panel panel-default facet_limit blacklight-<%= facet_field.field.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.field) %>">
+  <div class="<%= "collapsed" unless facet_field_in_params?(facet_field.field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#facet-<%= facet_field.label.parameterize %>">
+    <h5 class="panel-title">
+      <%= link_to facet_field.label, "#", :"data-no-turbolink" => true %>
+    </h5>
+  </div>
+  <div id="facet-<%= facet_field.label.parameterize %>" class="panel-collapse <%=  facet_field_in_params?(facet_field.field) ? 'in' : 'collapse' %>">
+    <div class="panel-body">
+      <%= yield %>
+    </div>
+  </div>
 </div>

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

@@ -1,14 +1,14 @@
-<ul>
-  <% paginator =
-      Blacklight::Solr::FacetPaginator.new(display_facet.items,
+<ul class="facet-values list-unstyled">
+  <% paginator =    
+      Blacklight::Solr::FacetPaginator.new(display_facet.items,        
         :limit => facet_limit_for(solr_field))
   %>
   <% paginator.items.each do |item| -%>
     <li>
-    <% if facet_in_params?( solr_field, item.value ) %>
-        <%= render_selected_facet_value(solr_field, item) %>
-      <% else %>
-        <%= render_facet_value(solr_field, item) %>
+    <% if facet_in_params?( solr_field, item.value ) %>              
+        <%= render_selected_facet_value(solr_field, item) %>              
+      <% else %>              
+        <%= render_facet_value(solr_field, item) %>              
     <% end -%>
     </li>
   <% end %>

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

@@ -1,21 +1,22 @@
 
     <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>
+      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn btn-link', :data => {:ajax_modal => "preserve"} do %>
+       <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
      <% end %>
-      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
+      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn btn-link',  :data => {:ajax_modal => "preserve"} do %>
        
-       <span class="disabled btn"><%= raw(t('views.pagination.next')) %></span>
+       <span class="disabled btn  btn-disabled"><%= raw(t('views.pagination.next')) %></span>
       <% end %>
      
     </div>
  
   <div class="sort_options btn-group pull-right">
     <% if @pagination.sort == 'index' -%>
-      <span class="active az btn"><%= 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") %>
+      <span class="active az btn btn-default"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'), 
+        @pagination.params_for_resort_url('count', params), :class => "sort_change numeric btn btn-default",  
+        :data => {:ajax_modal => "preserve"}) %>
     <% elsif @pagination.sort == 'count' -%>
       <%=  link_to(t('blacklight.search.facets.sort.index'), @pagination.params_for_resort_url('index', params), 
-        :class => "sort_change az btn") %><span class="active numeric btn"><%= t('blacklight.search.facets.sort.count') %></span>
+        :class => "sort_change az btn btn-default",  :data => {:ajax_modal => "preserve"}) %><span class="active numeric btn btn-default"><%= t('blacklight.search.facets.sort.count') %></span>
     <% end -%>    
   </div>

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

@@ -1,11 +1,13 @@
-<ul>
+<ul class="pivot-facet list-unstyled">
   <% display_facet.items.each do |item| -%>
     <li>
+    <span class="facet-values">
     <% if facet_in_params?( solr_field, item ) %>              
         <%= render_selected_facet_value(solr_field, item) %>              
       <% else %>              
         <%= render_facet_value(solr_field, item) %>              
     <% end -%>
+    </span>
 
     <% unless item.items.blank? %>
       <%= render :partial => 'facet_pivot', :locals => { :display_facet => item, :solr_field => solr_field } %>

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

@@ -1,18 +1,21 @@
 <% # main container for facets/limits menu -%>
 <% 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') %>
+  <div class="top-panel-heading panel-heading">
+    <button type="button" class="facets-toggle" data-toggle="collapse" data-target="#facet-panel-collapse">
+      <span class="sr-only">Toggle facets</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
 
+  <h4>
+  	<%= t('blacklight.search.facets.title') %>
   </h4>
-  <div class="facets-collapse">
+    </div>
+
+  <div id="facet-panel-collapse" class="collapse panel-group">
   <%= render_facet_partials %>
 </div>
 </div>

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

@@ -1,7 +1 @@
-<% paginate_compact ||= nil %>
-<% response = paginate_compact || @response -%>
-<% if response.total_pages > 1 %>
-<%= paginate response, :pagination_info_cache => page_entries_info(response), :theme => :blacklight_compact %>
-<% else %>
-<%= page_entries_info(response) %>
-<% end %>
+<%= paginate paginate_compact, :page_entries_info => page_entries_info(paginate_compact), :theme => :blacklight_compact %>

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

@@ -1,15 +1,12 @@
 <% if show_sort_and_per_page? and !blacklight_config.per_page.blank? %>
-<div id="per_page-dropdown" class="dropdown pull-right  hidden-phone">
-  <span class="hide-text"><%= t('blacklight.search.per_page.title') %></span>
-  <ul class="css-dropdown">
-    <li class="btn">
-      <%= link_to(t(:'blacklight.search.per_page.button_label', :count => current_per_page), "#") %> <span class="caret"></span>
-      <ul>
+
+  <span class="sr-only"><%= t('blacklight.search.per_page.title') %></span>
+<div id="per_page-dropdown" class="btn-group">
+  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><%= link_to(t(:'blacklight.search.per_page.button_label', :count => current_per_page), "#") %> <span class="caret"></span></button>
+  <ul class="dropdown-menu">
         <%- blacklight_config.per_page.each do |count| %>
           <li><%= link_to(t(:'blacklight.search.per_page.label', :count => count).html_safe, url_for(params_for_search(:per_page => count))) %></li>
         <%- end -%>
-      </ul>
-    </li>
   </ul>
 </div>
 <% end %>

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

@@ -1,16 +1,18 @@
 <% #Using the Bootstrap Pagination class  -%>
 <% if @previous_document || @next_document %>
-	<div class="well" id="previousNextDocument">
-    <%= link_to_previous_document @previous_document %> |
+	<div id="previousNextDocument">
+    <div class="page_links">
+      <%= link_to_previous_document @previous_document %> |
 
-    <%= item_page_entry_info %> |
+      <%= item_page_entry_info %> |
 
-    <%= link_to_next_document @next_document %>
+      <%= link_to_next_document @next_document %>
+      </div>
 
-<div class="pull-right">
-      <%= link_back_to_catalog %>
-      |
-      <%=link_to "#{t('blacklight.search.start_over')}", start_over_path(current_search_session.try(:query_params) || {}), :id=>"startOverLink" %>
+    <div class="pull-right search-widgets">
+        <%= link_back_to_catalog :class => 'btn' %>
+        
+        <%=link_to "#{t('blacklight.search.start_over')}", catalog_index_path, :id=>"startOverLink", :class => 'btn' %>
+  	</div>
   </div>
-	</div>
 <% end %>

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

@@ -1,6 +1,5 @@
-<%= form_tag "http://www.refworks.com/express/expressimport.asp?vendor=#{application_name}&filter=MARC%20Format&encoding=65001", :name => "refworks", :target => "_blank", :id => "refworks-form" do %>
+<%= form_tag "http://www.refworks.com/express/expressimport.asp?vendor=#{application_name}&filter=MARC%20Format&encoding=65001", :name => "refworks", :role => 'form', :target => "_blank", :id => "refworks-form" do %>
 
 <%= hidden_field_tag "ImportData", render_refworks_texts(documents) %>
-<%= submit_tag t('blacklight.tools.refworks'), :class => 'submit btn'%>
-<% end %>
-
+<%= submit_tag t('blacklight.tools.refworks'), :class => 'submit btn btn-default'%>
+<% end %>

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

@@ -1,6 +1,6 @@
 <% if @response.total_pages > 1 %>
  <div class="row record-padding">
-  <div class="span9"> 
+  <div class="col-md-9"> 
     <div class="pagination">
       <%= paginate @response, :outer_window => 2, :theme => 'blacklight' %>
     </div>

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

@@ -1,21 +1,23 @@
-  <%= form_tag search_action_url, :method => :get, :class => 'search-query-form form-inline clearfix' do %>
-    <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %> 
+  <%= form_tag search_action_url, :method => :get, :class => 'search-query-form form-inline clearfix navbar-form' do %>
+    <%= search_as_hidden_fields(:omit_keys => [:q, :search_field, :qt, :page, :utf8]) %>
 
+    <div class="input-group">
     <% unless search_fields.empty? %>
-      <div class="pull-left">
-        <label for="search_field" class="hide-text"><%= t('blacklight.search.form.search_field.label') %></label>
-        <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), :title => t('blacklight.search.form.search_field.title'), :class=>"search_field input-small") %>
-        <span class="hide-text"><%= t('blacklight.search.form.search_field.post_label') %></span>
-      </div>
+
+      <span class="input-group-addon">
+        <label for="search_field" class="sr-only"><%= t('blacklight.search.form.search_field.label') %></label>
+        <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), :title => t('blacklight.search.form.search_field.title'), :class=>"search_field") %>
+        <span class="sr-only"><%= t('blacklight.search.form.search_field.post_label') %></span>
+        </span>
       <% 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", :autofocus => should_autofocus_on_search_box? %>
+        <label for="q" class="sr-only"><%= t('blacklight.search.form.q') %></label>
+         <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.q'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
+
+      <span class="input-group-btn">
         <button type="submit" class="btn btn-primary search-btn" id="search">
           <span class="submit-search-text"><%=t('blacklight.search.form.submit')%></span>
-          <i class="icon-search icon-white"></i>
+          <span class="glyphicon glyphicon-search"></span>
         </button>
-
-       </div>
-
+        </span>
+      </div>
   <% end %>

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

@@ -1,12 +1,10 @@
-<div class="well" id="sidebar-nav">
-  <%= render :partial => 'show_tools' %>
-</div><!--/well -->
+<%= render :partial => 'show_tools' %>
   
 <% unless @document.more_like_this.empty? %>
-<div class="well" id="sidebar-mlt">
-  <ul class="nav nav-list">
-  <li class="nav-header">More Like This</li>
-    <%= render :collection => @document.more_like_this, :partial => 'show_more_like_this', :as => :document %>
-  </ul>
-</div><!--/well -->
+  <div class="panel panel-default">
+    <div class="panel-heading">More Like This</div>
+    <div class="panel-body">
+      <%= render :collection => @document.more_like_this, :partial => 'show_more_like_this', :as => :document %>
+    </div>
+  </div>
 <% end %>

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

@@ -6,16 +6,20 @@
   # item view. While "document tools" contains external export type
   # functions by default only on detail.
 
-  #Added Bootstrap class well and 'hidden-phone' for the tools-bar 
 -%>
+<div class="panel panel-default show-tools">
+  <div class="panel-heading">
+    <%= t('blacklight.tools.title') %>
+  </div>
+
+  <div class="panel-body">
   <ul class="nav nav-list">
-      <li class="nav-header"><%= t('blacklight.tools.title') %></li>
       <li>
         <%= render_show_doc_actions @document %>
       </li>
       <% if (@document.respond_to?(:export_as_mla_citation_txt) || @document.respond_to?(:export_as_apa_citation_txt)) %>
         <li class="cite">
-         <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:id => @document), {:id => 'citeLink', :class => 'lightboxLink'} %>
+         <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:id => @document), {:id => 'citeLink', :data => {:ajax_modal => "trigger"}} %>
         </li>
       <% end %>
       <% if @document.export_formats.keys.include?( :refworks_marc_txt ) %>
@@ -30,18 +34,20 @@
     <% end %>
     <% if @document.respond_to?( :to_email_text ) %>
       <li class="email">
-      <%= link_to t('blacklight.tools.email'), email_catalog_path(:id => @document), {:id => 'emailLink', :class => 'lightboxLink'} %>
+      <%= link_to t('blacklight.tools.email'), email_catalog_path(:id => @document), {:id => 'emailLink', :data => {:ajax_modal => "trigger"}} %>
       </li>
     <%- end -%>
     <%- if @document.respond_to?( :to_sms_text ) -%>
       <li class="sms">
-      <%= link_to t('blacklight.tools.sms'), sms_catalog_path(:id => @document), {:id => 'smsLink', :class => 'lightboxLink'} %>
+      <%= link_to t('blacklight.tools.sms'), sms_catalog_path(:id => @document), {:id => 'smsLink', :data => {:ajax_modal => "trigger"}} %>
       </li>
     <%- end -%>
     
-    <% if @document.respond_to?(:to_marc) %>
+    <% if respond_to? :librarian_view_catalog_path and @document.respond_to?(:to_marc) %>
       <li class="librarian_view">
-        <%= link_to t('blacklight.tools.librarian_view'), librarian_view_catalog_path(@document), {:id => 'librarianLink', :class => 'lightboxLink'} %>
+        <%= link_to t('blacklight.tools.librarian_view'), librarian_view_catalog_path(@document), {:id => 'librarianLink', :data => {:ajax_modal => "trigger"}} %>
       </li>
     <% end %>
   </ul>
+  </div>
+</div>

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

@@ -1,20 +1,20 @@
   <%= 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' %>
-    <div class="control-group">
-      <label class="control-label" for="to"> 
+    <div class="form-group">
+      <label class="control-label col-sm-2" for="to"> 
         <%= t('blacklight.sms.form.to') %>
       </label>
-      <div class="controls">
-        <%= text_field_tag :to, params[:to] %>
+      <div class="col-sm-10">
+        <%= text_field_tag :to, params[:to], class: 'form-control' %>
       </div>
     </div>
-    <div class="control-group">
-      <label class="control-label" for="carrier">
+    <div class="form-group">
+      <label class="control-label col-sm-2" for="carrier">
         <%= t('blacklight.sms.form.carrier') %> 
       </label>
-      <div class="controls">
-          <%= select_tag(:carrier, options_for_select(sms_mappings.to_a.sort.unshift([t('blacklight.sms.form.carrier_prompt'),'']), params[:carrier])) %><br/>
+      <div class="col-sm-10">
+          <%= select_tag(:carrier, options_for_select(sms_mappings.to_a.sort.unshift([t('blacklight.sms.form.carrier_prompt'),'']), params[:carrier]), class: 'form-control') %><br/>
       </div>
 
     </div>