blacklight-spotlight 3.0.0.alpha.3 → 3.0.0.alpha.8

data/app/views/spotlight/searches/_form.html.erb

@@ -40,7 +40,7 @@
         <% end %>
         <% unless @search.query_params.blank? %>
           <div class="form-group row">
-            <label class="col-md-2 col-sm-2 form-control-label"><%= t(:".query_params") %></label>
+            <label class="col-md-2 col-sm-2 col-form-label"><%= t(:".query_params") %></label>
             <div class="col-md-7 col-sm-7">
               <div class="appliedParams card card-body bg-light d-block">
                 <%= render_constraints(@search.query_params) %>
@@ -68,7 +68,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= cancel_link @search,exhibit_searches_path(@exhibit), class: 'btn btn-link' %>
+      <%= cancel_link @search,exhibit_searches_path(@exhibit), class: 'btn-sizing' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
   </div>

data/app/views/spotlight/searches/_search.html.erb

@@ -1,36 +1,37 @@
 <% search = f.object %>
-<li class="dd-item dd3-item" data-id="<%= search.id %>">
-  <div class="dd3-content card">
-    <div class="search d-flex card-body">
-      <div>
-        <%= f.check_box :published, inline: true, hide_label: true %>
-      </div>
+<%= render layout: 'spotlight/shared/dd3_item', locals: { id: search.id.to_s, field: f, dd3_content_classes: "search" , enabled_method: :published, label_method: :title, label: search.title } do |_, section| %>
+  <% case section when nil %>
+  <div class="d-flex flex-grow-1">
+    <div>
+      <%= f.check_box :published, inline: true, hide_label: true %>
+    </div>
 
-      <div class="pic">
-        <%= image_tag(search.thumbnail_image_url || 'spotlight/default_browse_thumbnail.jpg', class: 'img-thumbnail') %>
-      </div>
+    <div class="pic">
+      <%= image_tag(search.thumbnail_image_url || 'spotlight/default_browse_thumbnail.jpg', class: 'img-thumbnail') %>
+    </div>
 
-      <div class="flex-grow-1 mx-2 main">
-        <h4 class="card-title h6 mb-0">
-          <%= search.title %>
-        </h4>
+    <div class="flex-grow-1 mx-2 main">
+      <h4 class="card-title h6 mb-0">
+        <%= search.title %>
+      </h4>
 
-        <div class="card-text">
-          <div class="count"><%= t :'.item_count', count: search.count %></div>
-          <div class="actions"><%= exhibit_view_link(search) %> &bull; <%= exhibit_edit_link(search) %> &bull; <%= exhibit_delete_link(search) %></div>
-          <%= f.hidden_field :id %>
-          <%= f.hidden_field :weight, data: {property: "weight"} %>
-        </div>
+      <div class="card-text">
+        <div class="count"><%= t :'spotlight.searches.search.item_count', count: search.count %></div>
+        <div class="actions"><%= exhibit_view_link(search) %> &bull; <%= exhibit_edit_link(search) %> &bull; <%= exhibit_delete_link(search) %></div>
+        <%= f.hidden_field :id %>
+        <%= f.hidden_field :weight, data: {property: "weight"} %>
       </div>
-      <div class="flex-grow-1 mx-2 description">
-        <div class="card-text">
-          <% if search.long_description.present? %>
-            <%= truncate(search.long_description, length: 89) %>
-          <% else %>
-            <span class="missing-description"><%= t(:'.missing_description_html', link: (link_to action_label(search, :edit_long), [spotlight, :edit, search.exhibit, search])) %></span>
-          <% end %>
-        </div>
+    </div>
+  <% when :additional_options  %>
+    <div class="flex-grow-1 mx-2 description">
+      <div class="card-text">
+        <% if search.long_description.present? %>
+          <%= truncate(search.long_description, length: 89) %>
+        <% else %>
+          <span class="missing-description"><%= t(:'spotlight.searches.search.missing_description_html', link: (link_to action_label(search, :edit_long), [spotlight, :edit, search.exhibit, search])) %></span>
+        <% end %>
       </div>
     </div>
