hyrax 3.6.0 → 4.0.0.beta1

data/app/views/hyrax/file_sets/_show_actions.html.erb

@@ -1,13 +1,13 @@
 <div class="form-actions">
-  <% if Hyrax.config.analytics? && Hyrax.config.analytics_provider != 'ga4' %>
+  <% if Hyrax.config.analytics? %>
     <% # turbolinks needs to be turned off or the page will use the cache and the %>
     <% # analytics graph will not show unless the page is refreshed. %>
-    <%= link_to t('.analytics'), @presenter.stats_path, id: 'stats', class: 'btn btn-default', data: { turbolinks: false } %>
+    <%= link_to t('.analytics'), @presenter.stats_path, id: 'stats', class: 'btn btn-secondary', data: { turbolinks: false } %>
   <% end %>
 
   <% if @presenter.editor? && !workflow_restriction?(@presenter) %>
       <%= link_to t(".edit_this", type: @presenter.human_readable_type), edit_polymorphic_path([main_app, @presenter]),
-                  class: 'btn btn-default' %>
+                  class: 'btn btn-secondary' %>
       <%= link_to t(".delete_this", type: @presenter.human_readable_type), [main_app, @presenter],
                   class: 'btn btn-danger', data: { confirm: t(".confirm_delete_this", type: @presenter.human_readable_type) },
                   method: :delete %>

data/app/views/hyrax/file_sets/_show_details.html.erb

@@ -1,19 +1,29 @@
 <h2><%= t(".file_details") %></h2>
-<dl class="dl-horizontal file-show-term file-show-details">
-  <dt><%= t(".depositor") %></dt>
-  <dd itemprop="accountablePerson" itemscope itemtype="http://schema.org/Person"><span itemprop="name"><%= link_to_profile @presenter.depositor %></span></dd>
-  <dt><%= t(".date_uploaded") %></dt>
-  <dd itemprop="datePublished"><%= @presenter.date_uploaded %></dd>
-  <dt><%= t(".date_modified") %></dt>
-  <dd itemprop="dateModified"><%= @presenter.date_modified %></dd>
-  <dt><%= t(".fixity_check") %></dt>
-  <dd><%= @presenter.fixity_check_status %></dd>
-  <dt><%= t(".characterization") %></dt>
-  <dd>
-    <% if @presenter.characterized? %>
-      <%= render 'show_characterization_details' %>
-    <% else %>
-      <%= t(".not_yet_characterized") %>
-    <% end %>
-  </dd>
+<dl class="file-show-term file-show-details">
+  <div class="row">
+    <dt class="col-5"><%= t(".depositor") %></dt>
+    <dd class="col-7" itemprop="accountablePerson" itemscope itemtype="http://schema.org/Person"><span itemprop="name"><%= link_to_profile @presenter.depositor %></span></dd>
+  </div>
+  <div class="row">
+    <dt class="col-5"><%= t(".date_uploaded") %></dt>
+    <dd class="col-7" itemprop="datePublished"><%= @presenter.date_uploaded %></dd>
+  </div>
+  <div class="row">
+    <dt class="col-5"><%= t(".date_modified") %></dt>
+    <dd class="col-7" itemprop="dateModified"><%= @presenter.date_modified %></dd>
+  </div>
+  <div class="row">
+    <dt class="col-5"><%= t(".fixity_check") %></dt>
+    <dd class="col-7"><%= @presenter.fixity_check_status %></dd>
+  </div>
+  <div class="row">
+    <dt class="col-5"><%= t(".characterization") %></dt>
+    <dd class="col-7">
+      <% if @presenter.characterized? %>
+        <%= render 'show_characterization_details' %>
+      <% else %>
+        <%= t(".not_yet_characterized") %>
+      <% end %>
+    </dd>
+  </div>
 </dl>

data/app/views/hyrax/file_sets/_single_use_link_rows.html.erb

