hyrax 3.6.0 → 4.0.0.beta1

data/app/views/hyrax/content_blocks/templates/agreement.html.erb

@@ -9,14 +9,14 @@ To properly administer this repository and preserve the contents of
 When you submit your file(s) you will have the option of selecting its degree of Visibility on the Web, which will control who can access your materials.  Certain license terms apply to each visibility level:
 </p>
 
-<h3>Visibility Level: <span class="label label-success">PUBLIC</span></h3>
+<h3>Visibility Level: <span class="badge badge-success">PUBLIC</span></h3>
 <p>
 By choosing the Public option you are allowing anyone in the world to view your submission.   You may choose to apply one of several Creative Commons licenses to your submission, which are explained on the submission form and in the FAQ.  These licenses allow you to set your own terms of use for anyone accessing the submission.  You authorize <%= ApplicationController.helpers.institution_name %> to distribute your content under the terms of that Creative Commons license and to allow users of <%= ApplicationController.helpers.application_name %> to do the same if your license choice permits that.
 
 If you do not choose a license, you grant to <%= ApplicationController.helpers.institution_name %> the non-exclusive right to distribute your submission (including the metadata and abstract) worldwide, in any format or medium for non-commercial, research, educational, or related academic purposes only.  You also authorize <%= ApplicationController.helpers.institution_name %> to allow users of the repository to distribute your submission (including the metadata and abstract) worldwide, in any format or medium for non-commercial, research, educational, or related academic purposes only. <%= ApplicationController.helpers.institution_name %> will clearly identify your name(s) as the author(s) or owner(s) of the submission, and will not make any alteration, other than as allowed by this license, to your submission.
 </p>
 
-<h3>Visibility Level: <span class="label label-info"><%= ApplicationController.helpers.institution_name.upcase %></span></h3>
+<h3>Visibility Level: <span class="badge badge-info"><%= ApplicationController.helpers.institution_name.upcase %></span></h3>
 
 <p>
 If you select the <%= ApplicationController.helpers.institution_name %> access option, you have decided to restrict access only to users of <%= ApplicationController.helpers.institution_name %>'s network. Your deposit will not be accessible to colleagues or students at other universities or to members of the public. If you want your work to be accessible to the broader scholarly community, you should consider the regular Public option instead.  If you choose, you may also further limit access to specific individuals or groups of individuals at <%= ApplicationController.helpers.institution_name %>.
@@ -26,7 +26,7 @@ If you select the <%= ApplicationController.helpers.institution_name %> access o
 By clicking through this license, you grant to <%= ApplicationController.helpers.institution_name %> the non-exclusive right to reproduce and/or distribute your submission (including the metadata and abstract) to students, faculty, staff, and walk-in users of the <%= ApplicationController.helpers.institution_name %> libraries, in any format or medium for non-commercial, research, educational, or related academic purposes only.  If you have limited access to specific individuals or groups, <%= ApplicationController.helpers.institution_name %> will distribute your submission ONLY to those users.  You also authorize <%= ApplicationController.helpers.institution_name %> to allow <%= ApplicationController.helpers.institution_name %> community users of the repository to distribute your submission (including the metadata and abstract) in any format or medium for <%= ApplicationController.helpers.institution_name %> internal non-commercial, research, educational, or related academic purposes only. <%= ApplicationController.helpers.institution_name %> will clearly identify your name(s) as the author(s) or owner(s) of the submission, and will not make any alteration, other than as allowed by this license, to your submission.
 </p>
 
-<h3>Visibility Level: <span class="label label-danger">PRIVATE</span></h3>
+<h3>Visibility Level: <span class="badge badge-danger">PRIVATE</span></h3>
 
 <p>
 If you have selected the PRIVATE access option in the <%= ApplicationController.helpers.application_name %> deposit process, you have decided to allow <%= ApplicationController.helpers.institution_name %> a more limited set of rights than those afforded under the Public license option. Your deposit will not be accessible to anyone other than yourself. If you want your work to be accessible to the broader scholarly community, you should consider the regular Public or <%= ApplicationController.helpers.institution_name %> settings instead.

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

