hyrax 5.1.0 → 5.3.0

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 %>

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

@@ -1,12 +1,12 @@
 <%= render "shared/nav_safety_modal" %>
-<% provide :page_title, title_presenter(curation_concern).page_title %>
+<% provide :page_title, title_presenter(@presenter).page_title %>
 <% provide :page_header do %>
   <h1><span class="fa fa-edit" aria-hidden="true"></span><%= t('.header', file_set: curation_concern) %></h1>
 <% end %>
 
 <div class="row">
   <div class="col-12 col-sm-4">
-    <%= render media_display_partial(@presenter.solr_document), file_set: @presenter.solr_document %>
+    <%= render media_display_partial(@presenter.solr_document), file_set: @presenter %>
   </div>
   <div class="col-12 col-sm-8">
     <div class="card tabs">
@@ -16,11 +16,13 @@
             <i class="fa fa-tags" aria-hidden="true"></i> <%= t('.descriptions') %>
           </a>
         </li>
-        <li id="edit_versioning_link" class="nav-item">
-          <a href="#versioning_display" data-toggle="tab" class="nav-link nav-safety-confirm">
-            <i class="fa fa-sitemap" aria-hidden="true"></i> <%= t('.versions') %>
-          </a>
-        </li>
+        <% if @version_list.supports_multiple_versions? %>
+          <li id="edit_versioning_link" class="nav-item">
+            <a href="#versioning_display" data-toggle="tab" class="nav-link nav-safety-confirm">
+              <i class="fa fa-sitemap" aria-hidden="true"></i> <%= t('.versions') %>
+            </a>
+          </li>
+        <% end %>
         <li id="edit_permissions_link" class="nav-item">
           <a href="#permissions_display" data-toggle="tab" class="nav-link nav-safety-confirm">
             <i class="fa fa-key" aria-hidden="true"></i> <%= t('.permissions') %>
@@ -31,7 +33,11 @@
         <div class="tab-content">
           <div id="descriptions_display" class="tab-pane show active">
             <h2><%= t('.descriptions') %></h2>
-            <%= render "form" %>
+            <% if @form.is_a?(Hyrax::Forms::ResourceForm) %>
+              <%= render "valkyrie_form", form_object: @form %>
+            <% else %>
+              <%= render "form", form_object: @form %>
+            <% end %>
           </div>
           <%= render "permission", file_set: curation_concern, form_object: @form %>
           <%= render "versioning", file_set: curation_concern %>

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -5,6 +5,10 @@
         <source src="<%= hyrax.download_path(file_set, file: 'ogg', mime_type: 'audio/ogg') %>" type="audio/ogg" />
         <source src="<%= hyrax.download_path(file_set, file: 'mp3', mime_type: 'audio/mpeg') %>" type="audio/mpeg" />
         <%= t('hyrax.file_set.show.downloadable_content.audio_tag_not_supported') %>
+        <% file_set.transcripts.each do |transcript| %>
+          <track kind="captions" src="<%= file_set.transcript_url(transcript, host: request.base_url) %>"
+                 srclang="<%= file_set.language_code(transcript.language) %>" label="<%= transcript.title_or_label %>" />
+        <% end %>
       </audio>
       <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
                   hyrax.download_path(file_set),

data/app/views/hyrax/file_sets/media_display/_image.html.erb

@@ -3,7 +3,7 @@
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= document_presenter(file_set)&.thumbnail&.thumbnail_tag(
                     class: "representative-media",
-                    alt: "",
+                    alt: file_set.alt_text_for_view,
                     role: "presentation") %>
       <%= link_to t('hyrax.file_set.show.downloadable_content.image_link'),
                   hyrax.download_path(file_set),
@@ -15,7 +15,7 @@
     <div>
       <%= document_presenter(file_set)&.thumbnail&.thumbnail_tag(
                     class: "representative-media",
-                    alt: "",
+                    alt: file_set&.alt_text_for_view,
                     role: "presentation") %>
     </div>
 <% end %>

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -5,6 +5,10 @@
         <source src="<%= hyrax.download_path(file_set, file: 'webm', mime_type: 'video/webm') %>" type="video/webm" />
         <source src="<%= hyrax.download_path(file_set, file: 'mp4', mime_type: 'video/mp4') %>" type="video/mp4" />
         <%= t('hyrax.file_set.show.downloadable_content.video_tag_not_supported') %>
+        <% file_set.transcripts.each do |transcript| %>
+          <track kind="captions" src="<%= file_set.transcript_url(transcript, host: request.base_url) %>" 
+                 srclang="<%= file_set.language_code(transcript.language) %>" label="<%= transcript.title_or_label %>" />
+        <% end %>
       </video>
       <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),
                   hyrax.download_path(file_set),

