hyrax 5.2.0 → 5.3.0

data/app/views/hyrax/base/_form_member_of_collections.html.erb

@@ -15,12 +15,12 @@ HTML Properties:
 
   <div class="form-inline mb-3">
       <%= f.label :member_of_collection_ids %>
-      <%= f.input_field :member_of_collection_ids,
-                  prompt: :translate,
-                  data: {
-                    autocomplete: 'collection',
-                    'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/collections?access=deposit'
-                  } %>
+      <select name="member_of_collection_ids" class="ml-2 form-control collection-select2" style="width: 12rem;" data-placeholder="<%= t('hyrax.dashboard.my.action.select') %>">
+        <option value=""></option>
+        <% available_collections(work: @curation_concern).each do |coll| %>
+          <option value="<%= coll.id %>"><%= coll.title.first %></option>
+        <% end %>
+      </select>
       <a href="#" onclick="return false;" class="btn btn-secondary ml-2" data-behavior="add-relationship"><%= t('.add') %></a>
   </div>
 

data/app/views/hyrax/base/_form_redirects.html.erb

@@ -0,0 +1,125 @@
+<%# Aliases tab — see documentation/redirects.md %>
+<% return unless redirects_tab?(f.object) %>
+<h2 class="h3 mt-4"><%= t('hyrax.works.form.redirects.heading') %></h2>
+
+<p><%= sanitize t('hyrax.works.form.redirects.help_html'), tags: %w[code] %></p>
+
+<p><%= sanitize t('hyrax.works.form.redirects.display_url.help_html'), tags: %w[em] %></p>
+
+<% rows = Array(f.object.redirects).map { |e| Hyrax::Redirect.wrap(e) } %>
+<% selected_idx = rows.index(&:is_display_url) %>
+<%# All radios share one name so HTML treats them as one group; value is
+    the row's index. The populator folds the selected index onto per-row
+    is_display_url flags. %>
+<% radio_name = "#{f.object_name}[redirects_display_url_index]" %>
+
+<%# Always-submitted hidden marker so the populator runs even when the
+    user has removed every row from the DOM. The populator drops rows
+    with blank paths, so the marker contributes nothing to the saved
+    set. %>
+<%= hidden_field_tag "#{f.object_name}[redirects_attributes][_marker][path]", '' %>
+
+<table class="table table-striped" data-redirects-table data-next-index="<%= rows.length %>">
+  <caption class="sr-only"><%= t('hyrax.works.form.redirects.caption') %></caption>
+  <thead>
+    <tr>
+      <th scope="col"><%= t('hyrax.works.form.redirects.header.path') %></th>
+      <th scope="col"><%= t('hyrax.works.form.redirects.header.display_url') %></th>
+      <th scope="col" class="sr-only"><%= t('hyrax.works.form.redirects.header.actions') %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td colspan="2">
+        <label>
+          <%= radio_button_tag radio_name, '', selected_idx.nil? %>
+          <%= t('hyrax.works.form.redirects.display_url.none_label') %>
+        </label>
+      </td>
+      <td></td>
+    </tr>
+    <% rows.each_with_index do |entry, index| %>
+      <% input_id = "#{f.object_name}_redirects_attributes_#{index}_path" %>
+      <% label_text = entry.path.present? ? t('hyrax.works.form.redirects.path_label') : t('hyrax.works.form.redirects.new_path_label') %>
+      <% radio_id = "#{f.object_name}_redirects_display_url_index_#{index}" %>
+      <tr data-redirects-row>
+        <td>
+          <%= label_tag input_id, label_text, class: 'sr-only' %>
+          <div class="input-group">
+            <div class="input-group-prepend">
+              <span class="input-group-text"><%= request.base_url %></span>
+            </div>
+            <%= text_field_tag "#{f.object_name}[redirects_attributes][#{index}][path]",
+                               entry.path,
+                               id: input_id,
+                               class: 'form-control',
+                               placeholder: t('hyrax.works.form.redirects.placeholder.path'),
+                               data: { 'redirects-path-input': true, 'redirects-display-radio': radio_id } %>
+          </div>
+        </td>
+        <td>
+          <%= radio_button_tag radio_name,
+                               index.to_s,
+                               index == selected_idx,
+                               id: radio_id,
+                               disabled: entry.path.blank?,
+                               'aria-label': t('hyrax.works.form.redirects.display_url.row_label', path: entry.path.presence || (index + 1)) %>
+        </td>
+        <td class="text-right" style="width: 1%;">
+          <% if entry.path.present? %>
+            <button type="button"
+                    class="btn close"
+                    aria-label="<%= t('hyrax.works.form.redirects.remove_with_path_label', path: entry.path) %>"
+                    data-redirects-remove-row="true">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<p>
+  <button type="button" class="btn btn-secondary" data-redirects-add-row>
+    <%= t('hyrax.works.form.redirects.add_label') %>
+  </button>
+</p>
+
+<%# Template used by the Add button. JS clones this. %>
+<template data-redirects-row-template>
+  <% template_input_id = "#{f.object_name}_redirects_attributes___INDEX___path" %>
+  <% template_radio_id = "#{f.object_name}_redirects_display_url_index___INDEX__" %>
+  <tr data-redirects-row>
+    <td>
+      <%= label_tag template_input_id, t('hyrax.works.form.redirects.new_path_label'), class: 'sr-only' %>
+      <div class="input-group">
+        <div class="input-group-prepend">
+          <span class="input-group-text"><%= request.base_url %></span>
+        </div>
+        <%= text_field_tag "#{f.object_name}[redirects_attributes][__INDEX__][path]",
+                           nil,
+                           id: template_input_id,
+                           class: 'form-control',
+                           placeholder: t('hyrax.works.form.redirects.placeholder.path'),
+                           data: { 'redirects-path-input': true, 'redirects-display-radio': template_radio_id } %>
+      </div>
+    </td>
+    <td>
+      <%= radio_button_tag radio_name,
+                           '__INDEX__',
+                           false,
+                           id: template_radio_id,
+                           disabled: true,
+                           'aria-label': t('hyrax.works.form.redirects.display_url.row_label', path: t('hyrax.works.form.redirects.new_path_label')) %>
+    </td>
+    <td class="text-right" style="width: 1%;">
+      <button type="button"
+              class="btn close"
+              aria-label="<%= t('hyrax.works.form.redirects.remove_label') %>"
+              data-redirects-remove-row="true">
+        <span aria-hidden="true">&times;</span>
+      </button>
+    </td>
+  </tr>
+</template>