@@ -1,30 +1,24 @@
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title"><%= t('.title') %></h2>
-        <div><%= t('.subtitle') %></div>
-      </div>
-      <div class="panel-body">
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th><%= t('.admin_set') %></th>
-              <th><%= t('.works') %></th>
-              <th><%= t('.files') %></th>
-            </tr>
-          </thead>
-          <tbody>
-            <% @admin_set_rows.each do |row| %>
-              <tr>
-                <td><%= row.admin_set %></td>
-                <td><%= row.work_count %></td>
-                <td><%= row.file_count %></td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
-    </div>
+<div class="card">
+  <div class="card-body">
+    <h5 class="card-title"><%= t('.title') %></h5>
+    <h6 class="card-subtitle mb-2 text-muted"><%= t('.subtitle') %></h6>
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th><%= t('.admin_set') %></th>
+          <th><%= t('.works') %></th>
+          <th><%= t('.files') %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @admin_set_rows.each do |row| %>
+          <tr>
+            <td><%= row.admin_set %></td>
+            <td><%= row.work_count %></td>
+            <td><%= row.file_count %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>

data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb

@@ -1,6 +1,6 @@
 <div class="row proxy-rights">
-  <div class="col-xs-6">
-    <table class="table table-condensed table-striped" id="authorizedProxies">
+  <div class="col-6">
+    <table class="table table-sm table-striped" id="authorizedProxies">
       <tbody>
       <% if user.can_receive_deposits_from.count == 0 %>
         <%= t('hyrax.dashboard.no_proxies') %>

data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb

@@ -1,11 +1,11 @@
 <div class="clearfix proxy-rights">
   <div class="row">
-    <div class="col-xs-12">
+    <div class="col-12">
       <p><%= t('hyrax.dashboard.proxy_help') %></p>
     </div>
   </div>
   <div class="row">
-    <div class="col-xs-6 proxy-search">
+    <div class="col-6 proxy-search">
       <h2><%= t("hyrax.dashboard.authorize_proxies") %></h2>
       <div class="form-group">
         <label for="user"><%= t("hyrax.dashboard.proxy_user") %></label>
@@ -14,9 +14,9 @@
       </div>
     </div>
 
-    <div class="col-xs-6">
+    <div class="col-6">
       <h2><%= t("hyrax.dashboard.current_proxies") %></h2>
-      <table class="table table-condensed table-striped" id="authorizedProxies">
+      <table class="table table-sm table-striped" id="authorizedProxies">
         <tbody>
         <% user.can_receive_deposits_from.each do |depositor| %>
             <tr><td class="depositor-name"><%= depositor.name %></td>

data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb

@@ -1,8 +1,8 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-9">
+  <div class="col-12 col-sm-9">
     <h3><%= t("hyrax.dashboard.transfers_sent") %></h3>
   </div>
-  <div class="col-xs-12 col-sm-3 transfer_link">
+  <div class="col-12 col-sm-3 transfer_link">
     <%= link_to hyrax.my_works_path do %>
         <%= t("hyrax.dashboard.transfer_works_link") %>
     <% end %>

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

@@ -1,30 +1,30 @@
-<div class="panel-heading">
-  <h3 class="panel-title"><%= t('.title') %></h3>
-</div>
-<div class="panel-body text-center">
-  <div id="dashboard-growth" aria-hidden="true" style="height: 200px">
-  <% repository_growth = @presenter.repository_growth(@start_date.to_datetime, @end_date.to_datetime).to_json %>
-  <script>
-//<![CDATA[
-Hyrax.statistics.repositoryGrowth = <%== repository_growth %>
-//]]>
-</script></div>
-  <table aria-label="<%= t('.title') %>" class="table table-striped sr-only text-left">
-    <thead>
-      <tr>
-        <th><%= t('.date') %></th>
-        <th><%= t('.works') %></th>
-        <th><%= t('.collections') %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% JSON.parse(repository_growth).each do |row| %>
+<div class="card">
+  <div class="card-header"><%= t('.title') %></div>
+  <div class="card-body d-flex justify-content-center">
+    <div id="dashboard-growth" aria-hidden="true" style="height: 200px">
+    <% repository_growth = @presenter.repository_growth(@start_date.to_datetime, @end_date.to_datetime).to_json %>
+    <script>
+  //<![CDATA[
+  Hyrax.statistics.repositoryGrowth = <%== repository_growth %>
+  //]]>
+  </script></div>
+    <table aria-label="<%= t('.title') %>" class="table table-striped sr-only text-left">
+      <thead>
         <tr>
