blacklight-spotlight 3.0.0.alpha.9 → 3.0.0.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f44024854f3173fde8b7045255474d7abf905a6496fe3ee7a757475afde58d
-  data.tar.gz: e0c77bc04b435ba48a16d27e0c780b0a5159514096cae198e18e4ee7f54484df
+  metadata.gz: 27efff1c809c87463bcd240ccc65b6edca2182b73238f1027bc178a2f009ab5e
+  data.tar.gz: 9df0f469fa0bc43f39a718d2cdb3bc7909e25da15a2e1d189ccc054b006eb579
 SHA512:
-  metadata.gz: df80d3a4bfda7921d8b3aa337a1beb8871b0c992a58264015341c8fa8c50f1028c04402be37f5dfc589f6aa223a2c757ffc4092c7d2d10ee99b496fa5e100eea
-  data.tar.gz: 56a480928bc9a99b67024323517581f91c5f2cd1a44c98f5d75bc8c03e2917b84a25074d5653f3efc1619327328682df414dcb90987509ff8351a559bb734270
+  metadata.gz: fc49fe51f1c599c5c3569d4387f7b2c1e124e9d8369a2b554ec26e441d8197f4f7e154cec7ab0b9c8fd3bdb8597315675da6d54b129df4774cdafbecfa339c9f
+  data.tar.gz: c06bc5cd170cf772c13bf220bb8e0ebb136b81fb7a575b6cbfe16704fe77c4cf42c759131f9fda803361b909537ba97e9e366e58f4ab99b68d4275408b3c7853

data/README.md

@@ -9,7 +9,7 @@ Read more about what Spotlight is, our motivations for creating it, and how to i
 
 ## Requirements
 