data/app/views/hyrax/homepage/_explore_collections.html.erb

@@ -8,7 +8,7 @@
               <div class="media-heading">
                 <%= link_to [hyrax, collection] do %>
                   <%= document_presenter(collection)&.thumbnail&.thumbnail_tag(
-                    { class: 'd-none d-md-block file_listing_thumbnail', alt: "#{collection.title_or_label} #{ t('hyrax.homepage.admin_sets.thumbnail')}" },
+                    { class: 'd-none d-md-block file_listing_thumbnail', alt: thumbnail_alt_text_for(collection, block_name: 'default_collection_image_text') },
                     { suppress_link: true }
                   ) + collection.title_or_label %>
                 <% end %>

data/app/views/hyrax/homepage/_featured_fields.html.erb

@@ -3,7 +3,7 @@
     <span class="sr-only"><%= t('hyrax.homepage.featured_works.document.title_label') %></span>
     <h3>
       <%= link_to [main_app, featured] do %>
-        <%= render_thumbnail_tag(featured, {width: 90, alt: "#{featured.title.first.to_s} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true})%><%= featured.title.first %>
+        <%= render_thumbnail_tag(featured, {width: 90, alt: thumbnail_alt_text_for(featured.solr_document) }, {suppress_link: true})%><%= featured.title.first %>
       <% end %>
     </h3>
   </div>

data/app/views/hyrax/homepage/_recent_document.html.erb

@@ -5,7 +5,7 @@
         <h3>
           <%= link_to [main_app, recent_document] do %>
             <%= document_presenter(recent_document)&.thumbnail&.thumbnail_tag(
-              { width: 90, alt: "#{recent_document} #{ t('hyrax.homepage.admin_sets.thumbnail')}" },
+              { width: 90, alt: thumbnail_alt_text_for(recent_document) },
               { suppress_link: true }
             ) %><%= recent_document %>
           <% end %>

data/app/views/hyrax/homepage/robots.text.erb

@@ -0,0 +1,17 @@
+# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-agent: *
+# Disallow: /
+User-agent: *
+# Disable crawling filters - it'll just slow down discovery of useful resources - better that they page.
+Disallow: /catalog*f[
+Disallow: /catalog*f%5B
+# Bots can't log in.
+Disallow: /users
+Disallow: /dashboard
+Disallow: /embargoes
+Disallow: /leases
+Disallow: /admin
+# Tell them where they should look!
+Sitemap: <%= "#{request.base_url}/sitemap" %>

data/app/views/hyrax/my/_admin_set_action_menu.html.erb

@@ -7,39 +7,43 @@
     <%= t("hyrax.dashboard.my.action.select") %>
   </button>
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= link_to hyrax.admin_admin_set_path(id),
-                  class: 'itemicon itemedit',
-                  title: t("hyrax.dashboard.my.action.view_admin_set") do %>
+    <%= link_to hyrax.admin_admin_set_path(id),
+                class: 'itemicon itemedit',
+                role: 'menuitem',
+                title: t("hyrax.dashboard.my.action.view_admin_set") do %>
+      <li class="dropdown-item" tabindex="-1">
         <%= t("hyrax.dashboard.my.action.view_admin_set") %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
     <% if can? :edit, admin_set_presenter.solr_document %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to hyrax.edit_admin_admin_set_path(id),
-                    class: 'itemicon itemedit',
-                    title: t("hyrax.dashboard.my.action.edit_admin_set") do %>
+      <%= link_to hyrax.edit_admin_admin_set_path(id),
+                  class: 'itemicon itemedit',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.edit_admin_set") do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_admin_set") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% else %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to "#",
-                    class: 'itemicon itemedit edit-collection-deny-button',
-                    title: t("hyrax.dashboard.my.action.edit_collection") do %>
+      <%= link_to "#",
+                  class: 'itemicon itemedit edit-collection-deny-button',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.edit_collection") do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_collection") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= link_to "#",
-                     class: 'itemicon itemtrash delete-collection-button',
-                     title: t("hyrax.dashboard.my.action.delete_admin_set"),
-                     data: { totalitems: admin_set_presenter.total_items ,
-                             membership: admin_set_presenter.collection_type_is_require_membership? ,
-                             hasaccess: (can?(:edit, admin_set_presenter.solr_document)) } do %>
+    <%= link_to "#",
+                class: 'itemicon itemtrash delete-collection-button',
+                role: 'menuitem',
+                title: t("hyrax.dashboard.my.action.delete_admin_set"),
+                data: { totalitems: admin_set_presenter.total_items,
+                        membership: admin_set_presenter.collection_type_is_require_membership?,
+                        hasaccess: (can?(:edit, admin_set_presenter.solr_document)) } do %>
+      <li class="dropdown-item" tabindex="-1">
         <%= t("hyrax.dashboard.my.action.delete_admin_set") %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
   </ul>
 </div>

data/app/views/hyrax/my/_collection_action_menu.html.erb

@@ -7,52 +7,57 @@
     <%= t("hyrax.dashboard.my.action.select") %>
   </button>
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= link_to hyrax.dashboard_collection_path(id),
-                  class: 'itemicon itemedit',
-                  title: t("hyrax.dashboard.my.action.view_collection") do %>
+    <%= link_to hyrax.dashboard_collection_path(id),
+                class: 'itemicon itemedit',
+                role: 'menuitem',
+                title: t("hyrax.dashboard.my.action.view_collection") do %>
+      <li class="dropdown-item" tabindex="-1">
         <%= t("hyrax.dashboard.my.action.view_collection") %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
     <% if can? :edit, collection_presenter.solr_document %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to hyrax.edit_dashboard_collection_path(id),
-                    class: 'itemicon itemedit',
-                    title: t("hyrax.dashboard.my.action.edit_collection")  do %>
+      <%= link_to hyrax.edit_dashboard_collection_path(id),
+                  class: 'itemicon itemedit',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.edit_collection")  do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_collection") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% else %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to "#",
-                    class: 'itemicon itemedit edit-collection-deny-button',
-                    title: t("hyrax.dashboard.my.action.edit_collection") do %>
+      <%= link_to "#",
+                  class: 'itemicon itemedit edit-collection-deny-button',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.edit_collection") do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_collection") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= link_to "#",
-                  class: 'itemicon itemtrash delete-collection-button',
-                  title: t("hyrax.dashboard.my.action.delete_collection"),
-                  data: { totalitems: collection_presenter.total_items ,
-                          membership: collection_presenter.collection_type_is_require_membership? ,
-                          hasaccess: (can?(:edit, collection_presenter.solr_document)) } do %>
+    <%= link_to "#",
+                class: 'itemicon itemtrash delete-collection-button',
+                role: 'menuitem',
+                title: t("hyrax.dashboard.my.action.delete_collection"),
+                data: { totalitems: collection_presenter.total_items ,
+                        membership: collection_presenter.collection_type_is_require_membership? ,
+                        hasaccess: (can?(:edit, collection_presenter.solr_document)) } do %>
+      <li class="dropdown-item" tabindex="-1">
         <%= t("hyrax.dashboard.my.action.delete_collection") %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
 
     <% if collection_presenter.collection_type_is_nestable? %>
       <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to "#",
