hyrax 3.5.0 → 4.0.0.beta1

data/app/views/hyrax/admin/collection_types/_form_settings.html.erb

@@ -12,25 +12,25 @@
     <div class="collection-type-share-applies-to">
       <div id="sharable-applies-to-new-works-setting-checkbox-container"
            class="form-group boolean optional collection_type_share_applies_to_new_works <%= 'disabled' if f.object.share_options_disabled? %>">
-        <div class="checkbox">
+        <div class="form-check">
           <input value="0"
                  name="collection_type[share_applies_to_new_works]"
                  type="hidden"
                  <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %> />
+          <input id="collection_type_share_applies_to_new_works" <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %>
+                 class="form-check-input boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
+                 value="1"
+                 <%= "checked=\"checked\"".html_safe if f.object.share_applies_to_new_works %>"
+                 name="collection_type[share_applies_to_new_works]"
+                 type="checkbox" />
           <label id="sharable-applies-to-new-works-setting-label"
-                 class="boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
+                 class="form-check-label boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
                  for="collection_type_share_applies_to_new_works">
-            <input id="collection_type_share_applies_to_new_works" <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %>
-                   class="boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
-                   value="1"
-                   <%= "checked=\"checked\"".html_safe if f.object.share_applies_to_new_works %>"
-                   name="collection_type[share_applies_to_new_works]"
-                   type="checkbox" />
             APPLY TO NEW WORKS
           </label>
         </div>
-        <p class="help-block"><%= t('simple_form.hints.collection_type.share_applies_to_new_works') %></p>
       </div>
+      <p class="form-text"><%= t('simple_form.hints.collection_type.share_applies_to_new_works') %></p>
     </div>
     <p><%= f.input :allow_multiple_membership, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
     <p><%= f.input :require_membership, as: :boolean, disabled: true %></p>

data/app/views/hyrax/admin/collection_types/index.html.erb

@@ -4,16 +4,16 @@
     <h1><span class="fa fa-folder-open" aria-hidden="true"></span> <%= t('.header') %></h1>
   <% end %>
 
-  <div class="panel panel-default">
-    <div class="panel-heading adam">
-      <span class="panel-heading-message">
+  <div class="card">
+    <div class="card-header adam">
+      <span class="card-header-message">
         <strong><%= pluralize(@collection_types.size, 'collection type') %> </strong> in this repository
       </span>
       <%= link_to hyrax.new_admin_collection_type_path, class: 'btn btn-primary' do %>
         <%= t('.create_new_button') %>
       <% end %>
     </div>
-    <div class="panel-body">
+    <div class="card-body">
       <p><%= t('.description') %></p>
 
       <p><a class="collapse-header" data-toggle="collapse" href="#collapseAbout" aria-expanded="false" aria-controls="collapseAbout" data-expand-text="<%= t('helpers.action.more')%>" data-collapse-text="<%= t('helpers.action.less')%>"><%= t('.more_toggle_header_html') %></a></p>
@@ -62,7 +62,7 @@
           <%= t('.modal.can_delete_body_html') %>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
           <button type="button" class="btn btn-danger confirm-delete-collection-type"><%= t('helpers.action.delete') %></button>
         </div>
       </div>
@@ -78,7 +78,7 @@
           <%= t('.modal.cannot_delete_body_html') %>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
     <%= link_to  t('.modal.view_collections'), hyrax.my_collections_path, class: 'btn btn-primary view-collections-of-this-type', data_dismiss: 'modal' %>
         </div>
       </div>

data/app/views/hyrax/admin/features/index.html.erb

@@ -3,8 +3,8 @@
 <% end %>
 <div class="flip row">
   <div class="col-md-12">
-    <div class="panel">
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-body">
         <div class="table-responsive">
           <table class="table table-striped">
             <thead>
@@ -30,7 +30,7 @@
               <% features.each do |feature| %>
               <tr data-feature="<%= feature.name.dasherize.parameterize %>">
                 <td class="status">