data/app/views/hyrax/base/_form_share.html.erb

@@ -49,7 +49,12 @@
 
 <script type="text/x-tmpl" id="tmpl-work-grant">
   <tr>
-    <td><label class="col-form-label">{%= o.name %}</label></td>
-    <td><div class="col-sm-10">{%= o.accessLabel %}<button class="btn close">&times;</button></div></td>
+    <td class="user-group"><label class="col-form-label">{%= o.name %}</label></td>
+    <td>{%= o.accessLabel %}</td>
+    <td class="action">
+      <button class="btn btn-danger remove" aria-label="<%= t('helpers.action.remove') %>">
+        <%= t('helpers.action.remove') %>
+      </button>
+    </td>
   </tr>
 </script>

data/app/views/hyrax/base/_member.html.erb

@@ -1,6 +1,6 @@
 <tr class="<%= dom_class(member) %> attributes">
   <td class="thumbnail">
-    <%= document_presenter(member).thumbnail.thumbnail_tag(alt: 'file details') %>
+    <%= document_presenter(member).thumbnail.thumbnail_tag(alt: member.alt_text_for_view) %>
   </td>
   <td class="attribute attribute-filename ensure-wrapped"><%= link_to(member.link_name, contextual_path(member, @presenter)) %></td>
   <td class="attribute attribute-date_uploaded"><%= member.try(:date_uploaded) %></td>

data/app/views/hyrax/base/_social_media.html.erb

@@ -17,7 +17,7 @@
   <% end %>
 
   <!-- Sharingbutton Twitter -->
