geoblacklight 1.9.1 → 2.0.0

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

@@ -1,2 +1,2 @@
 <%= yield %>
-<%= link_to t('blacklight.search.facets.more'), facet_catalog_path(display_facet.name), class: 'more_facets_link' %>
+<%= link_to t('blacklight.search.facets.more_html'), facet_catalog_path(display_facet.name), class: 'more_facets_link' %>

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

@@ -1,49 +1,41 @@
-<div class='jumbotron'>
-  <div class='home-search-area'>
-    <%= content_tag :h2, t('geoblacklight.home.headline') %>
-    <%= content_tag :h3, t('geoblacklight.home.search_heading') %>
-    <div class='row'>
-      <div class='col-md-6 col-md-offset-3'>
-        <%= render_search_form_no_navbar %>
-      </div>
-    </div>
-  </div>
-</div>
-
 <div class='container'>
-  <div class='row'>
-    <div class='col-md-6'>
-      <%= content_tag :h3, t('geoblacklight.home.category_heading'), class: 'text-center' %>
-      <div class='category-block'>
-        <div class='category-icon'>
-          <span class='glyphicon glyphicon-home'></span>
+  <div class='row text-center'>
+    <div class='col-sm'>
+      <%= content_tag :h3, t('geoblacklight.home.category_heading') %>
+      <div class='row'>
+        <div class='category-block col-sm'>
+          <div class='category-icon'>
+            <span class='fa fa-home'></span>
+          </div>
+          <%= content_tag :h4, t('geoblacklight.home.institution') %>
+          <%= render_facet_tags [Settings.FIELDS.PROVENANCE] %>
         </div>
-        <%= content_tag :h4, t('geoblacklight.home.institution'), class: 'text-center' %>
-        <%= render_facet_tags [Settings.FIELDS.PROVENANCE] %>
-      </div>
-      <div class='category-block'>
-        <div class='category-icon'>
-          <span class='glyphicon glyphicon-download'></span>
+        <div class='category-block col-sm'>
+          <div class='category-icon'>
+            <span class='fa fa-arrow-circle-down'></span>
+          </div>
+          <%= content_tag :h4, t('geoblacklight.home.data_type') %>
+          <%= render_facet_tags [Settings.FIELDS.GEOM_TYPE] %>
         </div>
-        <%= content_tag :h4, t('geoblacklight.home.data_type'), class: 'text-center' %>
-        <%= render_facet_tags [Settings.FIELDS.GEOM_TYPE] %>
       </div>
-      <div class='category-block'>
-        <div class='category-icon'>
-          <span class='glyphicon glyphicon-globe'></span>
+      <div class='row'>
+        <div class='category-block col-sm'>
+          <div class='category-icon'>
+            <span class='fa fa-globe'></span>
+          </div>
+          <%= content_tag :h4, t('geoblacklight.home.placename') %>
+          <%= render_facet_tags [Settings.FIELDS.SPATIAL_COVERAGE] %>
         </div>
-        <%= content_tag :h4, t('geoblacklight.home.placename'), class: 'text-center' %>
-        <%= render_facet_tags [Settings.FIELDS.SPATIAL_COVERAGE] %>
-      </div>
-      <div class='category-block'>
-        <div class='category-icon'>
-          <span class='glyphicon glyphicon-tags'></span>
+        <div class='category-block col-sm'>
+          <div class='category-icon'>
+            <span class='fa fa-tags'></span>
+          </div>
+          <%= content_tag :h4, t('geoblacklight.home.subject') %>
+          <%= render_facet_tags [Settings.FIELDS.SUBJECT] %>
         </div>
-        <%= content_tag :h4, t('geoblacklight.home.subject'), class: 'text-center' %>
-        <%= render_facet_tags [Settings.FIELDS.SUBJECT] %>
       </div>
     </div>
-    <div class='col-md-6 text-center'>
+    <div class='col-sm'>
       <%= content_tag :h3, t('geoblacklight.home.map_heading') %>
       <%= content_tag :div, '', id: 'map', data: { map: 'home', 'catalog-path'=> search_catalog_path , 'map-bbox' => params[:bbox], basemap: geoblacklight_basemap, leaflet_options: leaflet_options } %>
     </div>

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

@@ -9,7 +9,7 @@
     <span class="document-counter">
       <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
     </span>
-    <%= link_to_document document, document_show_link_field(document), counter: counter, title: document[blacklight_config.index.title_field] %>
+    <%= link_to_document document, counter: counter, title: document[blacklight_config.index.title_field] %>
   </h3>
 
   <div class='col-md-12 more-info-area'>
@@ -20,4 +20,3 @@
     </div>
   </div>
 <% end %>
-

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

