hyrax 3.4.2 → 4.0.0.beta2

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

@@ -6,19 +6,19 @@
     <% if @presenter.create_many_work_types? %>
       <%= link_to '#',
         class: "btn btn-primary btn-lg",
-        data: { behavior: 'select-work', target: '#worktypes-to-create', 'create-type' => 'single' } do %>
-        <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+        data: { behavior: 'select-work', toggle: 'modal', target: '#worktypes-to-create', 'create-type' => 'single' } do %>
+        <i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
       <% end %>
     <% else # simple link to the first work type %>
       <%= link_to new_polymorphic_path([main_app, @presenter.first_work_type]),
             class: 'btn btn-primary btn-lg' do %>
-        <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+        <i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
       <% end %>
     <% end %>
   <% else %>
     <%= link_to hyrax.my_works_path,
       class: "btn btn-primary btn-lg" do %>
-      <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+      <i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
     <% end %>
   <% end %>
   <p class="terms-of-use"><%= link_to t(:'hyrax.pages.tabs.terms_page'), hyrax.terms_path %></p>

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

@@ -4,16 +4,16 @@
     <h1><%= t('.manage_leases_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 curation_concern.lease_expiration_date %>
+            <% if lease_enforced?(curation_concern) %>
               <%= t('.lease_true_html',  cc: cc_type) %>
             <% else %>
               <%= t('.lease_false_html', cc: cc_type) %>
@@ -29,26 +29,26 @@
 
       <div class="row">
         <div class="col-md-12 form-actions">
-          <% if curation_concern.lease_expiration_date %>
+          <% if lease_enforced?(curation_concern) %>
             <%= f.submit t('.lease_update'), class: 'btn btn-primary' %>
             <%= link_to t('.lease_deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
           <% else %>
             <%= f.submit t('.lease_apply'), class: 'btn btn-primary' %>
           <% end %>
-          <%= link_to t('.lease_cancel'), leases_path, class: 'btn btn-default' %>
-          <%= link_to t('.lease_return', cc: cc_type), edit_polymorphic_path([main_app, curation_concern]), class: 'btn btn-default' %>
+          <%= link_to t('.lease_cancel'), leases_path, class: 'btn btn-secondary' %>
+          <%= link_to t('.lease_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 curation_concern.lease_history.empty? %>
+  <div class="card-body">
+    <% if lease_history(curation_concern).empty? %>
       <%= t('.history_empty', cc: cc_type) %>
     <% else %>
       <%= render partial: 'lease_history', object: curation_concern.lease_history %>

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

@@ -2,15 +2,27 @@
   <h1><span class="fa fa-sitemap"></span><%= t('.manage_leases') %></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_leases" %>
       </div>
       <div class="tab-pane" id="expired">

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

@@ -4,10 +4,10 @@
 <div class="btn-group">
   <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true" aria-expanded="false" aria-controls="<%= ul_id %>">
     <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
-    <%= t("hyrax.dashboard.my.action.select") %> <span class="caret" aria-hidden="true"></span>
+    <%= t("hyrax.dashboard.my.action.select") %>
   </button>
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to hyrax.admin_admin_set_path(id),
                   class: 'itemicon itemedit',
                   title: t("hyrax.dashboard.my.action.view_admin_set") do %>
@@ -15,7 +15,7 @@
       <% end %>
     </li>
     <% if can? :edit, admin_set_presenter.solr_document %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to hyrax.edit_admin_admin_set_path(id),
                     class: 'itemicon itemedit',
                     title: t("hyrax.dashboard.my.action.edit_admin_set") do %>
@@ -23,7 +23,7 @@
         <% end %>
       </li>
     <% else %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to "#",
                     class: 'itemicon itemedit edit-collection-deny-button',
                     title: t("hyrax.dashboard.my.action.edit_collection") do %>
@@ -31,7 +31,7 @@
         <% end %>
       </li>
     <% end %>
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to "#",
                      class: 'itemicon itemtrash delete-collection-button',
                      title: t("hyrax.dashboard.my.action.delete_admin_set"),

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

@@ -4,10 +4,10 @@
 <div class="btn-group">
   <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true" aria-expanded="false" aria-controls="<%= ul_id %>">
     <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
-    <%= t("hyrax.dashboard.my.action.select") %> <span class="caret" aria-hidden="true"></span>
+    <%= t("hyrax.dashboard.my.action.select") %>
   </button>
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to hyrax.dashboard_collection_path(id),
                   class: 'itemicon itemedit',
                   title: t("hyrax.dashboard.my.action.view_collection") do %>
@@ -15,7 +15,7 @@
       <% end %>
     </li>
     <% if can? :edit, collection_presenter.solr_document %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to hyrax.edit_dashboard_collection_path(id),
                     class: 'itemicon itemedit',
                     title: t("hyrax.dashboard.my.action.edit_collection")  do %>
@@ -23,7 +23,7 @@
         <% end %>
       </li>
     <% else %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to "#",
                     class: 'itemicon itemedit edit-collection-deny-button',
                     title: t("hyrax.dashboard.my.action.edit_collection") do %>
@@ -31,7 +31,7 @@
         <% end %>
       </li>
     <% end %>
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to "#",
                   class: 'itemicon itemtrash delete-collection-button',
                   title: t("hyrax.dashboard.my.action.delete_collection"),
@@ -44,7 +44,7 @@
 
     <% if collection_presenter.collection_type_is_nestable? %>
       <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to "#",
                     class: 'itemicon add-to-collection',
                     title: t("hyrax.dashboard.my.action.add_to_collection"),

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

@@ -1,9 +1,9 @@
 <% if query_has_constraints? %>
   <div id="appliedParams" class="clearfix constraints-container">
-    <div class="pull-right">
+    <div class="float-right">
       <%= link_to start_over_path,
           class: "catalog_startOverLink btn btn-sm btn-text", id: "startOverLink" do %>
-          <span class="btn btn-sm btn-danger start-over"><span class="glyphicon glyphicon-remove"></span></span>
+          <span class="btn btn-sm btn-danger start-over"><span class="fa fa-times"></span></span>
           <%= t('blacklight.search.start_over') %>
       <% end %>
     </div>

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

@@ -1,4 +1,4 @@
 <% # container for all documents in index view -%>
-<div class="table-responsive" id="documents">
+<div class="table-responsive mt-4" id="documents">
   <%= render 'default_group', docs: @response.docs %>
 </div>

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

@@ -1,25 +1 @@
-  <div class="prev_next_links btn-group pull-left">
-    <% if @pagination.first_page? %>
-      <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
-    <% else %>
-      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), route_set: hyrax, params: search_state.to_h, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link', data: {ajax_modal: "preserve"} %>
-    <% end %>
-
-    <% if @pagination.last_page? %>
-      <span class="disabled btn  btn-disabled"><%= raw(t('views.pagination.next')) %></span>
-    <% else %>
-      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), route_set: hyrax, params: search_state.to_h, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link',  data: {ajax_modal: "preserve"} %>
-    <% end %>
-  </div>
-
-  <div class="sort_options btn-group pull-right">
-    <% if @pagination.sort == 'index' -%>
-      <span class="active az btn btn-default"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'),
-        Hyrax::Engine.routes.url_for(@pagination.params_for_resort_url('count', search_state.to_h).symbolize_keys.merge(only_path: true)),
-        class: "sort_change numeric btn btn-default",
-        data: {ajax_modal: "preserve"}) %>
-    <% elsif @pagination.sort == 'count' -%>
-      <%= link_to(t('blacklight.search.facets.sort.index'), Hyrax::Engine.routes.url_for(@pagination.params_for_resort_url('index', search_state.to_h).symbolize_keys.merge(only_path: true)),
-        class: "sort_change az btn btn-default",  data: {ajax_modal: "preserve"}) %><span class="active numeric btn btn-default"><%= t('blacklight.search.facets.sort.count') %></span>
-    <% end -%>
-  </div>
+<%= render(Blacklight::FacetFieldPaginationComponent.new(facet_field: facet_field_presenter(@facet, @display_facet))) %>

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

