commonwealth-vlr-engine 0.0.4 → 0.0.7

data/app/helpers/commonwealth_vlr_engine/facets_helper.rb

@@ -7,7 +7,9 @@ module CommonwealthVlrEngine
     # don't display 'Collections' genre_basic_ssim facet value
     # on collections#index or collections#facet views
     def render_facet_item(facet_field, item)
-      return if controller.controller_name == 'collections' && controller.action_name == 'index' && item.value == 'Collections'
+      return if controller.controller_name == 'collections' &&
+          (controller.action_name == 'index' || controller.action_name == 'facet') &&
+          item.value == 'Collections'
       if facet_in_params?(facet_field, item.value )
         render_selected_facet_value(facet_field, item)
       else

data/app/helpers/commonwealth_vlr_engine/ocr_search_helper_behavior.rb

@@ -7,6 +7,11 @@ module CommonwealthVlrEngine
       term_freq > 0 ? term_freq : term_freq+1
     end
 
+    # determine of the item has text content that can be searched
+    def has_searchable_text?(document)
+      document['has_searchable_text_bsi']
+    end
+
     # if current_search_session exists, return query_params['q'], otherwise return nil
     # @current_search_session is defined in Blacklight::SearchContext
     def ocr_q_params(current_search_session)

data/app/helpers/commonwealth_vlr_engine/search_history_constraints_helper.rb

@@ -0,0 +1,25 @@
+module CommonwealthVlrEngine
+  module SearchHistoryConstraintsHelper
+    include Blacklight::SearchHistoryConstraintsHelperBehavior
+
+    # include render_search_to_s_mlt() in rendered constraints
+    def render_search_to_s(params)
+      render_search_to_s_advanced(params) + render_search_to_s_mlt(params) + super
+    end
+
+    # render the MLT search query constraint, used on Search History page.
+    def render_search_to_s_mlt(params)
+      return "".html_safe if params[:mlt_id].blank?
+      render_search_to_s_element(t('blacklight.more_like_this.constraint_label'),
+                                 render_filter_value(params[:mlt_id]))
+    end
+
+    # render advanced search date constraints, used on SearchHistory, etc.
+    def render_search_to_s_advanced(params)
+      return "".html_safe if params[:date_start].blank? && params[:date_end].blank?
+      render_search_to_s_element(t('blacklight.advanced_search.constraints.date'),
+                                 render_filter_value(date_range_constraints_to_s(params)))
+    end
+
+  end
+end

data/app/helpers/downloads_helper.rb

@@ -0,0 +1,3 @@
+module DownloadsHelper
+  include CommonwealthVlrEngine::DownloadsHelperBehavior
+end

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

@@ -1,3 +1,4 @@
+<div class="documentFunctions">
 <!-- AddThis Button BEGIN -->
 <div id="social_media_links" class="addthis_toolbox addthis_default_style addthis_32x32_style">
   <a class="addthis_button_facebook" style="cursor:pointer"></a>
@@ -7,4 +8,5 @@
   <a class="addthis_button_compact"></a>
 </div>
 <script type="text/javascript" src="https://s7.addthis.com/js/300/addthis_widget.js#pubid=xa-505226a67a68dc99"></script>
-<!-- AddThis Button END -->
+<!-- AddThis Button END -->
+</div>

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

@@ -1,5 +1,5 @@
 <% if current_or_guest_user %>
-
+    <div class="documentFunctions">
     <div id="folder_item_toggle">
 
       <% if current_user %>
@@ -59,6 +59,7 @@
       <% end %>
 
     </div>
+    </div>
 
 <% end %>
 

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

@@ -0,0 +1,9 @@
+<%= blacklight_map_tag('blacklight-index-map',
+                       {data:{searchcontrol: true,
+                              catalogpath: search_catalog_path,
+                              placenamefield: blacklight_config.view.maps.placename_field,
+                              clustercount:'hits',
+                              searchresultsview: default_document_index_view_type,
+                              initialzoom: blacklight_config.view.maps.show_initial_zoom
+                       }}) %>
+<%= javascript_tag "$('#blacklight-index-map').blacklight_leaflet_map(#{geojson_features});" %>

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

@@ -1,7 +1,7 @@
 <div id="more_like_this" class="well well-sm">
   <h4><%= t('blacklight.more_like_this.heading') %></h4>
   <div id="more_like_this_docs" class="row">