-  <%= link_to "https://twitter.com/intent/tweet/?#{{text: page_title, url: share_url}.to_param}", 'aria-label': t(:'hyrax.base.social_media.twitter_share'), class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('hyrax.base.social_media.twitter') do %>
+  <%= link_to "https://x.com/intent/tweet/?#{{text: page_title, url: share_url}.to_param}", 'aria-label': t(:'hyrax.base.social_media.twitter_share'), class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('hyrax.base.social_media.twitter') do %>
     <div class="resp-sharing-button resp-sharing-button--twitter resp-sharing-button--small"><div aria-hidden="true" class="resp-sharing-button__icon resp-sharing-button__icon--solid">
       <svg version="1.1" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
           <title><%= t(:'hyrax.base.social_media.twitter_share') %></title>

data/app/views/hyrax/base/iiif_viewers/_universal_viewer.html.erb

@@ -1,6 +1,6 @@
 <div class="viewer-wrapper">
   <iframe title="image view" 
-    src="<%= universal_viewer_base_url %>#?manifest=<%= main_app.polymorphic_url [main_app, :manifest, presenter], { locale: nil } %>&config=<%= universal_viewer_config_url %>" 
+    src="<%= iiif_viewer_base_url(presenter.iiif_viewer) %>#?manifest=<%= main_app.polymorphic_url [main_app, :manifest, presenter], { locale: nil } %>&config=<%= universal_viewer_config_url %>" 
     allowfullscreen="true" 
     frameborder="0" 
   ></iframe>

data/app/views/hyrax/base/show.html.erb

@@ -1,4 +1,7 @@
 <% provide :page_title, @presenter.page_title %>
+<% content_for :canonical_url do %>
+  <link rel="canonical" href="<%= canonical_url_for(@presenter) %>" />
+<% end %>
 
 <%= render 'shared/citations' %>
 

data/app/views/hyrax/collections/_default_group.html.erb

@@ -5,6 +5,9 @@
   <tr>
     <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
     <th><%= t("hyrax.dashboard.my.heading.title") %></th>
+    <% if Hyrax.config.collection_flexible? %>
+      <th><%= t("hyrax.dashboard.my.heading.profile_version") %></th>
+    <% end %>
     <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%= params[:sort] == "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort] == "#{CatalogController.uploaded_field} asc" ? 'caret up' : '' %>"></i><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
     <th><%= t("hyrax.dashboard.my.heading.visibility") %></th>
     <th><%= t("hyrax.dashboard.my.heading.action") %></th>

data/app/views/hyrax/collections/_list_collections.html.erb

@@ -18,6 +18,9 @@
       </div>
     </div>
   </td>
+  <% if Hyrax.config.collection_flexible? %>
+    <td class='text-center'><%= collection_presenter.schema_version.to_f if collection_presenter.schema_version %></td>
+  <% end %>
   <td class="collection_type">
     <%= collection_presenter.collection_type_badge %>
   </td>

data/app/views/hyrax/collections/_list_works.html.erb

@@ -9,7 +9,7 @@
     <div class='media'>
       <%= link_to [main_app, document], class: 'media-left', 'aria-hidden' => true do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
-          { class: 'd-none d-md-block file_listing_thumbnail' }, { suppress_link: true }
+          { class: 'd-none d-md-block file_listing_thumbnail', alt: thumbnail_alt_text_for(document) }, { suppress_link: true }
         ) %>
       <% end %>
 

data/app/views/hyrax/collections/_show_document_list_row.html.erb

@@ -9,7 +9,7 @@
     <div class="media">
       <%= link_to [main_app, document], "class" => "media-left mr-3", "aria-hidden" => "true" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
-          { class: "d-none d-md-block file_listing_thumbnail", alt: "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" },
+          { class: "d-none d-md-block file_listing_thumbnail", alt: thumbnail_alt_text_for(document) },
           { suppress_link: true }
         ) %>
       <% end %>

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

@@ -1,4 +1,7 @@
 <% provide :page_title, construct_page_title(@presenter.title) %>
