hyrax 3.6.0 → 4.0.0.beta1

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

@@ -2,17 +2,17 @@
   <div class="modal-dialog text-left">
       <div class="modal-content">
         <div class="modal-header">
+          <h5 class="modal-title" id="col_add_title"><%= t("hyrax.collection.select_form.title") %></h5>
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <span class="modal-title" id="col_add_title"><%= t("hyrax.collection.select_form.title") %></span>
         </div>
         <div class="modal-body">
           <% if user_collections.blank? %>
             <em> <%= t("hyrax.collection.select_form.no_collections") %></em><br /><br /><br /><br />
           <% else %>
             <div class="collection-list">
-              <fieldset>
-                <legend><%= t("hyrax.collection.select_form.select_heading") %></legend>
-              <ul>
+              <div class="form-group">
+                <p><%= t("hyrax.collection.select_form.select_heading") %></p>
+              
                 <% if @add_works_to_collection.present? %>
                   <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, size: '90', disabled: true %>
                   <%= hidden_field_tag 'member_of_collection_ids', @add_works_to_collection %>
@@ -25,13 +25,13 @@
                                 'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/collections?access=deposit'
                               } %>
                 <% end %>
-              </ul>
-              </fieldset>
+            
+              </div>
             </div><!-- collection-list -->
           <% end %> <!-- else -->
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("hyrax.collection.select_form.close") %></button>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t("hyrax.collection.select_form.close") %></button>
           <% if user_collections.blank? %>
               <% # TODO: Uncomment the following line when errors with adding works to a new collection are resolved.  See Issue hyrax#3088 %>
               <% # = render 'hyrax/dashboard/collections/button_create_collection', label: t("hyrax.collection.select_form.create") %>

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

@@ -17,22 +17,22 @@
                               f.object.access_grants.build(agent_type: 'group'),
                               index: 0 do |builder| %>
 
-              <div class="form-group">
-                <label><%= t('.add_group') %>:</label>
+              <div class="form-group mr-2">
+                <label class="mr-2"><%= t('.add_group') %>:</label>
                 <%= builder.hidden_field :agent_type %>
                 <%= builder.text_field :agent_id,
                                         placeholder: t('.search_for_a_group'),
                                         class: 'form-control search-input' %>
               </div>
               <div class="form-group">
-                <label>as</label>
+                <label class="mr-2">as</label>
                 <%= builder.select :access,
                                       access_options,
                                       { prompt: t('.select_a_role') },
                                       class: 'form-control' %>
               </div>
             <% end %>
-            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button', :disabled => true %>
+            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button ml-2', :disabled => true %>
 
           </div><!-- /.form-inline -->
         <% end %>
@@ -50,13 +50,13 @@
                               index: 0 do |builder| %>
 
               <div class="form-group">
-                <label><%= t('.add_user') %>:</label>
+                <label class="mr-2"><%= t('.add_user') %>:</label>
                 <%= builder.hidden_field :agent_type %>
                 <%= builder.text_field :agent_id,
                                         placeholder: t('.search_for_a_user') %>
               </div>
               <div class="form-group">
-                <label>as</label>
+                <label class="mx-2">as</label>
                 <%= builder.select :access,
                                     access_options,
                                     { prompt: t('.select_a_role') },
@@ -64,17 +64,19 @@
               </div>
             <% end %>
 
-            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button', :disabled => true %>
+            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button ml-2', :disabled => true %>
 
           </div> <!-- /.form-inline -->
         <% end %>
       </div>
 
-      <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note') %></p>
+      <p class="form-text mt-2"><em><%= t('hyrax.admin.admin_sets.form.note') %></em></p>
     </section>
 
+    <h2 class="h3"><%= t(".current_shared") %></h2>
     <section class="section-collection-sharing">
-      <legend><%= t(".current_shared") %></legend>
+     
+      
       <%= render 'form_share_table', access: 'managers', filter: :manage? %>
       <%= render 'form_share_table', access: 'depositors', filter: :deposit? %>
       <%= render 'form_share_table', access: 'viewers', filter: :view? %>

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