-    <div class="dd-handle dd3-handle"><%= t :drag %></div>
-</li>
+  <% else %>
+  <% end %>
+<% end %>

data/app/views/spotlight/shared/_dd3_item.html.erb

@@ -0,0 +1,56 @@
+<% main_content = yield %>
+<% additional_options = yield nil, :additional_options %>
+<% additional_content = yield nil, :additional_content %>
+<% card_body = yield nil, :card_body %>
+<% dd3_content_classes = local_assigns[:dd3_content_classes].presence %>
+<% card_data = local_assigns[:card_data].presence || {} %>
+<% enabled_method = local_assigns[:enabled_method].presence || :enabled %>
+<% label_method = local_assigns[:label_method].presence || :label %>
+<% label = local_assigns[:label].presence || field.object.public_send(label_method) %>
+<% default_value = local_assigns[:default_value].presence %>
+<% index = local_assigns[:index].presence %>
+<% card_data[:behavior] ||= 'restore-default' if default_value %>
+
+<li class="dd-item" data-id="<%= id.parameterize %>">
+  <div class="dd3-content <%= dd3_content_classes %> card d-flex">
+    <div class="dd-handle dd3-handle"><%= t :drag %></div>
+    <%= content_tag :div, class: "d-flex card-header", data: card_data do %>
+      <%= field.hidden_field :id %>
+        <% if main_content.present?  %>
+          <%= main_content %>
+        <% else %>
+          <div class="flex-grow-1 align-self-center">
+            <h3 class="h6 card-title mb-0">
+              <%= field.hidden_field :weight, value: index, 'data-property' => 'weight' %>
+              <%= field.check_box enabled_method, inline: true, checked: field.object.public_send(enabled_method), hide_label: true, title: label %>
+              <span class="d-inline-block w-75" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
+                <a href="#edit-in-place" class="field-label edit-in-place"><%= label %></a>
+                <%= field.hidden_field label_method, value: label, class: 'form-control form-control-sm title-field', data: {:"edit-field-target" => 'true', default_value: default_value } %>
+              </span>
+            </h3>
+          </div>
+        <% end %>
+
+      <% if default_value %>
+        <div class="">
+          <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn restore-default btn-secondary btn-sm #{'d-none' if label.blank? || label == default_value}" %>
+        </div>
+      <% end %>
+
+      <%= content_tag :div, additional_options, class: 'd-flex' if additional_options.present? %>
+
+
+      <% if additional_content.present? %>
+        <div class="d-flex">
+          <button class="btn btn-link collapse-toggle collapsed" type="button" data-toggle="collapse" data-target="#<%= id.parameterize %>_options" aria-expanded="false" aria-controls="<%= id.parameterize %>_options">
+            Options
+          </button>
+          <span class="collapse-chevron">❯</span>
+        </div>
+      <% end %>
+    <% end %>
+    <%= content_tag :div, additional_content, id: "#{id.parameterize}_options", class: 'options collapse' if additional_content.present? %>
+    <%= content_tag :div, card_body, class: 'card-body bg-white' if card_body.present? %>
+  </div>
+  <%= yield nil, :nested_components %>
+</li>

data/app/views/spotlight/shared/_report_a_problem.html.erb

@@ -14,7 +14,7 @@
       <%= f.hidden_field :current_url %>
       <div class="form-actions">
         <div class="primary-actions">
-        <%= link_to t(:'helpers.action.cancel'), '#', class: 'btn btn-link', data: { 'behavior' => 'cancel-link' } %>
+        <%= link_to t(:'helpers.action.cancel'), '#', class: 'btn-sizing', data: { 'behavior' => 'cancel-link' } %>
         <%= f.submit nil, class: 'btn btn-primary' %>
         </div>
       </div>

data/app/views/spotlight/sir_trevor/blocks/_oembed_block.html.erb