@@ -5,7 +5,7 @@
                                                          time: presenter.human_readable_expiration) %>
     </td>
     <td>
-      <button class="btn btn-xs btn-default copy-single-use-link"
+      <button class="btn btn-sm btn-secondary copy-single-use-link"
               data-clipboard-text="<%= hyrax.send(presenter.url_helper, presenter.download_key) %>"
               data-toggle="tooltip" data-placement="bottom"
               title="<%= t('hyrax.single_use_links.copy.tooltip') %>">
@@ -13,7 +13,7 @@
       </button>
       <%= link_to t('hyrax.single_use_links.delete'),
                   hyrax.delete_single_use_link_path(params[:id], presenter),
-                  class: 'btn btn-xs btn-danger delete-single-use-link' %>
+                  class: 'btn btn-sm btn-danger delete-single-use-link' %>
     </td>
   </tr>
 <% end %>

data/app/views/hyrax/file_sets/_single_use_links.html.erb

@@ -1,5 +1,5 @@
 <h3><%= t('hyrax.single_use_links.title') %></h3>
-<table class="table table-striped table-condensed <%= dom_class(presenter) %> single-use-links">
+<table class="table table-striped table-sm <%= dom_class(presenter) %> single-use-links">
   <tbody data-url="<%= hyrax.generated_single_use_links_path(presenter) %>">
     <% if presenter.single_use_links.empty? %>
       <tr><td><%= t('hyrax.single_use_links.table.no_links') %></td></tr>
@@ -11,5 +11,5 @@
 <div class="form_actions">
   <%= link_to t('hyrax.single_use_links.button'),
               hyrax.generate_download_single_use_link_path(presenter),
-              class: 'btn btn-default generate-single-use-link' %>
+              class: 'btn btn-secondary generate-single-use-link' %>
 </div>

data/app/views/hyrax/file_sets/_versioning.html.erb

@@ -12,23 +12,23 @@
 
         <h3><%= t('.upload') %></h3>
 
-        <div class="col-xs-4">
+        <div class="col-4">
           <input id="file_set_files" style="display:none;" type="file" name="files[]" single/>
           <label for="file_set_files" class="btn btn-success fileinput-button"><%= t('.choose_file') %></label>
         </div>
 
-        <div class="col-xs-8 fileupload-progress versioning-files-progress fade">
+        <div class="col-8 fileupload-progress versioning-files-progress fade">
           <!-- The global progress bar -->
-          <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-            <div class="progress-bar progress-bar-success" style="width:0%;"></div>
+          <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+            <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
           </div>
           <!-- The extended global progress state -->
           <div class="progress-extended">&nbsp;</div>
-        </div> <!-- end col-xs-5 fileupload-progress fade -->
+        </div> <!-- end col-8 fileupload-progress fade -->
       </div>
 
       <div class="row versioning-files-list">
-        <div class="col-xs-12">
+        <div class="col-12">
           <div class="container">
             <div role="presentation" class="table"><span class="files"></span></div>
             <!-- The global file processing state -->
@@ -52,9 +52,9 @@
                html: { class: 'edit_file_set_previous_version nav-safety' } do |f| %>
     <h3><%= t('.restore') %></h3>
     <% @version_list.each do |version| %>
-      <div class="radio">
-        <label class="radio <%= version.current? ? 'disabled' : '' %>">
-          <%= radio_button_tag(:revision, version.label, false, disabled: version.current?, required: 'required') %>
+      <div class="form-check">
+        <label class="form-check-label <%= version.current? ? 'disabled' : '' %>">
+          <%= radio_button_tag(:revision, version.label, false, class: 'form-check-input', disabled: version.current?, required: 'required') %>
           <%= version.current? ? t('.current') : t('.restore_from') %>
           <%= version.created %> [by <%= version.committer %>]
         </label>

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

@@ -5,29 +5,35 @@
 <% end %>
 
 <div class="row">