-          <td><%= row["y"] %></td>
-          <td><%= row["a"] %></td>
-          <td><%= row["b"] %></td>
+          <th><%= t('.date') %></th>
+          <th><%= t('.works') %></th>
+          <th><%= t('.collections') %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
+      </thead>
+      <tbody>
+        <% JSON.parse(repository_growth).each do |row| %>
+          <tr>
+            <td><%= row["y"] %></td>
+            <td><%= row["a"] %></td>
+            <td><%= row["b"] %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

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

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= t('.title') %></h3>
+<div class="card">
+  <div class="card-header">
+    <%= t('.title') %>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <div id="dashboard-resource-types" aria-hidden="true" style="height: 200px">
       <% @resource_types = Hyrax::Statistic.resource_types %>
       <script>

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

@@ -1,8 +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">
-  <ul class="nav nav-pills nav-stacked">
-    <li>
+  <ul class="nav nav-pills flex-column">
+    <li class="nav-item">
       <div class="profile">
         <div class="profile-image">
           <%= image_tag current_user.avatar.url(:thumb), width: 100 if current_user.avatar.present? %>
@@ -12,7 +12,7 @@
         </div>
       </div>
     </li>
-    <li><%= link_to hyrax.dashboard_path do %>
+    <li class="nav-item"><%= link_to hyrax.dashboard_path, class: "nav-link" do %>
           <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
         <% end %>
     </li>

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

@@ -1,11 +1,15 @@
 <!-- Nav tabs -->
 <ul class="nav nav-tabs" role="tablist">
-  <li role="presentation" class="active"><a href="#admin_sets" aria-selected="true" role="tab" data-toggle="tab"><%= t('.admin_sets') %></a></li>
+  <li role="presentation" class="nav-item">
+    <a class="nav-link active" href="#admin_sets" aria-selected="true" role="tab" data-toggle="tab">
+      <%= t('.admin_sets') %>
+      </a>
+    </li>
 </ul>
 
 <!-- Tab panes -->
 <div class="tab-content">
-  <div role="tabpanel" class="tab-pane active" id="admin_sets">
+  <div role="tabpanel" class="tab-pane show active" id="admin_sets">
     <%= render 'admin_sets' %>
   </div>
 </div>

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

@@ -1,22 +1,25 @@
-<div class="panel-heading">
-  <h3 class="panel-title"><%= t('.title') %></h3>
-</div>
-<div class="panel-body text-center">
-  <% if Hyrax.config.analytics? && Hyrax.config.analytics_provider != 'ga4' %>
-    <%= render 'user_activity_graph' %>
+<div class="card">
+  <div class="card-header">
+    <%= t('.title') %>
+  </div>
+  <div class="card-body d-flex justify-content-center">
+    <% if Hyrax.config.analytics? %>
+      <%= render 'user_activity_graph' %>
 
-    <div class="col-md-3">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h2 class="panel-title text-center"><%= t('.user_summary') %></h2>
-        </div>
-        <div class="panel-body text-center">
-          <p><%= t('.registered_users') %>: <%= @presenter.user_count(@start_date.to_date, @end_date.to_date) %></p>
-          <p><%= t('.new_visitors') %>: <%= Hyrax::Analytics.new_visitors('range', "#{@start_date},#{@end_date}") %></p>
-          <p><%= t('.returning_visitors') %>: <%= Hyrax::Analytics.returning_visitors('range', "#{@start_date},#{@end_date}") %></p>
-          <p><%= t('.total_visitors') %>: <%= Hyrax::Analytics.total_visitors('range', "#{@start_date},#{@end_date}") %></p>
+      <!-- FIXME: This is like embedded a card in a card...seems odd -->
+      <div class="col-md-3">
+        <div class="card">
+          <div class="card-header">
+            <h2 class="card-title text-center"><%= t('.user_summary') %></h2>
+          </div>
+          <div class="card-body text-center">
+            <p><%= t('.registered_users') %>: <%= @presenter.user_count(@start_date.to_date, @end_date.to_date) %></p>
+            <p><%= t('.new_visitors') %>: <%= Hyrax::Analytics.new_visitors('range', "#{@start_date},#{@end_date}") %></p>
+            <p><%= t('.returning_visitors') %>: <%= Hyrax::Analytics.returning_visitors('range', "#{@start_date},#{@end_date}") %></p>
+            <p><%= t('.total_visitors') %>: <%= Hyrax::Analytics.total_visitors('range', "#{@start_date},#{@end_date}") %></p>
+          </div>
         </div>
       </div>
-    </div>
-  <% end %>
-</div>
+    <% end %>
+  </div>
+</div>

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

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= t('.visibility') %></h3>
+<div class="card">
+  <div class="card-header">
+    <%= t('.visibility') %>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
       <% repository_objects = @presenter.repository_objects.to_json %>
       <div id="dashboard-repository-objects" aria-hidden="true" style="height: 200px">
       <script>

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

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= t('.title') %></h3>
+<div class="card">
+  <div class="card-header">
+    <%= t('.title') %>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <div id="dashboard-work-types" aria-hidden="true" style="height: 200px">
       <% @work_types = Hyrax::Statistic.work_types %>
       <script>

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