@@ -1,31 +1,34 @@
-                  <h3><%= t(".#{access}.title") %></h3>
-                  <p><%= t(".#{access}.help") %></p>
-                  <p><%= t(".#{access}.help_with_works", type_title: @collection_type.title) if @collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
-                  <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
-                    <table class="table table-striped share-status">
-                      <thead>
-                        <tr>
-                          <th><%= t(".#{access}.agent_name") %></th>
-                          <th><%= t(".#{access}.type") %></th>
-                          <th><%= t(".#{access}.action") %></th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                      <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
-                        <tr>
-                          <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
-                          <td><%= g.agent_type.titleize %></td>
-                          <td>
-                            <% if g.admin_group? %>
-                              <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
-                            <% else %>
-                              <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
-                            <% end %>
-                          </td>
-                        </tr>
-                      <% end %>
-                      </tbody>
-                    </table>
-                  <% else %>
-                    <p><em><%= t(".#{access}.empty") %></em></p>
-                  <% end %>
+<div class="mb-4">
+                  
+  <h3 class="h4"><%= t(".#{access}.title") %></h3>
+  <p><%= t(".#{access}.help") %></p>
+  <p><%= t(".#{access}.help_with_works", type_title: @collection_type.title) if @collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
+  <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
+    <table class="table table-striped share-status">
+      <thead>
+        <tr>
+          <th><%= t(".#{access}.agent_name") %></th>
+          <th><%= t(".#{access}.type") %></th>
+          <th><%= t(".#{access}.action") %></th>
+        </tr>
+      </thead>
+      <tbody>
+      <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
+        <tr>
+          <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
+          <td><%= g.agent_type.titleize %></td>
+          <td>
+            <% if g.admin_group? %>
+              <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
+            <% else %>
+              <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <p><em><%= t(".#{access}.empty") %></em></p>
+  <% end %>
+</div>

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

@@ -31,7 +31,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/dashboard/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/dashboard/collections/_modal_remove_from_collection.html.erb

@@ -9,7 +9,7 @@
           <p><%= t('hyrax.dashboard.collections.form_relationships.modals.remove_from_collection_description') %></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-button-remove-collection">

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

@@ -9,7 +9,7 @@
           <p><%= t('hyrax.dashboard.collections.form_relationships.modals.remove_this_sub_collection_description') %></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-button-remove-collection">

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

@@ -6,7 +6,7 @@
         <%= link_to t('hyrax.collection.actions.add_new_work.label'),
                     '#',
                     title: t('hyrax.collection.actions.add_new_work.desc'),
-                    data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'single', add_works_to_collection: presenter.id },
+                    data: { behavior: "select-work", toggle: 'modal', target: "#worktypes-to-create", 'create-type' => 'single', add_works_to_collection: presenter.id },
                     class: 'btn btn-primary deposit-new-work-through-collection' %>
       <% else # simple link to the first work type %>
         <%= link_to t('hyrax.collection.actions.add_new_work.label'),

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

@@ -1,7 +1,9 @@
 <h2 class="sr-only"><%= t('.descriptions') %></h2>
-<dl class="dl-horizontal metadata-collections">
+<dl class="metadata-collections">
   <% @presenter.terms_with_values.each do |field_name| %>
-    <dt><%= collection_metadata_label(@presenter, field_name) %></dt>
-    <dd><%= collection_metadata_value(@presenter, field_name) %></dd>
+    <div class="row">
+      <dt class="col-5 text-right"><%= collection_metadata_label(@presenter, field_name) %></dt>
+      <dd class="col-7"><%= collection_metadata_value(@presenter, field_name) %></dd>
+    </div>
   <% end %>
 </dl>

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

@@ -3,18 +3,18 @@
   </button>
   <ul class="dropdown-menu dropdown-menu-right">
     <% if can?( :edit, document ) && !workflow_restriction?(@presenter) %>
-      <li>
+      <li class="dropdown-item">
         <%= link_to [main_app, :edit, document],
                     class: "itemicon itemedit",
                     title: t('hyrax.collection.document_list.edit'),
                     id: "edit_work_link_#{document.id}" do %>
-          <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> <%= t('hyrax.collection.document_list.edit') %>
+          <i class="fa fa-pencil" aria-hidden="true"></i> <%= t('hyrax.collection.document_list.edit') %>
         <% end %>
       </li>
     <% end %>
-    <li>
+    <li class="dropdown-item">
       <%= display_trophy_link(current_user, document.id) do |text| %>
-        <i class="glyphicon glyphicon-star" aria-hidden="true"></i> <%= text %>
+        <i class="fa fa-star" aria-hidden="true"></i> <%= text %>
       <% end %>
     </li>
   </ul>

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

@@ -2,18 +2,20 @@
 <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 }, { suppress_link: true } %>
