hyrax 3.6.0 → 4.0.0.beta1

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

@@ -2,50 +2,52 @@
   <h1><%= t("hyrax.dashboard.title") %></h1>
 <% end %>
 
-<% if Hyrax.config.analytics? && Hyrax.config.analytics_provider != 'ga4' %>
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title"><%= t(".graph_reports") %>:</h2>
-        <%= params[:start_date].present? ? params[:start_date].to_date : 1.month.ago.beginning_of_day.to_date %> -
-        <%= params[:end_date].present? ? params[:end_date].to_date : Time.zone.now.end_of_day.to_date %>
+<div class="spaced-rows">
+  <% if Hyrax.config.analytics? %>
+  <div class="row">
+    <div class="col">
+      <div class="card">
+        <div class="card-header">
+          <h2 class="card-title"><%= t(".graph_reports") %>:</h2>
+          <%= params[:start_date].present? ? params[:start_date].to_date : 1.month.ago.beginning_of_day.to_date %> -
+          <%= params[:end_date].present? ? params[:end_date].to_date : Time.zone.now.end_of_day.to_date %>
+        </div>
+        <div class="card-body">
+          <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.dashboard_path %>
+        </div>
       </div>
-      <div class="panel-body">
-        <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.dashboard_path %>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col">
+      <div class="card">
+        <%= render 'user_activity' %>
       </div>
     </div>
   </div>
-</div>
+  <% end %>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <%= render 'user_activity' %>
+  <div class="row">
+    <div class="col">
+     <%= render 'repository_growth' %>
     </div>
   </div>
-</div>
-<% end %>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <%= render 'repository_growth' %>
+  <div class="row">
+    <div class="col">
+      <%= render 'visibility_graph' %>
+    </div>
+    <div class="col">
+      <%= render 'work_type_graph' %>
+    </div>
+    <div class="col">
+      <%= render "resource_type_graph" %>
     </div>
   </div>
 </div>
 
-<div class="row">
-  <div class="col-md-4">
-    <%= render 'visibility_graph' %>
-  </div>
-  <div class="col-md-4">
-    <%= render 'work_type_graph' %>
-  </div>
-  <div class="col-md-4">
-    <%= render "resource_type_graph" %>
-  </div>
+<div class="clearfix mt-5">
+  <%= render 'tabs' %>
 </div>
-<br>
-<br>
-<%= render 'tabs' %>
+

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

@@ -2,42 +2,42 @@
   <h1><%= t("hyrax.dashboard.title") %></h1>
 <% end %>
 
-<div class="panel panel-default user-activity">
-  <div class="panel-heading">
-    <h2 class="panel-title "><%= t("hyrax.dashboard.user_activity.title") %></h2>
+<div class="card user-activity">
+  <div class="card-header">
+    <h2 class="card-title "><%= t("hyrax.dashboard.user_activity.title") %></h2>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <%= @presenter.render_recent_activity %>
   </div>
 </div>
 
-<div class="panel panel-default" id="notifications">
-  <div class="panel-heading">
-    <h2 class="panel-title "><%= t("hyrax.dashboard.user_notifications") %></h2>
+<div class="card" id="notifications">
+  <div class="card-header">
+    <h2 class="card-title "><%= t("hyrax.dashboard.user_notifications") %></h2>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <%= @presenter.render_recent_notifications %>
     <%= @presenter.link_to_additional_notifications %>
   </div>
 </div>
 
 <% if Flipflop.proxy_deposit? %>
-  <div class="panel panel-default" id="proxy_management">
-    <div class="panel-heading">
-      <h2 class="panel-title "><%= t("hyrax.dashboard.current_proxies") %></h2>
+  <div class="card" id="proxy_management">
+    <div class="card-header">
+      <h2 class="card-title "><%= t("hyrax.dashboard.current_proxies") %></h2>
     </div>
-    <div class="panel-body">
+    <div class="card-body">
       <%= render 'hyrax/dashboard/_index_partials/current_proxy_rights', user: current_user %>
       <%= @presenter.link_to_manage_proxies %>
     </div>
   </div>
 <% end %>
 
