blacklight 3.8.2 → 4.0.0.pre6

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

@@ -1,6 +1,6 @@
-<%= render :partial=>'search_form' %>
+<% #Search form can be added here, defaulted to the navbar for Bootstrap version -%>
 <%= render :partial=>'home_text' %>
 
 <% sidebar_items << capture do %>
   <%= render :partial=>'facets' %>
-<% end %>
+<% end %>

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

@@ -1,6 +1,9 @@
-<h3><%= t('blacklight.welcome') %></h3>
+<h4><%= t('blacklight.welcome') %></h3>
+<p>&nbsp;</p>
 <p>To modify this text to your specifications, copy this file located in the blacklight plugin directory:<br/>
 &nbsp;&nbsp;&nbsp;<%= Blacklight.root %>/app/views/catalog/_home_text.html.erb</p>
 <p>to your top level rails app:<br/>
 &nbsp;&nbsp;&nbsp;<%= Rails.root %>/app/views/catalog/_home_text.html.erb</p>
-Note that you will need to create the 'catalog' directory under views.
+<p>Note that you will need to create the 'catalog' directory under views.</p>
+<% #Creates a bit space in the page -%>
+

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

@@ -1,8 +1,8 @@
 <%# default partial to display solr document fields in catalog index view -%>
-<dl class="defList">
+<dl class="dl-horizontal dl-invert">
   
   <% index_fields.each do |solr_fname, field| -%>
-    <% if should_display_index_field? document, field %>
+    <% if should_render_index_field? document, field %>
 	    <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_label :field => solr_fname %></dt>
 	    <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_value :document => document, :field => solr_fname %></dd>
     <% end -%>

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

@@ -1,4 +1,3 @@
-<h1><%= t('blacklight.search.librarian_view.title') %></h1>
 <div id="marc_view">
   <% fields = @document.to_marc.find_all{|f| ('000'..'999') === f.tag }  %>
   <div class="field"><%= t('blacklight.search.librarian_view.leader', :leader => @document.to_marc.leader) %></div>

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

@@ -0,0 +1,5 @@
+<% if paginate_params(@response).num_pages > 1 %>
+<%= paginate_rsolr_response @response, :theme => :blacklight_compact %>
+<% else %>
+<%= render_pagination_info(@response) %>
+<% end %>

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

@@ -1,7 +1,13 @@
-
-    <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
-		<%= form_tag params[:controller] == "folder" ? folder_index_path : url_for(:action=>'index'), :method=>:get, :class=>'sort', :id => "sort_form" do %>
-      <%= label_tag(:sort, t('blacklight.search.sort.label', :select => select_tag(:sort, options_for_select(sort_fields, h(params[:sort])))).html_safe) %>
-      <%= search_as_hidden_fields(:omit_keys => [:page, :sort]) %>
-			<%= submit_tag t('blacklight.search.sort.submit') %>
-		<% end unless sort_fields.empty? %>
+<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("#{@response.rows} per page", "#") %> <span class="caret"></span>
+      <ul>
+        <%- blacklight_config.per_page.each do |count| %>
+          <li><%= link_to("#{count} #{content_tag(:span, t('blacklight.search.per_page.post_label'), :class =>'hide-text')}".html_safe, url_for(params_for_search.merge(:per_page => count))) %></li>
+        <%- end -%>
+      </ul>
+    </li>
+  </ul>
+</div>

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

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

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

@@ -1,7 +1,7 @@
-<%= form_tag "http://www.refworks.com/express/expressimport.asp?vendor=#{application_name}&filter=MARC%20Format&encoding=65001", :name => "refworks", :target => "_blank" do %>
+<%= 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 %>
 
 <%= hidden_field_tag "ImportData", render_refworks_texts(documents) %>
 <%= submit_tag t('blacklight.tools.refworks'), :class => 'submit'%>
-<%= link_to_function t('blacklight.tools.refworks'), "document.refworks.submit();" %>
+<%= link_to_function t('blacklight.tools.refworks'), "document.refworks.submit();", :class => "btn" %>
 <% end %>
 

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