-  <div class="col-xs-12 col-sm-4">
-    <%= render media_display_partial(@presenter.solr_document), file_set: @presenter.solr_document %>
+  <div class="col-12 col-sm-4">
+    <%= render media_display_partial(curation_concern.to_presenter), file_set: curation_concern.to_presenter %>
   </div>
-  <div class="col-xs-12 col-sm-8">
-    <div class="panel panel-default tabs">
+  <div class="col-12 col-sm-8">
+    <div class="card tabs">
       <ul class="nav nav-tabs" role="tablist">
-        <li id="edit_descriptions_link" class="active">
-          <a href="#descriptions_display" data-toggle="tab" class="nav-safety-confirm"><i class="fa fa-tags" aria-hidden="true"></i></span> <%= t('.descriptions') %></a>
+        <li id="edit_descriptions_link" class="nav-item">
+          <a href="#descriptions_display" data-toggle="tab" class="nav-link active nav-safety-confirm">
+            <i class="fa fa-tags" aria-hidden="true"></i> <%= t('.descriptions') %>
+          </a>
         </li>
-        <li id="edit_versioning_link">
-          <a href="#versioning_display" data-toggle="tab" class="nav-safety-confirm"><i class="fa fa-sitemap" aria-hidden="true"></i> <%= t('.versions') %></a>
+        <li id="edit_versioning_link" class="nav-item">
+          <a href="#versioning_display" data-toggle="tab" class="nav-link nav-safety-confirm">
+            <i class="fa fa-sitemap" aria-hidden="true"></i> <%= t('.versions') %>
+          </a>
         </li>
-        <li id="edit_permissions_link">
-          <a href="#permissions_display" data-toggle="tab" class="nav-safety-confirm"><i class="fa fa-key" aria-hidden="true"></i> <%= t('.permissions') %></a>
+        <li id="edit_permissions_link" class="nav-item">
+          <a href="#permissions_display" data-toggle="tab" class="nav-link nav-safety-confirm">
+            <i class="fa fa-key" aria-hidden="true"></i> <%= t('.permissions') %>
+          </a>
         </li>
       </ul>
-      <div class="panel-body">
+      <div class="card-body">
         <div class="tab-content">
-          <div id="descriptions_display" class="tab-pane active">
+          <div id="descriptions_display" class="tab-pane show active">
             <h2><%= t('.descriptions') %></h2>
             <%= render "form" %>
           </div>
-          <%= render "permission", file_set: curation_concern, form_object: @form %>
+          <%= render "permission", file_set: curation_concern %>
           <%= render "versioning", file_set: curation_concern %>
         </div>
       </div>

data/app/views/hyrax/file_sets/media_display/_image.html.erb

@@ -1,10 +1,10 @@
 <% if display_media_download_link?(file_set: file_set) %>
     <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
-      <%= image_tag thumbnail_url(file_set),
+      <%= document_presenter(file_set)&.thumbnail&.thumbnail_tag(
                     class: "representative-media",
                     alt: "",
-                    role: "presentation" %>
+                    role: "presentation") %>
       <%= link_to t('hyrax.file_set.show.downloadable_content.image_link'),
                   hyrax.download_path(file_set),
                   data: { label: file_set.id },
@@ -13,9 +13,9 @@
     </div>
 <% else %>
     <div>
-      <%= image_tag thumbnail_url(file_set),
+      <%= document_presenter(file_set)&.thumbnail&.thumbnail_tag(
                     class: "representative-media",
                     alt: "",
-                    role: "presentation" %>
+                    role: "presentation") %>
     </div>
 <% end %>

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

@@ -1,12 +1,12 @@
 <% provide :page_title, @presenter.page_title %>
 <div class="container-fluid">
   <div class="row">
-    <div class="col-xs-12 col-sm-4">
+    <div class="col-12 col-sm-3">
       <%= render media_display_partial(@presenter), file_set: @presenter %>
       <%= render 'show_actions', presenter: @presenter %>
       <%= render 'single_use_links', presenter: @presenter if @presenter.editor? %>
     </div>