-<div class="panel panel-default transfers">
-  <div class="panel-heading">
-    <h2 class="panel-title "><%= t("hyrax.dashboard.transfer_of_ownership") %></h2>
+<div class="card transfers">
+  <div class="card-header">
+    <h2 class="card-title "><%= t("hyrax.dashboard.transfer_of_ownership") %></h2>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <%= render 'hyrax/dashboard/_index_partials/transfers', presenter: @presenter.transfers %>
   </div>
 </div>

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

@@ -1,25 +1,26 @@
-  <li class="h5"><%= t('hyrax.admin.sidebar.activity') %></li>
+  <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.activity') %></li>
 
-  <li>
+  <li class="nav-item">
     <%= menu.collapsable_section t('hyrax.admin.sidebar.user_activity'),
                                  icon_class: "fa fa-line-chart",
                                  id: 'collapseUserActivity',
                                  open: menu.user_activity_section? do %>
       <%= menu.nav_link(hyrax.dashboard_profile_path(current_user),
+                        class: "nav-link",
                         also_active_for: hyrax.edit_dashboard_profile_path(current_user)) do %>
         <span class="fa fa-id-card" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.profile') %></span>
       <% end %>
 
-      <%= menu.nav_link(hyrax.notifications_path) do %>
+      <%= menu.nav_link(hyrax.notifications_path, class: "nav-link") do %>
         <span class="fa fa-bell" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.notifications') %></span>
       <% end %>
 
-      <%= menu.nav_link(hyrax.transfers_path) do %>
+      <%= menu.nav_link(hyrax.transfers_path, class: "nav-link") do %>
         <span class="fa fa-arrows-h" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.transfers') %></span>
       <% end %>
 
       <% if Flipflop.proxy_deposit? %>
-        <%= menu.nav_link(hyrax.depositors_path) do %>
+        <%= menu.nav_link(hyrax.depositors_path, class: "nav-link") do %>
           <span class="fa fa-users" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.dashboard.manage_proxies') %></span>
         <% end %>
       <% end %>
@@ -27,26 +28,25 @@
   </li>
 
   <% if can? :read, :admin_dashboard %>
-    <%= menu.nav_link(hyrax.admin_stats_path) do %>
+    <%= menu.nav_link(hyrax.admin_stats_path, class: "nav-link") do %>
       <span class="fa fa-bar-chart" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.statistics') %></span>
     <% end %>
   <% end %>
 
-  <% if current_ability.can_create_any_work? && Hyrax.config.analytics? && Hyrax.config.analytics_provider != 'ga4' %>
-    <li>
+  <% if current_ability.can_create_any_work? && Hyrax.config.analytics? %>
+    <li class="nav-item">
       <%= menu.collapsable_section t('hyrax.admin.sidebar.analytics'),
                                         icon_class: "fa fa-pie-chart",
                                         id: 'collapseAnalytics',
                                         open: menu.analytics_reporting_section? do %>
         <% if can? :read, :admin_dashboard %>
-          <%= menu.nav_link(hyrax.admin_analytics_collection_reports_path,
-                            onclick: "dontChangeAccordion(event);") do %>
+          <%= menu.nav_link(hyrax.admin_analytics_collection_reports_path, class: "nav-link", onclick: "dontChangeAccordion(event);") do %>
             <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections_report') %></span>
           <% end %>
         <% end %>
 
         <%= menu.nav_link(hyrax.admin_analytics_work_reports_path,
-                          onclick: "dontChangeAccordion(event);") do %>
+                          onclick: "dontChangeAccordion(event);", class: "nav-link") do %>
           <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works_report') %></span>
         <% end %>
 

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

@@ -1,28 +1,28 @@
   <% if menu.show_configuration? %>
-    <li class="h5"><%= t('hyrax.admin.sidebar.configuration') %></li>
-    <li>
+    <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.configuration') %></li>
+    <li class="nav-item">
       <%= menu.collapsable_section t('hyrax.admin.sidebar.settings'),
                                    icon_class: "fa fa-cog",
                                    id: 'collapseSettings',
                                    open: menu.settings_section? do %>
         <% if can?(:update, :appearance) %>