-                  <span class="<%= @feature_set.status(feature) -%>"><%= @feature_set.status(feature) -%></span>
+                  <span class="badge badge-<%= @feature_set.status(feature) -%>"><%= @feature_set.status(feature) -%></span>
                 </td>
                 <td class="name"><%= feature.name.humanize -%></td>
                 <td class="description"><%= feature.description -%></td>

data/app/views/hyrax/admin/stats/_new_users.html.erb

@@ -1,7 +1,7 @@
 <h3>Newest Users (<%= @presenter.date_filter_string %>)</h3>
 <h4>
 <%- if !@presenter.start_date.blank? %>
-  Total: <%= @presenter.recent_users.count %></div>
+  Total: <%= @presenter.recent_users.count %>
 <%- else %>
     <%= @presenter.recent_users.count %> most recent users:
 <%- end %>

data/app/views/hyrax/admin/stats/show.html.erb

@@ -1,7 +1,5 @@
-<div class="row">
-  <div class="col-sm-12">
-    <%= render "stats_by_date" %>
-    <hr />
-    <%= render "top_data" %>
-  </div>
+<div class="col-sm-12">
+  <%= render "stats_by_date" %>
+  <hr />
+  <%= render "top_data" %>
 </div>

data/app/views/hyrax/admin/users/index.html.erb

@@ -2,12 +2,12 @@
   <h1><span class="fa fa-user" aria-hidden="true"></span> <%= t('hyrax.admin.users.index.title') %></h1>
 <% end %>
 
-<div class="panel panel-default users-listing">
-  <div class="panel-heading">
+<div class="card users-listing">
+  <div class="card-header">
       <%= t('hyrax.admin.users.index.describe_users_html', count: @presenter.user_count) %>
   </div>
 
-  <div class="panel-body">
+  <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped datatable">
         <thead>

data/app/views/hyrax/admin/workflow_roles/index.html.erb

@@ -4,11 +4,11 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title h2"><%= t('.new_role') %></h2>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title h2"><%= t('.new_role') %></h2>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= simple_form_for Hyrax::Forms::WorkflowResponsibilityForm.new, url: hyrax.admin_workflow_roles_path do |f| %>
           <%= f.input :user_id, as: :select, collection: f.object.user_options %>
           <%= f.input :workflow_role_id, as: :select, collection: f.object.workflow_role_options %>
@@ -21,11 +21,11 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title h2"><%= t('.current_roles') %></h3>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title h2"><%= t('.current_roles') %></h3>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <table class="table table-striped datatable">
           <thead>
             <th><%= t('.header.name') %></th>

data/app/views/hyrax/admin/workflows/index.html.erb

@@ -1,24 +1,24 @@
 <% provide :page_header do %>
-  <h1><span class="glyphicon glyphicon-ok-circle"></span> <%= t('.header') %></h1>
+  <h1><span class="fa fa-check-circle"></span> <%= t('.header') %></h1>
 <% end %>
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs">
+    <div class="card tabs">
       <ul class="nav nav-tabs" role="tablist">
-        <li class="active">
-          <a href="#under-review" role="tab" data-toggle="tab"><%= t('.tabs.under_review') %></a>
+        <li class="nav-item">
+          <a class="nav-link active" href="#under-review" role="tab" data-toggle="tab"><%= t('.tabs.under_review') %></a>
         </li>
-        <li>
-          <a href="#published" role="tab" data-toggle="tab"><%= t('.tabs.published') %></a>
+        <li class="nav-item">
+          <a class="nav-link" href="#published" role="tab" data-toggle="tab"><%= t('.tabs.published') %></a>
         </li>
       </ul>
       <div class="tab-content">
-        <div id="under-review" class="tab-pane active">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
+        <div id="under-review" class="tab-pane show active">
+          <div class="card labels">
+            <div class="card-body">
               <div class="table-responsive">
-                <table class="table table-condensed table-striped datatable">
+                <table class="table table-sm table-striped datatable">
                   <thead>
                     <tr>
                       <th width="40%">Work</th>
@@ -51,10 +51,10 @@
           </div>
         </div>
         <div id="published" class="tab-pane">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