@@ -1,11 +1,11 @@
-<% document ||= @document %>
+<% document ||= @documents.first %>
 
 <div class='metadata-view'>
   <div class="container-fluid">
     <ul class="nav nav-pills" role="tablist">
       <% document.references.shown_metadata.each do |metadata| %>
-        <li role="presentation" class="<%= first_metadata?(document, metadata) ? 'active' : nil %>">
-          <a class="pill-metadata"
+        <li role="presentation" class="nav-item">
+          <a class="pill-metadata nav-link <%= first_metadata?(document, metadata) ? 'active' : nil %>"
              href="#<%= metadata.type %>"
              aria-controls="<%= metadata.type %>"
              role="tab"

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

@@ -1,17 +1,19 @@
 <% if show_attribute_table? %>
-  <div id='table-container' class='col-md-12'>
-    <table id="attribute-table" class="table table-hover table-condensed table-responsive table-striped table-bordered col-md-12">
-      <thead>
-        <tr>
-          <th><%= t('geoblacklight.show.attribute') %></th>
-          <th><%= t('geoblacklight.show.value') %></th>
-        </tr>
-      </thead>
-      <tbody class='attribute-table-body'>
-        <tr>
-          <td class='default-text' colspan='2'><em><%= t('geoblacklight.show.click_map') %></em></td>
-        </tr>
-      </tbody>
-    </table>
+  <div class='row'>
+    <div id='table-container' class='col-md-12'>
+      <table id="attribute-table" class="table table-hover table-condensed table-striped table-bordered col-md-12">
+        <thead>
+          <tr>
+            <th><%= t('geoblacklight.show.attribute') %></th>
+            <th><%= t('geoblacklight.show.value') %></th>
+          </tr>
+        </thead>
+        <tbody class='attribute-table-body'>
+          <tr>
+            <td class='default-text' colspan='2'><em><%= t('geoblacklight.show.click_map') %></em></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
 <% end %>

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

@@ -1,5 +1,7 @@
 <% document ||= @document %>
-<div id='viewer-container' class="col-md-12">
-  <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol.camelize, url: document.viewer_endpoint, 'layer-id' => document.wxs_identifier, 'map-bbox' => document.bounding_box_as_wsen, 'catalog-path'=> search_catalog_path, available: document_available?, inspect: show_attribute_table?, basemap: geoblacklight_basemap, leaflet_options: leaflet_options } do %>
-  <% end %>
+<div class='row'>
+  <div id='viewer-container' class="col-md-12">
+    <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol.camelize, url: document.viewer_endpoint, 'layer-id' => document.wxs_identifier, 'map-bbox' => document.bounding_box_as_wsen, 'catalog-path'=> search_catalog_path, available: document_available?, inspect: show_attribute_table?, basemap: geoblacklight_basemap, leaflet_options: leaflet_options } do %>
+    <% end %>
+  </div>
 </div>

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

@@ -1,2 +1,4 @@
-<div class='viewer-information col-md-4'>
+<div class='row'>
+  <div class='viewer-information col-sm-12'>
+  </div>
 </div>

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

@@ -2,21 +2,22 @@
 
 <% if document_downloadable? %>
   <% if document.direct_download.present? || document.hgl_download.present? || document.iiif_download.present? %>
-    <div class="panel panel-default downloads">
-      <div class="panel-heading">
-        <h3 class="h5"><%= t('geoblacklight.download.download').pluralize %></h3>
+    <div class="card downloads">
+      <div class="card-header">
+        <h2><%= t('geoblacklight.download.download').pluralize %></h2>
       </div>
 
-      <ul class="list-group list-group-flush">
+      <ul class="list-group list-group-flush js-download-list">
         <%= render 'downloads_primary' %>
       </ul>
     </div>
   <% end %>
 
   <% if document.download_types.present? %>
-    <div class="panel panel-default exports">
-      <div class="panel-heading">
-        <h3 class="h5"><%= t('geoblacklight.download.export_formats') %></h3>
+    <div class="card exports">
+      <div class="card-header">
+
+        <h2><%= t('geoblacklight.download.export_formats') %></h2>
       </div>
 
       <ul class="list-group list-group-flush">
@@ -25,7 +26,9 @@
     </div>
   <% end %>
 <% elsif document.restricted? && document.same_institution? %>
-  <div class='panel-body'>
-    <%= link_to t('geoblacklight.tools.login_to_view'), new_user_session_path(referrer: request.original_url) %>
+  <div class="card authentication">
+    <div class="card-header">
+      <%= link_to t('geoblacklight.tools.login_to_view'), new_user_session_path(referrer: request.original_url), class: ['btn', 'btn-default'] %>
+    </div>
   </div>
 <% end %>

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