@@ -1,6 +1,9 @@
 <% if paginate_params(@response).num_pages > 1 %>
+ <div class="row record-padding">
+  <div class="span8 offset1"> 
     <div class="pagination">
-      <h2><%= t('blacklight.search.pagination.title') %></h2>
       <%= paginate_rsolr_response @response, :outer_window => 2, :theme => 'blacklight' %>
     </div>
+  </div>
+ </div>
 <% end %>

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

@@ -1,15 +1,21 @@
-<div id="search" class="search">
-  <%= form_tag search_action_url, :method => :get do %>
-    <h2 class="search"><%= label_tag(:q, t('blacklight.search.form.q')) %></h2>
-    <%= text_field_tag :q, params[:q], :class => "q" %>
+  <%= form_tag search_action_url, :method => :get, :class => 'search-query-form form-inline clearfix' do %>
+    <%= search_as_hidden_fields(:omit_keys => [:q, :search_field, :qt, :page]).html_safe %> 
+
     <% unless search_fields.empty? %>
-      <%= label_tag(:search_field, " #{t('blacklight.search.form.search_field.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") %>
-    <% end %>
-    <%= search_as_hidden_fields(:omit_keys => [:q, :search_field, :qt, :page]).html_safe %>        
-    
-    <%= submit_tag t('blacklight.search.form.submit'), :class=>'submit' %>
-  <% end %>
+      <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>
+      <% 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"%>
+        <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>
+        </button>
 
-  <hr/>
-</div>
+       </div>
+
+  <% end %>

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

@@ -1,7 +1,7 @@
 <%# default partial to display solr document fields in catalog show view -%>
-<dl class="defList">
+<dl class="dl-horizontal  dl-invert">
   <% document_show_fields.each do |solr_fname, field| -%>
-    <% if should_display_show_field? document, field %>
+    <% if should_render_show_field? document, field %>
 	    <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_label :field => solr_fname %></dt>
 	    <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_value :document => document, :field => solr_fname %></dd>
     <% end -%>

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

@@ -0,0 +1,3 @@
+<li class="more_like_this_document">
+  <span class="mlt_title"><%= link_to_document document, :label=>document_show_link_field %></span>
+</li>

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

@@ -1 +1,14 @@
-<p><%= link_back_to_catalog %></p>
+<div class="well" id="sidebar-nav">
+  <ul class="nav nav-list">
+    <%= render :partial => 'show_tools' %>
+  </ul>
+</div><!--/well -->
+  
+<% 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 -->
+<% end %>

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

@@ -2,30 +2,31 @@
   # Compare with render_document_functions_partial helper, and
   # _document_functions partial. BL actually has two groups
   # of document-related tools. "document functions" by default
-  # contains Bookmark/Folder functionality shown on both results and
+  # contains Bookmark functionality shown on both results and
   # 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 
 -%>
-  <ul class="tools">
-  
-    <% 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', :name => 'citation', :class => 'lightboxLink'} %>
+      <li class="nav-header"><%= t('blacklight.tools.title') %></li>
+      <li>
+        <%= render_show_doc_actions @document %>
       </li>
-    <% end %>
-    
-    <% if @document.export_formats.keys.include?( :refworks_marc_txt ) %>
-      <li class="refworks">
-      <%= link_to t('blacklight.tools.refworks'), refworks_export_url(:id => @document) %>        
-      </li>
-    <% end %>
-    
-    <% if @document.export_formats.keys.include?( :endnote ) %>
+      <% 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', :name => 'citation', :class => 'lightboxLink'} %></i>
+        </li>
+      <% end %>
+      <% if @document.export_formats.keys.include?( :refworks_marc_txt ) %>
+        <li class="refworks">
+        <%= link_to t('blacklight.tools.refworks'), refworks_export_url(:id => @document)  %>        
+        </li>
+     <% end %>
+     <% if @document.export_formats.keys.include?( :endnote ) %>
       <li class="endnote">
       <%= link_to t('blacklight.tools.endnote'), catalog_path(@document, :format => 'endnote') %>
       </li>
     <% end %>