+          <div class="card labels">
+            <div class="card-body">
               <div class="table-responsive">
-                <table class="table table-condensed table-striped datatable">
+                <table class="table table-sm table-striped datatable">
                   <thead>
                     <tr>
                       <th width="40%">Work</th>

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

@@ -1,15 +1,15 @@
 <div class="citations">
     <% if Hyrax.config.citations? %>
-      <%= link_to t(".citations"), hyrax.citations_work_path(presenter), id: 'citations', class: 'btn btn-default' %>
+      <%= link_to t(".citations"), hyrax.citations_work_path(presenter), id: 'citations', class: 'btn btn-secondary btn-sm mr-2' %>
     <% end %>
     <div class="btn-group">
-      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <%= t('.header') %> <span class="caret"></span>
+      <button type="button" class="btn btn-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <%= t('.header') %>
       </button>
       <ul class="dropdown-menu">
-        <li><%= link_to t('.endnote'), polymorphic_path([main_app, presenter], format: 'endnote') %></li>
-        <li><%= link_to t('.zotero'), hyrax.zotero_path, id: 'zoteroLink', name: 'zotero' %></li>
-        <li><%= link_to t('.mendeley'), hyrax.mendeley_path, id: 'mendeleyLink', name: 'mendeley' %></li>
+        <li class="dropdown-item"><%= link_to t('.endnote'), polymorphic_path([main_app, presenter], format: 'endnote') %></li>
+        <li class="dropdown-item"><%= link_to t('.zotero'), hyrax.zotero_path, id: 'zoteroLink', name: 'zotero' %></li>
+        <li class="dropdown-item"><%= link_to t('.mendeley'), hyrax.mendeley_path, id: 'mendeleyLink', name: 'mendeley' %></li>
       </ul>
     </div>
 </div>

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

@@ -1,6 +1,6 @@
 <% permission_service = Hyrax::EditPermissionsService.build_service_object_from(form: f, ability: current_ability) %>
 
-<h2><%= t('.currently_sharing') %></h2>
+<h2 class="h3 mt-4"><%= t('.currently_sharing') %></h2>
 
 <table class="table table-bordered">
   <tr>
@@ -9,7 +9,7 @@
   </tr>
   <tr id="file_permissions">
     <td>
-      <%= label_tag :owner_access, class: "control-label" do %>
+      <%= label_tag :owner_access, class: "col-form-label" do %>
         Depositor (<span id="file_owner" data-depositor="<%= permission_service.depositor %>"><%= link_to_profile permission_service.depositor %></span>)
       <% end %>
     </td>
@@ -23,7 +23,7 @@
     <% permission_service.with_applicable_permission(permission_hash: permission_fields.object.to_hash) do |permission| %>
     <tr>
       <td>
-        <%= permission_fields.label :agent_name, class: "control-label" do %>
+        <%= permission_fields.label :agent_name, class: "col-form-label" do %>
           <%= user_display_name_and_key(permission.name) %>
           <%= permission.granted_by_html_hint %>
         <% end %>

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

@@ -1,5 +1,7 @@
-  <div class="actions form-horizontal panel panel-default">
-    <%= button_tag t('.save'), class: "btn btn-primary disabled", data: { action: "save-actions" } %>
-    <%= button_tag t('.sort_alphabetically'), class: "btn btn-primary", data: { action: "alpha-sort-action" } %>
+  <div class="actions card">
+    <div class="d-flex">
+      <%= button_tag t('.save'), class: "btn btn-primary disabled mr-2", data: { action: "save-actions" } %>
+      <%= button_tag t('.sort_alphabetically'), class: "btn btn-primary ", data: { action: "alpha-sort-action" } %>
+    </div>
   </div>
   <%= render "file_manager_resource_form" %>

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

@@ -1,13 +1,13 @@
 <li data-reorder-id='<%= node.id %>'>
-    <div class="panel panel-default">
+    <div class="card">
       <%= simple_form_for [main_app, node], remote: true, html: {'data-type': 'json'} do |f| %>