@@ -1,4 +1,4 @@
-<div class="content-block item-text row d-block">
+<div class="content-block item-text row d-block clearfix">
   <div class="<%= 'col-md-6' if oembed_block.text? %> col-12 <%= oembed_block.content_align == 'right' ? 'float-right' : 'float-left' %> oembed-block">
     <%= render_oembed_tag oembed_block.url %>
   </div>

data/app/views/spotlight/sir_trevor/blocks/_quote_block.html.erb

@@ -1,6 +1,6 @@
 <div class="st__content-block st__content-block--quote">
   <div class="quote">
-    <blockquote>
+    <blockquote class="blockquote">
       <div class="quote__content">
         <% if quote_block.format == :html %>
             <%= sir_trevor_format quote_block.text, format: quote_block.format %>
@@ -10,9 +10,9 @@
       </div>
 
       <% if quote_block.cite.present? %>
-        <div class="quote__cite">
-          <cite class="quote__cite-text">&ndash; <%= quote_block.cite %></cite>
-        </div>
+        <footer class="quote__cite blockquote-footer">
+          <cite class="quote__cite-text"><%= quote_block.cite %></cite>
+        </footer>
       <% end %>
     </blockquote>
   </div>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb

@@ -1,6 +1,6 @@
 <% solr_documents_block.with_solr_helper(self) %>
 
-<div class="content-block items-block row d-block">
+<div class="content-block items-block row d-block clearfix">
   <% if solr_documents_block.documents? %>
 
     <div class="items-col spotlight-flexbox <%= solr_documents_block.text? ? "col-md-6" : "col-md-12" %> <%= solr_documents_block.content_align == 'right' ? 'float-right' : 'float-left' %>">

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb

@@ -1,6 +1,6 @@
 <% solr_documents_embed_block.with_solr_helper(self) %>
 
-<div class="content-block items-block row d-block">
+<div class="content-block items-block row d-block clearfix">
 
   <% if solr_documents_embed_block.documents? %>
     <div class="items-col <%= solr_documents_embed_block.text? ? "col-md-6" : "col-md-12" %> <%= solr_documents_embed_block.content_align == 'right' ? 'float-right' : 'float-left' %>">

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb

@@ -1,5 +1,5 @@
 <% solr_documents_grid_block.with_solr_helper(self) %>
-<div class="content-block item-grid-block row d-block">
+<div class="content-block item-grid-block row d-block clearfix">
   <div class="items-col align-content-start justify-content-between flex-wrap <%= solr_documents_grid_block.text? ? 'col-md-9' : 'col-md-12' %> <%= solr_documents_grid_block.content_align == 'right' ? 'float-right' : 'float-left' %>">
     <% if solr_documents_grid_block.documents? %>
         <% solr_documents_grid_block.each_document.each_with_index do |(block_options, document), index| %>

data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb

@@ -1,4 +1,4 @@
-<div class="content-block item-text row d-block">
+<div class="content-block item-text row d-block clearfix">
   <div class="items-col spotlight-flexbox <%= 'col-md-6' if uploaded_items_block.text? %> col-12 <%= uploaded_items_block.content_align == 'right'  ? 'float-right' : 'float-left'  %> uploaded-items-block">
     <% if uploaded_items_block.files.present? %>
       <% uploaded_items_block.files.each do |file| %>

data/app/views/spotlight/sites/edit.html.erb

@@ -1,4 +1,4 @@
-<%= page_title(t('.section'), t('.page_title')) %>
+<%= page_title(t('.page_title')) %>
 <div role="tabpanel">
   <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
     <ul class="nav nav-tabs" role="tablist">

data/app/views/spotlight/sites/edit_exhibits.html.erb

@@ -1,4 +1,4 @@
-<%= page_title(t('.section'), t('.page_title')) %>
+<%= page_title(t('.page_title')) %>
 <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
   <p class="instructions"><%= t :'.instructions' %></p>
   <table class="table table-striped dd-table">

data/app/views/spotlight/translations/_search_fields.html.erb