+<% content_for :canonical_url do %>
+  <link rel="canonical" href="<%= canonical_url_for(@presenter) %>" />
+<% end %>
 <div class="hyc-container" itemscope itemtype="http://schema.org/CollectionPage">
   <div class="row hyc-header">
     <div class="col-md-12">
@@ -13,6 +16,7 @@
         <h1><%= @presenter.title.first %></h1>
         <%= @presenter.collection_type_badge %>
         <%= @presenter.permission_badge %>
+        <%= render 'hyrax/shared/copy_permalink', presenter: @presenter %>
       </div>
 
       <% unless @presenter.logo_record.blank? %>

data/app/views/hyrax/dashboard/_sidebar.html.erb

@@ -1,6 +1,8 @@
 <% menu = Hyrax::MenuPresenter.new(self) %>
-<div class="sidebar-toggle"><span class="fa fa-chevron-circle-right"></span></div>
-<nav aria-label="sidebar-nav">
+<button type="button" class="sidebar-toggle" aria-label="Toggle sidebar navigation" aria-expanded="true" aria-controls="sidebar-nav">
+  <span class="fa fa-chevron-circle-right" aria-hidden="true"></span>
+</button>
+<nav id="sidebar-nav" aria-label="sidebar navigation">
   <ul class="nav nav-pills flex-column">
     <li class="nav-item">
       <div class="profile">

data/app/views/hyrax/dashboard/collections/_button_for_update_collection.html.erb

@@ -3,5 +3,6 @@
 <%# label -- button label %>
 <%= button_to label, hyrax.dashboard_collection_path(collection_id),
               method: :post,
-              class: "btn btn-primary submits-batches",
+              class: "btn btn-primary submits-batches modal-submit-button",
+              disabled: @add_works_to_collection.blank?,
               data: { behavior: 'updates-collection' } %>

data/app/views/hyrax/dashboard/collections/_default_group.html.erb

@@ -12,6 +12,9 @@
       </label>
     </th>
     <th><%= t("hyrax.dashboard.my.heading.title") %></th>
+    <% if Hyrax.config.collection_flexible? %>
+      <th><%= t("hyrax.dashboard.my.heading.profile_version") %></th>
+    <% end %>
     <% if !current_ability.admin? %>
       <th><%= t("hyrax.dashboard.my.heading.access") %></th>
     <% end %>

data/app/views/hyrax/dashboard/collections/_form.html.erb

@@ -28,6 +28,13 @@
         </a>
       </li>
       <% end %>
+      <% if redirects_tab?(@form) %>
+      <li class="nav-item" role="presentation">
+        <a href="#redirects" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+          <%= t('.tabs.redirects') %>
+        </a>
+      </li>
+      <% end %>
     <% end %>
   </ul>
 
@@ -109,6 +116,16 @@
             </div>
           </div>
         <% end %>
+
+        <% if redirects_tab?(f.object) %>
+          <div id="redirects" class="tab-pane">
+            <div class="card labels">
+              <div class="card-body">
+                <%= render 'hyrax/base/form_redirects', f: f %>
+              </div>
+            </div>
+          </div>
+        <% end %>
       <% end %>
 
       <div class="card-footer">

data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb

@@ -1,4 +1,4 @@
-<div role="dialog" class="modal collection-list-modal fade" id="collection-list-container" tabindex="-1" aria-labelledby="col_add_title">
+<div role="dialog" class="modal collection-list-modal fade disable-unless-selected" id="collection-list-container" tabindex="-1" aria-labelledby="col_add_title">
   <div class="modal-dialog text-left">
       <div class="modal-content">
         <div class="modal-header">
@@ -12,20 +12,17 @@
             <div class="collection-list">
               <div class="form-group">
                 <p><%= t("hyrax.collection.select_form.select_heading") %></p>
-              
                 <% if @add_works_to_collection.present? %>
                   <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, disabled: true %>
                   <%= hidden_field_tag 'member_of_collection_ids', @add_works_to_collection %>
                 <% else %>
