blacklight 3.8.2 → 4.0.0.pre6

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

@@ -1,3 +1,10 @@
+
+<div class="modal-header">
+  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h1><%= t('blacklight.search.librarian_view.title') %></h1>
+</div>
 <%- if @document.respond_to?(:to_marc) -%>
   <%= render "marc_view" %>
+<%- else %>
+      No MARC data found.
 <%- end -%>

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

@@ -1,38 +1,44 @@
-<% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name) %>
-<% extra_head_content << render_link_rel_alternates %>
-<% sidebar_items << render_document_sidebar_partial %>
+<div class="row">
 
-<div class="show">
-  <%= render 'constraints', :localized_params=>session[:search] %>
-</div>
+  <div id="content" class="span9 show-document">
 
-<div class="pageEntriesInfo">
-  <%= item_page_entry_info %>
-  <%=link_to t('blacklight.search.start_over'), catalog_index_path, :id=>"startOverLink" %>
-</div>
+    <%= render 'previous_next_doc' %>
+
+     
+  <% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name) %>
+  <% extra_head_content << render_link_rel_alternates %>
+  <% sidebar_items << render_document_sidebar_partial %>
 
-<%= render 'previous_next_doc' %>
+  <%# this should be in a partial -%>
+  <div id="document" class="<%= render_document_class %>">
+    <div id="doc_<%= @document.id.to_s.parameterize %>">
+    
 
-<%# this should be in a partial -%>
-<div id="document" class="<%= render_document_class %>">
-  <div id="doc_<%= @document.id.to_s.parameterize %>">
+      <% # bookmark/folder functions -%>
+      <%= render_document_heading.html_safe %>
 
-    <% # bookmark/folder functions -%>
-    <%= render_show_doc_actions @document %>        
+      <div class="document">
+        <%= render_document_partial @document, :show %>
+      </div>
 
-    <%= render_document_heading.html_safe %>
-    <div class="tools"><%= render :partial => 'show_tools' %></div>
-    <div class="document">
-      <%= render_document_partial @document, :show %>
+     
     </div>
   </div>
-</div>
 
-  <% 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 %>
+
+
+    <% 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>
+
+  <div id="sidebar" class="span3">
+     <%= render_document_sidebar_partial  %>
+  </div><!--/span -->
+</div>

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

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

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

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="first">
+<li class="<%= 'disabled' if current_page.first? %>">
   <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
-</span>
+</li>

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

@@ -5,4 +5,7 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>
+<li class="disabled">
+  <%= link_to raw(t 'views.pagination.truncate'), "" %>
+</li>
+

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

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="last">
+<li class="<%= 'disabled' if current_page.last? %>">
   <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
-</span>
+</li>

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

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="next next_page <%= 'disabled' if current_page.last? %>">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
-</span>
+<li class="<%= 'disabled' if current_page.last? %>">
+  <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>

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

@@ -7,6 +7,7 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page<%= ' current' if page.current? %>">
-  <%= link_to_unless page.current?, number_with_delimiter(page.to_s), url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
-</span>
+<li class="<%= 'active' if page.current? %>">
+ <%= link_to number_with_delimiter(page.to_s), url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>
+

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

@@ -5,19 +5,19 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
     paginator:     the paginator that renders the pagination tags inside
+
+   Paginator now using the Bootstrap paginator class
 -%>
 <%= paginator.render do -%>
-  <nav class="pagination-container">
+  <ul>
     <%= prev_page_tag %>
     <%= next_page_tag  %>
-    <div class="page_links">
     <% each_relevant_page do |page| -%>
       <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
         <%= page_tag page %>
       <% elsif !page.was_truncated? -%>
         <%= gap_tag %>
       <% end -%>
-    <% end -%>
-  </div>
-  </nav>
+    <% end -%>  
+  </ul>
 <% end -%>

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

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="prev prev_page <%= 'disabled' if current_page.first? %>">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
-</span>
+<li class="<%= 'disabled' if current_page.first? %>">
+  <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>

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

@@ -0,0 +1,9 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<%= link_to_unless current_page.last?, raw(t 'views.pagination_compact.next'), url, :rel => 'next', :remote => remote %>

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

@@ -0,0 +1,15 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+
+   Paginator now using the Bootstrap paginator class
+-%>
+
+<%- pagination_info_cache = render_pagination_info @response %>
+<%= paginator.render do -%>
+  <%= prev_page_tag %> |  <%= pagination_info_cache %> |  <%= next_page_tag %>
+<% end -%>

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

