hyrax 3.6.0 → 4.0.0.beta1

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

@@ -1,21 +1,22 @@
 <div class="row button-row-top-two-column">
   <div class="col-sm-6">
     <% if presenter.editor? %>
-      <%= link_to t(".edit"), edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default' %>
+      <%= link_to t(".edit"), edit_polymorphic_path([main_app, presenter]), class: 'btn btn-secondary' %>
       <% if presenter.member_presenters.size > 1 %>
-          <%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-default' %>
+          <%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-secondary' %>
       <% end %>
       <% if presenter.valid_child_concerns.length > 0 %>
         <div class="btn-group">
-          <button type="button" class="btn btn-default dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <%= t('.attach_child') %> <span class="caret"></span></button>
-            <ul class="dropdown-menu">
-              <% presenter.valid_child_concerns.each do |concern| %>
-                <li>
-                  <%= link_to t(".attach", type: concern.human_readable_type), polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
-                </li>
-              <% end %>
-            </ul>
+          <button type="button" class="btn btn-secondary dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <%= t('.attach_child') %>
+          </button>
+          <ul class="dropdown-menu">
+            <% presenter.valid_child_concerns.each do |concern| %>
+              <li class="dropdown-item">
+                <%= link_to t(".attach", type: concern.human_readable_type), polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
+              </li>
+            <% end %>
+          </ul>
         </div>
       <% end %>
       <%= link_to t(".delete"), [main_app, presenter], class: 'btn btn-danger', data: { confirm: t(".delete_type", type: {presenter.human_readable_type}) }, method: :delete %>
@@ -25,20 +26,20 @@
     <% if presenter.show_deposit_for?(collections: @user_collections) %>
       <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
       <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
-                    class: 'btn btn-default submits-batches submits-batches-add',
+                    class: 'btn btn-secondary submits-batches submits-batches-add',
                     data: { toggle: "modal", target: "#collection-list-container" } %>
     <% end %>
     <% if presenter.work_featurable? %>
       <%= link_to t(".feature"), hyrax.featured_work_path(presenter, format: :json),
           data: { behavior: 'feature' },
-          class: presenter.display_unfeature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
+          class: presenter.display_unfeature_link? ? 'btn btn-secondary collapse' : 'btn btn-secondary' %>
 
       <%= link_to t(".unfeature"), hyrax.featured_work_path(presenter, format: :json),
           data: { behavior: 'unfeature' },
-          class: presenter.display_feature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
+          class: presenter.display_feature_link? ? 'btn btn-secondary collapse' : 'btn btn-secondary' %>
     <% end %>
-    <% if Hyrax.config.analytics? && Hyrax.config.analytics_provider != 'ga4' %>
-      <%= link_to t(".analytics"), presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
+    <% if Hyrax.config.analytics? %>
+      <%= link_to t(".analytics"), presenter.stats_path, id: 'stats', class: 'btn btn-secondary' %>
     <% end %>
   </div>
 </div>

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

@@ -1,18 +1,18 @@
-<div id="workflow_controls" class="panel panel-workflow">
-  <div class="panel-heading">
-    <a data-toggle="collapse" href="#workflow_controls_collapse">
-      <h2 class="panel-title"><%= t('.title') %> <span class="fa fa-chevron-right pull-right"></span></h2>
-    </a>
-  </div>
+<div id="workflow_controls" class="card panel-workflow">
+  <button data-toggle="collapse" data-target="#workflow_controls_collapse" class="btn">
+    <div class="card-header">
+        <h2 class="card-title"><%= t('.title') %> <span class="fa fa-chevron-right float-right"></span></h2>
+    </div>
+  </button>
   <%= form_tag main_app.hyrax_workflow_action_path(presenter), method: :put do %>
-    <div id="workflow_controls_collapse" class="panel-body panel-collapse collapse">
+    <div id="workflow_controls_collapse" class="card-body collapse">
       <div class="col-sm-3 workflow-actions">
         <h3><%= t('.actions') %></h3>
 
         <% presenter.workflow.actions.each do |key, label| %>
-          <div class="radio">
-            <label>
-              <%= radio_button_tag 'workflow_action[name]', key, key == 'comment_only' %>
+          <div class="form-check">
+            <label class="form-check-label">
+              <%= radio_button_tag 'workflow_action[name]', key, key == 'comment_only', class: 'form-check-input' %>
               <%= label %>
             </label>
           </div>

data/app/views/hyrax/base/_workflow_actions_widget.erb

@@ -1,4 +1,4 @@
-<div class="col-xs-12">
+<div class="col-12">
   <div class="workflow-actions">
     <%= render 'workflow_actions', presenter: @presenter if @presenter.workflow.actions.present? %>
   </div>

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

@@ -1,18 +1,17 @@
 <h1><%= t("hyrax.file_manager.link_text") %></h1>
 <ul class="breadcrumb">
-  <li>
+  <li class="breadcrumb-item">
     <%= t('.back_to') %> <%= link_to @form.to_s, [main_app, @form] %>
   </li>
 </ul>
 
 <% if !@form.member_presenters.empty? %>
-  <div data-action="file-manager">
-    <div class="col-md-3" id="file-manager-tools">
+  <div class="row" data-action="file-manager">
+    <div class="col-lg-3" id="file-manager-tools">
       <h2><%= t('.toolbar') %></h2>
       <%= render "file_manager_actions" %>
     </div>
-    <div class="col-md-3" id="label-tools-spacer" class="fixed"></div>
-    <div class="col-md-9" id="order-grid">
+    <div class="col-lg-9" id="order-grid">
       <%= render "file_manager_members" %>
     </div>
   </div>

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

@@ -1,6 +1,6 @@
 <h1><%= t("inspect_work.link_text") %></h1>
 <ul class="breadcrumb">
-  <li>
+  <li class="breadcrumb-item">
     <%= t('.back_to') %> <%= link_to @presenter.to_s, [main_app, @presenter] %>
   </li>
 </ul>

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

@@ -6,11 +6,11 @@
   <div class="col-sm-12">
     <%= render 'work_type', presenter: @presenter %>
   </div>
-  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12">
+  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-12">
     <%= render 'work_title', presenter: @presenter %>
     <%= render 'show_actions', presenter: @presenter %>
-    <div class="panel panel-default">
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-body">
         <div class="row">
           <%= render 'workflow_actions_widget', presenter: @presenter %>
           <% if @presenter.iiif_viewer? %>
@@ -29,22 +29,22 @@
           </div>
         </div>
       </div>
-    </div><!-- /panel -->
+    </div><!-- /.card -->
 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h1 class="panel-title"><%= t('hyrax.base.show.relationships') %></h1>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title"><%= t('hyrax.base.show.relationships') %></h2>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= render 'relationships', presenter: @presenter %>
       </div>
     </div>
 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h1 class="panel-title"><%= t('.items') %></h1>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title"><%= t('.items') %></h2>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= render 'items', presenter: @presenter %>
       </div>
     </div>

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

@@ -3,8 +3,8 @@
 </h1>
 <% if @parent_presenter %>
     <ul class="breadcrumb">
-        <li><%= link_to @parent_presenter, polymorphic_path([main_app, @parent_presenter]) %></li>
-        <li class="active"><%= @presenter.human_readable_type %></li>
+        <li class="breadcrumb-item"><%= link_to @parent_presenter, polymorphic_path([main_app, @parent_presenter]) %></li>
+        <li class="breadcrumb-item active"><%= @presenter.human_readable_type %></li>
     </ul>
 <% else %>
     <span class="human_readable_type">(<%= @presenter.human_readable_type %>)</span>

data/app/views/hyrax/batch_edits/_check_all.html.erb

@@ -7,7 +7,6 @@
     <% if !@disable_select_all %>
       <a class="dropdown-toggle" data-toggle="dropdown" href="#">
         <span class="sr-only"><%= t('.select_to_access_selection_options') %></span>
-        <span class="caret"></span>
       </a>
       <ul class="dropdown-menu">
         <%= render "batch_edits_actions" %>

data/app/views/hyrax/batch_edits/_delete_selected.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag(hyrax.batch_edits_path, method: :delete, class: "batch-select-all hidden button_to-inline", "data-behavior" => 'batch-select-all') do -%>
+<%= form_tag(hyrax.batch_edits_path, method: :delete, class: "batch-select-all button_to-inline", "data-behavior" => 'batch-select-all') do -%>
     <%= hidden_field_tag('update_type', 'delete_all') %>
     <%= hidden_field_tag('return_controller', params[:controller]) %>
   <%= submit_tag(t('.button_label'), class: 'batch-all-button btn btn-danger submits-batches', data: { confirm: t(".deleting_file_from", application_name: application_name) }) %>

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

@@ -7,14 +7,22 @@
 
 <div>
   <h3><%= t('.descriptions_title') %></h3>
-  <div class="panel panel-default tabs">
+  <div class="card tabs">
     <ul class="nav nav-tabs">
-      <li id="edit_descriptions_link" class="active"><a href="#descriptions_display" data-toggle="tab"><span class="glyphicon glyphicon-tags"></span> <%= t('.descriptions') %></a></li>
-      <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><span class="glyphicon glyphicon-lock"></span> <%= t('.permissions') %></a></li>
+      <li id="edit_descriptions_link" class="nav-item">
+        <a class="nav-link active" href="#descriptions_display" data-toggle="tab">
+          <span class="fa fa-tags"></span> <%= t('.descriptions') %>
+        </a>
+      </li>
+      <li id="edit_permissions_link" class="nav-item">
+        <a class="nav-link" href="#permissions_display" data-toggle="tab">
+          <span class="fa fa-lock"></span> <%= t('.permissions') %>
+        </a>
+      </li>
     </ul>
-    <div class="panel-body">
+    <div class="card-body">
       <div class="tab-content">
-        <div class="tab-pane active" id="descriptions_display">
+        <div class="tab-pane show active" id="descriptions_display">
           <% @form.terms.each do |term| %>
             <div class="row">
               <%= simple_form_for @form,
@@ -25,12 +33,12 @@
                                   html: { id: "form_#{term.to_s}",
                                           class: "ajax-form" },
                                   data: { model: @form.model_name.param_key } do |f| %>
-                <div class="col-xs-12 col-sm-4">
-                  <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_<%= term %>" id="expand_link_<%=term.to_s%>">
+                <div class="col-12 col-sm-4">
+                  <a class="accordion-toggle grey fa-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_<%= term %>" id="expand_link_<%=term.to_s%>">
                     <%= f.input_label term %> <span class="chevron"></span>
                   </a>
                 </div>
-                <div id="collapse_<%= term %>" class="collapse scrolly col-xs-12 col-sm-7">
+                <div id="collapse_<%= term %>" class="collapse scrolly col-12 col-sm-7">
                   <%= hidden_field_tag('update_type', 'update') %>
                   <%= hidden_field_tag('key', term.to_s) %>
                   <%# TODO we don't need to show required %>
@@ -40,7 +48,7 @@
                   <% end %>
                   <div>
                     <%= f.submit "Save changes", class: 'btn btn-primary field-save', id: "#{term.to_s}_save" %>
-                    <a class="btn btn-default" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>"><%= t('helpers.action.cancel') %> </a>
+                    <a class="btn btn-secondary" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>"><%= t('helpers.action.cancel') %> </a>
                     <div class="status fleft"></div>
                   </div>
                 </div>
@@ -58,12 +66,12 @@
                                 builder: Hyrax::FormBuilder,
                                 html: { id: "form_permissions_visibility", class: "ajax-form"},
                                 data: { 'param-key' => @form.model_name.param_key } do |f| %>
-              <div class="col-xs-12 col-sm-4">
-                <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_permissions_visibility" id="expand_link_permissions_visibility">
+              <div class="col-12 col-sm-4">
+                <a class="accordion-toggle grey fa-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_permissions_visibility" id="expand_link_permissions_visibility">
                   <%= f.input_label t(".visibility") %> <span class="chevron"></span>
                 </a>
               </div>
-              <div id="collapse_permissions_visibility" class="collapse scrolly col-xs-12 col-sm-7">
+              <div id="collapse_permissions_visibility" class="collapse scrolly col-12 col-sm-7">
                 <%= hidden_field_tag('update_type', 'update') %>
                 <%= hidden_field_tag('key', 'permissions') %>
                 <%= render "hyrax/base/form_permission", f: f %>
@@ -73,7 +81,7 @@
                 <% end %>
                 <div>
                   <%= f.submit "Save changes", class: 'btn btn-primary field-save', id: "permissions_visibility_save" %>
-                  <a class="btn btn-default" data-toggle="collapse" data-parent="#row_permissions_visibility" href="#collapse_permissions_visibility"><%= t('helpers.action.cancel') %></a>
+                  <a class="btn btn-secondary" data-toggle="collapse" data-parent="#row_permissions_visibility" href="#collapse_permissions_visibility"><%= t('helpers.action.cancel') %></a>
                   <div class="status fleft"></div>
                 </div>
               </div>
@@ -88,12 +96,12 @@
                                 builder: Hyrax::FormBuilder,
                                 html: { id: "form_permissions", class: "ajax-form"},
                                 data: { 'param-key' => @form.model_name.param_key } do |f| %>
-              <div class="col-xs-12 col-sm-4">
-                <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_permissions_sharing" id="expand_link_permissions_sharing">
+              <div class="col-12 col-sm-4">
+                <a class="accordion-toggle grey fa-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_permissions_sharing" id="expand_link_permissions_sharing">
                   <%= f.input_label t(".sharing") %> <span class="chevron"></span>
                 </a>
               </div>
-              <div id="collapse_permissions_sharing" class="collapse scrolly col-xs-12 col-sm-7">
+              <div id="collapse_permissions_sharing" class="collapse scrolly col-12 col-sm-7">
                 <%= hidden_field_tag('update_type', 'update') %>
                 <%= hidden_field_tag('key', 'permissions') %>
                 <%= render "hyrax/base/form_share", f: f %>
@@ -103,7 +111,7 @@
                 <% end %>
                 <div>
                   <%= f.submit "Save changes", class: 'btn btn-primary field-save', id: "permissions_sharing_save" %>
-                  <a class="btn btn-default" data-toggle="collapse" data-parent="#row_permissions_sharing" href="#collapse_permissions_sharing"><%= t('helpers.action.cancel') %></a>
+                  <a class="btn btn-secondary" data-toggle="collapse" data-parent="#row_permissions_sharing" href="#collapse_permissions_sharing"><%= t('helpers.action.cancel') %></a>
                   <div class="status fleft"></div>
                 </div>
               </div>
@@ -115,6 +123,6 @@
   </div>
 
 <!-- Ajax call to clear the batch before page uload. -->
-<%= button_to t(".clear_batch"), hyrax.clear_batch_edits_path, form_class: 'hidden', remote: true, id: 'clear_batch' %>
+<%= button_to t(".clear_batch"), hyrax.clear_batch_edits_path, form: { hidden: true }, remote: true, id: 'clear_batch' %>
 
 </div><!-- descriptions_display -->

data/app/views/hyrax/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/collections/_list_collections.html.erb

@@ -3,7 +3,7 @@
   <td></td>
   <td>
     <div class="media">
-      <span class="<%= Hyrax::ModelIcon.css_class_for(::Collection) %> collection-icon-small pull-left"></span>
+      <span class="<%= Hyrax::ModelIcon.css_class_for(::Collection) %> collection-icon-small float-left"></span>
       <div class="media-body">
         <div class="media-heading">
           <%= link_to collection_presenter.show_path do %>
@@ -11,7 +11,7 @@
               <%= collection_presenter.title_or_label %>
           <% end %>
           <a href="#" class="small" title="Click for more details">
-            <span id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+            <span id="expand_<%= id %>" class="fa fa-chevron-right" aria-hidden="true"></span>
             <span class="sr-only"> <%= "#{t("hyrax.dashboard.my.sr.detail_label")} #{collection_presenter.title_or_label}" %></span>
           </a>
         </div>
@@ -36,10 +36,10 @@
 <tr id="detail_<%= id %>"> <!--  collection detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
-      <dt class="col-xs-3 col-lg-2"><%= t("hyrax.dashboard.my.collection_list.description") %></dt>
-      <dd class="col-xs-9 col-lg-10"><%= collection_presenter.description&.first %></dd>
-      <dt class="col-xs-3 col-lg-2"><%= t("hyrax.dashboard.my.collection_list.edit_access") %></dt>
-      <dd class="col-xs-9 col-lg-10">
+      <dt class="col-3 col-lg-2"><%= t("hyrax.dashboard.my.collection_list.description") %></dt>
+      <dd class="col-9 col-lg-10"><%= collection_presenter.description&.first %></dd>
+      <dt class="col-3 col-lg-2"><%= t("hyrax.dashboard.my.collection_list.edit_access") %></dt>
+      <dd class="col-9 col-lg-10">
       <% if collection_presenter.edit_groups.present? %>
         <%= t("hyrax.dashboard.my.collection_list.groups") %> <%= collection_presenter.edit_groups.join(', ') %>
         <br />

data/app/views/hyrax/collections/_list_works.html.erb

@@ -8,7 +8,9 @@
   <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'>

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

@@ -1,11 +1,11 @@
   <%= form_for presenter, url: url, method: :get, class: "well form-search" do |f| %>
       <label for="collection_search" class="sr-only"><%= t('hyrax.collections.search_form.label', title: presenter.to_s) %></label>
-      <div class="input-group">
+      <div class="input-group mb-sm-auto">
         <%= text_field_tag :cq, params[:cq], class: "collection-query form-control", placeholder: t('hyrax.collections.search_form.placeholder'), size: '30', type: "search", id: "collection_search" %>
-        <div class="input-group-btn">
-          <button type="submit" class="btn btn-primary" id="collection_submit"><span class="glyphicon glyphicon-search"></span> <%= t('hyrax.collections.search_form.button_label') %></button>
+        <div class="input-group-append">
+          <button type="submit" class="btn btn-primary" id="collection_submit"><span class="fa fa-search"></span> <%= t('hyrax.collections.search_form.button_label') %></button>
         </div>
       </div>
       <%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>
-      <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:cq, :sort, :qt, :page)) %>
+      <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:cq, :sort, :qt, :page)) %>
   <% end %>

data/app/views/hyrax/collections/_show_document_list_row.html.erb

@@ -2,13 +2,16 @@
 <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", 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">
         <p class="media-heading">

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

@@ -1,7 +1,7 @@
 <% if show_sort_and_per_page? && collection_member_sort_fields.many? %>
   <%= form_tag collection_path(collection), method: :get, class: 'per_page form-horizontal' do %>
     <%= render 'view_type_group' %>
-    <fieldset class="pull-left">
+    <fieldset class="float-left">
       <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
       <%= label_tag(:sort, t('.sort_by_html')) %>
       <%= select_tag(:sort, options_from_collection_for_select(collection_member_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
@@ -9,8 +9,8 @@
         <span class="tiny-nudge"><%= t('.results_per_page') %></span>
         <%= select_tag(:per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page, h(params[:per_page])), title: t('.number_of_results_to_display_per_page')) %>
       <% end %>
-      <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
-      &nbsp;<button class="btn btn-xs btn-default tiny-nudge"><span class="glyphicon glyphicon-refresh"></span> <%= t('helpers.action.refresh') %></button>
+      <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:per_page, :sort)) %>
+      &nbsp;<button class="btn btn-sm btn-secondary tiny-nudge"><span class="fa fa-refresh"></span> <%= t('helpers.action.refresh') %></button>
     </fieldset>
   <% end %>
 <% end %>

data/app/views/hyrax/collections/_view_type_group.html.erb

@@ -1,9 +1,9 @@
 <% if has_alternative_views? -%>
-<div class="view-type pull-right">
+<div class="view-type float-right">
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
     <% document_index_views.each do |view, config| %>
-      <%= link_to collection_path(params[:id], view: view), title: t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: blacklight_config.view[view].title)), class: "btn btn-default view-type-#{view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
+      <%= link_to collection_path(params[:id], view: view), title: t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: blacklight_config.view[view].title)), class: "btn btn-light view-type-#{view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
         <%= render_view_type_group_icon view %>
         <span class="caption"><%= t("blacklight.search.view.#{view}") %></span>
       <% end %>

data/app/views/hyrax/contact_form/new.html.erb

@@ -16,33 +16,32 @@
   <% em = '' %>
 <% end %>
 
-<%= form_for @contact_form, url: hyrax.contact_form_index_path,
-                            html: { class: 'form-horizontal' } do |f| %>
-  <%= f.text_field :contact_method, class: 'hide' %>
-  <div class="form-group">
-    <%= f.label :category, t('hyrax.contact_form.type_label'), class: "col-sm-2 control-label" %>
+<%= form_for @contact_form, url: hyrax.contact_form_index_path do |f| %>
+  <%= f.hidden_field :contact_method %>
+  <div class="form-group row">
+    <%= f.label :category, t('hyrax.contact_form.type_label'), class: "col-sm-2 col-form-label" %>
     <div class="col-sm-10">
       <%= f.select 'category', options_for_select(contact_form_issue_type_options), { include_blank: t('hyrax.contact_form.select_type') }, {class: 'form-control', required: true } %>
     </div>
   </div>
 
-  <div class="form-group">
-    <%= f.label :name, t('hyrax.contact_form.name_label'), class: "col-sm-2 control-label" %>
+  <div class="form-group row">
+    <%= f.label :name, t('hyrax.contact_form.name_label'), class: "col-sm-2 col-form-label" %>
     <div class="col-sm-10"><%= f.text_field :name, value: nm, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="form-group">
-    <%= f.label :email, t('hyrax.contact_form.email_label'), class: "col-sm-2 control-label" %>
+  <div class="form-group row">
+    <%= f.label :email, t('hyrax.contact_form.email_label'), class: "col-sm-2 col-form-label" %>
     <div class="col-sm-10"><%= f.text_field :email, value: em, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="form-group">
-    <%= f.label :subject, t('hyrax.contact_form.subject_label'), class: "col-sm-2 control-label" %>
+  <div class="form-group row">
+    <%= f.label :subject, t('hyrax.contact_form.subject_label'), class: "col-sm-2 col-form-label" %>
     <div class="col-sm-10"><%= f.text_field :subject, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="form-group">
-    <%= f.label :message, t('hyrax.contact_form.message_label'), class: "col-sm-2 control-label" %>
+  <div class="form-group row">
+    <%= f.label :message, t('hyrax.contact_form.message_label'), class: "col-sm-2 col-form-label" %>
     <div class="col-sm-10"><%= f.text_area :message, rows: 4, class: 'form-control', required: true %></div>
   </div>
 

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

@@ -1,61 +1,67 @@
 <%= render "shared/nav_safety_modal" %>
-<div class="panel panel-default tabs">
+<div class="card tabs">
   <ul class="nav nav-tabs" role="tablist">
-    <li class="active">
-      <a href="#announcement_text" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.announcement_text') %></a>
+    <li id="announcement-nav-item" class="nav-item">
+      <a href="#announcement_text" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
+        <%= t(:'hyrax.content_blocks.tabs.announcement_text') %>
+      </a>
     </li>
-    <li>
-      <a href="#marketing" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.marketing_text') %></a>
+    <li id="marketing-nav-item" class="nav-item">
+      <a href="#marketing" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.content_blocks.tabs.marketing_text') %>
+      </a>
     </li>
-    <li>
-      <a href="#researcher" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.featured_researcher') %></a>
+    <li id="researcher-nav-item" class="nav-item">
+      <a href="#researcher" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.content_blocks.tabs.featured_researcher') %>
+      </a>
     </li>
   </ul>
   <div class="tab-content">
-    <div id="announcement_text" class="tab-pane active">
-      <div class="panel panel-default labels">
+    <div id="announcement_text" class="tab-pane show active">
+      <div class="card labels">
         <%= simple_form_for ContentBlock.for(:announcement), url: hyrax.content_block_path(ContentBlock.for(:announcement)), html: {class: 'nav-safety'} do |f| %>
-          <div class="panel-body">
+          <div class="card-body">
             <div class="field form-group">
                 <%= f.label :announcement %><br />
                 <%= f.text_area :announcement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
-          <div class="panel-footer">
-            <%= link_to t(:'hyrax.content_blocks.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(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
     </div>
     <div id="marketing" class="tab-pane">
-      <div class="panel panel-default labels">
+      <div class="card labels">
         <%= simple_form_for ContentBlock.for(:marketing), url: hyrax.content_block_path(ContentBlock.for(:marketing)), html: {class: 'nav-safety'} do |f| %>
-          <div class="panel-body">
+          <div class="card-body">
             <div class="field form-group">
                 <%= f.label :marketing %><br />
                 <%= f.text_area :marketing, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
-          <div class="panel-footer">
-            <%= link_to t(:'hyrax.content_blocks.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(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
     </div>
     <div id="researcher" class="tab-pane">
-      <div class="panel panel-default labels">
+      <div class="card labels">
         <%= simple_form_for ContentBlock.for(:researcher), url: hyrax.content_block_path(ContentBlock.for(:researcher)), html: {class: 'nav-safety'} do |f| %>
-          <div class="panel-body">
+          <div class="card-body">
             <div class="field form-group">
                 <%= f.label :researcher %><br />
                 <%= f.text_area :researcher, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
-          <div class="panel-footer">
-            <%= link_to t(:'hyrax.content_blocks.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(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>