hyrax 3.6.0 → 4.0.0.beta1

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

@@ -1,83 +1,95 @@
 <%= 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="#about" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.about_page') %></a>
+    <li class="nav-item">
+      <a href="#about" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.about_page') %>
+      </a>
     </li>
-    <li>
-      <a href="#help" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.help_page') %></a>
+    <li class="nav-item">
+      <a href="#help" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.help_page') %>
+      </a>
     </li>
-    <li>
-      <a href="#agreement" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.agreement_page') %></a>
+    <li class="nav-item">
+      <a href="#agreement" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.agreement_page') %>
+      </a>
     </li>
-    <li>
-      <a href="#terms" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.terms_page') %></a>
+    <li class="nav-item">
+      <a href="#terms" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.terms_page') %>
+      </a>
     </li>
   </ul>
+
   <div class="tab-content">
-  <div id="about" class="tab-pane active">
-    <div class="panel panel-default labels">
-      <%= simple_form_for ContentBlock.for(:about), url: hyrax.page_path(ContentBlock.for(:about)), html: { class: 'nav-safety' } do |f| %>
-        <div class="panel-body">
-          <div class="field form-group">
-              <%= f.label :about %><br />
-              <%= f.text_area :about, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+    <div id="about" class="tab-pane show active">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:about), url: hyrax.page_path(ContentBlock.for(:about)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+                <%= f.label :about %><br />
+                <%= f.text_area :about, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
           </div>
-        </div>
-        <div class="panel-footer">
-          <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-          <%= f.button :submit, class: 'btn btn-primary pull-right' %>
-        </div>
-      <% end %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
     </div>
-  </div>
-  <div id="help" class="tab-pane">
-    <div class="panel panel-default labels">
-      <%= simple_form_for ContentBlock.for(:help), url: hyrax.page_path(ContentBlock.for(:help)), html: { class: 'nav-safety' } do |f| %>
-        <div class="panel-body">
-          <div class="field form-group">
-              <%= f.label :help %><br />
-              <%= f.text_area :help, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+    <div id="help" class="tab-pane">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:help), url: hyrax.page_path(ContentBlock.for(:help)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+                <%= f.label :help %><br />
+                <%= f.text_area :help, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
           </div>
-        </div>
-        <div class="panel-footer">
-          <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-          <%= f.button :submit, class: 'btn btn-primary pull-right' %>
-        </div>
-      <% end %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
     </div>
-  </div>
-  <div id="agreement" class="tab-pane">
-    <div class="panel panel-default labels">
-      <%= simple_form_for ContentBlock.for(:agreement), url: hyrax.page_path(ContentBlock.for(:agreement)), html: { class: 'nav-safety' } do |f| %>
-        <div class="panel-body">
-          <div class="field form-group">
-              <%= f.label :agreement %><br />
-              <%= f.text_area :agreement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+    <div id="agreement" class="tab-pane">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:agreement), url: hyrax.page_path(ContentBlock.for(:agreement)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+                <%= f.label :agreement %><br />
+                <%= f.text_area :agreement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
           </div>
-        </div>
-        <div class="panel-footer">
-          <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-          <%= f.button :submit, class: 'btn btn-primary pull-right' %>
-        </div>
-      <% end %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
     </div>
-  </div>
-  <div id="terms" class="tab-pane">
-    <div class="panel panel-default labels">
-      <%= simple_form_for ContentBlock.for(:terms), url: hyrax.page_path(ContentBlock.for(:terms)), html: { class: 'nav-safety' } do |f| %>
-        <div class="panel-body">
-          <div class="field form-group">
-              <%= f.label :terms %><br />
-              <%= f.text_area :terms, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+    <div id="terms" class="tab-pane">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:terms), url: hyrax.page_path(ContentBlock.for(:terms)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+                <%= f.label :terms %><br />
+                <%= f.text_area :terms, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
+          </div>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
-        </div>
-        <div class="panel-footer">
-          <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-          <%= f.button :submit, class: 'btn btn-primary pull-right' %>
-        </div>
-      <% end %>
+        <% end %>
+      </div>
     </div>
   </div>
+
 </div>
 <%= tinymce :content_block %>

data/app/views/hyrax/permissions/confirm.html.erb

@@ -1,14 +1,14 @@
-<div class="panel panel-default permissions-confirm">
-  <div class="panel-heading">
+<div class="card permissions-confirm">
+  <div class="card-header">
     <h4>Apply changes to contents?<h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
       <%= I18n.t("hyrax.upload.change_permissions_message_html",
         curation_concern_human_readable_type: curation_concern.human_readable_type,
         curation_concern: curation_concern,
         visibility_badge: visibility_badge(curation_concern.visibility)).html_safe %>
   </div>
-  <div class="form-actions panel-footer">
+  <div class="form-actions card-footer">
     <%= button_to "Yes please.", main_app.copy_hyrax_permission_path(curation_concern), class: 'btn btn-primary' %>
     <%= link_to "No. I'll update it manually.", [main_app, curation_concern], class: 'btn' %>
   </div>

data/app/views/hyrax/permissions/confirm_access.html.erb

@@ -1,11 +1,11 @@
-<div class="panel panel-default permissions-confirm">
-  <div class="panel-heading">
+<div class="card permissions-confirm">
+  <div class="card-header">
     <h4><%= I18n.t("hyrax.upload.change_access_title_html") %><h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
       <%= sanitize I18n.t("hyrax.upload.change_access_message_html", curation_concern: curation_concern) %>
   </div>
-  <div class="form-actions panel-footer">
+  <div class="form-actions card-footer">
     <%= button_to I18n.t("hyrax.upload.change_access_yes_message"), hyrax.copy_access_permission_path(curation_concern), class: 'btn btn-primary' %>
     <%= link_to I18n.t("hyrax.upload.change_access_no_message"), [main_app, curation_concern], class: 'btn' %>
   </div>

data/app/views/hyrax/stats/file.html.erb

@@ -13,7 +13,7 @@
   <div class="col-sm-12">
     <%= content_tag :h2, "File Analytics" %>
     <div class="alert alert-info">
-      <span class="glyphicon glyphicon-signal large-icon"></span>
+      <span class="fa fa-signal large-icon"></span>
       <%= content_tag :strong, @stats.total_pageviews %> views and <%= content_tag :strong, @stats.total_downloads %> downloads since <%= @stats.created.strftime("%B %-d, %Y") %>
     </div>
     <div class="stats-container">

data/app/views/hyrax/stats/work.html.erb

@@ -11,7 +11,7 @@
   <div class="col-sm-12">
     <%= content_tag :h2, "#{t('.header')}" %>
     <div class="alert alert-info">
-      <span class="glyphicon glyphicon-signal large-icon"></span>
+      <span class="fa fa-signal large-icon"></span>
         <%= t('total_view', count: @pageviews.range(Hyrax.config.analytics_start_date.to_date, Time.zone.today)) %>
         <%= t('download', count: @downloads.range(Hyrax.config.analytics_start_date.to_date, Time.zone.today)) %>
     </div>

data/app/views/hyrax/transfers/_received.html.erb

@@ -23,15 +23,15 @@
         <% if req.pending? %>
             <div class="btn-group">
               <button class="btn btn-sm btn-primary" href="#"><%= t(".accept") %></button>
-              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"><span class="caret"></span></button>
+              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"></button>
               <ul class="dropdown-menu">
-                <li>
+                <li class="dropdown-item">
                   <%= link_to t(".allow_depositor_to_retain_edit_access"), hyrax.accept_transfer_path(req), method: :put, class: 'accept-retain', title: t(".accept_the_file_and_allow_the_original_depositor_to_retain_access_to_edit_the_file_and_metadata") %>
                 </li>
-                <li>
+                <li class="dropdown-item">
                   <%= link_to t(".remove_depositor_access"), hyrax.accept_transfer_path(req, reset: true), method: :put, class: 'accept-reset', title: t(".accept_the_file_remove_access_from_the_original_depositor") %>
                 </li>
-                <li>
+                <li class="dropdown-item">
                   <%= link_to t(".authorize_depositor_as_proxy"), hyrax.accept_transfer_path(req, sticky: true), method: :put, class: 'accept-stick', title: t(".accept_the_file_and_allow_the_original_depositor_to_retain_access_and_authorize") %>
                 </li>
               </ul>

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

@@ -4,11 +4,11 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title h2"><%= t("hyrax.dashboard.transfers_sent") %></h2>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title h2"><%= t("hyrax.dashboard.transfers_sent") %></h2>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= @presenter.render_sent_transfers %>
       </div>
     </div>
@@ -17,11 +17,11 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title h2"><%= t("hyrax.dashboard.transfers_received") %></h2>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title h2"><%= t("hyrax.dashboard.transfers_received") %></h2>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= @presenter.render_received_transfers %>
       </div>
     </div>

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

@@ -5,7 +5,7 @@
 <span class="sr-only"><%= t(:'.sr_only_description', work_title: @proxy_deposit_request.to_s) %></span>
 
 <%= simple_form_for @proxy_deposit_request,
-             url: hyrax.work_transfers_path(params[:id]) do |f| %>
+             url: hyrax.work_transfers_path(@work) do |f| %>
   <%= f.input :transfer_to,
         placeholder: t(:'.placeholder') %>
   <%= f.input :sender_comment %>

data/app/views/hyrax/uploads/_js_templates.html.erb

@@ -1,5 +1,5 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
+<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
@@ -12,18 +12,18 @@
         </td>
         <td>
             <p class="size">Processing...</p>
-            <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
+            <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div></div>
         </td>
         <td class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
-                    <span class="glyphicon glyphicon-upload"></span>
+                    <span class="fa fa-upload"></span>
                     <span><%= t('.start') %></span>
                 </button>
             {% } %}
             {% if (!i) { %}
                 <button class="btn btn-sm btn-warning cancel">
-                    <span class="glyphicon glyphicon-ban-circle"></span>
+                    <span class="fa fa-ban"></span>
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
@@ -63,28 +63,28 @@
             </div>
             <div class="col-sm-6">
               {% if (file.error) { %}
-                  <div><span class="label label-danger">Error</span> {%=file.error%}</div>
+                  <div><span class="badge badge-danger">Error</span> {%=file.error%}</div>
               {% } %}
               <span class="size">{%=o.formatFileSize(file.size)%}</span>
-              <button class="btn btn-sm btn-danger delete pull-right" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="glyphicon glyphicon-trash"></span>
+              <button class="btn btn-sm btn-danger delete float-right" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
+                  <span class="fa fa-trash"></span>
                   <span><%= t('helpers.action.delete') %></span>
               </button>
             </div>
           </div>
           <div class="row">
-            <div class="col-sm-12 form-horizontal">
-              <div class="form-group">
-                <label for="title_{%=file.id%}" class="col-sm-5 control-label"><%= t('.display_label') %></label>
+            <div class="col-sm-12">
+              <div class="form-group row">
+                <label for="title_{%=file.id%}" class="col-sm-5 col-form-label"><%= t('.display_label') %></label>
                 <div class="col-sm-7 padding-bottom">
                   <input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
                 </div>
-                <label for="resource_type_{%=file.id%}" class="col-sm-5 control-label">Resource Type</label>
+                <label for="resource_type_{%=file.id%}" class="col-sm-5 col-form-label">Resource Type</label>
                 <div class="col-sm-7 padding-bottom">
                   <select class="form-control resource_type_dropdown" multiple="multiple" size="6" name="resource_type[{%=file.id%}][]" id="resource_type_{%=file.id%}" value="{%=file.name%}">
                     <%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
                   </select>
-                  <button class="btn btn-default pull-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;"><%= t('.set_all_to_this_resource_type') %></button>
+                  <button class="btn btn-secondary float-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;"><%= t('.set_all_to_this_resource_type') %></button>
                 </div>
               </div>
             </div>
@@ -116,7 +116,7 @@
                 <input type="hidden" name="uploaded_files[]" value="{%=file.id%}">
             </p>
             {% if (file.error) { %}
-                <div><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</div>
+                <div><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</div>
             {% } %}
         </td>
         <td>
@@ -124,7 +124,7 @@
         </td>
         <td class="text-right">
             <button class="btn btn-sm btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                <span class="glyphicon glyphicon-trash"></span>
+                <span class="fa fa-trash"></span>
                 <%= t('helpers.action.delete') %>
             </button>
         </td>

data/app/views/hyrax/uploads/_js_templates_branding.html.erb

@@ -1,7 +1,7 @@
 <!-- The template to display files available for upload -->
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade">
+    <tr class="template-upload fade show">
       <td>
         <span class="preview"></span>
       </td>
@@ -46,13 +46,13 @@
                   <input type="hidden" name="banner_files[]" value="{%=file.id%}">
                 </span>
                 {% if (file.error) { %}
-                  <span><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</span>
+                  <span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
                 {% } %}
               </div>
 
               <div class="col-sm-2">
                 <button class="btn btn-link remove branding-banner-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}" onclick=$("#banner").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="fa fa-times"></span>
                   <span class="controls-remove-text"><%= t('.remove') %></span>
                   <span class="sr-only">
                     <%= t('.previous') %>
@@ -88,7 +88,7 @@
                 </span>
 
                 {% if (file.error) { %}
-                    <span><span class="label label-danger">Error</span> {%=file.error%}</span>
+                    <span><span class="badge badge-danger">Error</span> {%=file.error%}</span>
                 {% } %}
               </div>
 
@@ -104,7 +104,7 @@
               <div class="col-sm-2 text-right">
                 <span class="input-group-btn field-controls">
             <button class="btn btn-sm btn-danger delete branding-logo-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                    <span class="glyphicon glyphicon-remove"></span>
+                    <span class="fa fa-times"></span>
                     <span class="controls-remove-text">Remove</span>
                     <span class="sr-only">
                       <%= t('.previous') %>

data/app/views/hyrax/uploads/_js_templates_versioning.html.erb

@@ -1,5 +1,5 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
+<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
 <script id="versioning-template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
@@ -12,24 +12,24 @@
         </td>
         <td>
             <p class="size">Processing...</p>
-            <div class="progress progress-striped active"
+            <div class="progress"
                  role="progressbar"
                  aria-valuemin="0"
                  aria-valuemax="100"
                  aria-valuenow="0">
-               <div class="progress-bar progress-bar-success" style="width:0%;"></div>
+               <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
              </div>
         </td>
         <td class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
-                    <span class="glyphicon glyphicon-upload"></span>
+                    <span class="fa fa-upload"></span>
                     <span><%= t('.start') %></span>
                 </button>
             {% } %}
             {% if (!i) { %}
                 <button class="btn btn-sm btn-warning cancel">
-                    <span class="glyphicon glyphicon-ban-circle"></span>
+                    <span class="fa fa-ban"></span>
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
@@ -69,26 +69,26 @@
             </div>
             <div class="col-sm-6">
               {% if (file.error) { %}
-                  <div><span class="label label-danger">Error</span> {%=file.error%}</div>
+                  <div><span class="badge badge-danger">Error</span> {%=file.error%}</div>
               {% } %}
               <span class="size">{%=o.formatFileSize(file.size)%}</span>
-              <button class="btn btn-sm btn-danger delete pull-right"
+              <button class="btn btn-sm btn-danger delete float-right"
                       data-type="{%=file.deleteType%}"
                       data-url="{%=file.deleteUrl%}"
                       {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="glyphicon glyphicon-trash"></span>
+                  <span class="fa fa-trash"></span>
                   <span><%= t('helpers.action.delete') %></span>
               </button>
             </div>
           </div>
           <div class="row">
-            <div class="col-sm-12 form-horizontal">
-              <div class="form-group">
-                <label for="title_{%=file.id%}" class="col-sm-5 control-label"><%= t('.display_label') %></label>
+            <div class="col-sm-12">
+              <div class="form-group row">
+                <label for="title_{%=file.id%}" class="col-sm-5 col-form-label"><%= t('.display_label') %></label>
                 <div class="col-sm-7 padding-bottom">
                   <input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
                 </div>
-                <label for="resource_type_{%=file.id%}" class="col-sm-5 control-label">Resource Type</label>
+                <label for="resource_type_{%=file.id%}" class="col-sm-5 col-form-label">Resource Type</label>
                 <div class="col-sm-7 padding-bottom">
                   <select class="form-control resource_type_dropdown"
                           multiple="multiple"
@@ -98,7 +98,7 @@
                            value="{%=file.name%}">
                     <%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
                   </select>
-                  <button class="btn btn-default pull-right resource_type_button"
+                  <button class="btn btn-secondary float-right resource_type_button"
                           onClick="setAllResourceTypesVersioning({%= file.id %}); return false;">
                           <%= t('.set_all_to_this_resource_type') %>
                   </button>
@@ -125,7 +125,7 @@
                   <input type="hidden" name="files_files[]" value="{%=file.id%}">
                 </span>
                 {% if (file.error) { %}
-                  <span><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</span>
+                  <span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
                 {% } %}
               </div>
 
@@ -134,7 +134,7 @@
                         data-type="{%=file.deleteType%}"
                         data-url="{%=file.deleteUrl%}"
                         onclick=$("#files").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="fa fa-times"></span>
                   <span class="controls-remove-text"><%= t('.remove') %></span>
                   <span class="sr-only">
                     <%= t('.previous') %>

data/app/views/hyrax/users/_activity.html.erb

@@ -1,3 +1,3 @@
-        <div class="tab-pane" id="activity_log">
-          <%= render 'hyrax/users/activity_log', events: presenter.events %>
-        </div>
+<div class="tab-pane" id="activity_log">
+  <%= render 'hyrax/users/activity_log', events: presenter.events %>
+</div>

data/app/views/hyrax/users/_contributions.html.erb

@@ -1,4 +1,4 @@
-<div class="tab-pane active" id="contributions">
+<div class="tab-pane show active" id="contributions">
   <% if presenter.trophies.count > 0 %>
     <table>
       <% presenter.trophies.each do |t| %>
@@ -11,8 +11,8 @@
           <td>
             <%= link_to t.to_s, [main_app, t] %>
             <% if presenter.current_user? %>
-              <%= display_trophy_link current_user, t.id, class: 'glyphicon glyphicon-star', data: { removerow: true } do %>
-                <span class='trophy-on glyphicon glyphicon-remove'></span>
+              <%= display_trophy_link current_user, t.id, class: 'fa fa-star', data: { removerow: true } do %>
+                <span class='trophy-on fa fa-times'></span>
               <% end %>
             <% end %>
           </td>

data/app/views/hyrax/users/_left_sidebar.html.erb

@@ -1,4 +1,4 @@
 <%= render 'hyrax/users/user', user: @user %>
 
 <br />
-<a class="btn btn-primary" href="<%= hyrax.users_path %>"><i class="glyphicon glyphicon-globe" aria-hidden="true"></i><%= t('.view_users') %></a>
+<a class="btn btn-primary" href="<%= hyrax.users_path %>"><i class="fa fa-globe" aria-hidden="true"></i><%= t('.view_users') %></a>

data/app/views/hyrax/users/_profile_tabs.html.erb

@@ -1,9 +1,17 @@
-      <ul class="nav nav-tabs" id="myTab">
-        <li class="active"><a href="#contributions"><span class="glyphicon glyphicon-star"></span> <%= I18n.t('hyrax.user_profile.tab_highlighted') %></a></li>
-        <li><a href="#activity_log"><span class="glyphicon glyphicon-calendar"></span> <%= I18n.t('hyrax.user_profile.tab_activity') %></a></li>
-      </ul>
+<ul class="nav nav-tabs" id="myTab">
+  <li class="nav-item">
+    <a class="nav-link active" href="#contributions">
+      <span class="fa fa-star"></span> <%= I18n.t('hyrax.user_profile.tab_highlighted') %>
+    </a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link" href="#activity_log">
+      <span class="fa fa-calendar"></span> <%= I18n.t('hyrax.user_profile.tab_activity') %>
+    </a>
+  </li>
+</ul>
 
-      <div class="tab-content panel-body">
-        <%= render 'contributions', presenter: presenter %>
-        <%= render 'activity', presenter: presenter %>
-      </div> <!-- /tab-content -->
+<div class="tab-content card-body">
+  <%= render 'contributions', presenter: presenter %>
+  <%= render 'activity', presenter: presenter %>
+</div> <!-- /tab-content -->

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

@@ -4,9 +4,9 @@
     <label class="sr-only" for="user_search"><%= t('.search_users') %></label>
     <%= text_field_tag :uq, params[:uq], class: "q", placeholder: t('.search_users'), size: '30', type: "search", id: "user_search" %>
     <%= hidden_field_tag :sort, params[:sort], id: 'user_sort' %>
-    <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:uq, :sort, :qt, :page, :utf8)) %>
+    <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:uq, :sort, :qt, :page, :utf8)) %>
     <button type="submit" class="btn btn-primary" id="user_submit">
-      <span class="glyphicon glyphicon-search"></span><%= t('.go') %>
+      <span class="fa fa-search"></span><%= t('.go') %>
     </button>
   <% end %>
 </div>

data/app/views/hyrax/users/_user.html.erb

@@ -1,5 +1,5 @@
-<div class="panel panel-default panel-user">
-  <div class="panel-heading">
+<div class="card panel-user">
+  <div class="card-header">
     <%= image_tag user.avatar.url(:thumb), width: 100 if user.avatar.present? %>
     <h3>
       <%= user.name %>
@@ -14,10 +14,10 @@
     </div>
   </div>
 
-  <div class="panel-footer clearfix">
+  <div class="card-footer clearfix">
     <% if can? :edit, user %>
-      <%= link_to hyrax.edit_dashboard_profile_path(user), class: "btn btn-default pull-right" do %>
-        <span class="glyphicon glyphicon-edit"></span> <%= t("hyrax.edit_profile") %>
+      <%= link_to hyrax.edit_dashboard_profile_path(user), class: "btn btn-secondary float-right" do %>
+        <span class="fa fa-edit"></span> <%= t("hyrax.edit_profile") %>
       <% end %>
     <% end %>
   </div>