-        <div class="panel-heading">
+        <div class="card-header">
           <div class="order-title">
             <%= f.input :title, as: :string, input_html: { name: "#{f.object.model_name.singular}[title][]", class: "title" }, value: node.to_s, label: false, hint: false %>
           </div>
-          <div class="file-set-link pull-right">
+          <div class="file-set-link float-right">
             <%= link_to contextual_path(node, @presenter), title: "Edit file" do %>
-              <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>
+              <span class="fa fa-pencil" aria-hidden="true"></span>
             <% end %>
           </div>
           <% if node.respond_to?(:label) %>
@@ -16,7 +16,7 @@
             </div>
           <% end %>
         </div>
-        <div class="panel-body">
+        <div class="card-body">
           <div class="text-center thumbnail">
             <%= render "file_manager_thumbnail", node: node %>
           </div>

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

@@ -1,10 +1,10 @@
       <div class="form-group radio_buttons member_resource_options">
-        <span class="radio">
-          <%= radio_button_tag "thumbnail_id", node.id, @form.thumbnail_id == node.id, id: "thumbnail_id_#{node.id}", class: "radio_buttons" %>
-          <%= label_tag "thumbnail_id_#{node.id}", t('.thumbnail') %>
+        <span class="form-check">
+          <%= radio_button_tag "thumbnail_id", node.id, @form.thumbnail_id == node.id, id: "thumbnail_id_#{node.id}", class: "form-check-input radio_buttons" %>
+          <%= label_tag "thumbnail_id_#{node.id}", t('.thumbnail'), class: 'form-check-label' %>
         </span>
-        <span class="radio">
-          <%= radio_button_tag "representative_id", node.id, @form.representative_id == node.id, id: "representative_id_#{node.id}", class: "radio_buttons" %>
-          <%= label_tag "representative_id_#{node.id}", t('.representative_media') %>
+        <span class="form-check">
+          <%= radio_button_tag "representative_id", node.id, @form.representative_id == node.id, id: "representative_id_#{node.id}", class: "form-check-input radio_buttons" %>
+          <%= label_tag "representative_id_#{node.id}", t('.representative_media'), class: 'form-check-label' %>
         </span>
       </div>

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

@@ -1,6 +1,6 @@
 <%= content_tag :ul,
                 id: "sortable",
-                class: "list-unstyled grid clearfix",
+                class: "list-unstyled grid d-flex flex-wrap clearfix",
                 data: {
                   id: @form.id,
                   "class-name" => @form.model_name.plural,

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

@@ -1 +1 @@
-<%= render_thumbnail_tag node, class: 'thumbnail-inner' %>
+<%= document_presenter(node)&.thumbnail&.thumbnail_tag({ class: 'thumbnail-inner mw-100' }, {}) %>

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

@@ -20,10 +20,10 @@ HTML Properties:
                           'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/find_works',
                           'exclude-work': f.object.model.id.to_s # exclude this item from the result set.
                         } %>
-      <a href="#" onclick="return false;" class="btn btn-primary" data-behavior="add-relationship"><%= t('.add') %></a>
+      <a href="#" onclick="return false;" class="btn btn-secondary ml-2" data-behavior="add-relationship"><%= t('.add') %></a>
   </div>
-  <div class="message has-warning hidden"></div>
-  <div style="margin-top: 10px">
+  <div class="message has-warning"></div>
+  <div class="my-4">
     <%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular.to_sym], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
   </div>
   <table class="table table-striped">

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

@@ -11,18 +11,18 @@
         <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
         <div class="fileupload-buttonbar">
           <div class="row">
-            <div class="col-xs-12">
+            <div class="col-12">
                 <div class="fileinput-button" id="add-files">
                   <input id="addfiles" type="file" style="display:none;"  name="files[]" multiple />
                   <button type="button" class="btn btn-success" onclick="document.getElementById('addfiles').click();">
-                    <span class="glyphicon glyphicon-plus"></span>
+                    <span class="fa fa-plus"></span>
                     <span><%=  t(".add_files") %></span>
                   </button>
                 </div>
                 <div class="fileinput-button">
                   <input id="addfolder" type="file" style="display:none;"  name="files[]" multiple directory webkitdirectory />
                   <button type="button" class="btn btn-success" onclick="document.getElementById('addfolder').click();">