-          <%= menu.nav_link(hyrax.admin_appearance_path) do %>
+          <%= menu.nav_link(hyrax.admin_appearance_path, class: "nav-link") do %>
             <span class="fa fa-paint-brush" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.appearance') %></span>
           <% end %>
         <% end %>
         <% if can?(:manage, :collection_types) %>
-          <%= menu.nav_link(hyrax.admin_collection_types_path) do %>
+          <%= menu.nav_link(hyrax.admin_collection_types_path, class: "nav-link") do %>
             <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collection_types') %></span>
           <% end %>
         <% end %>
         <% if can?(:manage, Hyrax::Feature) %>
-          <%= menu.nav_link(hyrax.edit_pages_path) do %>
+          <%= menu.nav_link(hyrax.edit_pages_path, class: "nav-link") do %>
             <span class="fa fa-file-text-o" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.pages') %></span>
           <% end %>
-          <%= menu.nav_link(hyrax.edit_content_blocks_path) do %>
+          <%= menu.nav_link(hyrax.edit_content_blocks_path, class: "nav-link") do %>
             <span class="fa fa-square-o" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.content_blocks') %></span>
           <% end %>
-          <%= menu.nav_link(hyrax.admin_features_path) do %>
+          <%= menu.nav_link(hyrax.admin_features_path, class: "nav-link") do %>
             <span class="fa fa-wrench" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.technical') %></span>
           <% end %>
         <% end %>
@@ -30,7 +30,7 @@
     </li>
 
     <% if can?(:manage, Sipity::WorkflowResponsibility) %>
-      <%= menu.nav_link(hyrax.admin_workflow_roles_path) do %>
+      <%= menu.nav_link(hyrax.admin_workflow_roles_path, class: "nav-link") do %>
         <span class="fa fa-users" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.workflow_roles') %></span>
       <% end %>
     <% end %>

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

@@ -1,12 +1,14 @@
-  <li class="h5"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
+  <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
 
   <%= menu.nav_link(hyrax.my_collections_path,
+                    class: "nav-link",
                     onclick: "dontChangeAccordion(event);",
                     also_active_for: hyrax.dashboard_collections_path) do %>
     <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections') %></span>
   <% end %>
 
   <%= menu.nav_link(hyrax.my_works_path,
+                    class: "nav-link",
                     onclick: "dontChangeAccordion(event);",
                     also_active_for: hyrax.dashboard_works_path) do %>
     <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>

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

@@ -1,6 +1,7 @@
   <% if can? :review, :submissions %>