-                    class: 'itemicon add-to-collection',
-                    title: t("hyrax.dashboard.my.action.add_to_collection"),
-                    data: { nestable: collection_presenter.collection_type_is_nestable? ,
-                            hasaccess: (can?(:read, collection_presenter.solr_document)) } do %>
+      <%= link_to "#",
+                  class: 'itemicon add-to-collection',
+                  role: 'menuitem',
+                  title: t("hyrax.dashboard.my.action.add_to_collection"),
+                  data: { nestable: collection_presenter.collection_type_is_nestable? ,
+                          hasaccess: (can?(:read, collection_presenter.solr_document)) } do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.add_to_collection") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
   </ul>
 </div>

data/app/views/hyrax/my/_work_action_menu.html.erb

@@ -8,38 +8,39 @@
   </button>
 
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= document.id %>">
-
     <% if can? :edit, document.id %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to [main_app, :edit, document],
-                    id: 'action-edit-work' do %>
+      <%= link_to [main_app, :edit, document],
+                  id: 'action-edit-work', role: 'menuitem' do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.edit_work") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
 
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to [main_app, document],
-                    method: :delete,
-                    id: 'action-delete-work',
-                    data: {
-                      confirm: t("hyrax.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
+      <%= link_to [main_app, document],
+                  method: :delete,
+                  id: 'action-delete-work',
+                  role: 'menuitem',
+                  data: {
+                    confirm: t("hyrax.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.delete_work") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
 
-    <li class="dropdown-item" role="menuitem" tabindex="-1">
-      <%= display_trophy_link(current_user, document.id) do |text| %>
+    <%= display_trophy_link(current_user, document.id, role: 'menuitem' ) do |text| %>
+      <li class="dropdown-item" tabindex="-1">
         <%= text %>
-      <% end %>
-    </li>
+      </li>
+    <% end %>
 
     <% if can? :transfer, document.id %>
-      <li class="dropdown-item" role="menuitem" tabindex="-1">
-        <%= link_to(hyrax.new_work_transfer_path(document.id), id: 'action-transfer-work', class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
+      <%= link_to(hyrax.new_work_transfer_path(document.id), id: 'action-transfer-work', role: 'menuitem',
+                  class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
+        <li class="dropdown-item" tabindex="-1">
           <%= t("hyrax.dashboard.my.action.transfer") %>
-        <% end %>
-      </li>
+        </li>
+      <% end %>
     <% end %>
   </ul>
 </div>

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

@@ -4,6 +4,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><%= t("hyrax.dashboard.my.heading.type") %></th>
     <th><%= t("hyrax.dashboard.my.heading.last_modified") %></th>
     <th><%= t("hyrax.dashboard.my.heading.items") %></th>

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

@@ -57,6 +57,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/my/collections/_modal_add_subcollection.html.erb

@@ -11,8 +11,8 @@
         <div class="modal-ajax-alert"></div>
         <label><%= t('hyrax.collection.actions.nest_collections.select_label') %></label>
         <input type="hidden" name="source" value="<%= source %>" />
-        <select name="child_id">
-          <option value="none"><%= t("hyrax.dashboard.my.action.select") %></option>
+        <select name="child_id" class="form-control collection-select2" data-placeholder="<%= t('hyrax.dashboard.my.action.select') %>">
+          <option value=""></option>
           <% available_child_collections(collection: presenter).each do |coll| %>
             <option value="<%= coll.id %>"><%= coll.title.first %></option>
           <% end %>

data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb

@@ -13,8 +13,8 @@
 
         <label><%= t('hyrax.collection.actions.nested_subcollection.select_label') %></label>
         <input type="hidden" name="source" value="<%= source %>" />
-        <select name="parent_id">
-          <option value="none"><%= t("hyrax.dashboard.my.action.select") %></option>
+        <select name="parent_id" class="form-control collection-select2" data-placeholder="<%= t('hyrax.dashboard.my.action.select') %>">
+          <option value=""></option>
         </select>
       </div>
 

data/app/views/hyrax/my/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='text-center'><%= t("hyrax.dashboard.my.heading.last_modified") %></th>
     <th class='text-center'><%= t("hyrax.dashboard.my.heading.highlighted") %></th>
     <th class='text-center'><%= t("hyrax.dashboard.my.heading.work.visibility") %></th>

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

@@ -9,8 +9,8 @@
     <div class='media'>
       <%= link_to [main_app, document], class: 'mr-2' 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')}" },
-          { suppress_link: true } 
+          { class: 'd-none d-md-block file_listing_thumbnail', alt: thumbnail_alt_text_for(document) },
+          { suppress_link: true }
         ) %>
       <% end %>
 
@@ -27,6 +27,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='text-center'>
     <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>" aria-hidden="true"></span></td>

data/app/views/hyrax/shared/_copy_permalink.html.erb

@@ -0,0 +1,10 @@
+<% if copy_permalink_enabled? %>
+  <% label = t('hyrax.copy_permalink.button') %>
+  <button type="button"
+          class="btn btn-secondary btn-sm copy-permalink-button"
+          data-clipboard-text="<%= permalink_for(presenter) %>"
+          data-success-text="<%= t('hyrax.copy_permalink.success') %>"
+          title="<%= label %>">
+    <%= label %>
+  </button>
+<% end %>

data/app/views/hyrax/users/_user_info.html.erb

@@ -17,12 +17,7 @@
 
 <% if user.twitter_handle.present? %>
   <dt><span class="fa fa-twitter" aria-hidden="true"></span> Twitter Handle</dt>
-  <dd><%= link_to user.twitter_handle, "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
-<% end %>
-
-<% if user.googleplus_handle.present? %>
-  <dt><span class="fa fa-google-plus" aria-hidden="true"></span> Google+ Handle</dt>
-  <dd><%= link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
+  <dd><%= link_to user.twitter_handle, "http://x.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
 <% end %>
 
 <% if user.linkedin_handle.present? %>

data/app/views/layouts/_head_tag_content.html.erb

@@ -15,6 +15,8 @@ signed in %>
 <%= yield :twitter_meta %>
 <!-- Google Scholar metadata -->
 <%= yield :gscholar_meta %>
+<!-- Canonical URL -->
+<%= yield :canonical_url %>
 
 <title><%= content_for?(:page_title) ? yield(:page_title) : default_page_title %></title>
 

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

@@ -15,6 +15,7 @@
       <div class="sidebar maximized">
         <%= render 'hyrax/dashboard/sidebar' %>
       </div>
+      <div class="sidebar-backdrop" aria-hidden="true"></div>
       <div class="main-content maximized<%= " admin-stats" if request.fullpath.include? '/admin/stats' %>">
         <%= render_breadcrumbs builder: Hyrax.config.breadcrumb_builder %>
         <%= render '/flash_msg' %>
@@ -26,7 +27,7 @@
           </div>
         <% end %>
 
-          <a name="skip-to-content" id="skip-to-content"></a>
+          <div id="skip-to-content"></div>
           <%= render 'shared/read_only' if Flipflop.read_only? %>
           <%= content_for?(:content) ? yield(:content) : yield %>
 

data/app/views/records/edit_fields/_contexts.html.erb

@@ -0,0 +1 @@
+<%= f.input key, as: :hidden %>

data/app/views/records/edit_fields/_license.html.erb

@@ -1,6 +1,18 @@
 <% license_service = Hyrax.config.license_service_class.new %>
-<%= f.input :license, as: :multi_value_select,
-    collection: license_service.select_active_options,
-    include_blank: true,
-    item_helper: license_service.method(:include_current_value),
-    input_html: { class: 'form-control' } %>
+<% if f.object.multiple? :license %>
+  <%= f.input :license, as: :multi_value_select,
+      collection: license_service.select_active_options,
+      include_blank: true,
+      item_helper: license_service.method(:include_current_value),
+      input_html: { class: 'form-control' } %>
+<% else %>
+  <% base_options = license_service.select_active_options %>
+  <% current_values = Array.wrap(f.object[:license]).select(&:present?) %>
+  <% augmented_options = current_values.reduce(base_options) do |opts, value|
+       license_service.include_current_value(value, nil, opts, { class: [] }).first
+     end %>
+  <%= f.input :license, as: :select,
+      collection: augmented_options,
+      include_blank: true,
+      input_html: { class: 'form-control' } %>
+<% end %>

data/app/views/records/edit_fields/_resource_type.html.erb

@@ -1,2 +1,16 @@
-<%= f.input :resource_type, as: :select, collection: Hyrax::ResourceTypesService.select_options,
-    input_html: { class: 'form-control', multiple: true } %>
+<% base_options = Hyrax::ResourceTypesService.select_options %>
+<% current_values = Array.wrap(f.object[:resource_type]).select(&:present?) %>
+<% augmented_options = current_values.reduce(base_options) do |opts, value|
+     Hyrax::ResourceTypesService.include_current_value(value, nil, opts, { class: [] }).first
+   end %>
+<% if f.object.multiple? :resource_type %>
+  <%= f.input :resource_type, as: :select,
+      collection: augmented_options,
+      include_blank: !f.object.required?(:resource_type),
+      input_html: { class: 'form-control', multiple: true, name: "#{f.object_name}[resource_type][]" } %>
+<% else %>
+  <%= f.input :resource_type, as: :select,
+      collection: augmented_options,
+      include_blank: true,
+      input_html: { class: 'form-control' } %>
+<% end %>

data/app/views/records/edit_fields/_rights_statement.html.erb

@@ -1,6 +1,18 @@
 <% rights_statements = Hyrax.config.rights_statement_service_class.new %>
-<%= f.input :rights_statement,
-    collection: rights_statements.select_active_options,
-    include_blank: true,
-    item_helper: rights_statements.method(:include_current_value),
-    input_html: { class: 'form-control' } %>
+<% if f.object.multiple? :rights_statement %>
+  <%= f.input :rights_statement, as: :multi_value_select,
+      collection: rights_statements.select_active_options,
+      include_blank: true,
+      item_helper: rights_statements.method(:include_current_value),
+      input_html: { class: 'form-control' } %>
+<% else %>
+  <% base_options = rights_statements.select_active_options %>
+  <% current_values = Array.wrap(f.object[:rights_statement]).select(&:present?) %>
+  <% augmented_options = current_values.reduce(base_options) do |opts, value|
+       rights_statements.include_current_value(value, nil, opts, { class: [] }).first
+     end %>
+  <%= f.input :rights_statement, as: :select,
+      collection: augmented_options,
+      include_blank: true,
+      input_html: { class: 'form-control' } %>
+<% end %>

data/app/views/records/edit_fields/_schema_version.html.erb

@@ -0,0 +1 @@
+<%= render('shared/schema_version', f: f) if f.object.flexible? %>