hyrax 3.4.2 → 4.0.0.beta2

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

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

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

@@ -2,7 +2,7 @@
   <% if can?(:download, file_set.id) && !(can?(:edit, file_set.id) || can?(:destroy, file_set.id)) %>
   <%= link_to t('.download'),
               hyrax.download_path(file_set),
-              class: 'btn btn-default btn-sm',
+              class: 'btn btn-secondary btn-sm',
               title: t('.download_title', file_set: file_set),
               target: "_blank",
               id: "file_download",
@@ -12,24 +12,23 @@
     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= file_set.id %>" aria-haspopup="true" aria-expanded="false">
       <span class="sr-only"><%= t('.press_to') %> </span>
       <%= t('.header') %>
-      <span class="caret" aria-hidden="true"></span>
     </button>
 
     <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= file_set.id %>">
     <% if can?(:edit, file_set.id) %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to t('.edit'), edit_polymorphic_path([main_app, file_set]),
           { title: t('.edit_title', file_set: file_set) } %>
       </li>
 
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to t('.versions'),  edit_polymorphic_path([main_app, file_set], anchor: 'versioning_display'),
           { title: t('.versions_title') } %>
       </li>
     <% end %>
 
     <% if can?(:destroy, file_set.id) %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to t('.delete'), polymorphic_path([main_app, file_set]),
           method: :delete, title: t('.delete_title', file_set: file_set),
           data: { confirm: t('.delete_confirm', file_set: file_set, application_name: application_name) } %>
@@ -37,7 +36,7 @@
     <% end %>
 
     <% if can?(:download, file_set.id) %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to t('.download'),
                     hyrax.download_path(file_set),
                     title: t('.download_title', file_set: file_set),

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

@@ -7,7 +7,7 @@
       <% end %>
     <div>
       <%= button_tag class: 'btn btn-primary btn-lg', id: "upload_submit", name: "update_descriptions" do %>
-        <i class="glyphicon glyphicon-floppy-disk"></i> <%= t('.save') %>
+        <i class="fa fa-floppy-o"></i> <%= t('.save') %>
       <% end %>
     </div>
   <% end %>

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

@@ -1,7 +1,7 @@
 <div class="modal-div extra_tag">
 <% label = name.to_s.titleize %>
 <!-- Button to trigger modal -->
-<a href="#extraFieldsModal_<%= name %>" role="button" class="btn btn-warning fright vmiddle" data-toggle="modal"><%= t('.additional') %> <%= label %> <i class="glyphicon glyphicon-plus large-icon"></i></a>
+<a href="#extraFieldsModal_<%= name %>" role="button" class="btn btn-warning fright vmiddle" data-toggle="modal"><%= t('.additional') %> <%= label %> <i class="fa fa-plus large-icon"></i></a>
 <!-- Modal -->
 <div class="modal fade" id="extraFieldsModal_<%= name %>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog">

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

@@ -1,6 +1,6 @@
 <%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
   <fieldset class="required">
-    <span class="control-label">
+    <span class="col-form-label">
       <%= label_tag 'file_set[title][]', t('.title'),  class: "string optional" %>
     </span>
     <%= text_field_tag 'file_set[title][]', curation_concern.title.first, class: 'form-control', required: true %>

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

@@ -1,19 +1,14 @@
-<% depositor = f.object.depositor %>
-<% public_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "public"}.compact.first %>
-<% public_perm = true if params[:controller] == 'batch' %>
-<% registered_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "registered"}.compact.first %>
-
 <h2 id="permissions_display"><% if params[:controller] == 'batch' %><%= t('.bulk') %> <% end %><%= t('.header') %> <% if params[:controller] == 'batch' %>
       <small><%= t('.applied_to') %></small><% end %>
 </h2>
 
-<div class="alert alert-info hidden" id="save_perm_note"><%= t('.save_note_html') %></div>
+<div class="alert alert-info" id="save_perm_note"><%= t('.save_note_html') %></div>
 
-<div class="alert alert-warning hidden" role="alert" id="permissions_error">
+<div class="alert alert-warning" role="alert" id="permissions_error">
   <span id="permissions_error_text"></span>
 </div>
 
-<%= render 'hyrax/base/form_permission', f: f %>
+<%= render 'hyrax/base/form_visibility_component', f: f %>
 
 <!-- Share With -->
 <div class="row">