@@ -1,3 +1,3 @@
-<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="glyphicon glyphicon-ok"></i> Select None</a></li>
+<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="fa fa-check"></i> Select None</a></li>
 <li data-behavior="batch-edit-select-page" data-state="off"><a href="#"><i class=""></i> Select Current Page</a></li>
 <li><%= button_for_remove_selected_from_collection @collection %></li>

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

@@ -8,13 +8,13 @@
   <% unless bookmarked? document %>
 
       <%= form_tag(main_app.bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
-        <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add btn btn-default") %>
+        <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add btn btn-secondary") %>
       <% end %>
 
   <% else %>
 
       <%= form_tag(main_app.bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
-        <%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove btn btn-default") %>
+        <%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove btn btn-secondary") %>
       <% end %>
 
   <% end %>

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

@@ -3,5 +3,5 @@
   <%= link_to t('hyrax.collection.actions.add_existing_works.label'),
               hyrax.my_works_path(add_works_to_collection: @form.id),
               title: t('hyrax.collection.actions.add_existing_works.desc'),
-              class: 'btn btn-default' %>
+              class: 'btn btn-secondary' %>
 </div>

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

@@ -1,33 +1,41 @@
 <%= render "shared/nav_safety_modal" %>
-<div class="panel panel-default tabs" id="collection-edit-controls">
-  <ul class="nav nav-tabs" role="tablist">
-    <li class="active">
-      <a href="#description" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.description') %></a>
+<div class="tabs mt-4" id="collection-edit-controls">
+  <ul class="nav nav-tabs" id="dashboard-collection-tab" role="tablist">
+    <li class="nav-item">
+      <a href="#description" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
+        <%= t('.tabs.description') %>
+      </a>
     </li>
     <% if @form.persisted? %>
       <% if collection_brandable?(collection: @collection) %>
-      <li>
-        <a href="#branding" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.branding') %></a>
+      <li class="nav-item">
+        <a href="#branding" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+          <%= t('.tabs.branding') %>
+        </a>
       </li>
       <% end %>
       <% if collection_discoverable?(collection: @collection) %>
-      <li>
-        <a href="#discovery" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.discovery') %></a>
+      <li class="nav-item">
+        <a href="#discovery" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+          <%= t('.tabs.discovery') %>
+        </a>
       </li>
       <% end %>
       <% if collection_sharable?(collection: @collection) %>
-      <li>
-        <a href="#sharing" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.sharing') %></a>
+      <li class="nav-item">
+        <a href="#sharing" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+          <%= t('.tabs.sharing') %>
+        </a>
       </li>
       <% end %>
     <% end %>
   </ul>
 
   <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor nav-safety', data: { behavior: 'collection-form', 'param-key' => @form.model_name.param_key } } do |f| %>
-    <div class="tab-content">
-      <div id="description" class="tab-pane active">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
+    <div class="tab-content card" id="dashboard-collection-tab-content">
+      <div id="description" class="tab-pane show active">
+        <div class="labels">
+          <div class="card-body">
 
             <div id="base-terms">
               <% f.object.primary_terms.each do |term| %>
@@ -44,7 +52,7 @@
             <% if f.object.display_additional_fields? %>
               <%= link_to t('hyrax.collection.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",
@@ -74,8 +82,8 @@
       <% if @form.persisted? %>
         <% if collection_brandable?(collection: @collection) %>
           <div id="branding" class="tab-pane">
-            <div class="panel panel-default labels">
-              <div class="panel-body">
+            <div class="card labels">
+              <div class="card-body">
                 <%= render 'form_branding', f: f %>
               </div>
             </div>
@@ -84,8 +92,8 @@
 
         <% if collection_discoverable?(collection: @collection) %>
           <div id="discovery" class="tab-pane">
-            <div class="panel panel-default labels">
-              <div class="panel-body">
+            <div class="card labels">
+              <div class="card-body">
                 <%= render 'form_discovery', f: f %>
               </div>
             </div>
@@ -94,8 +102,8 @@
 
         <% if collection_sharable?(collection: @collection) %>
           <div id="sharing" class="tab-pane">
-            <div class="panel panel-default labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
-              <div class="panel-body">
+            <div class="card labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
+              <div class="card-body">
                 <%= render 'form_share', f: f %>
               </div>
             </div>
@@ -103,7 +111,7 @@
         <% end %>
       <% end %>
 
-      <div class="panel-footer">
+      <div class="card-footer">
         <% if @collection.persisted? %>
           <%= f.submit t(:'hyrax.collection.select_form.update'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
           <%= link_to t(:'helpers.action.cancel'), hyrax.dashboard_collection_path(@collection), class: 'btn btn-link' %>

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

@@ -11,28 +11,28 @@
 
     <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
     <div class="row fileupload-buttonbar">
-      <div class="col-xs-4">
+      <div class="col-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
         <span class="btn btn-success fileinput-button">
-          <span class="glyphicon glyphicon-plus"></span>
+          <span class="fa fa-plus"></span>
           <span><%= t('.choose_file') %></span>
           <input type="file" name="files[]" single />
         </span>
-      </div> <!-- end col-xs-4 -->
+      </div> <!-- end col-4 -->
 
       <!-- The global progress state -->
-      <div class="col-xs-8 fileupload-progress branding-banner-progress fade">
+      <div class="col-8 fileupload-progress branding-banner-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>
-      </div> <!-- end col-xs-5 fileupload-progress fade -->
+      </div> <!-- end col-8 fileupload-progress fade -->
     </div> <!-- end row fileupload-buttonbar -->
 
     <div class="row branding-banner-list">
-      <div class="col-xs-12">
+      <div class="col-12">
         <div class="container">
         <%# Where the request to display the branding comes from. %>
         <% if f.object.banner_info[:file] %>
@@ -47,7 +47,7 @@
 
               <div class="col-sm-2">
                 <button class="btn btn-danger delete branding-banner-remove" data-type="DELETE" data-url="/" onclick=$("#banner").remove();>
-                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="fa fa-times"></span>
                   <span class="controls-remove-text"><%= t('.remove') %></span>
                   <span class="sr-only">
                     <%= t('.previous') %>
@@ -89,28 +89,28 @@
 
     <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
     <div class="row fileupload-buttonbar">
-      <div class="col-xs-4">
+      <div class="col-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
         <span class="btn btn-success fileinput-button">
-          <span class="glyphicon glyphicon-plus"></span>
+          <span class="fa fa-plus"></span>
           <span><%= t('.choose_file') %></span>
           <input type="file" name="files[]" single />
         </span>
-      </div> <!-- end col-xs-4 -->
+      </div> <!-- end col-4 -->
 
       <!-- The global progress state -->
-      <div class="col-xs-8 fileupload-progress branding-logo-progress fade">
+      <div class="col-8 fileupload-progress branding-logo-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>
-      </div> <!-- end col-xs-8 fileupload-progress branding-logo-progress fade -->
+      </div> <!-- end col-8 fileupload-progress branding-logo-progress fade -->
     </div> <!-- end row fileupload-buttonbar -->
 
     <div class="row branding-logo-list">
-      <div class="col-xs-12">
+      <div class="col-12">
         <div class="container">
           <% i = 0 %>
           <% f.object.logo_info.each_with_index do |linfo, i| %>
@@ -133,7 +133,7 @@
 
               <div class="col-sm-2">
                 <button class="btn btn-danger delete branding-logo-remove" data-type="DELETE" data-url="/" onclick=$("#logorow_<%= i %>").remove();>
-                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="fa fa-times"></span>
                   <span class="controls-remove-text"><%= t('.remove') %></span>
                    <span class="sr-only">
                     <%= t('.previous') %>
@@ -148,7 +148,7 @@
 
         <!-- The global file processing state -->
         <span class="fileupload-process"></span>
-      </div> <!-- end col-xs-12 -->
+      </div> <!-- end col-12 -->
     </div> <!-- end row branding-logo-list -->
   </div> <!-- end fileuploadlogo -->
 </div> <!-- end set-access-controls -->

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

@@ -3,16 +3,20 @@
   <p><%= t('.para1') %></p>
   <p><%= t('.para2') %></p>
 
-  <div class="form-group">
-    <label class="radio">
+  <div class="form-check">
+    <label class="form-check-label">
       <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>
       <strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
     </label>
-    <label class="radio">
+  </div>
+  <div class="form-check">
+    <label class="form-check-label">
       <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>
       <strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
     </label>
-    <label class="radio">
+  </div>
+  <div class="form-check">
+    <label class="form-check-label">
       <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>
       <strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
     </label>