@@ -74,7 +74,7 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='form-group translation-form'>
+          <div data-translation-progress-item='true' class='row form-group translation-form'>
             <%= translation_fields.label :value, t("spotlight.search.fields.sort.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
             <div class='col-11 col-sm-9 card card-body panel-translation'>
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>

data/app/views/spotlight/translations/edit.html.erb

@@ -6,7 +6,7 @@
   <%= curation_page_title t('spotlight.exhibits.translations.title') %>
 
   <div class='text-center'>
-    <ul class='nav nav-pills inline-block'>
+    <ul class='nav nav-pills'>
       <% current_exhibit.available_locales.each do |language| %>
         <li role="presentation" class="nav-item">
           <%= link_to spotlight.edit_exhibit_translations_path(current_exhibit, language: language), class: "nav-link #{'active' if @language == language}" do %>

data/config/locales/spotlight.en.yml

@@ -187,7 +187,6 @@ en:
         page_title: Manage users
         pending: pending
         save: Add role
-        section: Manage exhibits
         update: Make user an administrator
     appearances:
       edit:
@@ -195,7 +194,6 @@ en:
         main_navigation:
           help: Select the menu items you want to be displayed in the main navigation menu (menu items are only displayed when published pages exist for that item). Click a menu item to change its display label. Drag and drop a menu item to change their order in the menu.
           menu: Main menu
-        restore_default: Restore default
         site_masthead:
           heading: Exhibit masthead
           help: You can select and crop an image to use as a background in your exhibit site's masthead. To use an image as a masthead background, you should use an image that is at least 120 pixels tall and 1200 pixels wide. For best results use an image at least 1800 pixels wide. You can crop larger images using the cropping tool below.
@@ -384,9 +382,7 @@ en:
         basic_settings:
           heading: Basic settings
         header: General
-      exhibit_card_back:
-        visit_exhibit: Visit exhibit
-      exhibit_card_front:
+      exhibit_card:
         unpublished: Unpublished
       export:
         download: Export data
@@ -426,7 +422,7 @@ en:
           language: Language
           public: Public
       new:
-        header: Create a new exhibit
+        page_title: Create a new exhibit
       new_exhibit_form:
         fields:
           slug:
@@ -768,6 +764,8 @@ en:
           other: "%{count} items"
         missing_description_html: "%{link} to add a description."
     shared:
+      dd3_item:
+        restore_default: Restore default
       exhibit_sidebar:
         header: Administration menu
       report_a_problem:
@@ -788,7 +786,6 @@ en:
         basic_settings:
           heading: Title
         page_title: Customize appearance
-        section: Manage exhibits
         site_masthead:
           heading: Site masthead
           help: |
@@ -797,13 +794,10 @@ en:
       edit_exhibits:
         instructions: Drag and drop the exhibits below to specify the order in which they are displayed on the exhibits homepage.
         page_title: Order exhibits
-        section: Manage exhibits
       exhibit:
         published: Published
         unpublished: Unpublished
-      new:
-        page_title: Create a new exhibit
-        section: Manage exhibits
+      home: Exhibits
     tags:
       index:
         actions: Actions

data/config/locales/spotlight.es.yml

@@ -1,32 +1,11 @@
 ---
 es:
-  about_pages:
-    contacts:
-      header: Contacto
   activemodel:
     attributes:
       spotlight/contact_form:
         email: Correo electrónico
         message: Mensage
         name: Nombre
-  browse:
-    search:
-      item_count:
-        one: "%{count} registros"
-        other: "%{count} registros"
-    search_box:
-      label: Buscar en esta categoría
-      placeholder: Buscar
-      reset: Limpiar
-      submit: Buscar en esta categoría
-      success:
-        expand_html: También puede buscar todos los elementos recuperados %{browse_query}.
-        result_number_html: Su búsqueda coincide con %{search_size} de elementos de las %{parent_search_count} en esta  categoría.
-      zero_results:
-        expand_html: Puede %{clear_search_url} borrar su búsqueda o interntar otra que busque en todos los elementos %{browse_query}.
-        result_number: No se encuentran registos con esta búsqueda.
-  header_links:
-    contact: Comentarios
   helpers:
     action:
       cancel: Cancelar
@@ -34,7 +13,29 @@ es:
       contact_form:
         create: Enviar
         created: Gracias. Hemos recibido sus comentarios.
-  shared:
-    report_a_problem:
-      honeypot_field_explanation: No escribir en espacio. Es para detectar "spam." Si escribe algo el mensaje no se enviará.
-      title: Contacto
+  spotlight:
+    about_pages:
+      contacts:
+        header: Contacto
+    browse:
+      search:
+        item_count:
+          one: "%{count} registros"
+          other: "%{count} registros"
+      search_box:
+        label: Buscar en esta categoría
+        placeholder: Buscar
+        reset: Limpiar
+        submit: Buscar en esta categoría
+        success:
+          expand_html: También puede buscar todos los elementos recuperados %{browse_query}.
+          result_number_html: Su búsqueda coincide con %{search_size} de elementos de las %{parent_search_count} en esta  categoría.
+        zero_results:
+          expand_html: Puede %{clear_search_url} borrar su búsqueda o interntar otra que busque en todos los elementos %{browse_query}.
+          result_number: No se encuentran registos con esta búsqueda.
+    header_links:
+      contact: Comentarios
+    shared:
+      report_a_problem:
+        honeypot_field_explanation: No escribir en espacio. Es para detectar "spam." Si escribe algo el mensaje no se enviará.
+        title: Contacto

data/lib/generators/spotlight/install_generator.rb

@@ -64,7 +64,9 @@ module Spotlight
 
     def add_helper
       copy_file 'spotlight_helper.rb', 'app/helpers/spotlight_helper.rb'
-      inject_into_class 'app/helpers/application_helper.rb', ApplicationHelper, '  include SpotlightHelper'
+      inject_into_file 'app/helpers/application_helper.rb', after: 'module ApplicationHelper' do
+        "\n  include SpotlightHelper"
+      end
     end
 
     def add_model_mixin
@@ -107,8 +109,10 @@ module Spotlight
     end
 
     def add_oembed
-      gem 'blacklight-oembed', '>= 0.1', github: 'sul-dlss/blacklight-oembed'
+      gem 'blacklight-oembed', '~> 1.0'
+      Bundler.with_clean_env { run 'bundle install' }
       generate 'blacklight_oembed:install'
+      copy_file 'config/initializers/oembed.rb'
     end
 
     def add_mailer_defaults

data/lib/generators/spotlight/templates/config/initializers/oembed.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'oembed'
+OEmbed::Providers.register_all

data/lib/spotlight/engine.rb

@@ -53,15 +53,10 @@ module Spotlight
       require 'cancan'
       require 'bootstrap_form'
       require 'acts-as-taggable-on'
-      require 'oembed'
 
       Mime::Type.register 'application/solr+json', :solr_json
     end
 
-    initializer 'oembed.initialize' do
-      OEmbed::Providers.register_all
-    end
-
     initializer 'spotlight.factories', after: 'factory_bot.set_factory_paths' do
       FactoryBot.definition_file_paths << File.expand_path('../../spec/factories', __dir__) if defined?(FactoryBot)
     end
@@ -197,6 +192,7 @@ module Spotlight
     config.ga_analytics_options = {}
     config.ga_page_analytics_options = config.ga_analytics_options.merge(limit: 5)
     config.ga_anonymize_ip = false # false for backwards compatibility
+    config.max_pages = 1000
 
     Blacklight::Engine.config.inject_blacklight_helpers = false
 
@@ -256,6 +252,8 @@ module Spotlight
     config.routes = OpenStruct.new
     config.routes.solr_documents = {}
 
+    config.controller_tracking_method = 'track_catalog_path'
+
     config.exports = {
       attachments: true,
       blacklight_configuration: true,

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.0.0.alpha.3'
+  VERSION = '3.0.0.alpha.8'
 end