hyrax 3.4.2 → 4.0.0.beta2

data/app/views/catalog/_search_form.html.erb

@@ -1,43 +1,41 @@
-<%= form_tag search_form_action, method: :get, class: "form-horizontal search-form", id: "search-form-header", role: "search" do %>
-  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+<%= form_tag search_form_action, method: :get, class: "search-form", id: "search-form-header", role: "search" do %>
+  <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
   <%= hidden_field_tag :search_field, 'all_fields' %>
-  <div class="form-group">
+  <div class="form-group row">
 
-    <label class="control-label col-sm-3" for="search-field-header">
+    <label class="col-sm-3 mb-0" for="search-field-header">
       <%= t("hyrax.search.form.q.label", application_name: application_name) %>
     </label>
 
-    <div class="input-group">
+    <div class="input-group col-sm-9">
       <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
 
-      <div class="input-group-btn">
+      <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">
           <%= t('hyrax.search.button.html') %>
         </button>
         <% if current_user %>
-          <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+          <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
 
             <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
             <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
-            <span class="caret"></span>
           </button>
 
-          <ul class="dropdown-menu pull-right">
-            <li>
+          <ul class="dropdown-menu dropdown-menu-right">
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
                   data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
                   data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
                   data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
             </li>
-          <% end %>
-
-        </ul>
+          </ul>
+        <% end %>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
     

data/app/views/catalog/_thumbnail_list_collection.html.erb

@@ -1,4 +1,4 @@
-<div class="col-md-2">
-  <%= render_thumbnail_tag document, {}, suppress_link: true %>
+<div class="col-md-3">
+  <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, { suppress_link: true }) %>
 </div> 
 

data/app/views/catalog/_thumbnail_list_default.html.erb

@@ -1,10 +1,10 @@
 <% model = document.hydra_model %>
-<div class="col-md-2">
+<div class="col-md-3">
   <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
-    <%= render_thumbnail_tag document, {}, suppress_link: true %>
+    <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, suppress_link: true) %>
   <% else %>
     <div class="list-thumbnail">
-      <%= render_thumbnail_tag document %>
+      <%= document_presenter(document)&.thumbnail&.thumbnail_tag %>
     </div>
   <% end %>
 </div>

data/app/views/catalog/facet.html.erb

@@ -0,0 +1,21 @@
+<%# Blacklight 7.24.0 %>
+<%# Override app/views/catalog/facet.html.erb %>
+
+<%= render Blacklight::System::ModalComponent.new do |component| %>
+  <%# Removed component prefix that duplicates the facet pagination view %>
+
+  <% component.title { facet_field_label(@facet.key) } %>
+
+  <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
+
+  <div class="facet-extended-list">
+    <%= render_facet_limit(@display_facet, layout: false) %>
+  </div>
+
+  <%# Removed component footer and placed the facet pagination partial within a `container` div %>
+  <div class="container">
+    <div class="facet-pagination bottom row justify-content-between">
+      <%= render :partial=>'facet_pagination' %>
+    </div>
+  </div>
+<% end %>

data/app/views/catalog/index.html.erb

@@ -1,7 +1,9 @@
-<div id="content" class="col-md-9 col-md-push-3 col-sm-8 col-sm-push-4">
+<div class="row mt-4">
+  <div id="content" class="order-sm-1 order-md-2 col-md-9 col-sm-12">
     <%= render 'search_results' %>
-</div>
+  </div>
 
-<div id="sidebar" class="col-md-3 col-md-pull-9 col-sm-4 col-sm-pull-8">
-  <%= render 'search_sidebar' %>
+  <div id="sidebar" class="order-sm-2 order-md-1 col-md-3 col-sm-12">
+    <%= render 'search_sidebar' %>
+  </div>
 </div>

data/app/views/hyrax/admin/admin_sets/_form.html.erb

@@ -1,26 +1,26 @@
     <%= render 'shared/nav_safety_modal' %>
-    <div class="panel panel-default tabs" id="admin-set-controls">
+    <div class="tabs mt-4" id="admin-set-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>
+        <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? %>
-          <li>
-            <a href="#participants" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.participants') %></a>
+          <li class="nav-item">
+            <a href="#participants" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('.tabs.participants') %></a>
           </li>
