blacklight 4.9.0 → 5.0.0.pre1

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

@@ -1,9 +1,7 @@
-<div id="sortAndPerPage">
-   <div class="page_links">
-     <%= render :partial => "paginate_compact" %>
-   </div>
+<div id="sortAndPerPage" class="clearfix">
+  <%= render :partial => "paginate_compact", :object => @response %>
+  <div class="search-widgets pull-right">
     <%= render :partial => 'sort_widget' %>
-
     <%= render :partial => 'per_page_widget' %>
-
+  </div>
 </div>

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

@@ -1,14 +1,13 @@
 <% if show_sort_and_per_page? and !blacklight_config.sort_fields.blank? %>
-<div id="sort-dropdown" class="dropdown pull-right hidden-phone">
-  <ul class="css-dropdown">
-    <li class="btn">
+<div id="sort-dropdown" class="btn-group">
+  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
       <%= link_to(t('blacklight.search.sort.label', :field =>current_sort_field.label), "#") %> <span class="caret"></span>
-      <ul>
+  </button>
+
+  <ul class="dropdown-menu">
         <%- blacklight_config.sort_fields.each do |sort_key, field| %>
           <li><%= link_to(field.label, url_for(params_for_search(:sort => sort_key))) %></li>
         <%- end -%>
-      </ul>
-    </li>
   </ul>
 </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div class="modal-header">
 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-<h1><%= t('blacklight.email.form.title') %></h1>
+<h1 class="modal-title"><%= t('blacklight.email.form.title') %></h1>
   </div>
 <%= render :partial => 'email_form' %>

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

@@ -1,21 +1,15 @@
-<% Deprecation.silence(Blacklight::BlacklightHelperBehavior) do -%>
-<% sidebar_items << capture do %>
-  <p><%= link_back_to_catalog %></p>
-<% end %>
-<% end %>
-
 <div class="facet_pagination top">
   <%= render :partial=>'facet_pagination' %>
 </div>
 
 <div class="modal-header">
   <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h3><%= facet_field_labels[params[:id]] %></h3>
+  <h3 class="modal-title"><%= blacklight_config.facet_fields[params[:id]].label %></h3>
 </div>
 <div class="modal-body">
   <div class="facet_extended_list">
 
-    <ul class="facet_extended_list">
+    <ul class="facet_extended_list facet-values">
       <% @pagination.items.each do |item| %>
         <li>
           <% if facet_in_params?( params[:id], item.value ) %>              

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

@@ -1,26 +1,31 @@
-<div id="sidebar" class="span3">
+<div id="sidebar" class="col-md-3">
  <%= render 'search_sidebar' %>
 </div>
 
-<div id="content" class="span9">
+<div id="content" class="col-md-9">
 
     <% unless has_search_parameters? %>
 	    <%# if there are no input/search related params, display the "home" partial -%>
 	    <%= render 'home' %>
     <% else %>
 
-      <h2 class="hide-text top-content-title"><%= t('blacklight.search.search_results_header') %></h2>
+      <h2 class="sr-only top-content-title"><%= t('blacklight.search.search_results_header') %></h2>
 
       <% @page_title = t('blacklight.search.title', :application_name => application_name) %>
 
 
-      <% Deprecation.silence(Blacklight::LegacyControllerMethods) { extra_head_content << render_opensearch_response_metadata.html_safe } %>
+      <% content_for(:head) do -%>
+        <%= render_opensearch_response_metadata %>
+        <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => t('blacklight.search.rss_feed') ) %>
+        <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => t('blacklight.search.atom_feed') ) %>
+      <% end -%>
+
 
       <%= render 'search_header' %>
 
-      <h2 class="hide-text"><%= t('blacklight.search.search_results') %></h2>
+      <h2 class="sr-only"><%= t('blacklight.search.search_results') %></h2>
 
-      <%- if @response.empty? %>
+      <%- if response_has_no_search_results? %>
         <%= render "zero_results" %>
       <%- elsif render_grouped_response? %>
         <%= render_grouped_document_index %>

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