-1. Ruby (2.3.0 or greater)
+1. Ruby (2.5.0 or greater)
 2. Rails (5.1 or greater)
 3. Java (7 or greater) *for Solr*
 4. ImageMagick (http://www.imagemagick.org/script/index.php) due to [carrierwave](https://github.com/carrierwaveuploader/carrierwave#adding-versions)
@@ -93,7 +93,7 @@ Spotlight ships with [`i18n-tasks`](https://github.com/glebm/i18n-tasks) to help
 $ bundle exec i18n-tasks health
 ```
 
-See [developer-facing instructions for enabling translation](https://github.com/projectblacklight/spotlight/wiki/Translations) on the wiki. 
+See [developer-facing instructions for enabling translation](https://github.com/projectblacklight/spotlight/wiki/Translations) on the wiki.
 
 ## Community
 

data/app/assets/javascripts/spotlight/admin/blocks/browse_block.js

@@ -10,7 +10,7 @@ SirTrevor.Blocks.Browse = (function(){
     autocomplete_url: function() {
       return $(this.inner).closest('form[data-autocomplete-exhibit-searches-path]').data('autocomplete-exhibit-searches-path').replace("%25QUERY", "%QUERY");
     },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
+    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{full_title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
 
     bloodhoundOptions: function() {
       return {
@@ -21,6 +21,60 @@ SirTrevor.Blocks.Browse = (function(){
       };
     },
 
+    _itemPanel: function(data) {
+      var index = "item_" + this.globalIndex++;
+      var checked;
+      if (data.display == "true") {
+        checked = "checked='checked'"
+      } else {
+        checked = "";
+      }
+      var resource_id = data.slug || data.id;
+      var markup = [
+          '<li class="field form-inline dd-item dd3-item" data-resource-id="' + resource_id + '" data-id="' + index + '" id="' + this.formId("item_" + data.id) + '">',
+            '<input type="hidden" name="item[' + index + '][id]" value="' + resource_id + '" />',
+            '<input type="hidden" name="item[' + index + '][full_title]" value="' + (data.full_title || data.title) + '" />',
+            '<input data-property="weight" type="hidden" name="item[' + index + '][weight]" value="' + data.weight + '" />',
+              '<div class="card d-flex dd3-content">',
+                '<div class="dd-handle dd3-handle"><%= i18n.t("blocks:resources:panel:drag") %></div>',
+                '<div class="card-header item-grid">',
+                  '<div class="d-flex">',
+                    '<div class="checkbox">',
+                      '<input name="item[' + index + '][display]" type="hidden" value="false" />',
+                      '<input name="item[' + index + '][display]" id="'+ this.formId(this.display_checkbox + '_' + data.id) + '" type="checkbox" ' + checked + ' class="item-grid-checkbox" value="true"  />',
+                      '<label class="sr-only" for="'+ this.formId(this.display_checkbox + '_' + data.id) +'"><%= i18n.t("blocks:resources:panel:display") %></label>',
+                    '</div>',
+                    '<div class="pic">',
+                      '<img class="img-thumbnail" src="' + (data.thumbnail_image_url || ((data.iiif_tilesource || "").replace("/info.json", "/full/!100,100/0/default.jpg"))) + '" />',
+                    '</div>',
+                    '<div class="main">',
+                      '<div class="title card-title">' + (data.full_title || data.title) + '</div>',
+                      '<div>' + (data.slug || data.id) + '</div>',
+                    '</div>',
+                    '<div class="remove float-right">',
+                      '<a data-item-grid-panel-remove="true" href="#"><%= i18n.t("blocks:resources:panel:remove") %></a>',
+                    '</div>',
+                  '</div>',
+                '</div>',
+              '</div>',
+            '</li>'
+      ].join("\n");
+
+      var panel = $(_.template(markup)(this));
+      var context = this;
+
+      $('.remove a', panel).on('click', function(e) {
+        e.preventDefault();
+        $(this).closest('.field').remove();
+        context.afterPanelDelete();
+
+      });
+
+      this.afterPanelRender(data, panel);
+
+      return panel;
+    },
+
     item_options: function() { return [
       '<label>',
         '<input type="hidden" name="display-item-counts" value="false" />',

data/app/assets/javascripts/spotlight/admin/blocks/uploaded_items_block.js

@@ -85,9 +85,13 @@ SirTrevor.Blocks.UploadedItems = (function(){
                 '</div>',
                 '<div class="main form-horizontal">',
                   '<div class="title card-title">' + dataTitle + '</div>',
-                  '<div class="field">',
+                  '<div class="field row mr-3">',
                     '<label for="' + this.formId('caption_' + dataId) + '" class="col-form-label col-md-3"><%= i18n.t("blocks:uploaded_items:caption") %></label>',
-                    '<input type="text" class="form-control" id="' + this.formId('caption_' + dataId) + '" name="item[' + index + '][caption]" data-field="caption"/>',
+                    '<input type="text" class="form-control col" id="' + this.formId('caption_' + dataId) + '" name="item[' + index + '][caption]" data-field="caption"/>',
+                  '</div>',
+                  '<div class="field row mr-3">',
+                    '<label for="' + this.formId('link_' + dataId) + '" class="col-form-label col-md-3"><%= i18n.t("blocks:uploaded_items:link") %></label>',
+                    '<input type="text" class="form-control col" id="' + this.formId('link_' + dataId) + '" name="item[' + index + '][link]" data-field="link"/>',
                   '</div>',
                 '</div>',
                 '<div class="remove float-right">',
@@ -99,6 +103,7 @@ SirTrevor.Blocks.UploadedItems = (function(){
 
       var panel = $(_.template(markup)(this));
       panel.find('[data-field="caption"]').val(data.caption);
+      panel.find('[data-field="link"]').val(data.link);
       var context = this;
 
       $('.remove a', panel).on('click', function(e) {

data/app/assets/javascripts/spotlight/admin/crop.es6

@@ -269,6 +269,11 @@ export default class Crop {
 
   successHandler(data, stat, xhr) {
     this.setIiifFields({ tilesource: data.tilesource });
+    this.setUploadId(data.id);
+  }
+
+  setUploadId(id) {
+    $('#' + this.formPrefix + "_upload_id").val(id);
   }
 
   aspectRatioPreservingRectangleEditor(aspect) {

data/app/assets/javascripts/spotlight/admin/sir-trevor/locales.js

@@ -29,8 +29,9 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
 
   uploaded_items: {
     title: "Uploaded Item Row",
-    description: "This widget displays uploaded items in a horizontal row. Optionally, you can add a heading and/or text to be displayed adjacent to the items.",
-    caption: 'Caption'
+    description: "This widget displays uploaded items in a horizontal row. Optionally, you can add a heading and/or text to be displayed adjacent to the items. The item caption and link URL fields are also optional.",
+    caption: 'Caption',
+    link: 'Link URL'
   },
 
   featured_pages: {

data/app/assets/stylesheets/spotlight/_accessibility.scss

@@ -2,7 +2,7 @@
 
 // Increase visibility of Firefox focus indicator
 @-moz-document url-prefix() {
-  &:focus {
+  :focus {
     outline: $input-focus-border-color auto 5px;
   }
 }

data/app/assets/stylesheets/spotlight/_browse.scss

@@ -26,6 +26,18 @@ $image-overlay-max-height: 300px;
   }
 }
 
+.blacklight-browse-show {
+  .subtitle {
+    padding-right: $spacer;
+
+    &::before {
+      content: " \000B7 ";
+      color: $text-muted;
+      padding-right: $spacer / 2;
+    }
+  }
+}
+
 .browse-landing {
   text-align: center;
   // Placeholder for vertically alignment - might already be available from use in another feature
@@ -70,6 +82,10 @@ $image-overlay-max-height: 300px;
       font-size: $h3-font-size;
       @extend %vertical-align;
 
+      .category-subtitle {
+        display: block;
+      }
+
       small {
         display: block;
         color: $white;

data/app/assets/stylesheets/spotlight/_curation.scss

@@ -216,3 +216,9 @@ table.tags {
     text-align: center;
   }
 }
+
+.card-title .subtitle::before {
+  content: " \000B7 ";
+  color: $text-muted;
+  padding-right: 3px;
+}

data/app/assets/stylesheets/spotlight/_featured_browse_categories_block.scss

@@ -55,6 +55,9 @@ $aspect-ratio-factor-medium-image: 1; // 1:1 width: height
     margin: 0;
     padding: $spacer / 4;
   }
+  .category-subtitle {
+    display: block;
+  }
   .item-count {
     font-size: $font-size-base;
     text-transform: uppercase;

data/app/assets/stylesheets/spotlight/_header.scss

@@ -79,7 +79,7 @@
 .image-masthead {
   background-color: $black;
 
-  .navbar {
+  .exhibit-navbar {
     @extend .navbar-dark;
     background-color: $navbar-transparent-page-bg;
 

data/app/assets/stylesheets/spotlight/_translations.scss

@@ -36,6 +36,7 @@
   }
 }
 
+.translation-subtitle-toggle,
 .translation-description-toggle {
   margin: 0;
   padding: 0;

data/app/controllers/spotlight/appearances_controller.rb

@@ -40,6 +40,7 @@ module Spotlight
         source
         image
         document_global_id
+        upload_id
       ]
     end
   end

data/app/controllers/spotlight/browse_controller.rb

@@ -69,7 +69,7 @@ module Spotlight
     end
 
     def attach_search_breadcrumb
-      add_breadcrumb @search.title, exhibit_browse_path(@exhibit, @search)
+      add_breadcrumb @search.full_title, exhibit_browse_path(@exhibit, @search)
     end
 
     def _prefixes

data/app/controllers/spotlight/exhibits_controller.rb

@@ -27,8 +27,7 @@ module Spotlight
     end
 
     def process_import
-      @exhibit.import(JSON.parse(import_exhibit_params.read))
-      if @exhibit.save && @exhibit.reindex_later
+      if @exhibit.import(JSON.parse(import_exhibit_params.read)) && @exhibit.reindex_later
         redirect_to spotlight.exhibit_dashboard_path(@exhibit), notice: t(:'helpers.submit.exhibit.updated', model: @exhibit.class.model_name.human.downcase)
       else
         render action: :import
@@ -50,7 +49,7 @@ module Spotlight
       respond_to do |format|
         format.json do
           authorize! :export, @exhibit
-          send_data JSON.pretty_generate(Spotlight::ExhibitExportSerializer.new(@exhibit).as_json),
+          send_data JSON.pretty_generate(Spotlight::ExhibitImportExportService.new(@exhibit).as_json),
                     type: 'application/json',
                     disposition: 'attachment',
                     filename: "#{@exhibit.friendly_id}-export.json"

data/app/controllers/spotlight/featured_images_controller.rb

@@ -3,7 +3,7 @@
 module Spotlight
   # Handles requests to upload images for exhibit thumbnails
   class FeaturedImagesController < Spotlight::ApplicationController
-    load_and_authorize_resource instance_name: :featured_image
+    load_and_authorize_resource instance_name: :featured_image, class: 'Spotlight::TemporaryImage'
 
     def create
       if @featured_image.save && @featured_image.file_present?

data/app/controllers/spotlight/pages_controller.rb

@@ -70,7 +70,7 @@ module Spotlight
       @page.lock&.delete
 
       if @page.update(page_params.merge(last_edited_by: current_user))
-        redirect_to [spotlight, @page.exhibit, @page], flash: { html_safe: true }, notice: undo_notice(:updated)
+        redirect_to [spotlight, @page.exhibit, @page, format: params.permit(:format)], flash: { html_safe: true }, notice: undo_notice(:updated)
       else
         render action: 'edit'
       end

data/app/controllers/spotlight/searches_controller.rb

@@ -31,7 +31,7 @@ module Spotlight
       respond_to do |format|
         format.html
         format.json do
-          render json: @searches.as_json(methods: %i[count thumbnail_image_url]), root: false
+          render json: @searches.as_json(methods: %i[full_title count thumbnail_image_url]), root: false
         end
       end
     end
@@ -50,7 +50,7 @@ module Spotlight
     end
 
     def edit
-      add_breadcrumb @search.title, edit_exhibit_search_path(@search.exhibit, @search)
+      add_breadcrumb @search.full_title, edit_exhibit_search_path(@search.exhibit, @search)
       @exhibit = @search.exhibit
     end
 
@@ -105,6 +105,7 @@ module Spotlight
     def search_params
       params.require(:search).permit(
         :title,
+        :subtitle,
         :long_description,
         :search_box,
         :default_index_view_type,

data/app/controllers/spotlight/translations_controller.rb

@@ -21,6 +21,22 @@ module Spotlight
       end
     end
 
+    def show
+      respond_to do |format|
+        format.yaml
+      end
+    end
+
+    def import
+      if current_exhibit.update(import_exhibit_params)
+        I18n.reload! # reload since we're memoizing
+        notice = t(:'helpers.submit.spotlight_default.updated', model: current_exhibit.class.model_name.human.downcase)
+        redirect_to edit_exhibit_translations_path(current_exhibit, language: @language), notice: notice
+      else
+        render 'edit'
+      end
+    end
+
     private
 
     def attach_breadcrumbs
@@ -33,6 +49,21 @@ module Spotlight
       params.require(:exhibit).permit(translations_attributes: %i[id locale key value])
     end
 
+    def import_exhibit_params
+      imported_translations = YAML.safe_load(params.require(:file).read)
+
+      # set language from YML root locale
+      language = imported_translations.keys.first
+
+      # convert YML to hash
+      translation = unfold(imported_translations.values.first).map do |k, v|
+        current_translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: k, locale: language)
+        { key: k, value: v, locale: language, id: current_translation.id }
+      end
+
+      { translations_attributes: translation }
+    end
+
     def set_language
       @language = params[:language] || current_exhibit.available_locales.first
     end
@@ -40,5 +71,20 @@ module Spotlight
     def set_tab
       @tab = params[:tab]
     end
+
+    def unfold(value, key = nil)
+      return to_enum(:unfold, value, key) unless block_given?
+
+      if value.is_a? Hash
+        value.each do |k, v|
+          arr = unfold(v, [key, k].compact.join('.'))
+          arr.each do |k1, v1|
+            yield k1, v1
+          end
+        end
+      else
+        yield key, value
+      end
+    end
   end
 end

data/app/helpers/spotlight/crop_helper.rb

@@ -25,7 +25,10 @@ module Spotlight
     end
 
     def iiif_upload_tag(f)
-      f.file_field_without_bootstrap :file, name: 'featured_image[image]', data: { endpoint: polymorphic_path(f.object.model_name.route_key) }
+      content_tag(:div) do
+        concat f.file_field_without_bootstrap :file, name: 'featured_image[image]', data: { endpoint: polymorphic_path(f.object.model_name.route_key) }
+        concat f.hidden_field :upload_id
+      end
     end
 
     def form_prefix(f)

data/app/models/concerns/spotlight/translatables.rb

@@ -15,8 +15,24 @@ module Spotlight
       # Set up a reader for the specified attribute that uses the I18n backend,
       # and defaults to the ActiveRecord value
       def define_translated_attr_reader(attr_name)
+        # Define a dynamic method for translating database-backed attributes,
+        # falling back to the database information as needed.
+        #
+        # Note: the empty string is provided as the final fallback to avoid i18n blowing
+        # up on nil attributes.
         define_method(:"#{attr_name}") do
-          I18n.translate(attr_name, scope: slug, default: attr_translation(attr_name))
+          send("translated_#{attr_name}", default: [attr_translation(attr_name), ''])
+        end
+
+        # Define an accessor that gets the value of the attribute in a given locale,
+        # returning `nil` for untranslated values.
+        #
+        # Note: For the default locale, we actually want to dig into the database,
+        # because that is the source of truth for the data.
+        define_method(:"translated_#{attr_name}") do |default: [], **options|
+          default = Array.wrap(default)
+          default.prepend(attr_translation(attr_name)) if I18n.locale == I18n.default_locale
+          I18n.translate(attr_name, scope: slug, default: default, **options).presence
         end
       end
     end

data/app/models/spotlight/about_page.rb

@@ -5,6 +5,8 @@ module Spotlight
   # About pages
   class AboutPage < Spotlight::Page
     extend FriendlyId
-    friendly_id :title, use: %i[slugged scoped finders history], scope: %i[exhibit locale]
+    friendly_id :title, use: %i[slugged scoped finders history], scope: %i[exhibit locale] do |config|
+      config.reserved_words.concat(%w[update_all contacts])
+    end
   end
 end

data/app/models/spotlight/exhibit.rb

@@ -100,8 +100,10 @@ module Spotlight
     end
 
     def import(hash)
-      Spotlight::ExhibitExportSerializer.prepare(self).from_hash(hash)
-      self
+      ActiveRecord::Base.transaction do
+        Spotlight::ExhibitImportExportService.new(self).from_hash!(hash)
+        save
+      end
     end
 
     def solr_data