-          <li>
-            <a href="#visibility" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.visibility') %></a>
+          <li class="nav-item">
+            <a href="#visibility" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('.tabs.visibility') %></a>
           </li>
-          <li>
-            <a href="#workflow" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.workflow') %></a>
+          <li class="nav-item">
+            <a href="#workflow" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('.tabs.workflow') %></a>
           </li>
         <% end %>
       </ul>
-      <div class="tab-content">
-        <div id="description" class="tab-pane active">
-          <div class="panel panel-default labels">
+      <div class="tab-content card">
+        <div id="description" class="tab-pane show active">
+          <div class="labels">
             <%= simple_form_for @form, url: [hyrax, :admin, @form], html: { class: 'nav-safety' } do |f| %>
-              <div class="panel-body">
+              <div class="card-body">
                 <%= render 'form_metadata', f: f %>
 
                 <% if f.object.persisted? && f.object.member_ids.present? %>
@@ -31,10 +31,10 @@
 
               </div>
 
-              <div class="panel-footer">
+              <div class="card-footer d-flex justify-content-end">
                 <% cancel_path = f.object.persisted? ? hyrax.admin_admin_set_path(f.object) : hyrax.dashboard_collections_path %>
-                <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default pull-right' %>
-                <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+                <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+                <%= link_to t('.cancel'), cancel_path, class: 'btn btn-light' %>
               </div>
             <% end %>
           </div>

data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb

@@ -1,33 +1,35 @@
-                  <h3><%= t(".#{access}.title") %></h3>
-                  <p><%= t(".#{access}.help") %></p>
-                  <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
-                    <table class="table table-striped share-status">
-                      <thead>
-                        <tr>
-                          <th><%= t(".#{access}.agent_name") %></th>
-                          <th><%= t(".#{access}.type") %></th>
-                          <th><%= t(".#{access}.action") %></th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                      <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
-                        <tr>
-                          <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
-                          <td><%= g.agent_type.titleize %></td>
-                          <td>
-                            <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
-                              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
-                            <% else %>
-                              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
-                            <% end %>
-                          </td>
-                        </tr>
-                      <% end %>
-                      </tbody>
-                    </table>
-                  <% else %>
-                    <p><em><%= t(".#{access}.empty") %></em></p>
-                  <% end %>
-                  <%= button_tag t('.allow_all_registered'),
-                                 class: 'btn btn-info',
-                                 data: { behavior: 'add-registered-users' } if access == 'depositors' %>
+<div class="mb-4">
+  <h3 class="h4"><%= t(".#{access}.title") %></h3>
+  <p><%= t(".#{access}.help") %></p>
+  <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
+    <table class="table table-striped share-status">
+      <thead>
+        <tr>
+          <th><%= t(".#{access}.agent_name") %></th>
+          <th><%= t(".#{access}.type") %></th>
+          <th><%= t(".#{access}.action") %></th>
+        </tr>
+      </thead>
+      <tbody>
+      <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
+        <tr>
+          <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
+          <td><%= g.agent_type.titleize %></td>
+          <td>
+            <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
+              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
+            <% else %>
+              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <p><em><%= t(".#{access}.empty") %></em></p>
+  <% end %>
+  <%= button_tag t('.allow_all_registered'),
+                  class: 'btn btn-primary ',
+                  data: { behavior: 'add-registered-users' } if access == 'depositors' %>
+</div>

data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb

@@ -1,8 +1,8 @@
           <div id="participants" class="tab-pane">
-            <div class="panel panel-default labels edit-sharing-tab">
-              <div class="panel-body">
+            <div class="card labels edit-sharing-tab">
+              <div class="card-body">
                 <section class="section-add-sharing clearfix">
-                  <h3><%= t('.add_participants') %></h3>
+                  <h2 class="h3"><%= t('.add_participants') %></h2>
                   <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
                   <div class="sharing-row-form">
                     <%= simple_form_for collection_permission_template_form_for(form: @form),
@@ -27,7 +27,7 @@
                                 class: 'form-control' %>
                           </div>
                         <% end %>
-                        <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
+                        <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
 
                     <% end %>
                   </div>
@@ -54,20 +54,21 @@
                                       class: 'form-control' %>
                         </div>
                       <% end %>