@@ -5,7 +5,7 @@
       <% link_options = remove_facet_params(k, selected_facet, params).merge(action: :index) %>
       <div class="alert alert-warning">
         <%= link_to "X", hyrax.url_for(link_options), { class: "close", data: { dismiss: "alert" } } %>
-        <i class="glyphicon glyphicon-ok"></i> <strong><%= selected_facet %></strong>
+        <i class="fa fa-check"></i> <strong><%= selected_facet %></strong>
       </div>
     <% end %>
   <% end %>

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

@@ -1,19 +1,18 @@
-<%= form_tag search_action_url, method: :get, class: "search-query-form form-horizontal search-form", role: "search" do %>
+<%= form_tag search_action_url, method: :get, class: "search-query-form search-form", role: "search" do %>
 
-  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
-  <div class="form-group">
-    <label class="control-label col-sm-3" for="search-field-header">
+  <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+  <div class="form-group row">
+    <label class="col-form-label col-sm-3 text-right" for="search-field-header">
       <%= t("hyrax.search.form.q.label", application_name: application_name) %>
     </label>
 
-    <div class="input-group">
+    <div class="input-group mb-sm-auto 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>
       </div>
     </div><!-- /.input-group -->
-  </div><!-- /.form-group -->
+  </div><!-- /.form-row -->
 <% end %>

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

@@ -1,16 +1,14 @@
 <% if show_sort_and_per_page? %>
-  <div class="sort-toggle">
-      <%= form_tag search_action_for_dashboard, method: :get, class: 'per_page form-inline' do %>
-        <div class="form-group">
-          <fieldset class="col-xs-12">
-            <legend class="sr-only"><%= t('hyrax.dashboard.my.sr.results_per_page') %></legend>
-            <%= label_tag :per_page do %>
-                Show <%= select_tag :per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page.map(&:to_s), h(params[:per_page])),
-                                    title: t(".number_of_results_to_display_per_page") %> per page
-            <% end %>
-            <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort, :utf8)) %>
-          </fieldset>
-        </div>
+  <div class="sort-toggle mt-2">
+      <%= form_tag search_action_for_dashboard, method: :get, class: 'per_page' do %>
+        <fieldset class="col-12">
+          <legend class="sr-only"><%= t('hyrax.dashboard.my.sr.results_per_page') %></legend>
+          <%= label_tag :per_page do %>
+              Show <%= select_tag :per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page.map(&:to_s), h(params[:per_page])),
+                                  title: t(".number_of_results_to_display_per_page") %> per page
+          <% end %>
+          <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:per_page, :sort, :utf8)) %>
+        </fieldset>
       <% end %>
   </div>
 <% end %>

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

@@ -5,20 +5,19 @@
   <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= document.id %>" aria-haspopup="true" aria-expanded="false" aria-controls="<%= ul_id %>">
     <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
     <%= t("hyrax.dashboard.my.action.select") %>
-    <span class="caret" aria-hidden="true"></span>
   </button>
 
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= document.id %>">
 
     <% if can? :edit, document.id %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to [main_app, :edit, document],
                     id: 'action-edit-work' do %>
           <%= t("hyrax.dashboard.my.action.edit_work") %>
         <% end %>
       </li>
 
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to [main_app, document],
                     method: :delete,
                     id: 'action-delete-work',
@@ -29,14 +28,14 @@
       </li>
     <% end %>
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= display_trophy_link(current_user, document.id) do |text| %>
         <%= text %>
       <% end %>
     </li>
 
     <% if can? :transfer, document.id %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to(hyrax.new_work_transfer_path(document.id), id: 'action-transfer-work', class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
           <%= t("hyrax.dashboard.my.action.transfer") %>
         <% end %>

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

@@ -1,7 +1,9 @@
 <% # main container for facets/limits menu -%>
-<% if has_facet_values? %>
-  <div class="list-filters" role="group">
-    <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.collections") %></span>
-    <%= render_facet_partials %>
-  </div>
+<% facets = capture do %>
+  <%= render Blacklight::FacetComponent.with_collection(blacklight_config.facet_fields_in_group(nil), response: @response, component: Hyrax::DropdownFacetFieldComponent)%>
 <% end %>
+
+<div class="list-filters" role="group">
+  <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.collections") %></span>
+  <%= facets %>
+</div>

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

@@ -33,7 +33,7 @@
 
       <%# Expand arrow %>
       <a href="#" class="small show-more" title="Click for more details">
-        <i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></i>
+        <i id="expand_<%= id %>" class="fa fa-chevron-right" aria-hidden="true"></i>
         <span class="sr-only"> <%= "#{t("hyrax.dashboard.my.sr.detail_label")} #{collection_presenter.title_or_label}" %></span>
       </a>
     </div>

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

@@ -3,8 +3,8 @@
     <div class="modal-content">
 
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title" id="add-subcollection-label"><%= t('hyrax.collection.actions.nest_collections.modal_title') %></h4>
+        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
       </div>
 
       <div class="modal-body">
@@ -20,7 +20,7 @@
       </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>
         <% # '.modal-add-button' and '.modal-submit-button' classes applied below are used for JavaScript targeting %>
         <button
           disabled

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

@@ -3,8 +3,8 @@
     <div class="modal-content">
 
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title" id="add-to-collection-label"><%= t('hyrax.collection.actions.nested_subcollection.modal_title') %></h4>
+        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
       </div>
 
       <div class="modal-body">
@@ -19,7 +19,7 @@
       </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
           disabled
           type="button"

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

@@ -4,15 +4,15 @@
       <form class="new-collection-select">
 
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.collection_type_actions.close') %>"><span aria-hidden="true">&times;</span></button>
           <h4 class="modal-title" id="select-collectiontype-label"><%= t('hyrax.dashboard.collection_type_actions.select_type_of_collection') %></h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.collection_type_actions.close') %>"><span aria-hidden="true">&times;</span></button>
         </div>
 
         <div class="modal-body">
           <% @collection_type_list_presenter.each do |row_presenter| %>
-            <div class="radio radio-button-list">
-              <label>
-                <input type="radio" name="collection_type" value="<%= row_presenter.title.gsub(/\s+/, '') %>"
+            <div class="form-check radio-button-list">
+              <label class="form-check-label">
+                <input class="form-check-input" type="radio" name="collection_type" value="<%= row_presenter.title.gsub(/\s+/, '') %>"
                 <% if row_presenter.admin_set? %>
                   data-path="<%= new_admin_admin_set_path %>"
                 <% else %>
@@ -26,7 +26,7 @@
         </div>
 
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('hyrax.dashboard.collection_type_actions.close') %>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('hyrax.dashboard.collection_type_actions.close') %>
           </button>
           <input type="submit" class="btn btn-primary" value="<%= t('hyrax.dashboard.collection_type_actions.create_collection') %>" />
         </div>

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

@@ -7,7 +7,7 @@
       </div>
       <div class="modal-footer">
         <button type="button"
-          class="btn btn-default"
+          class="btn btn-secondary"
           data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
         <button type="button"
           class="btn btn-danger modal-delete-button"

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

@@ -6,7 +6,7 @@
         <p><%= t('hyrax.dashboard.my.action.collections_confirmation_no_items_html') %></p>
       </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 modal-delete-button"
           title="<%= t("hyrax.dashboard.my.action.delete_collection") %>">

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

@@ -9,7 +9,7 @@
         </div>
         <div class="modal-footer">
           <div style="text-align: right; display: inline-block">
-            <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>
             <div style="float: right; margin-left: 10px;">
               <%= render 'hyrax/dashboard/collections/button_for_batch_delete_collection', label: t('helpers.action.delete') %>
             </div>

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

@@ -1,8 +1,15 @@
+<% current_page_dashboard = current_page?(hyrax.dashboard_collections_path(locale: nil)) %>
 <ul class="nav nav-tabs" id="my_nav" role="navigation">
-  <li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_collections_path(locale: nil)) %>>
-    <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.collections"), hyrax.dashboard_collections_path %>
+  <li<%= ' class="nav-item"'.html_safe if current_page_dashboard %>>
+    <%= link_to(
+      t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.collections"), 
+      hyrax.dashboard_collections_path, 
+      class: "nav-link#{' active' if current_page_dashboard}") %>
   </li>
-  <li<%= ' class="active"'.html_safe if current_page?(hyrax.my_collections_path(locale: nil)) %>>
-    <%= link_to t('hyrax.dashboard.my.your_collections'), hyrax.my_collections_path %>
+  <li<%= ' class="nav-item"'.html_safe if !current_page_dashboard %>>
+    <%= link_to(
+      t('hyrax.dashboard.my.your_collections'), 
+      hyrax.my_collections_path, 
+      class: "nav-link#{' active' if !current_page_dashboard}") %>
   </li>
 </ul>

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

@@ -40,8 +40,8 @@
   </section>
 
   <%# Collections list %>
-  <div class="panel panel-default collections-panel-wrapper">
-    <div class="panel-heading">
+  <div class="card collections-panel-wrapper">
+    <div class="card-header">
       <% if  current_page?(hyrax.my_collections_path(locale: nil)) %>
         <span class="count-display"><%= I18n.t('hyrax.my.count.collections.you_own', total_count: @response.total_count).html_safe %></span>
       <% elsif current_page?(hyrax.dashboard_collections_path(locale: nil)) && !current_ability.admin? %>
@@ -50,7 +50,7 @@
         <span class="count-display"><%= I18n.t('hyrax.my.count.collections.in_repo', total_count: @response.total_count).html_safe %></span>
       <% end %>
     </div>
-    <div class="panel-body">
+    <div class="card-body">
       <h2 class="sr-only"><%= t('hyrax.my.count.collections.collections_listing') %></h2>
       <%= render 'search_header' %>
       <%= render 'hyrax/my/document_list' %>

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

@@ -1,20 +1,21 @@
-<div class="facet_pagination top">
-  <%= render partial: 'facet_pagination' %>
-</div>
+<%# Blacklight 7.24.0 %>
+<%# Override app/views/catalog/facet.html.erb %>
 
-<div class="modal-header">
-  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h3 class="modal-title"><%= facet_field_label(@facet.field) %></h3>
-</div>
-<div class="modal-body">
-  <div class="facet_extended_list">
-  <%= render_facet_limit(@display_facet, layout: false) %>
-  </div>
-</div>
+<%= render Blacklight::System::ModalComponent.new do |component| %>
+  <%# Removed component prefix that duplicates the facet pagination view %>
+
+  <% component.title { facet_field_label(@facet.key) } %>
 
-<div class="modal-footer">
+  <%= 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>
 
-  <div class="facet_pagination bottom">
-    <%= render partial: 'facet_pagination' %>
+  <%# 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>
-</div>
+<% end %>

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

@@ -19,9 +19,9 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default<%= ' tabs' if can?(:read, :admin_dashboard) %>">
+    <div class="card<%= ' tabs' if can?(:read, :admin_dashboard) %>">
       <%= render 'tabs' if can?(:read, :admin_dashboard) %>
-      <div class="panel-body">
+      <div class="card-body">
         <%= render 'search_header' %>
         <h2 class="sr-only"><%= t('hyrax.admin.sidebar.works_listing') %></h2>
         <%= render 'document_list' %>

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

@@ -4,7 +4,7 @@
   <div class="batch-toggle">
     <% session[:batch_edit_state] = "on" %>
     <div class="button_to-inline">
-      <%= button_to t('hyrax.dashboard.my.action.edit_selected'), hyrax.edit_batch_edits_path, method: :get, class: "btn btn-update btn-primary hidden submits-batches", data: { behavior: 'batch-edit' }, id: 'batch-edit' %>
+      <%= button_to t('hyrax.dashboard.my.action.edit_selected'), hyrax.edit_batch_edits_path, method: :get, class: "btn btn-update btn-primary submits-batches", data: { behavior: 'batch-edit' }, id: 'batch-edit' %>
     </div>
     <%= batch_delete %>
     <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),

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

@@ -1,7 +1,11 @@
 <% # main container for facets/limits menu -%>
-<% if has_facet_values? %>
+<% facets = capture do %>
+  <%= render Blacklight::FacetComponent.with_collection(blacklight_config.facet_fields_in_group(nil), response: @response, component: Hyrax::DropdownFacetFieldComponent)%>
+<% end %>
+
+<% if facets.present? %>
   <div class="list-filters" role="group">
     <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.works") %></span>
-    <%= render_facet_partials %>
+    <%= facets %>
   </div>
 <% end %>