-                    <span class="glyphicon glyphicon-plus"></span>
+                    <span class="fa fa-plus"></span>
                     <span><%=  t(".add_folder") %></span>
                   </button>
                 </div>
@@ -30,12 +30,12 @@
                   <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
                     'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
                     'data-target' => "#{f.object.persisted? ? "#edit_#{f.object.model.model_name.param_key}_#{f.object.model.id}" : "#new_#{f.object.model.model_name.param_key}"}" ) do %>
-                    <span class="glyphicon glyphicon-plus"></span>
+                    <span class="fa fa-plus"></span>
                     <%= t('hyrax.upload.browse_everything.browse_files_button') %>
                   <% end %>
                 <% end %>
-                <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel hidden">
-                    <span class="glyphicon glyphicon-ban-circle"></span>
+                <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel">
+                    <span class="fa fa-ban"></span>
                     <span><%= t('.cancel_upload') %></span>
                 </button>
                 <!-- The global file processing state -->
@@ -43,12 +43,12 @@
             </div>
           </div>
           <div class="row">
-            <div class="col-xs-12">
+            <div class="col-12">
               <!-- The global progress state -->
               <div class="fileupload-progress fade">
                   <!-- The global progress bar -->
-                  <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-                      <div class="progress-bar progress-bar-success" style="width:0%;"></div>
+                  <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+                      <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
                   </div>
                   <!-- The extended global progress state -->
                   <div class="progress-extended">&nbsp;</div>

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

@@ -9,11 +9,11 @@ HTML Properties:
   table:
     [data-behavior="child-relationships"] : allows the javascript to be initialized
     data-param-key : the parameter key value for this model type %>
-<h2><%= t("hyrax.works.form.in_collections") %></h2>
+<h2 class="h3 mt-4"><%= t("hyrax.works.form.in_collections") %></h2>
 
 <div class="form-group" data-behavior="collection-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= member_of_collections_json(f.object) %>">
 
-  <div class="form-inline">
+  <div class="form-inline mb-3">
       <%= f.label :member_of_collection_ids %>
       <%= f.input_field :member_of_collection_ids,
                   prompt: :translate,
@@ -21,7 +21,7 @@ HTML Properties:
                     autocomplete: 'collection',
                     'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/collections?access=deposit'
                   } %>
-      <a href="#" onclick="return false;" class="btn btn-primary" data-behavior="add-relationship"><%= t('.add') %></a>
+      <a href="#" onclick="return false;" class="btn btn-secondary ml-2" data-behavior="add-relationship"><%= t('.add') %></a>
   </div>
 
   <table class="table table-striped">

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

@@ -6,7 +6,7 @@
         <% if f.object.display_additional_fields? %>
           <%= link_to t('hyrax.works.form.additional_fields'),
                       '#extended-terms',
-                      class: 'btn btn-default additional-fields',
+                      class: 'btn btn-secondary additional-fields',
                       data: { toggle: 'collapse' },
                       role: "button",
                       'aria-expanded'=> "false",

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

@@ -10,26 +10,36 @@
     </legend>
 
     <div class="form-group">
-      <label class="radio">
-        <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>
-        <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) %>
-      </label>
-      <label class="radio">
-        <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>
-        <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED) %>
-      </label>
-      <label class="radio">
-        <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO %>
-        <%= render "form_permission_embargo", f: f %>
-      </label>
-      <label class="radio">
-        <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE %>
-        <%= render "form_permission_lease", f: f %>
-      </label>
-      <label class="radio">
-        <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>
-        <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE) %>
-      </label>
+      <div class="form-check">
+        <label class="form-check-label">
+          <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, class: 'form-check-input' %>
+          <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) %>
+        </label>
+      </div>
+      <div class="form-check">
+        <label class="form-check-label">
+          <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED, class: 'form-check-input' %>
+          <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED) %>
+        </label>
+      </div>
+      <div class="form-check">
+        <label class="form-check-label">
+          <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, class: 'form-check-input' %>
+          <%= render "form_permission_embargo", f: f %>
+        </label>
+      </div>
+      <div class="form-check">
+        <label class="form-check-label">
+          <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE, class: 'form-check-input' %>
+          <%= render "form_permission_lease", f: f %>
+        </label>
+      </div>
+      <div class="form-check">
+        <label class="form-check-label">
+          <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, class: 'form-check-input' %>
+          <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE) %>
+        </label>
+      </div>
     </div>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
     <%= t('.legend_html') %>
   </legend>
 