-                      <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
+                      <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
                     <% end %>
                   </div>
 
-                  <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note') %></p>
+                  <p class="form-text"><%= t('hyrax.admin.admin_sets.form.note') %></p>
                 </section>
 
+                <h2 class="h3"><%= t(".current_participants") %></h2>
                 <fieldset class="admin-set-participants section-collection-sharing">
-                  <legend><%= t(".current_participants") %></legend>
+                  
                   <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
                   <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
                   <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
                 </fieldset>
 
-              </div><!-- /.panel-body -->
+              </div><!-- /.card-body -->
             </div>
           </div>

data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb

@@ -3,47 +3,47 @@
               <%= simple_form_for collection_permission_template_form_for(form: @form),
                                   url: [hyrax, :admin, @form, :permission_template],
                                   html: { class: 'nav-safety' } do |f| %>
-                <div class="panel-body">
+                <div class="card-body">
                   <p><%= t('.page_description') %></p>
                   <h3><%= t('.release.title') %></h3>
                   <p><%= t('.release.description') %></p>
-                  <div id="release-no-delay" class="radio">
-                    <label>
-                      <%= f.radio_button :release_period, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY %>
+                  <div id="release-no-delay" class="form-check">
+                    <label class="form-check-label">
+                      <%= f.radio_button :release_period, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY, class: 'form-check-input' %>
                       <%= t('.release.no_delay') %>
                     </label>
                   </div>
-                  <div id="release-varies" class="radio">
-                    <label>
-                      <%= f.radio_button :release_period, '', checked: f.object.release_period.blank? || !f.object.release_varies.blank? %>
+                  <div id="release-varies" class="form-check">
+                    <label class="form-check-label">
+                      <%= f.radio_button :release_period, '', checked: f.object.release_period.blank? || !f.object.release_varies.blank?, class: 'form-check-input' %>
                       <%= t('.release.varies.description') %>
                     </label>
                     <ul>
-                      <li class="radio form-inline">
-                        <label>
-                          <%= f.radio_button :release_varies, '' %>
+                      <li class="form-check form-check-inline">
+                        <label class="form-check-label">
+                          <%= f.radio_button :release_varies, '', class: 'form-check-input' %>
                           <%= t('.release.varies.any') %>
                         </label>
                       </li>
-                      <li class="radio form-inline">
-                        <label>
-                          <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE %>
+                      <li class="form-check form-check-inline">
+                        <label class="form-check-label">
+                          <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, class: 'form-check-input' %>
                           <%= t('.release.varies.between') %>
                         </label>
                         <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control', placeholder: 'mm/dd/yyyy' %>
                       </li>
-                      <li class="radio form-inline">
-                        <label>
-                          <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO %>
+                      <li class="form-check form-check-inline">
+                        <label class="form-check-label">
+                          <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO, class: 'form-check-input' %>
                           <%= t('.release.varies.period') %>
                           <%= f.collection_select :release_embargo, f.object.embargo_options, :first, :last, prompt: t('.release.varies.embargo.select') %>
                         </label>
                       </li>
                     </ul>
                   </div>
-                  <div id="release-fixed" class="radio form-inline">
-                    <label>
-                      <%= f.radio_button :release_period, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED %>
+                  <div id="release-fixed" class="form-check form-check-inline mb-4">
+                    <label class="form-check-label">
+                      <%= f.radio_button :release_period, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, class: 'form-check-input' %>
                       <%= t('.release.fixed') %>
                     </label>
                     <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control', placeholder: 'mm/dd/yyyy' %>
@@ -51,14 +51,14 @@
                   <h3><%= t('.visibility.title') %></h3>
                   <p><%= t('.visibility.description') %></p>
                   <%# List each option in a <div class='radio'> tag %>
-                  <%= f.collection_radio_buttons :visibility, f.object.visibility_options, :first, :last, item_wrapper_tag: :div, item_wrapper_class: 'radio' do |b| %>
+                  <%= f.collection_radio_buttons :visibility, f.object.visibility_options, :first, :last, item_wrapper_tag: :div, item_wrapper_class: 'form-check' do |b| %>
                     <%# NOTE: Bug in simple_form causes nested labels: https://github.com/plataformatec/simple_form/issues/1190 This block is a workaround. %>