-    <div itemscope itemtype="<%= @presenter.itemtype %>" class="col-xs-12 col-sm-8">
+    <div itemscope itemtype="<%= @presenter.itemtype %>" class="col-12 col-sm-9">
       <header>
         <%= render 'file_set_title', presenter: @presenter %>
       </header>

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

@@ -1,5 +1,5 @@
 <% if display_content_block? @announcement_text %>
-  <div id="announcement_text" class="row">
-    <%= displayable_content_block @announcement_text, class: 'row', id: 'announcement', role: 'complementary', 'aria-label': 'announcement-text' %>
+  <div id="announcement_text">
+    <%= displayable_content_block @announcement_text, id: 'announcement', role: 'complementary', 'aria-label': 'announcement-text' %>
   </div>
 <% end %>

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

@@ -7,8 +7,10 @@
             <div class="media-body">
               <div class="media-heading">
                 <%= link_to [hyrax, collection] do %>
-                  <%= render_thumbnail_tag(collection, { class: 'hidden-xs file_listing_thumbnail', alt: "#{collection.title_or_label} #{ t('hyrax.homepage.admin_sets.thumbnail')}" },
-                                           { suppress_link: true }) + collection.title_or_label %>
+                  <%= document_presenter(collection)&.thumbnail&.thumbnail_tag(
+                    { class: 'd-none d-md-block file_listing_thumbnail', alt: "#{collection.title_or_label} #{ t('hyrax.homepage.admin_sets.thumbnail')}" },
+                    { suppress_link: true }
+                  ) + collection.title_or_label %>
                 <% end %>
               </div>
             </div>
@@ -19,9 +21,9 @@
   </tbody>
 </table>
 <ul class="list-inline collection-highlights-list">
-  <li>
+  <li class="list-inline-item">
     <%= link_to t('hyrax.homepage.admin_sets.link'),
                 main_app.search_catalog_path(f: { human_readable_type_sim: ["Collection"]}),
-                class: 'btn btn-default' %>
+                class: 'btn btn-secondary' %>
   </li>
 </ul>

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

@@ -3,7 +3,7 @@
     <span class="sr-only"><%= t('hyrax.homepage.featured_works.document.title_label') %></span>
     <h3>
       <%= link_to [main_app, featured] do %>