-    <%= render :collection => document.more_like_this,
+    <%= render :collection => mlt_document_list,
                :partial => 'show_more_like_this',
                :as => :document %>
   </div>

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

@@ -0,0 +1,3 @@
+<%= link_to content_tag(:span, '', :class => 'glyphicon glyphicon-list-alt') + ' ' + t('blacklight.tools.citation'),
+            citation_solr_document_path(:id => @document),
+            {:id => 'citeLink', :data => {:ajax_modal => 'trigger'}} %>

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

@@ -1,21 +1,20 @@
 <%# show the object image(s)/file(s) and metadata %>
 <%# TODO: refactor how views access files/volumes/etc., this is getting REALLY ugly %>
-<% image_files = has_image_files?(@object_files) %>
 <% volumes = has_volumes?(@document) %>
 <% book_reader = false %>
 <% oai_object = @document[blacklight_config.show.display_type_field.to_sym] == 'OAIObject' ? true : false %>
-<% if image_files %>
+<% if has_image_files?(@object_files) %>
     <%= javascript_include_tag 'openseadragon' %>
-    <% case image_files.length %>
+    <% case @object_files[:images].length %>
         <% when 1 %>
             <%= render :partial => 'catalog/_show_partials/show_default_img',
                        :locals => {:document => @document,
-                                   :image_pid => image_files.first,
+                                   :image_pid => @object_files[:images][0]['id'],
                                    :page_sequence => {:total => 1}} %>
         <% when 2..7 %>
             <%= render :partial => 'catalog/_show_partials/show_multi_img',
                        :locals => {:document => @document,
-                                   :image_files => image_files} %>
+                                   :image_files => image_file_pids(@object_files[:images])} %>
         <% else %>
             <% book_reader = true %>
     <% end %>
@@ -24,7 +23,7 @@
 <div class="row">
 
   <%# show thumbnail or icon if object has no images, or volume list %>
-  <% if !image_files || book_reader || volumes %>
+  <% if !has_image_files?(@object_files) || book_reader || volumes %>
       <div id="thumbnail_wrapper" class="col-sm-4">
         <div id="thumb_img_show_container">
           <% img = create_thumb_img_element(@document, %w(thumb_img_show)) %>
@@ -52,21 +51,23 @@
     <%= render :partial => 'catalog/_show_partials/show_default_metadata', :locals => {:document => @document} %>
 
     <%# more like this %>
-    <% unless @document.more_like_this.empty? %>
-        <%= render :partial => 'catalog/more_like_this', :locals => {:document => @document} %>
+    <% unless @mlt_document_list.empty? %>
+        <%= render partial: 'catalog/more_like_this',
+                   locals: {document: @document, mlt_document_list: @mlt_document_list} %>
     <% end %>
 
   </div>
 
   <div id="sidebar" class="<%= show_sidebar_classes %>">
-    <%# render files to download %>
-    <% if has_downloadable_files?(@object_files) %>
-        <%= render :partial => 'catalog/_show_partials/show_downloads', :locals => {:document => @document, :object_files => @object_files} %>
-    <% end %>
 
     <% # bookmark/folder/sharing functions -%>
     <%= render_document_sidebar_partial  %>
 
+    <%# render files to download %>
+    <% if has_downloadable_files?(@document, @object_files) %>
+        <%= render :partial => 'catalog/_show_partials/show_downloads', :locals => {:document => @document, :object_files => @object_files} %>
+    <% end %>
+
     <%# map view %>
     <%= render :partial => 'catalog/show_maplet_default' %>
 

data/app/views/catalog/_show_partials/_show_book_viewer_link.html.erb

@@ -11,7 +11,7 @@
           <i class="fa fa-book"></i> <%= t('blacklight.book_viewer.link_to_reader') %>
       <% end %>
     </li>
-    <% if document['identifier_ia_id_ssi'] || document['has_searchable_text_bsi'] %>
+    <% if has_searchable_text?(document) %>
         <li id="search_inside_link_wrap">
           <%= link_to(ocr_search_path,
                       :class => 'search_inside_link btn',

data/app/views/catalog/_show_partials/_show_default_metadata.html.erb

@@ -34,11 +34,11 @@
       </dd>
     <% end %>
     <%# uniform title field %>
-    <% if document[:title_info_uniform_tsim] %>
+    <% if document[:title_info_uniform_ssim] %>
         <dt><%= t('blacklight.metadata_display.fields.title_uniform') %>:</dt>
         <dd>
-          <% document[:title_info_uniform_tsim].each do |uniform_title| %>
-              <%= uniform_title %><br />
+          <% document[:title_info_uniform_ssim].each do |uniform_title| %>
+              <%= link_to_facet(uniform_title, 'title_info_uniform_ssim') %><br />
           <% end %>
         </dd>
     <% end %>

data/app/views/catalog/_show_partials/_show_downloads.html.erb

@@ -5,7 +5,7 @@
 
   <div class="panel-body">
     <ul class="nav nav-list">
-      <% create_download_links(document, object_files, 'sidebar_downloads_link').each do |link| %>
+      <% create_download_links(document, object_files).each do |link| %>
         <li class="download_list_item"><%= link %></li>
       <% end %>
         <!-- <li class="download_info"><%# t('blacklight.downloads.link_info') %></li> -->

data/app/views/catalog/_show_partials/_show_volumes.html.erb

@@ -37,7 +37,7 @@
               <div class="download_volume_links">
                 <i class="fa fa-download"></i> Downloads
                 <ul class="volume_downloads">
-                  <% create_download_links(volume[:vol_doc], volume[:vol_files], 'volume_downloads_link').each do |link| %>
+                  <% create_download_links(volume[:vol_doc], volume[:vol_files]).each do |link| %>
                       <li class="download_list_item"><%= link %></li>
                   <% end %>
                 </ul>

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

@@ -0,0 +1,3 @@
+<%= link_to content_tag(:span, '', :class => 'glyphicon glyphicon-envelope') + ' ' + t('blacklight.tools.email'),
+            email_solr_document_path(:id => @document),
+            {:id => 'emailLink', :data => {:ajax_modal => 'trigger'}} %>

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

@@ -92,6 +92,7 @@
           </div>
 
           <div id="sidebar" class="col-sm-3">
+            <%= render :partial => 'show_tools' if (request.host_with_port.match(/admin\./) || Rails.application.class.parent_name == 'Commonwealth') %>
             <%= javascript_include_tag 'commonwealth-vlr-engine/collection_facets' %>
             <%= render 'search_sidebar' %>
           </div>

data/app/views/downloads/_terms_of_use.html.erb

@@ -0,0 +1,29 @@
+<strong>Please review the terms of use for this item:</strong>
+<ul class="downloads_terms">
+  <% if document[:rights_ssm] %>
+      <% document[:rights_ssm].each do |rights| %>
+          <li><%= rights %></li>
+      <% end %>
+  <% end %>
+  <% if document[:license_ssm] %>
+      <% document[:license_ssm].each do |license| %>
+          <li>
+            <%= license %>
+            <% if license.match(/\(CC\s/) %>
+                <br/>
+                  <%= link_to t('blacklight.downloads.cc'),
+                              cc_url(license),
+                              target: '_blank' %>
+                  <%= render_cc_license(license) %>
+            <% end %>
+          </li>
+      <% end %>
+  <% end %>
+  <li>
+    <%= link_to t('blacklight.pages.contact.title'), feedback_path %> if you have questions about usage or reproduction.
+  </li>
+</ul>
+<p>
+  <strong>Click the button below to start your download</strong><br/>
+  It may take a few moments for your download to begin, especially for large file sizes.
+</p>

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

@@ -0,0 +1,29 @@
+<div class="modal-header">
+  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h4 id="downloads_modal_title" class="modal-title">
+    <%= truncate("#{t('blacklight.downloads.title')}: #{render_main_title(@parent_document)}",
+                 length: 55,
+                 separator: ' ') %>
+  </h4>
+</div>
+<div id="downloads_modal" class="modal-body">
+  <%= render partial: 'terms_of_use', locals: {document: @parent_document} %>
+</div>
+
+<div id="downloads_start_links" class="modal-footer">
+  <%= link_to(url_for_download(@document, params[:datastream_id]),
+              class: 'trigger_download btn btn-primary ' + params[:datastream_id],
+              rel: 'nofollow',
+              target: '_blank') do %>
+      <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>
+      <%= "Download #{truncate(download_link_title(@parent_document[:identifier_ia_id_ssi] ? @parent_document : @document,
+                                                   @object_profile,
+                                                   params[:datastream_id]),
+                               length: 40,
+                               omission: '...')} (#{file_type_string(params[:datastream_id],
+                                                                     @object_profile)}, #{file_size_string(params[:datastream_id],
+                                                                                                           @object_profile)})" %>
+  <% end %>
+  <button type="button" class="btn btn-warning" data-dismiss="modal">Cancel</button>
+</div>
+<%= javascript_include_tag 'commonwealth-vlr-engine/download_utils' %>

data/app/views/image_viewer/_render_book_viewer.html.erb

@@ -142,7 +142,7 @@ var $window = $(window),
             seadragonPrefixUrl: '', // "/assets/commonwealth-vlr-engine/openseadragon/"
             seadragonNavImages: $.parseJSON('<%= osd_nav_images('commonwealth-vlr-engine/openseadragon').html_safe %>'),
             thumbUrlTemplate: generateThumbUrl,
-            fts: <%= @document[:identifier_ia_id_ssi] ? 'true' : 'false' %>,
+            fts: <%= has_searchable_text?(@document) ? 'true' : 'false' %>,
             wordCoordinatesUrlTemplate: generateWordCoordsUrl,
             ocrSearchPath: "<%= ocr_search_path %>"
         });

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

@@ -35,16 +35,7 @@
       </div>
     </div>
 
-    <% if @institution_image_pid %>
-        <%= iiif_image_tag(@institution_image_pid,
-                           {:size => 'pct:20',
-                            :alt => @institution_title,
-                            :class => 'institution_img_show'}) %>
-    <% else %>
-        <%= image_tag(institution_icon_path,
-                      :alt => @institution_title,
-                      :class => 'institution_img_show') %>
-    <% end %>
+    <%= create_thumb_img_element(@document, ['institution_img_show']) %>
 
     <div id="institution_desc">
 
@@ -81,6 +72,7 @@
 
 
   <div id="sidebar" class="col-sm-3">
+    <%= render :partial => 'show_tools' if (request.host_with_port.match(/admin\./) || Rails.application.class.parent_name == 'Commonwealth') %>
     <%= render 'search_sidebar' %>
   </div>
 

data/app/views/layouts/commonwealth-vlr-engine.html.erb

@@ -19,10 +19,7 @@
   <title><%= render_page_title %></title>
   <%= opensearch_description_tag application_name, opensearch_catalog_url(:format => 'xml') %>
   <%= favicon_link_tag %>
-  <%= favicon_link_tag 'dc_mobile-icons_60x60.png', :rel => 'apple-touch-icon', :type => 'image/png'  %>
-  <%= favicon_link_tag 'dc_mobile-icons_76x76.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => '76x76' %>
-  <%= favicon_link_tag 'dc_mobile-icons_120x120.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => '120x120' %>
-  <%= favicon_link_tag 'dc_mobile-icons_152x152.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => '152x152' %>
+  <%= render_mobile_icon_tags %>
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>

data/app/views/ocr_search/_index_ocr_list.html.erb

@@ -1,3 +1,4 @@
+<% doc_presenter = index_presenter(document) %>
 <div class="ocr_search_result">
   <dl class="defList ocr_defList dl-horizontal">
     <dt><span class="ocr_page_link"><%= render_page_link(document, @image_pid_list, params[:id]) %></span></dt>
@@ -8,9 +9,8 @@
           </div>
       <% end %>
       <div class="ocr_snippets">
-        <%= render_index_field_value document,
-                                     field: blacklight_config.ocr_search_field,
-                                     counter: document_counter_with_offset(document_counter) %>
+        <%= doc_presenter.field_value(blacklight_config.ocr_search_field,
+                                      {counter: document_counter_with_offset(document_counter)}) %>
       </div>
     </dd>
   </dl>

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

@@ -0,0 +1,4 @@
+<%= favicon_link_tag 'commonwealth-vlr-engine/vlr_mobile-icons_60x60.png', :rel => 'apple-touch-icon', :type => 'image/png' %>
+<%= favicon_link_tag 'commonwealth-vlr-engine/vlr_mobile-icons_76x76.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => '76x76' %>
+<%= favicon_link_tag 'commonwealth-vlr-engine/vlr_mobile-icons_120x120.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => '120x120' %>
+<%= favicon_link_tag 'commonwealth-vlr-engine/vlr_mobile-icons_152x152.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => '152x152' %>

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

@@ -1,5 +1,5 @@
 <%= form_tag search_action_url, :method => :get, :class => 'header-search-form form-inline' do %>
-    <%= render_hash_as_hidden_fields(search_state.params_for_search(:search_field => default_search_field[:key]).except('q', 'qt', 'page', 'utf8', 'f', 'sort', 'mlt_id', 'coordinates', 'spatial_search_type', 'view')) %>
+    <%= render_hash_as_hidden_fields(search_state.params_for_search(:search_field => default_search_field[:key]).except('q', 'qt', 'page', 'utf8', 'f', 'sort', 'mlt_id', 'coordinates', 'spatial_search_type', 'view', 'range', 'date_start', 'date_end')) %>
 
     <div class="input-group pull-left">
       <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>

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

@@ -1,14 +1,14 @@
 <input type="checkbox" name="selectAll" id="selectAllItems" />
 <ul class="folderItemToolsList">
-    <li class="cite">
+  <li class="cite">
     <%= link_to content_tag(:span, '', :class => 'glyphicon glyphicon-list-alt') + ' ' + t('blacklight.tools.citation'),
                 citation_solr_documents_path(:id => ''),
-                  {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink btn btn-default'} %>
-    </li>
-    <li class="email">
+                {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink btn btn-default'} %>
+  </li>
+  <li class="email">
     <%= link_to content_tag(:span, '', :class => 'glyphicon glyphicon-envelope') + ' ' + t('blacklight.tools.email'),
                 email_solr_documents_path(:id => ''),
                 :class => 'lightboxLink btn btn-default',
                 :id => 'emailLink' %>
-    </li>
+  </li>
 </ul>

data/commonwealth-vlr-engine.gemspec

@@ -18,14 +18,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rails', '~>4.2.0'
-  spec.add_dependency 'blacklight', '>= 6.1.0'
-  spec.add_dependency 'blacklight_advanced_search', '6.0.2'
-  spec.add_dependency 'blacklight-gallery', '0.5.0'
+  spec.add_dependency 'blacklight', '>= 6.3.0'
+  spec.add_dependency 'blacklight_advanced_search', '6.2.1'
+  spec.add_dependency 'blacklight-gallery', '0.6.1'
   spec.add_dependency 'blacklight-maps', '0.5.0'
+  spec.add_dependency 'leaflet-rails', '~> 0.7.3' # remove once blacklight-maps has been updated
+  spec.add_dependency 'blacklight_range_limit', '6.0.0'
+  spec.add_dependency 'openseadragon', '0.3.1'
   spec.add_dependency 'bootstrap-sass', '~> 3.0'
   spec.add_dependency 'font-awesome-sass', '4.1.0'
-  spec.add_dependency 'bpluser'
-  #, '~> 0.0.7'
+  spec.add_dependency 'bpluser' #, '~> 0.0.7'
   spec.add_dependency 'typhoeus'
   spec.add_dependency 'devise-guests', '0.3.3'
   spec.add_dependency 'omniauth'
@@ -35,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'omniauth-polaris'
   spec.add_dependency 'madison', '~> 0.5.0'
   spec.add_dependency 'osullivan'
-
+  spec.add_dependency 'zipline'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'

data/config/initializers/patch_blacklight_advanced_search.rb

@@ -9,13 +9,13 @@ class BlacklightAdvancedSearch::QueryParser
   # LOCAL OVERRIDE of BlacklightAdvancedSearch::ParsingNestingParser#process_query
   def process_query(params,config)
     queries = []
-    keyword_queries.each do |field,query|
-      queries << ParsingNesting::Tree.parse(query, config.advanced_search[:query_parser]).to_query( local_param_hash(field, config) )
-    end
+    queries = keyword_queries.map do |field, query|
+      queries << ParsingNesting::Tree.parse(query, config.advanced_search[:query_parser]).to_query(local_param_hash(field, config))
+    end.join(" #{keyword_op} ")
     if params[:date_start].blank? && params[:date_end].blank?
-      queries.join( ' ' + keyword_op + ' ')
+      queries
     else
-      queries.join( ' ' + keyword_op + ' ') + ' AND ' + add_date_range_to_queries(params)
+      queries.blank? ? add_date_range_to_queries(params) : [queries, add_date_range_to_queries(params)].join(' AND ')
     end
   end
 
@@ -67,7 +67,7 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
     if is_advanced_search? localized_params
       true
     else
-      !(localized_params[:q].blank? and localized_params[:f].blank? and localized_params[:f_inclusive].blank? and localized_params[:mlt_id].blank? and localized_params[:coordinates].blank?)
+      !(localized_params[:q].blank? && localized_params[:f].blank? && localized_params[:f_inclusive].blank? && localized_params[:mlt_id].blank? && localized_params[:coordinates].blank?)
     end
   end