-    <li class="h5"><%= t('hyrax.admin.sidebar.tasks') %></li>
+    <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.tasks') %></li>
     <%= menu.nav_link(hyrax.admin_workflows_path,
+                      class: "nav-link",
                       onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.workflow_review') %></span>
     <% end %>
@@ -8,6 +9,7 @@
 
   <% if can? :manage, User %>
     <%= menu.nav_link(hyrax.admin_users_path,
+                      class: "nav-link",
                       onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-user" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.users') %></span>
     <% end %>
@@ -15,11 +17,13 @@
 
   <% if can? :read, :admin_dashboard %>
     <%= menu.nav_link(hyrax.embargoes_path,
+                      class: "nav-link",
                       onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.embargoes.index.manage_embargoes') %></span>
     <% end %>
 
     <%= menu.nav_link(hyrax.leases_path,
+                      class: "nav-link",
                       onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.leases.index.manage_leases') %></span>
     <% end %>

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

@@ -6,7 +6,10 @@
   <td>
     <div class='media'>
       <%= link_to [main_app, document], class: 'media-left' do %>
-        <%= render_thumbnail_tag document, { class: 'hidden-xs file_listing_thumbnail', alt: "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" }, { suppress_link: true } %>
+        <%= 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 }
+        ) %>
       <% end %>
 
       <div class='media-body'>

data/app/views/hyrax/depositors/index.html.erb

@@ -4,8 +4,8 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-body">
         <%= render 'hyrax/dashboard/_index_partials/proxy_rights', user: @user %>
       </div>
     </div>

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

@@ -4,16 +4,16 @@
   <h1><%= t('.manage_embargoes_html', cc: curation_concern, cc_type: cc_type) %></h1>
 <% end %>
 
-<div class="panel panel-default tabs">
-  <div class="panel-heading">
-    <h2 class="panel-title"><%= t('.header.current') %></h2>
+<div class="card tabs">
+  <div class="card-header">
+    <h2 class="card-title"><%= t('.header.current') %></h2>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <%= simple_form_for [main_app, curation_concern] do |f| %>
       <fieldset class="set-access-controls">
-        <section class="help-block">
+        <section class="form-text">
           <p>
-            <% if embargo_enforced?(curation_concern) %>
+            <% if curation_concern.embargo_release_date %>
               <%= t('.embargo_true_html',  cc: cc_type) %>
             <% else %>
               <%= t('.embargo_false_html', cc: cc_type) %>
@@ -29,26 +29,26 @@
 
       <div class="row">
         <div class="col-md-12 form-actions">
-          <% if embargo_enforced?(curation_concern) %>
+          <% if curation_concern.embargo_release_date %>
             <%= f.submit t('.embargo_update'), class: 'btn btn-primary' %>
             <%= link_to t('.embargo_deactivate'), embargo_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
           <% else %>
             <%= f.submit t('.embargo_apply'), class: 'btn btn-primary' %>
           <% end %>
-          <%= link_to t('.embargo_cancel'), embargoes_path, class: 'btn btn-default' %>
-          <%= link_to t('.embargo_return', cc: cc_type), edit_polymorphic_path([main_app, curation_concern]), class: 'btn btn-default' %>
+          <%= link_to t('.embargo_cancel'), embargoes_path, class: 'btn btn-secondary' %>
+          <%= link_to t('.embargo_return', cc: cc_type), edit_polymorphic_path([main_app, curation_concern]), class: 'btn btn-secondary' %>
         </div>
       </div>
     <% end %>
   </div>
 </div>
 
-<div class="panel panel-default tabs">
-  <div class="panel-heading">
-    <h2 class="panel-title"><%= t('.header.past') %></h2>
+<div class="card tabs">
+  <div class="card-header">
+    <h2 class="card-title"><%= t('.header.past') %></h2>
   </div>
-  <div class="panel-body">
-    <% if embargo_history(curation_concern).empty? %>
+  <div class="card-body">
+    <% if curation_concern.embargo_history.empty? %>
       <%= t('.history_empty', cc: cc_type) %>
     <% else %>
       <%= render partial: "embargo_history", object: curation_concern.embargo_history %>

data/app/views/hyrax/embargoes/index.html.erb

@@ -2,15 +2,27 @@
   <h1><span class="fa fa-sitemap" aria-hidden="true"></span><%= t('.manage_embargoes') %></h1>
 <% end %>
 
-<div class="panel panel-default tabs">
+<div class="card tabs">
   <ul class="nav nav-tabs">
-    <li class="active"><a href="#active" data-toggle="tab"><%= t('.active') %></a></li>
-    <li><a href="#expired" data-toggle="tab"><%= t('.expired') %></a></li>
-    <li><a href="#deactivated" data-toggle="tab"><%= t('.deactivated') %></a></li>
+    <li class="nav-item">
+      <a class="nav-link active" href="#active" data-toggle="tab">
+        <%= t('.active') %>
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link" href="#expired" data-toggle="tab">
+        <%= t('.expired') %>
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link" href="#deactivated" data-toggle="tab">
+        <%= t('.deactivated') %>
+      </a>
+    </li>
   </ul>
-  <div class="panel-body">
+  <div class="card-body">
     <div class="tab-content">
-      <div class="tab-pane active" id="active">
+      <div class="tab-pane show active" id="active">
         <%= render "list_active_embargoes" %>
       </div>
       <div class="tab-pane" id="expired">

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

@@ -2,7 +2,7 @@
   <% if can?(:download, file_set.id) && !(can?(:edit, file_set.id) || can?(:destroy, file_set.id)) %>
   <%= link_to t('.download'),
               hyrax.download_path(file_set),
-              class: 'btn btn-default btn-sm',
+              class: 'btn btn-secondary btn-sm',
               title: t('.download_title', file_set: file_set),
               target: "_blank",
               id: "file_download",
@@ -12,24 +12,23 @@
     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= file_set.id %>" aria-haspopup="true" aria-expanded="false">
       <span class="sr-only"><%= t('.press_to') %> </span>
       <%= t('.header') %>
-      <span class="caret" aria-hidden="true"></span>
     </button>
 
     <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= file_set.id %>">
     <% if can?(:edit, file_set.id) %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to t('.edit'), edit_polymorphic_path([main_app, file_set]),
           { title: t('.edit_title', file_set: file_set) } %>
       </li>
 
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to t('.versions'),  edit_polymorphic_path([main_app, file_set], anchor: 'versioning_display'),
           { title: t('.versions_title') } %>
       </li>
     <% end %>
 
     <% if can?(:destroy, file_set.id) %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to t('.delete'), polymorphic_path([main_app, file_set]),
           method: :delete, title: t('.delete_title', file_set: file_set),
           data: { confirm: t('.delete_confirm', file_set: file_set, application_name: application_name) } %>
@@ -37,7 +36,7 @@
     <% end %>
 
     <% if can?(:download, file_set.id) %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to t('.download'),
                     hyrax.download_path(file_set),
                     title: t('.download_title', file_set: file_set),

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

@@ -7,7 +7,7 @@
       <% end %>
     <div>
       <%= button_tag class: 'btn btn-primary btn-lg', id: "upload_submit", name: "update_descriptions" do %>
-        <i class="glyphicon glyphicon-floppy-disk"></i> <%= t('.save') %>
+        <i class="fa fa-floppy-o"></i> <%= t('.save') %>
       <% end %>
     </div>
   <% end %>

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

@@ -1,7 +1,7 @@
 <div class="modal-div extra_tag">
 <% label = name.to_s.titleize %>
 <!-- Button to trigger modal -->
-<a href="#extraFieldsModal_<%= name %>" role="button" class="btn btn-warning fright vmiddle" data-toggle="modal"><%= t('.additional') %> <%= label %> <i class="glyphicon glyphicon-plus large-icon"></i></a>
+<a href="#extraFieldsModal_<%= name %>" role="button" class="btn btn-warning fright vmiddle" data-toggle="modal"><%= t('.additional') %> <%= label %> <i class="fa fa-plus large-icon"></i></a>
 <!-- Modal -->
 <div class="modal fade" id="extraFieldsModal_<%= name %>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog">

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

@@ -1,6 +1,6 @@
 <%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
   <fieldset class="required">
-    <span class="control-label">
+    <span class="col-form-label">
       <%= label_tag 'file_set[title][]', t('.title'),  class: "string optional" %>
     </span>
     <%= text_field_tag 'file_set[title][]', curation_concern.title.first, class: 'form-control', required: true %>

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

@@ -1,5 +1,5 @@
   <div id="permissions_display" class="tab-pane">
-    <%= simple_form_for [main_app, form_object],
+    <%= simple_form_for [main_app, file_set],
                         html: { multipart: true,
                                 id: 'permission',
                                 data: { param_key: file_set.model_name.param_key },

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

@@ -1,14 +1,19 @@
+<% depositor = f.object.depositor %>
+<% public_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "public"}.compact.first %>
+<% public_perm = true if params[:controller] == 'batch' %>
+<% registered_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "registered"}.compact.first %>
+
 <h2 id="permissions_display"><% if params[:controller] == 'batch' %><%= t('.bulk') %> <% end %><%= t('.header') %> <% if params[:controller] == 'batch' %>
       <small><%= t('.applied_to') %></small><% end %>
 </h2>
 
-<div class="alert alert-info hidden" id="save_perm_note"><%= t('.save_note_html') %></div>
+<div class="alert alert-info" id="save_perm_note"><%= t('.save_note_html') %></div>
 
-<div class="alert alert-warning hidden" role="alert" id="permissions_error">
+<div class="alert alert-warning" role="alert" id="permissions_error">
   <span id="permissions_error_text"></span>
 </div>
 
-<%= render 'hyrax/base/form_visibility_component', f: f %>
+<%= render 'hyrax/base/form_permission', f: f %>
 
 <!-- Share With -->
 <div class="row">
@@ -23,20 +28,22 @@
   <div id="new-user">
     <p class="col-sm-12"><%= t('.enter', account_label: t('hyrax.account_label')) %></p>
     <p class="sr-only"><%= t('.new_user_help_text', account_label: t('hyrax.account_label')) %></p>
-    <div class="col-sm-5">
-      <label for="new_user_name_skel" class="sr-only"><%= t('.new_user_name_skel', account_label: t('hyrax.account_label'), suffix: t('hyrax.directory.suffix')) %></label>
-      <%= text_field_tag 'new_user_name_skel', nil %>
-    </div>
-    <div class="col-sm-4">
-      <label for="new_user_permission_skel" class="sr-only"><%= t('.new_user_permission_skel') %></label>
-      <%= select_tag 'new_user_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
-    </div>
-    <div class="col-sm-3">
-      <button class="btn btn-default" id="add_new_user_skel">
-        <span class="sr-only"><%= t('.add_new_user_skel', account_label: t('hyrax.account_label')) %></span>
-        <span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span>
-      </button>
-      <br /> <span id="directory_user_result"></span>
+    <div class="row">
+      <div class="col-sm-5">
+        <label for="new_user_name_skel" class="sr-only"><%= t('.new_user_name_skel', account_label: t('hyrax.account_label'), suffix: t('hyrax.directory.suffix')) %></label>
+        <%= text_field_tag 'new_user_name_skel', nil %>
+      </div>
+      <div class="col-sm-4">
+        <label for="new_user_permission_skel" class="sr-only"><%= t('.new_user_permission_skel') %></label>
+        <%= select_tag 'new_user_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
+      </div>
+      <div class="col-sm-3">
+        <button class="btn btn-secondary" id="add_new_user_skel">
+          <span class="sr-only"><%= t('.add_new_user_skel', account_label: t('hyrax.account_label')) %></span>
+          <span aria-hidden="true"><i class="fa fa-plus"></i></span>
+        </button>
+        <br /> <span id="directory_user_result"></span>
+      </div>
     </div>
   </div>
 </div>
@@ -44,18 +51,20 @@
 <div class="form-group row">
   <div id="new-group">
     <p class="sr-only"><%= t('.new_group_help_text') %></p>
-    <div class="col-sm-5">
-      <label for="new_group_name_skel" class="sr-only"><%= t('.new_group_name_skel') %></label>
-      <%= select_tag 'new_group_name_skel', options_for_select([t('.select_group')] + current_user.groups), class: 'form-control' %>
-    </div>
-    <div class="col-sm-4">
-      <label for="new_group_permission_skel" class="sr-only"><%= t('.new_group_permission_skel') %></label>
-      <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
-    </div>
-    <div class="col-sm-3">
-      <span class="sr-only"><%= t('.add_new_group_skel') %></span>
-      <button class="btn btn-default" id="add_new_group_skel"><i class="glyphicon glyphicon-plus"></i></button>
-      <br /><span id="directory_group_result"></span>
+    <div class="row">
+      <div class="col-sm-5">
+        <label for="new_group_name_skel" class="sr-only"><%= t('.new_group_name_skel') %></label>
+        <%= select_tag 'new_group_name_skel', options_for_select([t('.select_group')] + current_user.groups), class: 'form-control' %>
+      </div>
+      <div class="col-sm-4">
+        <label for="new_group_permission_skel" class="sr-only"><%= t('.new_group_permission_skel') %></label>
+        <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
+      </div>
+      <div class="col-sm-3">
+        <span class="sr-only"><%= t('.add_new_group_skel') %></span>
+        <button class="btn btn-secondary" id="add_new_group_skel"><i class="fa fa-plus"></i></button>
+        <br /><span id="directory_group_result"></span>
+      </div>
     </div>
   </div>
 </div>
@@ -64,7 +73,7 @@
 
 <script type="text/x-tmpl" id="tmpl-file-set-grant">
 <tr>
-  <td><label class="control-label">{%= o.name %}</label></td>
+  <td><label class="col-form-label">{%= o.name %}</label></td>
   <td>{%= o.accessLabel %} <button class="btn close">&times;</button></td>
 </tr>
 </script>