-                    <% b.radio_button + b.text %>
+                    <% b.label(class: 'form-check-label') { b.radio_button(class: 'form-check-input') + b.text } %>
                   <% end %>
                 </div>
-                <div class="panel-footer">
-                  <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-                  <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+                <div class="card-footer d-flex justify-content-end">
+                  <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+                  <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
                 </div>
               <% end %>
             </div>

data/app/views/hyrax/admin/admin_sets/_form_workflow.erb

@@ -4,19 +4,19 @@
                       url: [hyrax, :admin, @form, :permission_template],
                       html: { id: 'form_workflows', class: 'nav-safety' } do |f| %>
                       <% if f.object.available_workflows.any? %>
-                        <div class="panel-body">
+                        <div class="card-body">
                           <p><%= t('.page_description') %></p>
                               <%= f.collection_radio_buttons :workflow_id, f.object.available_workflows, :id, :label, item_wrapper_tag: :div, item_wrapper_class: "radio" do |b| %>
                                 <span><%= b.radio_button + b.object.label %></span>
                                 <p><%= b.object.description %></p>
                               <% end %>
                         </div>
-                        <div class="panel-footer">
-                          <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
-                          <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+                        <div class="card-footer d-flex justify-content-end">
+                          <%= f.button :submit, class: 'btn btn-primary text-white mr-2'%>
+                          <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light'%>
                         </div>
                       <% else %>
-                        <div class="panel-body">
+                        <div class="card-body">
                           <p><%= t('.no_workflows') %></p>
                         </div>
                       <% end %>

data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb

@@ -1,12 +1,12 @@
 
-      <div class="panel-heading">
+      <div class="card-header">
         <div class="row">
           <div class="col-sm-8">
-            <h2 class="panel-title display-page"><%= presenter.to_s %></h2>
+            <h2 class="card-title display-page"><%= presenter.to_s %></h2>
           </div>
           <% if can? :edit, presenter.solr_document %>
           <div class="col-sm-4">
-            <div class="pull-right">
+            <div class="float-right">
               <%= link_to edit_admin_admin_set_path(presenter), class: 'btn btn-primary' do %>
                 <span class="fa fa-edit" aria-hidden="true"></span> <%= t(:'helpers.action.edit') %>
               <% end %>

data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb

@@ -3,18 +3,18 @@
 <tr id="document_<%= id %>">
   <td>&nbsp;
     <% if current_user and document.depositor != current_user.user_key %>
-      <i class="glyphicon glyphicon-share-alt" />
+      <i class="fa fa-share" />
     <% end %>
   </td>
   <td>
     <div class="media">
       <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
-        <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
+        <%= document_presenter(document)&.thumbnail&.thumbnail_tag({ class: "d-none d-md-block file_listing_thumbnail" }, { suppress_link: true }) %>
       <% end %>
       <div class="media-body">
         <p class="media-heading">
           <strong><%= link_to document.title_or_label, [main_app, document], id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %></strong>
-          <a href="#" class="small" title="Click for more details"><span id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></span></a>
+          <a href="#" class="small" title="Click for more details"><span id="expand_<%= id %>" class="fa fa-chevron-right"></span></a>
         </p>
         <%= render_collection_links(document) %>
       </div>
@@ -34,12 +34,12 @@
 <tr id="detail_<%= id %>"> <!--  document detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
-      <dt class="col-xs-3 col-lg-2">Creator:</dt>
-      <dd class="col-xs-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
-      <dt class="col-xs-3 col-lg-2">Depositor:</dt>
-      <dd class="col-xs-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
-      <dt class="col-xs-3 col-lg-2">Edit Access:</dt>
-      <dd class="col-xs-9 col-lg-10">
+      <dt class="col-3 col-lg-2">Creator:</dt>
+      <dd class="col-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
+      <dt class="col-3 col-lg-2">Depositor:</dt>
+      <dd class="col-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
+      <dt class="col-3 col-lg-2">Edit Access:</dt>
+      <dd class="col-9 col-lg-10">
         <% if document.edit_groups.present? %>
           Groups: <%= document.edit_groups.join(', ') %>
           <br />

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