@@ -0,0 +1,25 @@
+<%-
+  # 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 functionality shown on both results and
+  # item view. While "document tools" contains external export type
+  # functions by default only on detail.
+-%>
+<% if show_doc_actions? %>
+  <div class="card show-tools">
+    <div class="card-header">
+      <h2><%= t('blacklight.tools.title') %></h2>
+    </div>
+
+    <ul class="list-group list-group-flush">
+      <%= render_show_doc_actions @document do |config, inner| %>
+        <% if inner.present? %>
+          <li class="list-group-item <%= config.key %>">
+            <%= inner %>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

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

@@ -1,4 +1,4 @@
-<% document ||= @document %>
+<% document ||= @documents.first %>
 
 <% document.references.refs.each do |reference| %>
   <% if Settings.WEBSERVICES_SHOWN.include? reference.type.to_s %>

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

@@ -1,4 +1,4 @@
-<% document ||= @document %>
+<% document ||= @documents.first %>
 
 <%= render partial: 'web_services_default', locals: { reference: reference } %>
 

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

@@ -1,4 +1,4 @@
-<% document ||= @document %>
+<% document ||= @documents.first %>
 
 <%= render partial: 'web_services_default', locals: { reference: reference } %>
 

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

@@ -1,12 +1,13 @@
+<% content_for(:sidebar) do %>
+  <% if has_search_parameters? %>
+    <%= render 'search_sidebar' %>
+  <% end %>
+<% end %>
+
 <% unless has_search_parameters? %>
   <%# if there are no input/search related params, display the "home" partial -%>
   <%= render 'home' %>
+  <%= render 'shared/sitelinks_search_box' %>
 <% else %>
-  <div id="sidebar" class="col-md-3 col-sm-4">
-    <%= render 'search_sidebar' %>
-  </div>
-
-  <div id="content" class="col-md-9 col-sm-8">
-    <%= render 'search_results' %>
-  </div>
-<% end %>
+  <%= render 'search_results' %>
+<% end %>

data/app/views/relation/_ancestors.html.erb

@@ -1,8 +1,8 @@
-<li>
+<li class="list-group-item relations-ancestors">
   <b><%= t('geoblacklight.relations.ancestor') %></b>
 </li>
 <% @relations.ancestors['docs'].each do |ancestor| %>
-  <li>
+  <li class="list-group-item">
     <%= link_to solr_document_path(ancestor['layer_slug_s']) do %>
       <span class='geoblacklight geoblacklight-relations-ancestor'></span> <%= ancestor['dc_title_s'] %>
     <% end %>

data/app/views/relation/_descendants.html.erb

@@ -1,15 +1,15 @@
-<li>
+<li class="list-group-item relations-descendants">
   <b><%= t('geoblacklight.relations.descendant', count: @relations.descendants['numFound']) %></b>
 </li>
 <% @relations.descendants['docs'][0..2].each do |descendant| %>
-  <li>
+  <li class="list-group-item">
     <%= link_to solr_document_path(descendant['layer_slug_s']) do %>
       <span class='geoblacklight geoblacklight-relations-descendant'></span> <%= descendant['dc_title_s'] %>
     <% end %>
   </li>
 <% end %>
 <% unless (@relations.descendants['numFound'].to_i <= 3) %>
-  <li>
+  <li class="list-group-item">
     <%= link_to search_catalog_path({f: {"#{Settings.FIELDS.SOURCE}" => [@relations.search_id]}}) do %>
       <%= t('geoblacklight.relations.browse_all', count: @relations.descendants['numFound']) %>
     <% end %>

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

@@ -1,13 +1,13 @@
 <% unless @relations.empty? %>
-  <div class="panel panel-default show-tools">
-    <div class="panel-heading">
+  <div class="card relations">
+    <div class="card-header">
       <%= t('geoblacklight.relations.title') %>
     </div>
-    <div class="panel-body">
-      <ul class="nav">
-        <%= render 'ancestors' unless @relations.ancestors['numFound'].to_i == 0 %>
-        <%= render 'descendants' unless @relations.descendants['numFound'].to_i == 0 %>
-      </ul>
-    </div>
+
+    <ul class="list-group list-group-flush">
+      <%= render 'ancestors' unless @relations.ancestors['numFound'].to_i == 0 %>
+      <%= render 'descendants' unless @relations.descendants['numFound'].to_i == 0 %>
+    </ul>
+
   </div>
 <% end %>

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

@@ -1,25 +1,36 @@
-<div id="header-navbar" class="navbar navbar-inverse navbar-static-top" 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>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
+  <div class="<%= container_classes %>">
+    <%= link_to application_name, root_path, class: 'mb-0 navbar-brand' %>
+    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
     </button>
-    <%= link_to application_name, root_path, class: "navbar-brand" %>
-    </div>
 
