blacklight-spotlight 4.3.6 → 4.5.0

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

@@ -6,3 +6,12 @@
     outline: $input-focus-border-color auto 5px;
   }
 }
+
+// CSS for accessibility dashboard
+.alt-text-status .bi-exclamation-triangle-fill {
+  fill: $warning;
+}
+
+.alt-text-status .bi-check-circle-fill {
+  fill: $success;
+}

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

@@ -48,12 +48,6 @@ $image-overlay-max-height: 300px;
 
 .browse-landing {
   text-align: center;
-  // Placeholder for vertically alignment - might already be available from use in another feature
-  %vertical-align {
-    position: relative;
-    top: 50%;
-    transform: translateY(-50%);
-  }
 
   .category {
     margin-bottom: $spacer;
@@ -77,18 +71,16 @@ $image-overlay-max-height: 300px;
     bottom: 0;
     left: 0;
     width: 100%;
-    height: 100%;
-    background: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, .2), rgba(0, 0, 0, .4));
+    background: linear-gradient(0deg, rgba(46, 45, 41, 0.7) 70%, rgba(46, 45, 41, 0) 100%);
     color: $white;
-    padding: 8%;
+    padding: 50px 20px 20px 20px;
     text-align: center;
-    text-shadow: 0 1px 0 $black;
+
     // prevents potential blur caused by the vertical-align technique
     transform-style: preserve-3d;
 
     .browse-category-title {
       font-size: $h3-font-size;
-      @extend %vertical-align;
 
       .category-subtitle {
         display: block;
@@ -142,6 +134,7 @@ $image-overlay-max-height: 300px;
     .btn-reset {
       background-color: transparent;
       display: none;
+      margin-left: -42px;
       left: -40px;
       z-index: 20;
     }

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

@@ -61,12 +61,14 @@ $xl-sidebar-five-tile-width: ($container-xl-sidebar * 0.2) - $tile-margin;
   position: relative;
 
   .category-caption {
-    bottom: 16px; // assumes default font-size of 16px, using browser default of 1 rem == 16px
+    bottom: 0px;
     color: $featured-browse-category-caption-color;
     position: absolute;
     text-align: center;
-    text-shadow: 0 1px 0 $black;
     width: 100%;
+    padding: 35px 15px 15px;
+    background: linear-gradient(0deg, rgba(46, 45, 41, 0.7) 70%, rgba(46, 45, 41, 0) 100%);
+    border-radius: $border-radius-lg;
   }
 
   .category-title {

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

@@ -14,5 +14,6 @@
     @extend .bg-warning !optional;
     content: 'Private';
     margin-left: 3px;
+    color: black;
   }
 }

data/app/components/spotlight/edit_view_links_component.html.erb

@@ -0,0 +1,13 @@
+<div class="<%= classes %>">
+  <% if page.is_a?(Spotlight::HomePage) %>
+    <%= helpers.exhibit_view_link page, helpers.exhibit_root_path(page.exhibit) %> &middot;
+    <%= helpers.exhibit_edit_link page, helpers.edit_exhibit_home_page_path(page.exhibit), data: { turbolinks: false,
+        turbo: false } %>
+  <% else %>
+    <%= helpers.exhibit_view_link page %> &middot;
+    <%= helpers.exhibit_edit_link page, data: { turbolinks: false, turbo: false } %>
+  <% end %>
+  <% if delete_link %>
+    &middot; <%= helpers.exhibit_delete_link page %>
+  <% end %>
+</div>

data/app/components/spotlight/edit_view_links_component.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Allows component addition to exhibit navbar
+  class EditViewLinksComponent < ViewComponent::Base
+    attr_reader :page, :classes, :delete_link
+
+    def initialize(page:, classes: 'page-links', delete_link: false)
+      super
+
+      @page = page
+      @classes = classes
+      @delete_link = delete_link
+    end
+  end
+end

data/app/components/spotlight/solr_document_legacy_embed_component.rb

@@ -12,7 +12,7 @@ module Spotlight
     end
 
     def before_render
-      set_slot(:embed, nil, block_context: block_context) unless embed
+      set_slot(:embed, nil, block_context:) unless embed
 
       super
     end

data/app/components/spotlight/tag_list_form_component.html.erb

@@ -1,5 +1,5 @@
 <% if Spotlight::Engine.config.site_tags %>
-  <div class="form-group row">
+  <div class="form-group mb-3 row">
   <label class="col-form-label col-md-2" for="tag_list">Tag list</label>
   <div class="col-md-10">
     <div class="overflow-scroll rounded border px-3 py-2 h-25" style="overflow: scroll; height: 25vh!important;">

data/app/controllers/spotlight/accessibility_controller.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ##
+  # Exhibit dashboard controller
+  class AccessibilityController < Spotlight::ApplicationController
+    before_action :authenticate_user!
+    load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
+
+    def alt_text
+      @limit = 5
+      # Sort by newest except for the homepage, which is always first
+      pages_with_alt = @exhibit.pages.order(Arel.sql('id = 1 DESC, created_at DESC')).select { |elem| elem.content.any?(&:alt_text?) }
+      pages = params[:show_all] ? pages_with_alt : pages_with_alt.first(@limit)
+      @pages = pages.map { |page| get_alt_info(page) }
+      @has_alt_text = @pages.sum { |page| page[:has_alt_text] }
+      @total_alt_items = @pages.sum { |page| page[:can_have_alt_text] }
+
+      attach_alt_text_breadcrumbs
+    end
+
+    private
+
+    def get_alt_info(page)
+      can_have_alt_text = 0
+      has_alt_text = 0
+      page.content.each do |content|
+        next unless content.alt_text?
+
+        content.item&.each_value do |item|
+          can_have_alt_text += 1
+          has_alt_text += 1 if item['alt_text'].present? || item['decorative'].present?
+        end
+      end
+      complete = can_have_alt_text.zero? || has_alt_text / can_have_alt_text == 1
+      { can_have_alt_text:, has_alt_text:, page:, status: has_alt_text, complete: }
+    end
+
+    def attach_alt_text_breadcrumbs
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.accessibility.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.accessibility.alt_text.header'), exhibit_alt_text_path(@exhibit))
+    end
+  end
+end

data/app/helpers/spotlight/main_app_helpers.rb

@@ -31,7 +31,7 @@ module Spotlight
 
     # Expecting to upstream this override in https://github.com/projectblacklight/blacklight/pull/3343/files
     def document_presenter(document, view_config: nil, **kwargs)
-      (view_config&.document_presenter_class || document_presenter_class(document)).new(document, self, view_config: view_config, **kwargs)
+      (view_config&.document_presenter_class || document_presenter_class(document)).new(document, self, view_config:, **kwargs)
     end
 
     def document_presenter_class(_document)

data/app/helpers/spotlight/title_helper.rb

@@ -8,6 +8,10 @@ module Spotlight
       page_title t(:'spotlight.curation.header'), title
     end
 
+    def accessibility_page_title(title = nil)
+      page_title t(:'spotlight.accessibility.header'), title
+    end
+
     def configuration_page_title(title = nil)
       page_title t(:'spotlight.configuration.header'), title
     end

data/app/javascript/spotlight/admin/blocks/resources_block.js

@@ -8,18 +8,16 @@ Core.Block.Resources = (function(){
     formable: true,
     autocompleteable: true,
     show_heading: true,
-    show_alt_text: true,
-
     title: function() { return i18n.t("blocks:" + this.type + ":title"); },
     description: function() { return i18n.t("blocks:" + this.type + ":description"); },
-    alt_text_guidelines: function() { 
-      if (this.show_alt_text) {
+    alt_text_guidelines: function() {
+      if (this.showAltText()) {
         return i18n.t("blocks:alt_text_guidelines:intro"); 
       }
       return "";
     },
     alt_text_guidelines_link: function() {
-      if (this.show_alt_text) {
+      if (this.showAltText()) {
         var link_url = i18n.t("blocks:alt_text_guidelines:link_url");
         var link_label = i18n.t("blocks:alt_text_guidelines:link_label");
         return '<a target="_blank" href="' + link_url + '">' +  link_label + '</a>'; 
@@ -45,12 +43,23 @@ Core.Block.Resources = (function(){
     },
 
     _altTextFieldsHTML: function(index, data) {
-      if (this.show_alt_text) {
+      if (this.showAltText()) {
         return this.altTextHTML(index, data);
       }
       return "";
     },
 
+    showAltText: function() {
+      return this.editorOptions.altTextSettings[this._typeAsCamelCase()]
+    },
+
+    _typeAsCamelCase: function() {
+      return this.type
+          .split('_')
+          .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+          .join('');
+    },
+
     _itemPanel: function(data) {
       var index = "item_" + this.globalIndex++;
       var checked;
@@ -188,7 +197,7 @@ Core.Block.Resources = (function(){
     },
 
     attachAltTextHandlers: function(panel) {
-      if (this.show_alt_text) {
+      if (this.showAltText()) {
         const decorativeCheckbox = $('input[name$="[decorative]"]', panel);
         const altTextInput = $('textarea[name$="[alt_text]"]', panel);
         const altTextBackupInput = $('input[name$="[alt_text_backup]"]', panel);

data/app/javascript/spotlight/admin/blocks/solr_documents_embed_block.js

@@ -4,7 +4,6 @@ SirTrevor.Blocks.SolrDocumentsEmbed = (function(){
 
   return SirTrevor.Blocks.SolrDocumentsBase.extend({
     type: "solr_documents_embed",
-    show_alt_text: false,
     icon_name: "item_embed",
 
     item_options: function() { return "" },

data/app/javascript/spotlight/admin/pages.js

@@ -25,6 +25,7 @@ export default class {
       var editor = new SirTrevor.Editor({
         el: instance[0],
         blockTypes: instance.data('blockTypes'),
+        altTextSettings: instance.data('altTextSettings'),
         defaultType:["Text"],
         onEditorRender: function() {
           $.SerializedForm();

data/app/javascript/spotlight/admin/visibility_toggle.js

@@ -7,7 +7,7 @@ const VisibilityToggle = (e) => {
   if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {
     const form = e.target.closest('form')
     if (form) {
-      new CheckboxSubmit(form).clicked(e)
+      if (!Blacklight.BookmarkToggle) new CheckboxSubmit(form).clicked(e)
 
       // Add/remove the "private" label to the document row when visibility is toggled
       const docRow = form.closest('tr')

data/app/javascript/spotlight/user/clear_form_button.js

@@ -1,10 +1,10 @@
 export default class {
   connect() {
     var $clearBtn = $('.btn-reset');
-    var $input = $clearBtn.parent().prev('input');
+    var $input = $clearBtn.prev('#browse_q');
     var btnCheck = function(){
       if ($input.val() !== '') {
-        $clearBtn.css('display', 'inline-block');
+        $clearBtn.css('display', 'block');
       } else {
         $clearBtn.css('display', 'none');
       }

data/app/models/sir_trevor_rails/block.rb

@@ -18,12 +18,24 @@ module SirTrevorRails
       send(:[], :format).present? ? send(:[], :format).to_sym : DEFAULT_FORMAT
     end
 
+    def alt_text?
+      self.class.alt_text?
+    end
+
+    def self.alt_text?
+      false
+    end
+
     # Sets a list of custom block types to speed up lookup at runtime.
     def self.custom_block_types
       # You can define your custom block types directly here or in your engine config.
       Spotlight::Engine.config.sir_trevor_widgets
     end
 
+    def self.custom_block_type_alt_text_settings
+      custom_block_types.index_with { |block_type| SirTrevorRails::Block.block_class(block_type).alt_text? }
+    end
+
     def initialize(hash, parent)
       @raw_data = hash
       @parent  = parent

data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb

@@ -13,6 +13,10 @@ module SirTrevorRails
         @solr_helper = solr_helper
       end
 
+      def self.alt_text?
+        true
+      end
+
       def each_document
         return to_enum(:each_document) unless block_given?
 

data/app/models/sir_trevor_rails/blocks/solr_documents_embed_block.rb

@@ -5,6 +5,9 @@ module SirTrevorRails
     ##
     # Embed documents (using a special blacklight view configuration) and text block
     class SolrDocumentsEmbedBlock < SirTrevorRails::Blocks::SolrDocumentsBlock
+      def self.alt_text?
+        false
+      end
     end
   end
 end

data/app/models/sir_trevor_rails/blocks/uploaded_items_block.rb

@@ -12,6 +12,10 @@ module SirTrevorRails
         (item || {}).map { |_, file| file }.select { |file| file[:display].to_s == 'true' }
       end
 
+      def self.alt_text?
+        true
+      end
+
       def zpr_link?
         zpr_link == 'true'
       end

data/app/models/spotlight/blacklight_configuration.rb

@@ -253,7 +253,7 @@ module Spotlight
         original_config = blacklight_config.index_fields[custom_field.field] || {}
         field = Blacklight::Configuration::IndexField.new original_config.merge(
           custom_field.configuration.merge(
-            key: custom_field.field, field: custom_field.solr_field, custom_field: true
+            key: custom_field.field, field: custom_field.solr_field, custom_field: true, type: 'custom-field'
           )
         )
         [custom_field.field, field]
@@ -358,6 +358,7 @@ module Spotlight
 
       options = f.blacklight_options || {}
       options[:label] = f.label if f.label
+      options[:type] = 'uploaded'
 
       config.add_index_field key, options
     end

data/app/models/spotlight/custom_field.rb

@@ -39,7 +39,7 @@ module Spotlight
              else
                configuration
              end
-      conf['label']
+      conf['label'] || conf[:label]
     end
 
     def short_description=(short_description)

data/app/services/spotlight/exhibit_import_export_service.rb

@@ -164,6 +164,7 @@ module Spotlight
 
       hash[:custom_fields].each do |attr|
         ar = exhibit.custom_fields.find_or_initialize_by(slug: attr[:slug])
+        attr[:configuration] = attr[:configuration].clone.transform_keys(&:to_s)
         ar.update(attr)
       end
 

data/app/views/layouts/spotlight/base.html.erb

@@ -36,7 +36,7 @@
     <%= render partial: 'shared/masthead' %>
     <%= content_for?(:header_content) ? yield(:header_content) : "" %>
 
-    <main id="main-container" class="<%= container_classes %>" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
+    <main id="main-container" class="<%= container_classes %>" aria-label="<%= t('blacklight.main.aria.main_container') %>">
       <%= content_for(:container_header) %>
 
       <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>

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

@@ -14,7 +14,7 @@
   <% end %>
 <% end %>
 
-<header class="masthead <%= 'image-masthead' if current_masthead %> <%= 'resource-masthead' if resource_masthead? %>" role="banner">
+<header class="masthead <%= 'image-masthead' if current_masthead %> <%= 'resource-masthead' if resource_masthead? %>">
   <% if current_masthead %>
     <span class='background-container' style="background-image: url('<%= current_masthead.iiif_url %>')"></span>
     <span class='background-container-gradient'></span>

data/app/views/spotlight/accessibility/alt_text.html.erb

@@ -0,0 +1,64 @@
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<%= accessibility_page_title t(:".header") %>
+
+<p>
+  <%= t(:'.total_items', has_alt_text: @has_alt_text, total_alt_items: @total_alt_items).html_safe %>
+</p>
+
+<p>
+  <%= t(:'.note') %>
+</p>
+<table class="table table-striped">
+  <thead>
+    <tr class="d-flex">
+      <th class="col-6">
+        <%= t :'.table.page_title' %>
+      </th>
+      <th class="col-3">
+        <%= t :'.table.has_alt_text' %>
+      </th>
+      <th class="col-3">
+        <%= t :'.table.can_have_alt_text' %>
+      </th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @pages.each do | page_dict | %>
+      <% page = page_dict[:page] %>
+      <tr class="d-flex">
+        <td class="col-6">
+          <h4 class="h5 mb-0">
+            <%= page.title %>
+            <span class="alt-text-status">
+              <% if page_dict[:complete] %>
+                <svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px" class="bi bi-check-circle-fill">
+                  <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0m-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
+                </svg>
+              <% else %>
+              <svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px" class="bi bi-exclamation-triangle-fill">
+                  <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
+                </svg>
+              <% end %>
+            </span>
+          </h4>
+          <%= render Spotlight::EditViewLinksComponent.new(page:, classes:'page-links pt-0') %>
+        </td>
+        <td class="col-3">
+          <%= page_dict[:has_alt_text] %>
+        </td>
+        <td class="col-3">
+          <%= page_dict[:can_have_alt_text] %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<% unless params[:show_all] || @pages.length < @limit %>
+  <%= link_to '?show_all=true', class: 'ml-3' do %>
+    Show all<%= blacklight_icon('chevron_right') %>
+  <% end %>
+<% end %>

data/app/views/spotlight/browse/_search_box.html.erb

@@ -1,21 +1,19 @@
 <div class="search-box-container">
   <%= form_tag exhibit_browse_path(current_exhibit, search), method: :get, class: 'browse-search-form search-query-form form-horizontal', role: 'search', 'aria-labelledby' => 'browse-search-form' do %>
     <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :exhibit_id, :qt, :page)) %>
-    <div class="form-group mb-3 row">
+    <div class="form-group mb-5 row">
       <label id="browse-search-form" class="col-sm-4 col-form-label h6" for="browse_q"><%= t(:'.label') %></label>
       <div class="col-sm-6">
         <div class="input-group">
           <%= text_field_tag :q, params[:q], placeholder: t(:'.placeholder'), class: "form-control", id: "browse_q" %>
-            <span class="input-group-btn input-group-append">
-              <button class="btn btn-reset btn-sm" type="reset">
-                <span class="sr-only visually-hidden"><%= t(:'.reset') %></span>
-                <%= blacklight_icon('highlight_off') %>
-              </button>
-              <button type="submit" class="btn btn-primary search-btn" id="browse-search">
-                <span class="submit-search-text"><%= t(:'.submit') %></span>
-                <%= blacklight_icon('search', aria_hidden: true) %>
-              </button>
-            </span>
+            <button class="btn btn-reset btn-sm" type="reset">
+              <span class="sr-only visually-hidden"><%= t(:'.reset') %></span>
+              <%= blacklight_icon('highlight_off') %>
+            </button>
+            <button type="submit" class="btn btn-primary search-btn" id="browse-search">
+              <span class="submit-search-text"><%= t(:'.submit') %></span>
+              <%= blacklight_icon('search', aria_hidden: true) %>
+            </button>
         </div>
       </div>
     </div>

data/app/views/spotlight/bulk_updates/_upload.html.erb

@@ -9,7 +9,7 @@
       <div class="input-group">
         <%= file_field_tag :file, class: 'form-control', accept: '.csv,text/csv', 'aria-described-by': 'bulk-update-form-help' %>
         <div class="input-group-append">
-          <%= f.submit t('.submit'), class: 'btn btn-primary' %>
+          <%= f.submit t('.submit'), class: 'btn btn-primary rounded-0 rounded-end' %>
         </div>
       </div>
     </div>

data/app/views/spotlight/custom_fields/form_group/_text.html.erb

@@ -18,6 +18,6 @@
         <%= f.text_area_without_bootstrap field.slug, multiple: field.is_multiple?, value: nil, class: "form-control field-#{field.slug}" %>
       </div>
     <% end %>
-    <%= content_tag :button, t('helpers.action.add_another'), class: 'btn btn-info btn-sm h-100', data: { action: 'add-another', template_id: "spotlight-field-template-#{field.slug}" } %>
+    <%= content_tag :button, t('helpers.action.add_another'), class: 'btn btn-info btn-sm col-auto h-100', data: { action: 'add-another', template_id: "spotlight-field-template-#{field.slug}" } %>
   <% end %>
 </div>

data/app/views/spotlight/custom_fields/form_group/_vocab.html.erb

@@ -18,6 +18,6 @@
         <%= f.text_field_without_bootstrap field.slug, multiple: field.is_multiple?, value: nil, class: "form-control field-#{field.slug}" %>
       </div>
     <% end %>
-    <%= content_tag :button, t('helpers.action.add_another'), class: 'btn btn-info btn-sm h-100', data: { action: 'add-another', template_id: "spotlight-field-template-#{field.slug}" } %>
+    <%= content_tag :button, t('helpers.action.add_another'), class: 'btn btn-info btn-sm col-auto h-100', data: { action: 'add-another', template_id: "spotlight-field-template-#{field.slug}" } %>
   <% end %>
 </div>

data/app/views/spotlight/dashboards/_page.html.erb

@@ -1,15 +1,7 @@
 <tr class="d-flex">
   <td class="col-6">
     <h4 class="h5 mb-0"><%= page.title %></h4>
-    <div class="page-links pt-0">
-      <% if page.is_a?(Spotlight::HomePage) %>
-          <%= link_to action_default_value(page, :view), current_exhibit %> &middot;
-          <%= exhibit_edit_link page, edit_exhibit_home_page_path(page.exhibit), data: { turbolinks: false, turbo: false } %>
-      <% else %>
-        <%= exhibit_view_link page %> &middot;
-        <%= exhibit_edit_link page, data: { turbolinks: false, turbo: false } %>
-      <% end %>
-    </div>
+    <%= render Spotlight::EditViewLinksComponent.new(page:, classes: 'page-links pt-0') %>
   </td>
   <td class="col-4"><%= page.last_edited_by.to_s if page.last_edited_by %></td>
   <td class="col-2"><%= l page.updated_at, format: :long %></td>

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

@@ -11,8 +11,8 @@
     <button id='another-email' class="btn btn-sm btn-info"><%= t('.add_contact_email_button') %></button>
     <div class="form-text text-muted mb-3"><%= t(:'.fields.contact_emails.help_block') %></div>
   <% end %>
-  <%= f.form_group :published, label: { text: nil, class: 'pt-0' }, help: nil do %>
-    <%= f.check_box :published, label: "" %>
+  <%= f.form_group :published, label: { class: 'pt-0 col-md-2 col-form-label' }, help: nil do %>
+    <%= f.check_box_without_bootstrap :published %>
     <div class="form-text text-muted mb-3"><%= t(:'.fields.published.help_block') %></div>
   <% end %>
 

data/app/views/spotlight/feature_pages/_header.html.erb

@@ -2,8 +2,8 @@
   <% page = p.object %>
   <div class="home_page">
     <h2><%= t('spotlight.pages.index.feature_pages.home_pages_header') %></h2>
-    <div class="card d-flex">
-      <div class="card-body d-flex bg-light page main">
+    <div class="card d-flex bg-light">
+      <div class="card-body d-flex page main">
         <div class="flex-grow-1 align-self-center">
           <%= p.hidden_field :id, value: page.id , class: 'form-control form-control-sm' %>
           <h3 class="h6 card-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
@@ -11,10 +11,7 @@
             <%= p.hidden_field :title, value: page.title , class: 'form-control form-control-sm title-field', data: {:"edit-field-target" => 'true'} %>
           </h3>
         </div>
-        <div class="page-links">
-          <%= exhibit_view_link page, exhibit_root_path(page.exhibit) %> &middot;
-          <%= exhibit_edit_link page, edit_exhibit_home_page_path(page.exhibit), data: { turbolinks: false } %>
-        </div>
+        <%= render Spotlight::EditViewLinksComponent.new(page:) %>
       </div>
     </div>
   </div>

data/app/views/spotlight/metadata_configurations/_metadata_field.html.erb

@@ -27,5 +27,12 @@
         <%= field.check_box_without_bootstrap type, checked: config.send(type), disabled: !config.immutable.send(type).nil?, hide_label: true %>
       </td>
     <% end %>
+    <td class="text-center">
+      <% if config.type %>
+        <%= t(:".types.#{config.type}") %>
+      <% end %>
+    </td>
+
+
   <% end %>
 </tr>

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

@@ -26,6 +26,7 @@
               <%= select_deselect_button %>
             </th>
           <% end %>
+          <th class="text-center"><%= t :'.type_label' %></th>
         </tr>
       </thead>
       <tbody class="metadata_fields dd dd-list" data-behavior="nestable" data-max-depth="1" data-list-node-name="tbody" data-item-node-name="tr" data-expand-btn-HTML=" " data-collapse-btn-HTML=" ">

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

@@ -40,7 +40,7 @@
         </div>
         <div class="form-group mb-3">
           <%= f.label :content, class: 'sr-only visually-hidden' %>
-          <%= f.text_area_without_bootstrap :content, value: { data: f.object.content.as_json }.to_json, class: content_editor_class(f.object), data: { 'block-types': SirTrevorRails::Block.custom_block_types } %>
+          <%= f.text_area_without_bootstrap :content, value: { data: f.object.content.as_json }.to_json, class: content_editor_class(f.object), data: { 'block-types': SirTrevorRails::Block.custom_block_types, 'alt-text-settings': SirTrevorRails::Block.custom_block_type_alt_text_settings } %>
         </div>
       </div>