@@ -1,10 +1,10 @@
-<div id="content" class="span9 show-document">
+<div id="content" class="col-md-9 show-document">
 
   <%= render 'previous_next_doc' %>
 
    
-<% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name) %>
-<% Deprecation.silence(Blacklight::LegacyControllerMethods) { extra_head_content << render_link_rel_alternates } %>
+<% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name) -%>
+<% content_for(:head) { render_link_rel_alternates } -%>
 
 <%# this should be in a partial -%>
 <div id="document" class="<%= render_document_class %>">
@@ -12,7 +12,7 @@
   
 
     <% # bookmark/folder functions -%>
-    <%= render_document_heading(:h1).html_safe %>
+    <%= render_document_heading(:h1) %>
 
     <div class="document">
       <%= render_document_partial @document, :show %>
@@ -35,6 +35,6 @@
 
 </div>
 
-<div id="sidebar" class="span3">
+<div id="sidebar" class="col-md-3">
    <%= render_document_sidebar_partial %>
 </div>

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

@@ -1,5 +1,5 @@
 <div class="modal-header">
 	<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-	<h1><%= t('blacklight.sms.form.title') %></h1>
+	<h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
 </div>
 <%= render :partial => 'sms_form' %>

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

@@ -1,6 +1,6 @@
 <div class="modal-header">
   <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h1><%= t('blacklight.sms.form.title') %></h1>
+  <h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
 </div>
 
 <div class="modal-body">

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

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

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

@@ -1,4 +1,4 @@
-<div id="content" class="span9">
+<div id="content" class="col-md-9">
 <h1>Send Us Feedback</h1>
 
 <% unless @errors.empty? %>

data/app/views/kaminari/blacklight/_paginator.html.erb

@@ -9,7 +9,7 @@
    Paginator now using the Bootstrap paginator class
 -%>
 <%= paginator.render do -%>
-  <ul>
+  <ul class="pagination">
     <%= prev_page_tag %>
     <%= next_page_tag  %>
     <% each_relevant_page do |page| -%>

data/app/views/kaminari/blacklight_compact/_paginator.html.erb

@@ -7,9 +7,29 @@
     paginator:     the paginator that renders the pagination tags inside
 
    Paginator now using the Bootstrap paginator class
--%>
-<%- pagination_info_cache ||= page_entries_info(@response) %>
 
-<%= paginator.render do -%>
-  <%= prev_page_tag %> |  <%= pagination_info_cache %> |  <%= next_page_tag %>
-<% end -%>
+   page_entries_info is passed into the paginate call, e.g. :
+
+   > paginate collection, :page_entries_info => page_entries_info(collection), :theme => :blacklight_compact
+
+   As of Kaminari 0.15, this paginator doesn't have access to the original collection/scope, so it can't render the page entries info directly.
+-%>
+<% if total_pages > 1 -%>
+  <%# #render checks if total_pages > 1, so we can't put our fallback 
+  in here .. -%>
+  <%= paginator.render do -%>
+    <div class="page_links">
+      <%= prev_page_tag %> | 
+      <span class="page_entries">
+        <%= page_entries_info %>
+      </span> | 
+      <%= next_page_tag %>
+    </div>
+  <% end -%>
+<% else -%>
+    <div class="page_links">
+      <span class="page_entries">
+        <%= page_entries_info %>
+      </span>
+    </div> 
+<% end -%> 

data/app/views/layouts/blacklight.html.erb

@@ -19,39 +19,39 @@
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>
-    <%= Deprecation.silence(Blacklight::HtmlHeadHelperBehavior) { raw(render_head_content) } %> 
+    <%= content_for(:head) %> 
 
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+      <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
   </head>
   <body class="<%= render_body_class %>">
   <%= render :partial => 'shared/header_navbar' %>
 