-    
     <% if @document.respond_to?( :to_email_text ) %>
       <li class="email">
       <%= link_to t('blacklight.tools.email'), email_catalog_path(:id => @document), {:id => 'emailLink', :name => 'email', :class => 'lightboxLink'} %>
@@ -42,5 +43,4 @@
         <%= link_to t('blacklight.tools.librarian_view'), librarian_view_catalog_path(@document), {:id => 'librarianLink', :name => 'librarian_view', :class => 'lightboxLink'} %>
       </li>
     <% end %>
-    
-  </ul>
+    </ul>

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

@@ -10,14 +10,39 @@
 'Cricket' => 'cricket'
 }
 %>
-<h1><%= t('blacklight.sms.form.title') %></h1>
-<%= form_tag url_for(:controller => "catalog", :action => "sms"), :id => 'sms_form', :method => :post do %>
-  <%= label_tag(:to, t('blacklight.sms.form.to')) %><br/>
-  <%= text_field_tag :to %><br/>
-  <%= label_tag(:carrier, t('blacklight.sms.form.carrier')) %><br/>
-  <%= select_tag(:carrier, options_for_select(carriers.to_a.sort.unshift([t('blacklight.sms.form.carrier_prompt'),'']), '')) %><br/>
-  <% @documents.each do |doc| %>
-     <%=hidden_field_tag "id[]", doc.get(:id)%>
+<%- unless flash[:success] %>
+  
+  <%= 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"> 
+        <%= t('blacklight.sms.form.to') %>
+      </label>
+      <div class="controls">
+        <%= text_field_tag :to, params[:to] %>
+      </div>
+    </div>
+    <div class="control-group">
+      <label class="control-label" for="carrier">
+        <%= t('blacklight.sms.form.carrier') %> 
+      </label>
+      <div class="controls">
+          <%= select_tag(:carrier, options_for_select(carriers.to_a.sort.unshift([t('blacklight.sms.form.carrier_prompt'),'']), params[:carrier])) %><br/>
+      </div>
+
+    </div>
+    <% @documents.each do |doc| %>
+       <%=hidden_field_tag "id[]", doc.get(:id)%>
+    <% end %>
+</div>
+<div class="modal-footer">
+<button type="submit" class="btn btn-primary"> <%= t('blacklight.sms.form.submit') %></button>
+</div>
   <% end %>
-  <%= submit_tag t('blacklight.sms.form.submit') %>
-<% end %>
+<%- else %>
+<div class="modal-body">
+  <%= render :partial=>'/flash_msg' %>
+    <span class="ajax-close-modal"/>
+    </div>
+<%- end %>

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

@@ -1,7 +1,9 @@
-<div id="sortAndPerPage">  
-	<% unless @response.total < 2 %>
+<div id="sortAndPerPage">
+
+    <%= render :partial => "paginate_compact" %> 
+
     <%= render :partial => 'sort_widget' %>
 
     <%= render :partial => 'per_page_widget' %>
-	<% end %>
+
 </div>

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

@@ -1,6 +1,12 @@
-	  <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
-  	<%= form_tag params[:controller] == "folder" ? folder_index_path : url_for(:action=>'index'), :method=>:get, :class=>'per_page' do %>
-      <%= label_tag(:per_page, t('blacklight.search.per_page.label', :select => select_tag(:per_page, options_for_select(blacklight_config.per_page, h(params[:per_page])), :title => t('blacklight.search.per_page.title'))).html_safe) %>
-      <%= search_as_hidden_fields(:omit_keys => [:page, :per_page]) %>
-      <%= submit_tag t('blacklight.search.per_page.submit') %>
-    <% end %>
+<div id="sort-dropdown" class="dropdown pull-right hidden-phone">
+  <ul class="css-dropdown">
+    <li class="btn">
+      <%= link_to("#{t('blacklight.search.sort.label')} #{current_sort_field ? current_sort_field.label : 'default'}".html_safe, "#") %> <span class="caret"></span>
+      <ul>
+        <%- blacklight_config.sort_fields.each do |sort_key, field| %>
+          <li><%= link_to(field.label, url_for(params_for_search.merge(:sort => sort_key))) %></li>
+        <%- end -%>
+      </ul>
+    </li>
+  </ul>
+</div>

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