@@ -28,20 +23,22 @@
   <div id="new-user">
     <p class="col-sm-12"><%= t('.enter', account_label: t('hyrax.account_label')) %></p>
     <p class="sr-only"><%= t('.new_user_help_text', account_label: t('hyrax.account_label')) %></p>
-    <div class="col-sm-5">
-      <label for="new_user_name_skel" class="sr-only"><%= t('.new_user_name_skel', account_label: t('hyrax.account_label'), suffix: t('hyrax.directory.suffix')) %></label>
-      <%= text_field_tag 'new_user_name_skel', nil %>
-    </div>
-    <div class="col-sm-4">
-      <label for="new_user_permission_skel" class="sr-only"><%= t('.new_user_permission_skel') %></label>
-      <%= select_tag 'new_user_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
-    </div>
-    <div class="col-sm-3">
-      <button class="btn btn-default" id="add_new_user_skel">
-        <span class="sr-only"><%= t('.add_new_user_skel', account_label: t('hyrax.account_label')) %></span>
-        <span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span>
-      </button>
-      <br /> <span id="directory_user_result"></span>
+    <div class="row">
+      <div class="col-sm-5">
+        <label for="new_user_name_skel" class="sr-only"><%= t('.new_user_name_skel', account_label: t('hyrax.account_label'), suffix: t('hyrax.directory.suffix')) %></label>
+        <%= text_field_tag 'new_user_name_skel', nil %>
+      </div>
+      <div class="col-sm-4">
+        <label for="new_user_permission_skel" class="sr-only"><%= t('.new_user_permission_skel') %></label>
+        <%= select_tag 'new_user_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
+      </div>
+      <div class="col-sm-3">
+        <button class="btn btn-secondary" id="add_new_user_skel">
+          <span class="sr-only"><%= t('.add_new_user_skel', account_label: t('hyrax.account_label')) %></span>
+          <span aria-hidden="true"><i class="fa fa-plus"></i></span>
+        </button>
+        <br /> <span id="directory_user_result"></span>
+      </div>
     </div>
   </div>
 </div>
@@ -49,18 +46,20 @@
 <div class="form-group row">
   <div id="new-group">
     <p class="sr-only"><%= t('.new_group_help_text') %></p>
-    <div class="col-sm-5">
-      <label for="new_group_name_skel" class="sr-only"><%= t('.new_group_name_skel') %></label>
-      <%= select_tag 'new_group_name_skel', options_for_select([t('.select_group')] + current_user.groups), class: 'form-control' %>
-    </div>
-    <div class="col-sm-4">
-      <label for="new_group_permission_skel" class="sr-only"><%= t('.new_group_permission_skel') %></label>
-      <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
-    </div>
-    <div class="col-sm-3">
-      <span class="sr-only"><%= t('.add_new_group_skel') %></span>
-      <button class="btn btn-default" id="add_new_group_skel"><i class="glyphicon glyphicon-plus"></i></button>
-      <br /><span id="directory_group_result"></span>
+    <div class="row">
+      <div class="col-sm-5">
+        <label for="new_group_name_skel" class="sr-only"><%= t('.new_group_name_skel') %></label>
+        <%= select_tag 'new_group_name_skel', options_for_select([t('.select_group')] + current_user.groups), class: 'form-control' %>
+      </div>
+      <div class="col-sm-4">
+        <label for="new_group_permission_skel" class="sr-only"><%= t('.new_group_permission_skel') %></label>
+        <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
+      </div>
+      <div class="col-sm-3">
+        <span class="sr-only"><%= t('.add_new_group_skel') %></span>
+        <button class="btn btn-secondary" id="add_new_group_skel"><i class="fa fa-plus"></i></button>
+        <br /><span id="directory_group_result"></span>
+      </div>
     </div>
   </div>
 </div>
@@ -69,7 +68,7 @@
 
 <script type="text/x-tmpl" id="tmpl-file-set-grant">
 <tr>
-  <td><label class="control-label">{%= o.name %}</label></td>
+  <td><label class="col-form-label">{%= o.name %}</label></td>
   <td>{%= o.accessLabel %} <button class="btn close">&times;</button></td>
 </tr>
 </script>

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

@@ -2,12 +2,12 @@
   <% 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,25 +5,31 @@
 <% end %>
 
 <div class="row">
-  <div class="col-xs-12 col-sm-4">
-    <%= render media_display_partial(curation_concern.to_presenter), file_set: curation_concern.to_presenter %>
+  <div class="col-12 col-sm-4">
+    <%= render media_display_partial(@presenter.solr_document), file_set: @presenter.solr_document %>
   </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>

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>