-  <div id="ajax-modal" class="modal hide fade" tabindex="-1"></div>
+  <div id="ajax-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="modal menu" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+      </div>
+    </div>
+  </div>
 
 <!-- /container -->
   <div id="main-container" class="container">
-            <!-- Top bar -->
-            <div id="search-found" class="row hidden-phone">
-              <%= Deprecation.silence(Blacklight::BlacklightHelperBehavior) { topbar_items.join('').html_safe } %>
-            </div>
-            <!-- /Top bar -->
-                  <div class="row">
-                      <div class="span12">
-                        <div id="main-flashes">
-                          <%= render :partial=>'/flash_msg' %>
-                        </div>
-                      </div>    
-                  </div>              
-
-                  <div class="row">
-                       <%= yield %>
-                       </div>   
-</div>
-
-<%= render :partial => 'shared/footer' %>
-    </body>
+    <div class="row">
+      <div class="col-md-12">
+        <div id="main-flashes">
+          <%= render :partial=>'/flash_msg' %>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <%= yield %>
+    </div>
+  </div>
+
+  <%= render :partial => 'shared/footer' %>
+  </body>
 </html>

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

@@ -1,4 +1,4 @@
-<div id="content" class="span9">
+<div id="content" class="col-md-9">
 <h1><%= t('blacklight.saved_searches.title') %></h1>
 
 <%- if current_or_guest_user.blank? -%>
@@ -26,4 +26,4 @@
 
 <%- end -%>
 
-</div>
+</div>

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

@@ -1,11 +1,9 @@
-<div id="content" class="span12">
+<div id="content" class="col-md-12">
 <h1><%=t('blacklight.search_history.title')%></h1>
 <%- if @searches.blank? -%>
   <h2><%=t('blacklight.search_history.no_history')%></h2>
 <%- else -%>
-    <p>
-    <%= link_to t('blacklight.search_history.clear.action_title'), clear_search_history_path, :method => :delete, :data => { :confirm => t('blacklight.search_history.clear.action_confirm') } %>
-    </p>
+    <%= link_to t('blacklight.search_history.clear.action_title'), clear_search_history_path, :method => :delete, :data => { :confirm => t('blacklight.search_history.clear.action_confirm') }, :class => 'btn btn-danger pull-right' %>
   <h3><%=t('blacklight.search_history.recent')%></h3>
   <table class="table table-striped search_history">
     <%-  @searches.each_with_index do |search,index| -%>
@@ -14,9 +12,9 @@
       <%- if has_user_authentication_provider? -%>
         <td class="actions">
           <%- if current_or_guest_user && search.saved? -%>
-            <%= button_to t('blacklight.search_history.forget'), forget_search_path(search.id) %>
+            <%= button_to t('blacklight.search_history.forget'), forget_search_path(search.id), :class => 'btn btn-default' %>
           <%- else -%>
-            <%= button_to t('blacklight.search_history.save'), save_search_path(search.id), :method => :put %>
+            <%= button_to t('blacklight.search_history.save'), save_search_path(search.id), :method => :put, :class => 'btn btn-default' %>
           <%- end -%>
         </td>
       <%- end -%>
@@ -24,4 +22,4 @@
   <%- end -%>
   </table>
 <%- end -%>
-</div>
+</div>

data/app/views/shared/_header_navbar.html.erb

@@ -1,25 +1,25 @@
-<div id="header-navbar-fixed-top" class="navbar navbar-fixed-top">
-     <div class="navbar-inner">
-            <div class="container">
-              <div class="row">
-                      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                      <span class="icon-bar"></span>
-                      <span class="icon-bar"></span>
-                      <span class="icon-bar"></span>
-                    </a>
-<div class="span3">
-                    <%= link_to application_name, root_path, :class => "brand" %>
-                  </div>
-                  <div class="span6 clearfix" id="searchbar">         
-                                    <%= render_search_bar  %>
-                  </div>
+<div id="header-navbar" class="navbar navbar-default navbar-static-top navbar-inverse" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#user-util-collapse">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <%= link_to application_name, root_path, class: "navbar-brand" %>
+    </div>
 