@@ -1 +1 @@
-<%= render :partial => 'citation' -%>
+<%= render :partial => 'citation' -%>

data/app/views/catalog/citation.js.erb

@@ -0,0 +1,7 @@
+<div class="modal-header">
+  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h3><%= t('blacklight.tools.cite') %></h3>
+</div>
+<div class="modal-body">
+<%= render :partial => 'citation' -%>
+</div>

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

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

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

@@ -1,28 +1,35 @@
-<div class="facet_extended_list">
-  
-  <% sidebar_items << capture 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="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>
+</div>
+<div class="modal-body">
+  <div class="facet_extended_list">
+
+    <ul class="facet_extended_list">
+      <% @pagination.items.each do |item| %>
+        <li>
+          <% if facet_in_params?( params[:id], item.value ) %>              
+            <%= render_selected_facet_value(params[:id], item) %>              
+          <% else %>              
+            <%= render_facet_value(params[:id], item) %>              
+          <% end -%>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>
   
-  <ul class="facet_extended_list">
-    <% @pagination.items.each do |item| %>
-      <li>
-        <% if facet_in_params?( params[:id], item.value ) %>              
-          <%= render_selected_facet_value(params[:id], item) %>              
-        <% else %>              
-          <%= render_facet_value(params[:id], item) %>              
-        <% end -%>
-      </li>
-    <% end %>
-  </ul>
-  
+<div class="modal-footer">
+
   <div class="facet_pagination bottom">
     <%= render :partial=>'facet_pagination' %>
   </div>
-</div>
+</div>

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

@@ -1,35 +1,35 @@
 
-<% unless has_search_parameters? %>
-	<%# if there are no input/search related params, display the "home" partial -%>
-	<%= render 'home' %>
-<% else %>
+  <div id="sidebar" class="span3">
+   <%= render :partial=>'facets' %>
+  </div><!--/well -->
 
-  <% @page_title = t('blacklight.search.title', :application_name => application_name) %>
+<div id="content" class="span9">
 
-        <% extra_head_content << render_opensearch_response_metadata.html_safe %>
+    <% unless has_search_parameters? %>
+	    <%# if there are no input/search related params, display the "home" partial -%>
+	    <%= render 'home' %>
+    <% else %>
 
-	<%= render :partial => 'search_form' %>
-	
-	<%= render :partial => 'did_you_mean' %>
+      <h2 class="hide-text top-content-title"><%= t('blacklight.search.search_results_header') %></h2>
 
-	<%= render 'constraints', :localized_params=>params %>
-  
-  <div class="pageEntriesInfo">
-    <%= render_pagination_info @response, :entry_name=>'item' %>
-    <%=link_to t('blacklight.search.start_over'), url_for(:action=>'index'), :id=>"startOverLink" %>
-  </div>
-  
-	<%= render 'sort_and_per_page' %>
-  
-        <%= render 'results_pagination' %>
-  
-	<%= render :partial => 'document_list' %>
+      <% @page_title = t('blacklight.search.title', :application_name => application_name) %>
 
-	<% sidebar_items << capture do %>
-	  <%= render :partial=>'facets' %>
-	<% end %>
 
-  <%= render 'results_pagination' %>
+      <% extra_head_content << render_opensearch_response_metadata.html_safe %>
 
-<% end %>
+	    <%= render :partial => 'did_you_mean' %>
 
+      <%= render :partial => 'constraints' %>
+
+	    <%= render 'sort_and_per_page' %>
+
+      <h2 class="hide-text"><%= t('blacklight.search.search_results') %></h2>
+	    <%= render_document_index %>
+
+
+	    <%= render 'results_pagination' %>
+
+
+    <% end %>
+
+</div>