@@ -1,7 +1,7 @@
 <% provide :page_header do %>
   <h1><span class="fa fa-sitemap" aria-hidden="true"></span> Administrative Sets</h1>
   <% if can? :create, AdminSet %>
-    <div class="pull-right">
+    <div class="float-right">
       <%= link_to hyrax.new_admin_admin_set_path, class: 'btn btn-primary' do %>
         <span class="fa fa-edit" aria-hidden="true"></span> <%= t(:'helpers.action.admin_set.new') %>
       <% end %>
@@ -9,8 +9,8 @@
   <% end %>
 <% end %>
 
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="card">
+  <div class="card-body">
     <% if @admin_sets.present? %>
       <div class="table-responsive">
         <table class="table table-striped datatable">

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

@@ -4,14 +4,14 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
+    <div class="card">
       <%= render 'show_actions', presenter: @presenter %>
 
-      <div class="panel-body admin-set row">
+      <div class="card-body admin-set row">
         <div class="col-md-2">
           <% if has_thumbnail? @presenter.solr_document %>
             <div class="document-thumbnail">
-              <%= render_thumbnail_tag @presenter.solr_document, {}, suppress_link: true %>
+              <%= render_thumbnail_tag(@presenter.solr_document, {}, { suppress_link: true }) %>
             </div>
           <% else %>
             <span class="fa fa-sitemap collection-icon-search" aria-hidden="true"></span>
@@ -23,7 +23,7 @@
         </div>
       </div>
 
-      <div class="panel-body admin-set-members">
+      <div class="card-body admin-set-members">
         <h3><%= t '.item_list_header' %></h3>
         <%= render 'sort_and_per_page', collection: @presenter %>
 

data/app/views/hyrax/admin/analytics/_date_range_form.html.erb

@@ -1,6 +1,6 @@
-<div class="panel panel-default">
-  <div class="panel-heading"><h4><%= t('.date_range_heading') %></h4></div>
-  <div class="panel-body">
+<div class="card">
+  <div class="card-header"><h4><%= t('.date_range_heading') %></h4></div>
+  <div class="card-body">
     <%= form_tag(redirect_path, method: :get, class: "form-inline") do %>
       <%= t('.start_date') %>: <%= date_field_tag :start_date, "", class: 'datepicker form-control', placeholder: 'mm/dd/yyyy', required: true %>
       <%= t('.end_date') %>: <%= date_field_tag :end_date, "", class: 'datepicker form-control', placeholder: 'mm/dd/yyyy', required: true %>

data/app/views/hyrax/admin/analytics/collection_reports/_custom_range.html.erb

@@ -1,6 +1,6 @@
-<div class="panel panel-default">
-  <div class="panel-heading"><h4><%= t('.summary_heading') %></h4></div>
-  <div class="panel-body">
+<div class="card">
+  <div class="card-header"><h4><%= t('.summary_heading') %></h4></div>
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
         <tr>

data/app/views/hyrax/admin/analytics/collection_reports/_monthly_summary.html.erb

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     <h4><%= t('.monthly_subtitle') %> <%= Time.zone.today.strftime("%B %Y") %></h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
       <tr>

data/app/views/hyrax/admin/analytics/collection_reports/_summary.html.erb

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
   <h4><%= t('.subtitle')%></h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
         <tr>

data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb

@@ -1,14 +1,14 @@
-<div class="panel panel-default">
+<div class="card">
   
-  <div class="panel-heading">
+  <div class="card-header">
     <h4><%= t('.top_collections') %>
-    <div class="btn-group pull-right">
-      <%= link_to "#{t('.export')}", admin_analytics_collection_reports_path(start_date: @start_date, end_date: @end_date, format: :csv, disposition: "attachment"), class: "btn btn-default" %>
+    <div class="btn-group float-right">
+      <%= link_to "#{t('.export')}", admin_analytics_collection_reports_path(start_date: @start_date, end_date: @end_date, format: :csv, disposition: "attachment"), class: "btn btn-secondary" %>
     </div>
     </h4>
   </div>
 
-  <div class="panel-body">
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
         <tr>
@@ -42,8 +42,8 @@
     </table>
   </div>
   
-  <div class="panel-footer">
-    <div class="pull-right">
+  <div class="card-footer">
+    <div class="float-right">
       <%= paginate @top_collections %>
     </div>
   </div>