-                  <div class="span3 nav-collapse">
-                    <%= render :partial=>'/user_util_links' %>
-                  
-                  </div>
-
-        </div>
-        </div>
-   </div>
+    <div class="collapse navbar-collapse" id="user-util-collapse">
+      <%= render :partial=>'/user_util_links' %>
+    </div>
+  </div>
 </div>
+
+<div id="search-navbar" class="navbar navbar-default navbar-static-top" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+    <%= render_search_bar  %>
+    </div>
+  </div>
+</div>

data/blacklight.gemspec

@@ -11,27 +11,24 @@ Gem::Specification.new do |s|
   s.summary     = "Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr) index."
   s.description = %q{Blacklight is an open source Solr user interface discovery platform. You can use Blacklight to enable searching and browsing of your collections. Blacklight uses the Apache Solr search engine to search full text and/or metadata.}
   s.license     = "Apache 2.0"
-  s.rubyforge_project = "blacklight"
-
+  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   # PRODUCTION GEM REQUIREMENTS
-  # ---------------------------------------
-  s.add_dependency "rails",     "~> 4.0"
+  # ---------------------------------------   
+  s.add_dependency "rails",     ">= 3.2.6", "< 5"
   s.add_dependency "nokogiri",  "~>1.6"     # XML Parser
-  # Let's allow future versions of marc, count on
-  # them to be backwards compat until 1.1
-  s.add_dependency "marc",      ">= 0.4.3", "< 1.1"  # Marc record parser.
-  s.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
   s.add_dependency "kaminari", "~> 0.13"  # the pagination (page 1,2,3, etc..) of our search results
-  s.add_dependency "bootstrap-sass", ">= 2.2.0", "< 2.4"
-  s.add_dependency "deprecation", "~> 0.1"
+  s.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
+  s.add_dependency "sass-rails"
+  s.add_dependency "bootstrap-sass", "~> 3.0"
+  s.add_dependency "deprecation"
   s.add_development_dependency "jettywrapper", ">= 1.4.1"
-  s.add_development_dependency "rspec-rails", "~> 3.0"
-  s.add_development_dependency "rspec-its"
-  s.add_development_dependency 'engine_cart', "~> 2.0"
+  s.add_development_dependency "blacklight_marc", "0.0.6"
+  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency 'engine_cart', ">= 0.1.0"
   s.add_development_dependency "equivalent-xml"
 end

data/config/locales/blacklight.en.yml

@@ -34,9 +34,6 @@ en:
     or: 'or'
 
     bookmarks:
-      collection:
-        add:
-          button: 'Add to Bookmarks'
       title: 'Bookmarks'
       no_bookmarks: 'You have no bookmarks'
       add:
@@ -106,7 +103,6 @@ en:
       refworks: 'Export to Refworks'
       email: 'Email'
       sms: 'SMS This'
-      librarian_view: 'Librarian View'
       clear: 'Clear'
 
     citation:
@@ -168,7 +164,7 @@ en:
         request_error: "Sorry, I don't understand your search."
         invalid_solr_id: "Sorry, you have requested a record that doesn't exist."
       per_page:
-        label: '%{count}<span class="hide-text"> per page</span>'
+        label: '%{count}<span class="sr-only"> per page</span>'
         button_label: '%{count} per page'
         title: 'Number of results to display per page'
         submit: 'Update'
@@ -212,16 +208,9 @@ en:
         remove:
           value: 'Remove constraint %{value}'
           label_value: 'Remove constraint %{label}: %{value}'
-      librarian_view:
-        title: 'Librarian View'
-        leader: 'LEADER %{leader}'
-        empty: 'No MARC data found.'
       start_over: 'Start Over'
-      index:
-        label: '%{label}'
       show:
         title: '%{document_title} - %{application_name}'
-        label: '%{label}'
       rss_feed: 'RSS for results'
       atom_feed: 'Atom for results'
       fields: