hyrax 3.4.2 → 4.0.0.beta2

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

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

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

@@ -2,13 +2,16 @@
 <tr id="document_<%= id %>">
   <td>&nbsp;
     <% if current_user and document.depositor != current_user.user_key %>
-      <i class="glyphicon glyphicon-share-alt" />
+      <i class="fa fa-share" />
     <% end %>
   </td>
   <td>
     <div class="media">
       <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
-        <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail", alt: "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" }, { suppress_link: true } %>
+        <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
+          { class: "d-none d-md-block file_listing_thumbnail", alt: "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" },
+          { suppress_link: true }
+        ) %>
       <% end %>
       <div class="media-body">
         <p class="media-heading">

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

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

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

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

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

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

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

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

data/app/views/hyrax/content_blocks/templates/agreement.html.erb

@@ -9,14 +9,14 @@ To properly administer this repository and preserve the contents of
 When you submit your file(s) you will have the option of selecting its degree of Visibility on the Web, which will control who can access your materials.  Certain license terms apply to each visibility level:
 </p>
 
-<h3>Visibility Level: <span class="label label-success">PUBLIC</span></h3>
+<h3>Visibility Level: <span class="badge badge-success">PUBLIC</span></h3>
 <p>
 By choosing the Public option you are allowing anyone in the world to view your submission.   You may choose to apply one of several Creative Commons licenses to your submission, which are explained on the submission form and in the FAQ.  These licenses allow you to set your own terms of use for anyone accessing the submission.  You authorize <%= ApplicationController.helpers.institution_name %> to distribute your content under the terms of that Creative Commons license and to allow users of <%= ApplicationController.helpers.application_name %> to do the same if your license choice permits that.
 
 If you do not choose a license, you grant to <%= ApplicationController.helpers.institution_name %> the non-exclusive right to distribute your submission (including the metadata and abstract) worldwide, in any format or medium for non-commercial, research, educational, or related academic purposes only.  You also authorize <%= ApplicationController.helpers.institution_name %> to allow users of the repository to distribute your submission (including the metadata and abstract) worldwide, in any format or medium for non-commercial, research, educational, or related academic purposes only. <%= ApplicationController.helpers.institution_name %> will clearly identify your name(s) as the author(s) or owner(s) of the submission, and will not make any alteration, other than as allowed by this license, to your submission.
 </p>
 
-<h3>Visibility Level: <span class="label label-info"><%= ApplicationController.helpers.institution_name.upcase %></span></h3>
+<h3>Visibility Level: <span class="badge badge-info"><%= ApplicationController.helpers.institution_name.upcase %></span></h3>
 
 <p>
 If you select the <%= ApplicationController.helpers.institution_name %> access option, you have decided to restrict access only to users of <%= ApplicationController.helpers.institution_name %>'s network. Your deposit will not be accessible to colleagues or students at other universities or to members of the public. If you want your work to be accessible to the broader scholarly community, you should consider the regular Public option instead.  If you choose, you may also further limit access to specific individuals or groups of individuals at <%= ApplicationController.helpers.institution_name %>.
@@ -26,7 +26,7 @@ If you select the <%= ApplicationController.helpers.institution_name %> access o
 By clicking through this license, you grant to <%= ApplicationController.helpers.institution_name %> the non-exclusive right to reproduce and/or distribute your submission (including the metadata and abstract) to students, faculty, staff, and walk-in users of the <%= ApplicationController.helpers.institution_name %> libraries, in any format or medium for non-commercial, research, educational, or related academic purposes only.  If you have limited access to specific individuals or groups, <%= ApplicationController.helpers.institution_name %> will distribute your submission ONLY to those users.  You also authorize <%= ApplicationController.helpers.institution_name %> to allow <%= ApplicationController.helpers.institution_name %> community users of the repository to distribute your submission (including the metadata and abstract) in any format or medium for <%= ApplicationController.helpers.institution_name %> internal non-commercial, research, educational, or related academic purposes only. <%= ApplicationController.helpers.institution_name %> will clearly identify your name(s) as the author(s) or owner(s) of the submission, and will not make any alteration, other than as allowed by this license, to your submission.
 </p>
 
-<h3>Visibility Level: <span class="label label-danger">PRIVATE</span></h3>
+<h3>Visibility Level: <span class="badge badge-danger">PRIVATE</span></h3>
 
 <p>
 If you have selected the PRIVATE access option in the <%= ApplicationController.helpers.application_name %> deposit process, you have decided to allow <%= ApplicationController.helpers.institution_name %> a more limited set of rights than those afforded under the Public license option. Your deposit will not be accessible to anyone other than yourself. If you want your work to be accessible to the broader scholarly community, you should consider the regular Public or <%= ApplicationController.helpers.institution_name %> settings instead.

data/app/views/hyrax/dashboard/_admin_sets.html.erb

@@ -1,30 +1,24 @@
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title"><%= t('.title') %></h2>
-        <div><%= t('.subtitle') %></div>
-      </div>
-      <div class="panel-body">
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th><%= t('.admin_set') %></th>
-              <th><%= t('.works') %></th>
-              <th><%= t('.files') %></th>
-            </tr>
-          </thead>
-          <tbody>
-            <% @admin_set_rows.each do |row| %>
-              <tr>
-                <td><%= row.admin_set %></td>
-                <td><%= row.work_count %></td>
-                <td><%= row.file_count %></td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
-    </div>
+<div class="card">
+  <div class="card-body">
+    <h5 class="card-title"><%= t('.title') %></h5>
+    <h6 class="card-subtitle mb-2 text-muted"><%= t('.subtitle') %></h6>
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th><%= t('.admin_set') %></th>
+          <th><%= t('.works') %></th>
+          <th><%= t('.files') %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @admin_set_rows.each do |row| %>
+          <tr>
+            <td><%= row.admin_set %></td>
+            <td><%= row.work_count %></td>
+            <td><%= row.file_count %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>

data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb

@@ -1,6 +1,6 @@
 <div class="row proxy-rights">
-  <div class="col-xs-6">
-    <table class="table table-condensed table-striped" id="authorizedProxies">
+  <div class="col-6">
+    <table class="table table-sm table-striped" id="authorizedProxies">
       <tbody>
       <% if user.can_receive_deposits_from.count == 0 %>
         <%= t('hyrax.dashboard.no_proxies') %>

data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb

@@ -1,11 +1,11 @@
 <div class="clearfix proxy-rights">
   <div class="row">
-    <div class="col-xs-12">
+    <div class="col-12">
       <p><%= t('hyrax.dashboard.proxy_help') %></p>
     </div>
   </div>
   <div class="row">
-    <div class="col-xs-6 proxy-search">
+    <div class="col-6 proxy-search">
       <h2><%= t("hyrax.dashboard.authorize_proxies") %></h2>
       <div class="form-group">
         <label for="user"><%= t("hyrax.dashboard.proxy_user") %></label>
@@ -14,9 +14,9 @@
       </div>
     </div>
 
-    <div class="col-xs-6">
+    <div class="col-6">
       <h2><%= t("hyrax.dashboard.current_proxies") %></h2>
-      <table class="table table-condensed table-striped" id="authorizedProxies">
+      <table class="table table-sm table-striped" id="authorizedProxies">
         <tbody>
         <% user.can_receive_deposits_from.each do |depositor| %>
             <tr><td class="depositor-name"><%= depositor.name %></td>

data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb

@@ -1,8 +1,8 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-9">
+  <div class="col-12 col-sm-9">
     <h3><%= t("hyrax.dashboard.transfers_sent") %></h3>
   </div>
-  <div class="col-xs-12 col-sm-3 transfer_link">
+  <div class="col-12 col-sm-3 transfer_link">
     <%= link_to hyrax.my_works_path do %>
         <%= t("hyrax.dashboard.transfer_works_link") %>
     <% end %>

data/app/views/hyrax/dashboard/_repository_growth.html.erb

@@ -1,30 +1,30 @@
-<div class="panel-heading">
-  <h3 class="panel-title"><%= t('.title') %></h3>
-</div>
-<div class="panel-body text-center">
-  <div id="dashboard-growth" aria-hidden="true" style="height: 200px">
-  <% repository_growth = @presenter.repository_growth(@start_date.to_datetime, @end_date.to_datetime).to_json %>
-  <script>
-//<![CDATA[
-Hyrax.statistics.repositoryGrowth = <%== repository_growth %>
-//]]>
-</script></div>
-  <table aria-label="<%= t('.title') %>" class="table table-striped sr-only text-left">
-    <thead>
-      <tr>
-        <th><%= t('.date') %></th>
-        <th><%= t('.works') %></th>
-        <th><%= t('.collections') %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% JSON.parse(repository_growth).each do |row| %>
+<div class="card">
+  <div class="card-header"><%= t('.title') %></div>
+  <div class="card-body d-flex justify-content-center">
+    <div id="dashboard-growth" aria-hidden="true" style="height: 200px">
+    <% repository_growth = @presenter.repository_growth(@start_date.to_datetime, @end_date.to_datetime).to_json %>
+    <script>
+  //<![CDATA[
+  Hyrax.statistics.repositoryGrowth = <%== repository_growth %>
+  //]]>
+  </script></div>
+    <table aria-label="<%= t('.title') %>" class="table table-striped sr-only text-left">
+      <thead>
         <tr>
-          <td><%= row["y"] %></td>
-          <td><%= row["a"] %></td>
-          <td><%= row["b"] %></td>
+          <th><%= t('.date') %></th>
+          <th><%= t('.works') %></th>
+          <th><%= t('.collections') %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
+      </thead>
+      <tbody>
+        <% JSON.parse(repository_growth).each do |row| %>
+          <tr>
+            <td><%= row["y"] %></td>
+            <td><%= row["a"] %></td>
+            <td><%= row["b"] %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/app/views/hyrax/dashboard/_resource_type_graph.html.erb

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= t('.title') %></h3>
+<div class="card">
+  <div class="card-header">
+    <%= t('.title') %>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <div id="dashboard-resource-types" aria-hidden="true" style="height: 200px">
       <% @resource_types = Hyrax::Statistic.resource_types %>
       <script>

data/app/views/hyrax/dashboard/_sidebar.html.erb

@@ -1,8 +1,8 @@
 <% menu = Hyrax::MenuPresenter.new(self) %>
 <div class="sidebar-toggle"><span class="fa fa-chevron-circle-right"></span></div>
 <nav aria-label="sidebar-nav">
-  <ul class="nav nav-pills nav-stacked">
-    <li>
+  <ul class="nav nav-pills flex-column">
+    <li class="nav-item">
       <div class="profile">
         <div class="profile-image">
           <%= image_tag current_user.avatar.url(:thumb), width: 100 if current_user.avatar.present? %>
@@ -12,7 +12,7 @@
         </div>
       </div>
     </li>
-    <li><%= link_to hyrax.dashboard_path do %>
+    <li class="nav-item"><%= link_to hyrax.dashboard_path, class: "nav-link" do %>
           <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
         <% end %>
     </li>

data/app/views/hyrax/dashboard/_tabs.html.erb

@@ -1,11 +1,15 @@
 <!-- Nav tabs -->
 <ul class="nav nav-tabs" role="tablist">
-  <li role="presentation" class="active"><a href="#admin_sets" aria-selected="true" role="tab" data-toggle="tab"><%= t('.admin_sets') %></a></li>
+  <li role="presentation" class="nav-item">
+    <a class="nav-link active" href="#admin_sets" aria-selected="true" role="tab" data-toggle="tab">
+      <%= t('.admin_sets') %>
+      </a>
+    </li>
 </ul>
 
 <!-- Tab panes -->
 <div class="tab-content">
-  <div role="tabpanel" class="tab-pane active" id="admin_sets">
+  <div role="tabpanel" class="tab-pane show active" id="admin_sets">
     <%= render 'admin_sets' %>
   </div>
 </div>

data/app/views/hyrax/dashboard/_user_activity.html.erb

@@ -1,22 +1,25 @@
-<div class="panel-heading">
-  <h3 class="panel-title"><%= t('.title') %></h3>
-</div>
-<div class="panel-body text-center">
-  <% if Hyrax.config.analytics? %>
-    <%= render 'user_activity_graph' %>
+<div class="card">
+  <div class="card-header">
+    <%= t('.title') %>
+  </div>
+  <div class="card-body d-flex justify-content-center">
+    <% if Hyrax.config.analytics? %>
+      <%= render 'user_activity_graph' %>
 
-    <div class="col-md-3">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h2 class="panel-title text-center"><%= t('.user_summary') %></h2>
-        </div>
-        <div class="panel-body text-center">
-          <p><%= t('.registered_users') %>: <%= @presenter.user_count(@start_date.to_date, @end_date.to_date) %></p>
-          <p><%= t('.new_visitors') %>: <%= Hyrax::Analytics.new_visitors('range', "#{@start_date},#{@end_date}") %></p>
-          <p><%= t('.returning_visitors') %>: <%= Hyrax::Analytics.returning_visitors('range', "#{@start_date},#{@end_date}") %></p>
-          <p><%= t('.total_visitors') %>: <%= Hyrax::Analytics.total_visitors('range', "#{@start_date},#{@end_date}") %></p>
+      <!-- FIXME: This is like embedded a card in a card...seems odd -->
+      <div class="col-md-3">
+        <div class="card">
+          <div class="card-header">
+            <h2 class="card-title text-center"><%= t('.user_summary') %></h2>
+          </div>
+          <div class="card-body text-center">
+            <p><%= t('.registered_users') %>: <%= @presenter.user_count(@start_date.to_date, @end_date.to_date) %></p>
+            <p><%= t('.new_visitors') %>: <%= Hyrax::Analytics.new_visitors('range', "#{@start_date},#{@end_date}") %></p>
+            <p><%= t('.returning_visitors') %>: <%= Hyrax::Analytics.returning_visitors('range', "#{@start_date},#{@end_date}") %></p>
+            <p><%= t('.total_visitors') %>: <%= Hyrax::Analytics.total_visitors('range', "#{@start_date},#{@end_date}") %></p>
+          </div>
         </div>
       </div>
-    </div>
-  <% end %>
-</div>
+    <% end %>
+  </div>
+</div>

data/app/views/hyrax/dashboard/_visibility_graph.html.erb

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= t('.visibility') %></h3>
+<div class="card">
+  <div class="card-header">
+    <%= t('.visibility') %>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
       <% repository_objects = @presenter.repository_objects.to_json %>
       <div id="dashboard-repository-objects" aria-hidden="true" style="height: 200px">
       <script>

data/app/views/hyrax/dashboard/_work_type_graph.html.erb

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= t('.title') %></h3>
+<div class="card">
+  <div class="card-header">
+    <%= t('.title') %>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <div id="dashboard-work-types" aria-hidden="true" style="height: 200px">
       <% @work_types = Hyrax::Statistic.work_types %>
       <script>

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

@@ -1,3 +1,3 @@
-<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="glyphicon glyphicon-ok"></i> Select None</a></li>
+<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="fa fa-check"></i> Select None</a></li>
 <li data-behavior="batch-edit-select-page" data-state="off"><a href="#"><i class=""></i> Select Current Page</a></li>
 <li><%= button_for_remove_selected_from_collection @collection %></li>

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

@@ -8,13 +8,13 @@
   <% unless bookmarked? document %>
 
       <%= form_tag(main_app.bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
-        <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add btn btn-default") %>
+        <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add btn btn-secondary") %>
       <% end %>
 
   <% else %>
 
       <%= form_tag(main_app.bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
-        <%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove btn btn-default") %>
+        <%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove btn btn-secondary") %>
       <% end %>
 
   <% end %>

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

@@ -3,5 +3,5 @@
   <%= link_to t('hyrax.collection.actions.add_existing_works.label'),
               hyrax.my_works_path(add_works_to_collection: @form.id),
               title: t('hyrax.collection.actions.add_existing_works.desc'),
-              class: 'btn btn-default' %>
+              class: 'btn btn-secondary' %>
 </div>