+        <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
+          { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
+        ) %>
       <% end %>
       <div class="media-body">
         <p class="media-heading">
           <strong><%= link_to document.title_or_label, [main_app, document], id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %></strong>
-          <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></i></a>
+          <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="fa fa-chevron-right"></i></a>
         </p>
         <%= render_other_collection_links(document, @presenter.id) %>
       </div>
@@ -26,19 +28,19 @@
   </td>
   <% if current_user and can? :edit, @collection %>
     <td class="text-center">
-      <%= button_for_remove_from_collection @collection, document, label: "Remove", btn_class: "btn-danger btn-xs" %>
+      <%= button_for_remove_from_collection @collection, document, label: "Remove", btn_class: "btn-danger btn-sm" %>
     </td>
   <% end %>
 </tr>
 <tr id="detail_<%= id %>"> <!--  document detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
-      <dt class="col-xs-3 col-lg-2"><%= t('.creator') %></dt>
-      <dd class="col-xs-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
-      <dt class="col-xs-3 col-lg-2"><%=  t('.depositor') %></dt>
-      <dd class="col-xs-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
-      <dt class="col-xs-3 col-lg-2"><%= t('.edit_access') %></dt>
-      <dd class="col-xs-9 col-lg-10">
+      <dt class="col-3 col-lg-2"><%= t('.creator') %></dt>
+      <dd class="col-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
+      <dt class="col-3 col-lg-2"><%=  t('.depositor') %></dt>
+      <dd class="col-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
+      <dt class="col-3 col-lg-2"><%= t('.edit_access') %></dt>
+      <dd class="col-9 col-lg-10">
         <% if document.edit_groups.present? %>
           Groups: <%= document.edit_groups.join(', ') %>
           <br />

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

@@ -8,10 +8,10 @@
     </div>
     <% if can? :edit, id %>
       <% if can? :edit, document.id %>
-        <button class="btn btn-xs btn-danger remove-from-collection-button"><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
+        <button class="btn btn-sm btn-danger remove-from-collection-button"><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
       <% else %>
         <%= link_to "#",
-                    class: 'btn btn-xs btn-danger remove-parent-from-collection-deny-button',
+                    class: 'btn btn-sm btn-danger remove-parent-from-collection-deny-button',
                     title: t('hyrax.collections.show.buttons.remove_from_collection') do %>
             <%= t('hyrax.collections.show.buttons.remove_from_collection') %>
         <% end %>

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

@@ -10,8 +10,8 @@
 
   <% if show_sort_and_per_page? && collection_member_sort_fields.many? %>
     <div class="sort-toggle">
-      <%= form_tag dashboard_collection_path(collection), method: :get, class: 'per_page form-horizontal' do %>
-         <div class="form-group form-group-lg">
+      <%= form_tag dashboard_collection_path(collection), method: :get, class: 'per_page' do %>
+         <div class="form-group row form-control-lg">
            <fieldset class="col-sm-9">
              <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
              <%= label_tag(:sort, t(".sort_by")) %>
@@ -19,8 +19,8 @@
              <%= label_tag(:per_page) do %>
                <%= t(".show_par_page_html", select: select_tag(:per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page, params[:per_page]), title: t('hyrax.dashboard.my.sr.results_per_page'))) %>
              <% end %>
-             <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
-             <button class="btn btn-info"><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)) %>
+             <button class="btn btn-info"><span class="fa fa-refresh"></span> <%= t('helpers.action.refresh') %></button>
            </fieldset>
            <div class="col-sm-3">
              <%= render 'hyrax/collections/view_type_group' %>

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

@@ -13,7 +13,7 @@
         <%= link_to document.title_or_label, [hyrax, :dashboard, document], id: "src_copy_link_#{document.id}" %>
       </div>
       <% if can? :edit, id %>
-      <button class="btn btn-xs btn-danger remove-subcollection-button"><%= t('hyrax.collections.show.buttons.remove_this_sub_collection') %></button>
+      <button class="btn btn-sm btn-danger remove-subcollection-button"><%= t('hyrax.collections.show.buttons.remove_this_sub_collection') %></button>
       <% end %>
     </div>
   </li>

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

@@ -3,37 +3,37 @@
   <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= document.id %>" aria-haspopup="true">
     <span class="sr-only"><%= t('.press_to') %> </span>
     <%= t('.select_an_action') %>
-    <span class="caret" aria-hidden="true"></span>
   </button>
 
   <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= document.id %>">
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= button_for_remove_from_collection(@collection, document, label: t('.remove_from_collection')) %>
     </li>
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to [main_app, :edit, document] do %>
-        <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
+        <i class="fa fa-pencil" aria-hidden="true"></i>
         <span> <%= t('.edit_work') %> </span>
       <% end %>
     </li>
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to [main_app, document], method: :delete, data: { confirm: t(".deleting_from_work", application_name: application_name) } do %>
-        <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
+        <i class="fa fa-trash" aria-hidden="true"></i>
         <span><%= t('.delete_work') %></span>
       <% end %>
     </li>
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= display_trophy_link @user, document.id do |text| %>
-        <i class="glyphicon glyphicon-star" aria-hidden="true"></i> <%= text %>
+        <i class="fa fa-star" aria-hidden="true"></i> <%= text %>
       <% end %>
     </li>
-    <li role="menuitem" tabindex="-1">
+
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to(hyrax.new_work_transfer_path(document.id), class: 'itemicon itemtransfer', title: t('.transfer_ownership_of_work')) do %>
-        <i aria-hidden="true" class="glyphicon glyphicon-transfer"></i>
+        <i aria-hidden="true" class="fa fa-exchange"></i>
         <span> <%=t('.transfer_ownership_of_work') %> </span>
       <% end %>
     </li>

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

@@ -5,12 +5,12 @@
 <% end %>
 
 <div class="collections-wrapper">
-  <section class="panel panel-default collections-panel-wrapper admin-show-page">
-    <div class="panel-heading">
+  <section class="card collections-panel-wrapper admin-show-page">
+    <div class="card-header">
       <%= render 'collection_title', presenter: @presenter %>
     </div>
 
-    <div class="panel-body">
+    <div class="card-body">
       <section>
         <div itemscope itemtype="http://schema.org/CollectionPage" class="row collection">
           <div class="col-sm-3 text-center">
@@ -90,7 +90,7 @@
         <%= render 'hyrax/collections/paginate' %>
       </section>
 
-    </div><!-- /panel-body -->
+    </div><!-- /card-body -->
   </section><!-- /collections-panel-wrapper -->
 </div><!-- /collections-wrapper -->
 

data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb

@@ -1,19 +1,19 @@
 <%= form_for @user,
              url: hyrax.dashboard_profile_path(@user.to_param),
-             html: { multipart: true, class: 'form-horizontal' } do |f| %>
-  <div class="form-group">
-    <%= f.label :avatar, t(".change_picture").html_safe, class: "col-xs-4 control-label" %>
-    <div class="col-xs-8">
+             html: { multipart: true } do |f| %>
+  <div class="form-group row">
+    <%= f.label :avatar, t(".change_picture").html_safe, class: "col-4 col-form-label" %>
+    <div class="col-8">
       <%= image_tag @user.avatar.url(:thumb) if @user.avatar? %>
       <%= f.file_field :avatar %>
       <%= f.hidden_field :avatar_cache %>
-      <span class="help-block"><%= t('.help_change_picture_type') %></span>
+      <span class="form-text"><%= t('.help_change_picture_type') %></span>
 
-      <div class="checkbox">
-        <%= f.label :remove_avatar do %>
-          <%= f.check_box :remove_avatar %>
+      <div class="form-check">
+        <%= f.label :remove_avatar, class: 'form-check-label' do %>
+          <%= f.check_box :remove_avatar, class: 'form-check-input' %>
           <%= t(".delete_picture") %>
-          <a href="#" id="delete_picture_help" data-toggle="popover" data-content="<%= t('.delete_picture_data_content') %>" data-original-title="<%= t('.delete_picture_data_original_title') %>"><i class="glyphicon glyphicon-question-sign"></i></a>
+          <a href="#" id="delete_picture_help" data-toggle="popover" data-content="<%= t('.delete_picture_data_content') %>" data-original-title="<%= t('.delete_picture_data_original_title') %>"><i class="fa fa-question"></i></a>
         <% end %>
       </div>
     </div>
@@ -23,32 +23,32 @@
     <%= render partial: 'zotero', locals: { f: f, user: @user } %>
   <% end %>
 
-  <div class="form-group">
-    <%= f.label :orcid, class: 'col-xs-4 control-label' do %>
+  <div class="form-group row">
+    <%= f.label :orcid, class: 'col-4 col-form-label' do %>
       <%= orcid_label %>
     <% end %>