@@ -0,0 +1,9 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<%= link_to_unless current_page.first?, raw(t 'views.pagination_compact.previous'), url, :rel => 'prev', :remote => remote %>

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

@@ -1,37 +1,57 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html" charset="utf-8">
+
+    <!-- Mobile viewport optimization h5bp.com/ad -->
+    <meta name="HandheldFriendly" content="True">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+
+    <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
+    <meta http-equiv="cleartype" content="on">
+
     <title><%= h(@page_title || application_name) %></title>
     <link href="<%= opensearch_catalog_path(:format => 'xml', :only_path => false) %>" title="<%= application_name%>" type="application/opensearchdescription+xml" rel="search"/>
     <%= favicon_link_tag asset_path('favicon.ico') %>
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>
-    <%= raw(render_head_content) %>
+    <%= raw(render_head_content) %> 
+
+    <!-- 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>
+    <![endif]-->
+
+    <%= favicon_link_tag asset_path('favicon.ico') %>
   </head>
   <% onload_text = "$('input#q').focus();" if params[:q].to_s.empty? and params[:f].to_s.empty? and params[:id].nil? %>
-  <body onload="<%= onload_text %>" class="<%= render_body_class.html_safe %>">
-    <div id="page">
-      <div id="hd">
-        <div id="logo">
-          <h1 class="site_title"><%= link_to application_name, root_path %><%= (params[:controller] == "catalog" and !params[:id]) ? content_tag(:span, t('blacklight.search.search_results'), :id => 'results_text') : "" %></h1>
-        </div>
-        <div id="user_util_links">
-          <%= render :partial=>'/user_util_links' %>
-        </div>
-      </div>
-      <div id="bd">
-        <div id="main">
-          <div id="main_container">
-            <%= render :partial=>'/flash_msg' %>
-            <%= yield %>
-          </div>
-        </div>
-        <div id="sidebar"><%= sidebar_items.join('').html_safe %></div>
-      </div>
-      <div id="ft">
-        <%= raw(@footer) %>
-      </div>
-    </div>
-  </body>
+  <body onload="<%= onload_text %>" class="<%= render_body_class %>">
+  <%= render :partial => 'shared/header_navbar' %>
+
+  <div id="ajax-modal" class="modal hide fade" tabindex="-1"></div>
+
+<!-- /container -->
+  <div id="main-container" class="container">
+            <!-- Top bar -->
+            <div id="search-found" class="row hidden-phone">
+              <%= topbar_items.join('').html_safe %>
+            </div>
+            <!-- /Top bar -->
+                  <div class="row">
+                      <div class="span10">
+                        <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,6 +1,6 @@
 <h1><%= t('blacklight.saved_searches.title') %></h1>
 
-<%- if current_user.blank? -%>
+<%- if current_or_guest_user.blank? -%>
   
   <h2><%= t('blacklight.saved_searches.need_login') %></h2>
   
@@ -14,7 +14,7 @@
   </p>
 
   <h2><%= t('blacklight.saved_searches.list_title') %></h2>
-  <table class="zebra">
+  <table class="table table-striped">
   <%- @searches.each do |search| -%>
     <tr>
       <td><%= link_to_previous_search(search.query_params) %></td>

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

@@ -1,18 +1,23 @@
+<% sidebar_items << capture do %>
+  <p><%= link_back_to_catalog %></p>
+<% end %>
+
+
 <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>
-  <h2><%=t('blacklight.search_history.recent')%></h2>
-  <table class="zebra search_history">
-  <%-  @searches.each_with_index do |search,index| -%>
+    <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>
+  <h3><%=t('blacklight.search_history.recent')%></h3>
+  <table class="table table-striped search_history">
+    <%-  @searches.each_with_index do |search,index| -%>
     <%= content_tag :tr, :id => "document_#{index + 1}" do %>
       <td class="query"><%= link_to_previous_search(search.query_params) %></td>
       <%- if has_user_authentication_provider? -%>
         <td class="actions">
-          <%- if current_user && search.saved? -%>
+          <%- if current_or_guest_user && search.saved? -%>
             <%= button_to t('blacklight.search_history.forget'), forget_search_path(search.id) %>
           <%- else -%>
             <%= button_to t('blacklight.search_history.save'), save_search_path(search.id), :method => :put %>

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

@@ -0,0 +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 class="span3 nav-collapse">
+                    <%= render :partial=>'/user_util_links' %>
+                  
+                  </div>
+
+        </div>
+        </div>
+   </div>
+</div>