-    <div class="collapse navbar-collapse" id="user-util-collapse">
-      <%= render :partial=>'/user_util_links' %>
+    <div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
+      <%= render 'shared/user_util_links' %>
     </div>
   </div>
-</div>
+</nav>
 
-<% if controller_name == 'catalog' && has_search_parameters? %>
-  <div id="search-navbar" class="navbar navbar-default navbar-static-top" role="navigation">
-    <div class="container">
+<% if controller_name == 'catalog' && (has_search_parameters? || params[:action] == 'show') %>
+  <div class="navbar-search navbar navbar-light bg-faded" role="navigation">
+    <div class="<%= container_classes %> stuff">
       <%= render_search_bar  %>
     </div>
   </div>
-<% end %>
+<% else %>
+  <div class='geobl-homepage-masthead jumbotron'>
+    <div class='d-flex justify-content-center'>
+      <%= content_tag :h2, t('geoblacklight.home.headline'), class: 'text-center' %>
+    </div>
+    <div class='d-flex justify-content-center'>
+      <%= content_tag :h3, t('geoblacklight.home.search_heading'), class: 'text-center' %>
+    </div>
+    <div class='row justify-content-md-center'>
+      <div class='col-md-6 col-sm-12'>
+        <div class='navbar-search'>
+          <%= render_search_bar %>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>

data/config/locales/geoblacklight.en.yml

@@ -15,7 +15,7 @@ en:
       error_with_url: 'Sorry, the requested file could not be downloaded. Try downloading it directly from: %{link}'
       export_formats: 'Export Formats'
       export_link: 'Export'
-      export_shapefile_link: 'EPSG:4326 Shapefile'
+      export_shapefile_link: 'Shapefile'
       export_kmz_link: 'KMZ'
       export_geojson_link: 'GeoJSON'
     home:
@@ -28,7 +28,7 @@ en:
       placename: 'Placename'
       subject: 'Subject'
     tools:
-      login_to_view: 'Login to view and download'
+      login_to_view: 'Login to View and Download'
       open_carto: 'Open in Carto'
     formats:
       arcgrid: 'ArcGRID'

data/geoblacklight.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = '>= 2.5.2'
 
   spec.add_dependency 'rails', '~> 5.0'
-  spec.add_dependency 'blacklight', '~> 6.11'
-  spec.add_dependency 'leaflet-rails', '~> 1.3.0'
+  spec.add_dependency 'blacklight', '~> 7.0'
   spec.add_dependency 'font-awesome-rails'
   spec.add_dependency 'config'
   spec.add_dependency 'faraday'
@@ -29,14 +28,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'coderay'
   spec.add_dependency 'geoblacklight-icons', '>= 0.2'
   spec.add_dependency 'deprecation'
-  spec.add_dependency 'geo_combine', '>= 0.3'
+  spec.add_dependency 'geo_combine', '~> 0.4'
   spec.add_dependency 'mime-types'
   spec.add_dependency 'handlebars_assets'
+  spec.add_dependency 'webpacker', '~> 3.5'
 
   spec.add_development_dependency 'solr_wrapper'
   spec.add_development_dependency 'rails-controller-testing'
   spec.add_development_dependency 'rspec-rails', '~> 3.1'
-  spec.add_development_dependency 'engine_cart', '~> 1.0'
+  spec.add_development_dependency 'engine_cart', '~> 2.0'
   spec.add_development_dependency 'capybara', '>= 2.5.0'
   spec.add_development_dependency 'selenium-webdriver'
   spec.add_development_dependency 'chromedriver-helper'
@@ -45,4 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bixby'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'foreman'
 end

data/lib/generators/geoblacklight/install_generator.rb

@@ -36,6 +36,9 @@ module Geoblacklight
 
       append_to_file 'config/initializers/assets.rb',
                      "\nRails.application.config.assets.precompile += %w( favicon.ico )\n"
+
+      append_to_file 'config/initializers/assets.rb',
+                     "\nRails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'images')\n"
     end
 
     def create_blacklight_catalog
@@ -80,18 +83,6 @@ module Geoblacklight
       FileUtils.mkdir_p('tmp/cache/downloads') unless File.directory?('tmp/cache/downloads')
     end
 
-    # Necessary for bootstrap-sass 3.2
-    def inject_sprockets
-      blacklight_css = Dir['app/assets/stylesheets/blacklight.scss'].first
-      if blacklight_css
-        insert_into_file blacklight_css, before: "@import 'bootstrap';" do
-          "@import 'bootstrap-sprockets';\n"
-        end
-      else
-        say_status 'warning', 'Can not find blacklight.scss, did not insert our require', :red
-      end
-    end
-
     def disable_turbolinks
       gsub_file('app/assets/javascripts/application.js', %r{\/\/= require turbolinks}, '')
     end