-                  <%= text_field_tag 'member_of_collection_ids', nil,
-                              prompt: :translate,
-                              data: {
-                                placeholder: t('simple_form.placeholders.defaults.member_of_collection_ids'),
-                                autocomplete: 'collection',
-                                'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/collections?access=deposit'
-                              } %>
+                  <select name="member_of_collection_ids" id="member_of_collection_ids" class="form-control collection-select2" data-placeholder="<%= t('hyrax.dashboard.my.action.select') %>">
+                    <option value=""></option>
+                    <% available_collections(work: @presenter&.solr_document).each do |coll| %>
+                      <option value="<%= coll.id %>"><%= coll.title.first %></option>
+                    <% end %>
+                  </select>
                 <% end %>
-            
               </div>
             </div><!-- collection-list -->
           <% end %> <!-- else -->

data/app/views/hyrax/dashboard/collections/_list_collections.html.erb

@@ -55,6 +55,9 @@
       </div>
     </div>
   </td>
+  <% if Hyrax.config.collection_flexible? %>
+    <td class='text-center'><%= collection_presenter.schema_version.to_f if collection_presenter.schema_version %></td>
+  <% end %>
   <% if !current_ability.admin? %>
     <td><%= collection_presenter.managed_access %></td>
   <% end %>

data/app/views/hyrax/dashboard/collections/_list_works.html.erb

@@ -9,7 +9,7 @@
     <div class='media'>
       <%= link_to [main_app, document], class: 'media-left', 'aria-hidden': true do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
-          { class: 'd-none d-md-block file_listing_thumbnail' }, { suppress_link: true }
+          { class: 'd-none d-md-block file_listing_thumbnail', alt: thumbnail_alt_text_for(document) }, { suppress_link: true }
         ) %>
       <% end %>
 

data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb

@@ -9,7 +9,7 @@
     <div class="media">
       <%= link_to [main_app, document], "class" => "media-left mr-3" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
-          { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
+          { class: "d-none d-md-block file_listing_thumbnail", alt: thumbnail_alt_text_for(document) }, { suppress_link: true }
         ) %>
       <% end %>
       <div class="media-body">

data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb

@@ -13,7 +13,7 @@
         <%= f.label :remove_avatar, class: 'form-check-label' do %>
           <%= f.check_box :remove_avatar, class: 'form-check-input' %>
           <%= t(".delete_picture") %>
-          <a href="#" id="delete_picture_help" data-toggle="popover" data-content="<%= t('.delete_picture_data_content') %>" data-original-title="<%= t('.delete_picture_data_original_title') %>"><i class="fa fa-question"></i></a>
+          <a href="#" id="delete_picture_help" data-toggle="popover" data-content="<%= t('.delete_picture_data_content') %>" data-original-title="<%= t('.delete_picture_data_original_title') %>"><i class="fa fa-info-circle"></i></a>
         <% end %>
       </div>
     </div>
@@ -46,13 +46,6 @@
     </div>
   </div><!-- .form-group -->
 
-  <div class="form-group row">
-    <%= f.label :googleplus_handle, t(".google_handle").html_safe, class: 'col-4 col-form-label' %>
-    <div class="col-8">
-       <%= f.text_field :googleplus_handle, class: "form-control" %>
-    </div>
-  </div><!-- .form-group -->
-
   <%= render 'trophy_edit', trophies: @trophies %>
 
   <%= f.button t(".save_profile").html_safe, type: 'submit', class: "btn btn-primary" %>

data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb

@@ -2,7 +2,7 @@
   <div class="form-group">
     <span>
       <i class="fa fa-star trophy-on"></i> Remove Highlight Designation
-      <a href="#" id="remove_trophy_help" data-toggle="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="fa fa-question"></i></a>
+      <a href="#" id="remove_trophy_help" data-toggle="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="fa fa-info-circle"></i></a>
     </span>
     <% trophies.each do |t| %>
       <div class="form-check">

data/app/views/hyrax/dashboard/profiles/show.html.erb