data/blacklight.gemspec

@@ -20,17 +20,14 @@ Gem::Specification.new do |s|
 
   # PRODUCTION GEM REQUIREMENTS
   # ---------------------------------------   
-  s.add_dependency "rails",     "~> 3.1"
+  s.add_dependency "rails",     "~> 3.2"
   s.add_dependency "nokogiri",  "~>1.5"     # XML Parser
-  s.add_dependency "unicode"                # provides C-form normalization of unicode characters, as required by refworks.
   # 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 "rsolr-ext", '~> 1.0.3'  # extension to the above for some rails-ish behaviors - currently embedded in our solr document ojbect.
   s.add_dependency "kaminari", "~> 0.13"  # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "sass-rails"
+  s.add_dependency "bootstrap-sass", "~> 2.1.0"
   s.add_development_dependency "jettywrapper", ">= 1.2.0"
-  s.add_dependency "compass-rails", "~> 1.0.0"
-  s.add_dependency "compass-susy-plugin", ">= 0.9.0"
 end

data/config/locales/blacklight.en.yml

@@ -15,16 +15,19 @@ en:
       next: 'Next »'
       truncate: '…'
 
+    pagination_compact:
+      previous: '« Previous'
+      next: 'Next »'
+
   blacklight:
     application_name: 'Blacklight'
 
     header_links:
       login: 'Login'
       logout: 'Log Out'
-      bookmarks: 'Your Bookmarks'
+      bookmarks: 'Bookmarks'
       saved_searches: 'Saved Searches'
-      selected_items: 'Selected Items'
-      search_history: 'Search History'
+      search_history: 'History'
 
     welcome: 'Welcome!'
     and: 'and'
@@ -97,6 +100,7 @@ en:
       save: 'save'
 
     tools:
+      title: 'Tools'
       cite: 'Cite'
       endnote: 'Export to EndNote'
       refworks: 'Export to Refworks'
@@ -150,37 +154,41 @@ en:
           blank: 'You must select a carrier'
 
     back_to_search: 'Back to Search'
+    back_to_bookmarks: 'Back to Bookmarks'
 
     search:
       title: '%{application_name} Search Results'
+      search_results_header: 'Search'
       search_results: 'Search Results'
       errors:
         request_error: "Sorry, I don't understand your search."
         invalid_solr_id: "Sorry, you have requested a record that doesn't exist."
       per_page:
+        post_label: 'per page'
         label: 'Show %{select} per page'
         title: 'Number of results to display per page'
-        submit: 'update'
+        submit: 'Update'
       sort:
-        label: 'Sort by %{select}'
+        label: 'Sort by'
         submit: 'sort results'
       form:
         search_field:
-          label: 'in'
+          label: 'Search in'
           title: 'Targeted search options'
-        q: 'Search '
-        submit: 'search'
+          post_label: 'for'
+        q: 'Search...'
+        submit: 'Search'
       pagination:
         title: 'Results navigation'
       pagination_info:
         no_items_found: 'No %{entry_name} found'
-        single_item_found: 'Displaying <b>1</b> %{entry_name}'
+        single_item_found: '<b>1</b> to <b>1</b> of <b>1</b>'
         pages:
-          one: 'Displaying <b>all %{total_num}</b> %{entry_name}'
-          other: 'Displaying %{entry_name} <b>%{start_num} - %{end_num}</b> of <b>%{total_num}</b>'
+          one: '<b>%{start_num}</b> - <b>%{end_num}</b> of <b>%{total_num}</b>'
+          other: '<b>%{start_num}</b> - <b>%{end_num}</b> of <b>%{total_num}</b>'
       entry_pagination_info:
-        one: 'Showing the only item from your search.'
-        other: 'Showing item <b>%{current} of %{total}</b> from your search.'
+        one: '<b>1 of 1</b>'
+        other: '<b>%{current}</b> of <b>%{total}</b>'
       documents:
         counter: '%{counter}. '
       facets:
@@ -188,7 +196,7 @@ en:
         sort:
           count: 'Numerical Sort'
           index: 'A-Z Sort'
-        count: '(%{number})'
+        count: '%{number}'
         more: 'more »'
         selected:
           remove: '[remove]'
@@ -201,7 +209,7 @@ en:
       librarian_view:
         title: 'Librarian View'
         leader: 'LEADER %{leader}'
-      start_over: 'start over'
+      start_over: 'Start Over'
       show:
         title: '%{document_title} - %{application_name}'
       rss_feed: 'RSS for results'