-    <div class="col-xs-8">
+    <div class="col-8">
        <%= f.text_field :orcid, class: "form-control" %>
     </div>
   </div><!-- .form-group -->
 
-  <div class="form-group">
-    <%= f.label :twitter_handle, t(".twitter_handle").html_safe, class: 'col-xs-4 control-label' %>
-    <div class="col-xs-8">
+  <div class="form-group row">
+    <%= f.label :twitter_handle, t(".twitter_handle").html_safe, class: 'col-4 col-form-label' %>
+    <div class="col-8">
        <%= f.text_field :twitter_handle, class: "form-control" %>
     </div>
   </div><!-- .form-group -->
 
-  <div class="form-group">
-    <%= f.label :facebook_handle, t(".facebook_handle").html_safe, class: 'col-xs-4 control-label' %>
-    <div class="col-xs-8">
+  <div class="form-group row">
+    <%= f.label :facebook_handle, t(".facebook_handle").html_safe, class: 'col-4 col-form-label' %>
+    <div class="col-8">
        <%= f.text_field :facebook_handle, class: "form-control" %>
     </div>
   </div><!-- .form-group -->
 
-  <div class="form-group">
-    <%= f.label :googleplus_handle, t(".google_handle").html_safe, class: 'col-xs-4 control-label' %>
-    <div class="col-xs-8">
+  <div class="form-group row">
+    <%= f.label :googleplus_handle, t(".google_handle").html_safe, class: 'col-4 col-form-label' %>
+    <div class="col-8">
        <%= f.text_field :googleplus_handle, class: "form-control" %>
     </div>
   </div><!-- .form-group -->

data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb

@@ -1,13 +1,13 @@
 <% if trophies.any? %>
   <div class="form-group">
     <span>
-      <i class="glyphicon glyphicon-star trophy-on"></i> Remove Highlight Designation
-      <a href="#" id="remove_trophy_help" data-toggle="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="glyphicon glyphicon-question-sign"></i></a>
+      <i class="fa fa-star trophy-on"></i> Remove Highlight Designation
+      <a href="#" id="remove_trophy_help" data-toggle="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="fa fa-question"></i></a>
     </span>
     <% trophies.each do |t| %>
-      <div class="checkbox">
-        <label>
-          <%= check_box_tag "remove_trophy_#{t.id}" %>
+      <div class="form-check">
+        <label class="form-check-label">
+          <%= check_box_tag "remove_trophy_#{t.id}", class: "form-check-input" %>
           <%= link_to t, [main_app, t] %>
         </label>
       </div>

data/app/views/hyrax/dashboard/profiles/_zotero.html.erb

@@ -1,8 +1,8 @@
   <div class="form-group">
-    <%= f.label :zotero, class: 'col-xs-4 control-label' do %>
+    <%= f.label :zotero, class: 'col-4 col-form-label' do %>
       <%= zotero_label %>
     <% end %>
-    <div class="col-xs-8">
+    <div class="col-8">
     <% if user.zotero_userid.present? %>
        <%= link_to t('hyrax.user_profile.zotero.connected'), zotero_profile_url(user.zotero_userid), class: "form-control" %>
     <% else %>

data/app/views/hyrax/dashboard/profiles/edit.html.erb

@@ -1,8 +1,8 @@
 <% provide :page_header do %>
   <h1><span class="fa fa-id-card" aria-hidden="true"></span> Edit Profile</h1>
 <% end %>
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="card">
+  <div class="card-body">
     <div class="col-sm-6 profile">
       <%= render 'edit_primary' %>
     </div>

data/app/views/hyrax/dashboard/profiles/show.html.erb

@@ -1,7 +1,7 @@
 <% provide :page_header do %>
   <h1><span class="fa fa-id-card" aria-hidden="true"></span> <%= t("hyrax.admin.sidebar.profile") %></h1>
   <% if can? :edit, current_user %>
-    <div class="pull-right">
+    <div class="float-right">
       <%= link_to hyrax.edit_dashboard_profile_path(@user), class: "btn btn-primary" do %>
         <%= t("hyrax.edit_profile") %>
       <% end %>
@@ -9,8 +9,8 @@
   <% end %>
 <% end %>
 
-  <div class="panel panel-default">
-    <div class="panel-body">
+  <div class="card">
+    <div class="card-body">
       <div class="list-group col-md-5 col-sm-8">
         <%= render "hyrax/users/vitals", user: @user %>