@@ -1,12 +1,12 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-id-card" aria-hidden="true"></span> <%= t("hyrax.admin.sidebar.profile") %></h1>
-  <% if can? :edit, current_user %>
-    <div class="float-right">
+  <div class="d-flex flex-column flex-md-row justify-content-between align-items-start align-items-md-center">
+    <h1 class="mb-2 mb-md-0"><span class="fa fa-id-card" aria-hidden="true"></span> <%= t("hyrax.admin.sidebar.profile") %></h1>
+    <% if can? :edit, current_user %>
       <%= link_to hyrax.edit_dashboard_profile_path(@user), class: "btn btn-primary" do %>
         <%= t("hyrax.edit_profile") %>
       <% end %>
-    </div>
-  <% end %>
+    <% end %>
+  </div>
 <% end %>
 
   <div class="card">

data/app/views/hyrax/dashboard/sidebar/_metadata.html.erb

@@ -0,0 +1,11 @@
+<%# menu item to be inserted when using flexible metadata %>
+<% if Hyrax.config.flexible? && current_ability.can?(:manage, Hyrax::FlexibleSchema) %>
+  <li class="nav-item">
+    <%= menu.nav_link(hyrax.admin_metadata_profiles_path,
+                      class: "nav-link",
+                      onclick: "dontChangeAccordion(event);",
+                      title: t('hyrax.admin.sidebar.metadata_profiles')) do %>
+                        <span class="fa fa-table" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.metadata_profiles') %></span>
+                      <% end %>
+  </li>
+<% end %>

data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb

@@ -14,4 +14,5 @@
     <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>
   <% end %>
 
+  <%= render 'hyrax/dashboard/sidebar/metadata', menu: menu %>
   <%= render 'hyrax/dashboard/sidebar/menu_partials', menu: menu, section: :repository_content %>

data/app/views/hyrax/dashboard/works/_default_group.html.erb

@@ -5,6 +5,9 @@
     <tr>
       <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
       <th><%= t("hyrax.dashboard.my.heading.title") %></th>
+      <% if Hyrax.config.flexible? %>
+        <th class='text-center'><%= t("hyrax.dashboard.my.heading.profile_version") %></th>
+      <% end %>
       <th class="date text-center"><%= t("hyrax.dashboard.my.heading.date_modified") %></th>
       <th class="text-center"><%= t("blacklight.search.fields.facet.suppressed_bsi") %></th>
       <th class="text-center"><%= t("hyrax.dashboard.my.heading.work.visibility") %></th>

data/app/views/hyrax/dashboard/works/_list_works.html.erb

@@ -7,7 +7,7 @@
     <div class='media'>
       <%= link_to [main_app, document], class: 'media-left' do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
-          { class: 'd-none d-md-block file_listing_thumbnail', alt: "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" },
+          { class: 'd-none d-md-block file_listing_thumbnail', alt: thumbnail_alt_text_for(document) },
           { suppress_link: true }
         ) %>
       <% end %>
@@ -29,7 +29,9 @@
       </div>
     </div>
   </td>
-
+  <% if Hyrax.config.flexible? %>
+    <td class='text-center'><%= document.schema_version.to_f if document.schema_version %></td>
+  <% end %>
   <td class="date text-center"><%= document.date_modified %></td>
   <td class='workflow-state text-center'><%= presenter.workflow.state_label %></td>
   <td class='text-center'><%= render_visibility_link document %></td>

data/app/views/hyrax/file_sets/_form.html.erb

@@ -1,11 +1,24 @@
 <%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
   <fieldset class="required">
-    <span class="col-form-label">
-      <%= label_tag 'file_set[title][]', t('.title'),  class: "string optional" %>
-    </span>
+    <legend>
+      <%= t('.title') %>
+    </legend>
     <%= text_field_tag 'file_set[title][]', curation_concern.title.first, class: 'form-control', required: true %>
   </fieldset>
 