-        <%= render_thumbnail_tag(featured, {width: 90, alt: "#{featured.title.first.to_s} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) + featured.title.first %>
+        <%= render_thumbnail_tag(featured, {width: 90, alt: "#{featured.title.first.to_s} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true})%><%= featured.title.first %>
       <% end %>
     </h3>
   </div>

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

@@ -10,7 +10,7 @@
         <% end %>
       </ol>
     </div>
-    <%= f.submit("Save order", class: 'btn btn-default') %>
+    <%= f.submit("Save order", class: 'btn btn-secondary') %>
   <% end %>
 <% else %>
   <ol class="list-group list-group-striped" id="featured_works">

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

@@ -1,27 +1,41 @@
 <div class="col-sm-6">
   <ul id="homeTabs" class="nav nav-tabs" role="list">
-    <li class="active"><a href="#featured_container" data-toggle="tab" id="featureTab"><%= t('hyrax.homepage.featured_works.tab_label') %></a></li>
-    <li><a href="#recently_uploaded" data-toggle="tab" id="recentTab"><%= t('hyrax.homepage.recently_uploaded.tab_label') %></a></li>
+    <li class="nav-item">
+      <a class="nav-link active" href="#featured_container" data-toggle="tab" id="featureTab">
+        <%= t('hyrax.homepage.featured_works.tab_label') %>
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link" href="#recently_uploaded" data-toggle="tab" id="recentTab">
+        <%= t('hyrax.homepage.recently_uploaded.tab_label') %>
+      </a>
+    </li>
   </ul>
   <div class="tab-content">
-    <div class="tab-pane fade in active" id="featured_container" role="tabpanel" aria-labelledby="featureTab">
+    <div class="tab-pane show active" id="featured_container" role="tabpanel" aria-labelledby="featureTab">
       <%= render 'featured_works' %>
     </div>
-    <div class="tab-pane fade" id="recently_uploaded" role="tabpanel" aria-labelledby="recentTab">
+    <div class="tab-pane" id="recently_uploaded" role="tabpanel" aria-labelledby="recentTab">
       <%= render 'recently_uploaded', recent_documents: @recent_documents %>
     </div>
   </div>
-</div><!-- /.col-xs-6 -->
+</div>
 
 <div class="col-sm-6">
-
   <ul class="nav nav-tabs" role="list">
-    <li class="active"><a aria-expanded="true" href="#tab-col2-first" data-toggle="tab"><%= t('hyrax.homepage.admin_sets.title') %></a></li>
-    <li class=""><a aria-expanded="false" href="#tab-col2-second" data-toggle="tab"><%= t('hyrax.homepage.featured_researcher.tab_label') %></a></li>
+    <li class="nav-item">
+      <a class="nav-link active" aria-expanded="true" href="#tab-col2-first" data-toggle="tab">
+        <%= t('hyrax.homepage.admin_sets.title') %>
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link" aria-expanded="false" href="#tab-col2-second" data-toggle="tab">
+        <%= t('hyrax.homepage.featured_researcher.tab_label') %>
+      </a>
+    </li>
   </ul>
-
   <div class="tab-content">
-    <div class="tab-pane active" id="tab-col2-first">
+    <div class="tab-pane show active" id="tab-col2-first">
       <h2 class="sr-only"><%= t('hyrax.homepage.admin_sets.title') %></h2>
       <%= render 'explore_collections', collections: @presenter.collections %>
     </div>

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

@@ -1,5 +1,5 @@
 <% if display_content_block? @marketing_text %>
   <div class="home_marketing_text">
-    <%= displayable_content_block @marketing_text, class: 'col-sm-offset-2 col-sm-9 col-md-offset-1 home_marketing_text', role: 'complementary' %>
+    <%= displayable_content_block @marketing_text, class: 'offset-sm-2 col-sm-9 offset-md-1 home_marketing_text', role: 'complementary' %>
   </div>
 <% end %>

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

@@ -4,7 +4,10 @@
         <span class="sr-only"><%= t('hyrax.homepage.recently_uploaded.document.title_label') %></span>
         <h3>
           <%= link_to [main_app, recent_document] do %>
-            <%= render_thumbnail_tag(recent_document, {width: 90, alt: "#{recent_document} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) %><%= recent_document %>
+            <%= document_presenter(recent_document)&.thumbnail&.thumbnail_tag(
+              { width: 90, alt: "#{recent_document} #{ t('hyrax.homepage.admin_sets.thumbnail')}" },
+              { suppress_link: true }
+            ) %><%= recent_document %>
           <% end %>
         </h3>
         <p class="recent-field">

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

@@ -1,17 +1,17 @@
 <% presenter = f.object.presenter %>
 <li class="dd-item dd3-item featured-item" data-id="<%= presenter.id %>">
   <div class="dd-handle dd3-handle"><%= t 'hyrax.homepage.featured_works.drag' %></div>
-  <div class="dd3-content panel panel-default">
+  <div class="dd3-content card">
     <%= f.hidden_field :id %>
     <%= f.hidden_field :order, data: { property: "order" } %>
     <div class="main row">
       <div class="col-sm-12">
         <% if can? :destroy, FeaturedWork %>
-          <h3 class="pull-right">
+          <h3 class="float-right">
             <%= link_to hyrax.featured_work_path(presenter, format: :json),
               title: "Remove work from feature section",
               data: {behavior: 'unfeature'} do %>
-              <i class='glyphicon glyphicon-remove'></i>
+              <i class='fa fa-times'></i>
             <% end %>
             <p class="sr-only"><%= t 'helpers.action.remove' %></p>
           </h3>

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

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

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

@@ -4,16 +4,16 @@
     <h1><%= t('.manage_leases_html', cc: curation_concern, cc_type: cc_type) %></h1>
 <% end %>
 
-<div class="panel panel-default tabs">
-  <div class="panel-heading">
-    <h2 class="panel-title"><%= t('.header.current') %></h2>
+<div class="card tabs">
+  <div class="card-header">
+    <h2 class="card-title"><%= t('.header.current') %></h2>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <%= simple_form_for [main_app, curation_concern] do |f| %>
       <fieldset class="set-access-controls">
-        <section class="help-block">
+        <section class="form-text">
           <p>
-            <% if lease_enforced?(curation_concern) %>
+            <% if curation_concern.lease_expiration_date %>
               <%= t('.lease_true_html',  cc: cc_type) %>
             <% else %>
               <%= t('.lease_false_html', cc: cc_type) %>
@@ -29,26 +29,26 @@
 
       <div class="row">
         <div class="col-md-12 form-actions">
-          <% if lease_enforced?(curation_concern) %>
+          <% if curation_concern.lease_expiration_date %>
             <%= f.submit t('.lease_update'), class: 'btn btn-primary' %>
             <%= link_to t('.lease_deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
           <% else %>
             <%= f.submit t('.lease_apply'), class: 'btn btn-primary' %>
           <% end %>
-          <%= link_to t('.lease_cancel'), leases_path, class: 'btn btn-default' %>
-          <%= link_to t('.lease_return', cc: cc_type), edit_polymorphic_path([main_app, curation_concern]), class: 'btn btn-default' %>
+          <%= link_to t('.lease_cancel'), leases_path, class: 'btn btn-secondary' %>
+          <%= link_to t('.lease_return', cc: cc_type), edit_polymorphic_path([main_app, curation_concern]), class: 'btn btn-secondary' %>
         </div>
       </div>
     <% end %>
   </div>
 </div>
 
-<div class="panel panel-default tabs">
-  <div class="panel-heading">
-    <h2 class="panel-title"><%= t('.header.past') %></h2>
+<div class="card tabs">
+  <div class="card-header">
+    <h2 class="card-title"><%= t('.header.past') %></h2>
   </div>
-  <div class="panel-body">
-    <% if lease_history(curation_concern).empty? %>
+  <div class="card-body">
+    <% if curation_concern.lease_history.empty? %>
       <%= t('.history_empty', cc: cc_type) %>
     <% else %>
       <%= render partial: 'lease_history', object: curation_concern.lease_history %>

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

@@ -2,15 +2,27 @@
   <h1><span class="fa fa-sitemap"></span><%= t('.manage_leases') %></h1>
 <% end %>
 
-<div class="panel panel-default tabs">
+<div class="card tabs">
   <ul class="nav nav-tabs">
-    <li class="active"><a href="#active" data-toggle="tab"><%= t('.active') %></a></li>
-    <li><a href="#expired" data-toggle="tab"><%= t('.expired') %></a></li>
-    <li><a href="#deactivated" data-toggle="tab"><%= t('.deactivated') %></a></li>
+    <li class="nav-item">
+      <a class="nav-link active" href="#active" data-toggle="tab">
+        <%= t('.active') %>
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link" href="#expired" data-toggle="tab">
+        <%= t('.expired') %>
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link" href="#deactivated" data-toggle="tab">
+        <%= t('.deactivated') %>
+      </a>
+    </li>
   </ul>
-  <div class="panel-body">
+  <div class="card-body">
     <div class="tab-content">
-      <div class="tab-pane active" id="active">
+      <div class="tab-pane show active" id="active">
         <%= render "list_active_leases" %>
       </div>
       <div class="tab-pane" id="expired">

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

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

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

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

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

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

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

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