-  <section class="help-block">
+  <section class="form-text">
     <p>
       <%= t('.help_html', edit_link: link_to( t('.management_page'), edit_embargo_path(f.object)) ) %>
     </p>

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

@@ -3,7 +3,7 @@
     <%= t('.legend_html') %>
   </legend>
 
-  <section class="help-block">
+  <section class="form-text">
     <p>
       <%= t('.help_html', edit_link: link_to( t('.management_page'), edit_lease_path(f.object)) ) %>
     </p>

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

@@ -1,6 +1,6 @@
-<aside id="form-progress" class="form-progress panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= t("hyrax.works.progress.header") %></h3>
+<aside id="form-progress" class="form-progress card">
+  <div class="card-header">
+    <h3 class="card-title"><%= t("hyrax.works.progress.header") %></h3>
   </div>
   <div class="list-group">
     <div class="list-group-item">
@@ -19,7 +19,7 @@
     </div>
 
     <div class="set-access-controls list-group-item">
-      <%= render 'form_visibility_component', f: f, save_work: true %>
+      <%= render 'form_visibility_component', f: f %>
     </div>
     <% if Flipflop.proxy_deposit? && current_user.can_make_deposits_for.any? %>
         <div class="list-group-item">
@@ -31,7 +31,7 @@
       <%= render "form_progress_#{section}", f: f %>
     <% end %>
   </div>
-  <div class="panel-footer text-center">
+  <div class="card-footer text-center">
     <% if ::Flipflop.show_deposit_agreement? %>
       <% if ::Flipflop.active_deposit_agreement_acceptance? %>
         <label>
@@ -56,9 +56,9 @@
   </div>
 
   <%# Provide immediate feedback after the form is submitted while the subsequent page is loading %>
-  <div class="panel-footer hidden">
+  <div class="card-footer save-progress" hidden>
     <div class="progress">
-      <div class="progress-bar progress-bar-striped progress-bar-complete active">
+      <div class="progress-bar progress-bar-striped progress-bar-complete progress-bar-animated">
         <span id="form-feedback" aria-live="assertive"><%= t(".saving_your_work") %></span>
       </div>
     </div>

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

@@ -9,6 +9,6 @@
 <%= render 'form_member_of_collections', f: f %>
 
 <% if f.object.persisted? %>
-  <h2><%= t("hyrax.works.form.in_this_work") %></h2>
+  <h2 class="h3 mt-4"><%= t("hyrax.works.form.in_this_work") %></h2>
   <%= render 'form_child_work_relationships', f: f %>
 <% end %>

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

@@ -5,7 +5,7 @@
         <%= t("hyrax.base.form_rendering.legend_html") %>
       </legend>
       <div class="form-group">
-        <span class="help-block"><%= t("hyrax.base.form_rendering.help_html") %></span>
+        <span class="form-text"><%= t("hyrax.base.form_rendering.help_html") %></span>
         <%= f.select :rendering_ids,
                     form_file_set_select_for(parent: f.object),
                     { include_blank: true },

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

@@ -5,7 +5,7 @@
           <%= t("hyrax.base.form_representative.legend_html") %>
         </legend>
         <div class="form-group">
-          <span class="help-block"><%= t("hyrax.base.form_representative.help_html") %></span>
+          <span class="form-text"><%= t("hyrax.base.form_representative.help_html") %></span>
           <%= f.select :representative_id, form_file_set_select_for(parent: @form), {}, { class: 'form-control' } %>
         </div>
       </fieldset>