+  <fieldset class="mt-2">
+    <legend>
+      <%= t("simple_form.labels.file_set.language") %>
+    </legend>
+    <div class="form-group">
+      <span class="form-text"><%= sanitize(t("simple_form.hints.file_set.language")) %></span>
+      <%= text_field_tag 'file_set[language][]', curation_concern.language.first, class: 'form-control' %>
+    </div>
+  </fieldset>
+  <% if Hyrax.config.file_set_include_metadata? %>
+    <%= render 'records/edit_fields/transcript_ids', f: f, curation_concern: curation_concern %>
+  <% end %>
+  
   <div class="row">
     <div class="col-md-12 form-actions">
       <%= f.submit(

data/app/views/hyrax/file_sets/_metadata.html.erb

@@ -0,0 +1,35 @@
+<h2><%= t('.metadata') %></h2>
+<dl class="file-show-term file-show-details">
+  <% if @presenter.try(:flexible?) %>
+    <% view_options_for(@presenter).each do |field, options| %>
+      <% view_options = conform_options(field, options) %>
+      <% next unless field_visible?(view_options, @presenter) %>
+      <% values = Array(@presenter.try(field)).reject(&:blank?) %>
+      <% next if values.empty? %>
+      <% label = view_options["label"] %>
+      <div class="row">
+        <dt class="col-5"><%= label %></dt>
+        <dd class="col-7"><%= auto_link(values.join(', '), html: { target: '_blank' }) %></dd>
+      </div>
+    <% end %>
+  <% else %>
+    <% { description: nil, creator: nil, license: nil, subject: nil, keyword: nil,
+         date_created: nil, related_url: nil, resource_type: nil, alt_text: nil }.each_key do |field| %>
+      <% values = Array(@presenter.try(field)).reject(&:blank?) %>
+      <% next if values.empty? %>
+      <div class="row">
+        <dt class="col-5"><%= t("blacklight.search.fields.show.#{field}_tesim", default: field.to_s.humanize) %></dt>
+        <dd class="col-7"><%= auto_link(values.join(', '), html: { target: '_blank' }) %></dd>
+      </div>
+    <% end %>
+  <% end %>
+
+  <% [:embargo_release_date, :lease_expiration_date].each do |field| %>
+    <% value = @presenter.try(field) %>
+    <% next unless value.present? %>
+    <div class="row">
+      <dt class="col-5"><%= t("blacklight.search.fields.show.#{field}_dtsi", default: field.to_s.humanize) %></dt>
+      <dd class="col-7"><%= value %></dd>
+    </div>
+  <% end %>
+</dl>

data/app/views/hyrax/file_sets/_valkyrie_form.html.erb

@@ -0,0 +1,37 @@
+<%= simple_form_for [main_app, form_object], url: main_app.hyrax_file_set_path(form_object), html: { multipart: true, class: 'nav-safety', data: { behavior: 'file-set-form', 'param-key' => form_object.model_name.param_key } } do |f| %>
+  <% if curation_concern.flexible? %>
+    <div class="col-md-3 pull-right">
+      <%= render('shared/schema_version', f: f) %>
+    </div>
+  <% end %>
+  <div id="base-terms" class="<%= curation_concern.flexible? ? 'col-md-9' : 'col-md-12' %>">
+    <% f.object.primary_terms.each do |term| %>
+      <% next if [:contexts, :schema_version].include?(term) %>
+      <%= render_edit_field_partial(term, f: f, curation_concern: curation_concern) %>
+    <% end %>
+  </div>
+  <% if f.object.display_additional_fields? %>
+    <%= link_to t('hyrax.collection.form.additional_fields'),
+            '#extended-terms',
+            class: 'btn btn-secondary additional-fields',
+            data: { toggle: 'collapse' },
+            role: "button",
+            'aria-expanded'=> "false",
+            'aria-controls'=> "extended-terms" %>
+    <div id="extended-terms" class="collapse">
+      <% f.object.secondary_terms.each do |term| %>
+        <%= render_edit_field_partial(term, f: f, curation_concern: curation_concern) %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <div class="row">
+    <div class="col-md-12 form-actions">
+      <%= f.submit(
+        (curation_concern.persisted? ? t('.save') : t('.attach_to', parent: @parent.human_readable_type)),
+        class: 'btn btn-primary'
+      ) %>
+      <%= link_to t('.cancel'), main_app.hyrax_file_set_path(form_object), class: 'btn btn-link' %>
+    </div>
+  </div>
+<% end %>