hyrax 3.4.2 → 4.0.0.beta2

data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb

@@ -9,26 +9,26 @@
     <div class="collection-reports">
 
 <% if Hyrax.config.analytics? %>
-      <div class="panel panel-default">
-        <div class="panel-heading"><%= t('.repo_summary') %> <b><%= pluralize(Collection.count, "collection") %></b>, <%= t('.repo_summary_2') %> <b><%= @pageviews.all %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all %> <%= t('.downloads') %></b>.</div>
-        <div class="panel-body">
+      <div class="card">
+        <div class="card-header"><%= t('.repo_summary') %> <b><%= pluralize(Collection.count, "collection") %></b>, <%= t('.repo_summary_2') %> <b><%= @pageviews.all %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all %> <%= t('.downloads') %></b>.</div>
+        <div class="card-body">
       
                <div class="row text-center">
                 <div class="nav nav-pills btn-group" role="group">
                     <% if params[:start_date] %>
-                     <a button id='summary-btn' class="btn btn-default nav-link" type="button" href="#summary" data-toggle="pill">
+                     <a button id='summary-btn' class="btn btn-secondary nav-link" type="button" href="#summary" data-toggle="pill">
                     <% else %>
                      <a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
                     <% end %>
                         <%= t('.summary') %>
                      </a>
-                      <a button id='monthly-btn' class="btn btn-default nav-link" type="button" href="#monthly" data-toggle="pill">
+                      <a button id='monthly-btn' class="btn btn-secondary nav-link" type="button" href="#monthly" data-toggle="pill">
                         <%= t('.monthly') %>
                       </a>
                     <% if params[:start_date] %>
                       <a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
                     <% else %>
-                      <a button id='range-btn' class="btn btn-default nav-link" type="button" href="#custom-range" data-toggle="pill">
+                      <a button id='range-btn' class="btn btn-secondary nav-link" type="button" href="#custom-range" data-toggle="pill">
                     <% end %>
                         <%= t('.custom_range') %>
                       </a>

data/app/views/hyrax/admin/analytics/collection_reports/show.html.erb

@@ -2,7 +2,7 @@
 
 <% provide :page_header do %>
   <h1><span class="fa fa-bar-chart" aria-hidden="true"></span> <%= t('.title') %>
-  <%= link_to "#{t('.return_to_btn')}", admin_analytics_collection_reports_path, class: "btn btn-primary pull-right" %>
+  <%= link_to "#{t('.return_to_btn')}", admin_analytics_collection_reports_path, class: "btn btn-primary float-right" %>
   </h1>
   <br>
 <% end %>
@@ -11,23 +11,23 @@
   <div class="col-sm-12">
     <div class="collection-reports">
 
-      <div class="panel panel-default">
-        <div class="panel-heading">
+      <div class="card">
+        <div class="card-header">
           <div class="col-sm-10">
             <h3><%= @document %></h3>
           </div>
           <div class="col-sm-2">
-            <%= link_to "#{t('.view_collection_btn')}", collection_path(@document.id), class: "btn btn-default pull-right" %>
+            <%= link_to "#{t('.view_collection_btn')}", collection_path(@document.id), class: "btn btn-secondary float-right" %>
           </div>
         </div>
 
-        <div class="panel-body">
+        <div class="card-body">
           <div class="row">
-            <div class="col-xs-12 col-md-5">
+            <div class="col-12 col-md-5">
               <p><%= t('.created_by') %> <b><%= @document.depositor %></b> on <b><%= @document.create_date %></b></p>
               <p><%= t('.collection_type') %> <b><%= @document.collection_type_gid %></b></p>
             </div>
-            <div class="col-xs-12 col-md-5">
+            <div class="col-12 col-md-5">
               <p><%= t('.last_updated') %> <b><%= @document.modified_date.strftime("%B %d, %Y") %></b></p>
               <p><%= t('.visibility') %> <b><%= @document.read_groups.join(",") %></b></p>
             </div>
@@ -38,19 +38,19 @@
             <div class="row text-center">
         <div class="nav nav-pills btn-group" role="group">
             <% if params[:start_date] %>
-              <a button id='summary-btn' class="btn btn-default nav-link" type="button" href="#summary" data-toggle="pill">
+              <a button id='summary-btn' class="btn btn-secondary nav-link" type="button" href="#summary" data-toggle="pill">
             <% else %>
               <a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
             <% end %>
                 <%= t('.summary') %>
               </a>
-              <a button id='monthly-btn' class="btn btn-default nav-link" type="button" href="#monthly" data-toggle="pill">
+              <a button id='monthly-btn' class="btn btn-secondary nav-link" type="button" href="#monthly" data-toggle="pill">
                 <%= t('.monthly') %>
               </a>
             <% if params[:start_date] %>
               <a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
             <% else %>
-              <a button id='range-btn' class="btn btn-default nav-link" type="button" href="#custom-range" data-toggle="pill">
+              <a button id='range-btn' class="btn btn-secondary nav-link" type="button" href="#custom-range" data-toggle="pill">
             <% end %>
                 <%= t('.custom_range') %>
               </a>

data/app/views/hyrax/admin/analytics/work_reports/_custom_range.html.erb

@@ -1,6 +1,6 @@
-<div class="panel panel-default">
-  <div class="panel-heading"><h4><%= t('.summary_heading') %></h4></div>
-  <div class="panel-body">
+<div class="card">
+  <div class="card-header"><h4><%= t('.summary_heading') %></h4></div>
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
         <tr>

data/app/views/hyrax/admin/analytics/work_reports/_monthly_summary.html.erb

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     <h4><%= t('.monthly_subtitle') %> <%= Time.zone.today.strftime("%B %Y") %></h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
       <tr>

data/app/views/hyrax/admin/analytics/work_reports/_summary.html.erb

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     <h4><%= t('.subtitle') %></h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
         <tr>

data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     <h4><%= t('.top_downloads')%></h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
       <tr>
@@ -22,8 +22,8 @@
       </tbody>
     </table>
   </div>
-  <div class="panel-footer">
-    <div class="pull-right">
+  <div class="card-footer">
+    <div class="float-right">
      <%= paginate @top_file_set_downloads %> 
     </div>
   </div>

data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb

@@ -1,13 +1,13 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
    <h4><%= t('.top_works') %>
-      <div class="btn-group pull-right">
-        <%= link_to "#{t('.export')}", admin_analytics_work_reports_path(start_date: @start_date, end_date: @end_date, format: :csv, disposition: "attachment"), class: "btn btn-default" %>
+      <div class="btn-group float-right">
+        <%= link_to "#{t('.export')}", admin_analytics_work_reports_path(start_date: @start_date, end_date: @end_date, format: :csv, disposition: "attachment"), class: "btn btn-secondary" %>
       </div>
   </h4>
   </div>
 
-  <div class="panel-body">
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
         <tr>
@@ -31,8 +31,8 @@
   </div>
   
 
-  <div class="panel-footer">
-    <div class="pull-right">
+  <div class="card-footer">
+    <div class="float-right">
       <%= paginate @top_works %>
     </div>
   </div>

data/app/views/hyrax/admin/analytics/work_reports/_work_counts.html.erb

@@ -1,16 +1,16 @@
 <div class="row">
-  <div class="col-xs-12 work-counts">
-    <div class="work-count-border col-sm-2 col-sm-offset-3 pull-left text-center">
+  <div class="col-12 work-counts">
+    <div class="work-count-border col-sm-2 offset-sm-3 float-left text-center">
        <% @file_sizes_total_bytes = @file_sizes.inject(0, :+) %>
        <% @file_size_total = (@file_sizes_total_bytes / 1.0.megabyte).round(2) %>
       <h4 class="work-count-title"><%= @file_size_total %>MB</p>
       <p><%= t('.total_size') %></p>
     </div>
-    <div class="work-count-border col-sm-2 pull-left text-center">
+    <div class="work-count-border col-sm-2 float-left text-center">
       <h4 class="work-count-title"></p>
       <p><%= t('.child_works') %></p>
     </div>
-    <div class="work-count-border col-sm-2 pull-left text-center">
+    <div class="work-count-border col-sm-2 float-left text-center">
       <h4 class="work-count-title"><%= @files.count %></p>
       <p><%= t('.files') %></p>
     </div>

data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb

@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     <h4><%= t('.title') %></h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <table class="table table-striped">
       <thead>
       <tr>
@@ -28,8 +28,8 @@
       </tbody>
     </table>
   </div>
-  <div class="panel-footer">
-    <div class="pull-right">
+  <div class="card-footer">
+    <div class="float-right">
      <%= paginate @files %> 
     </div>
   </div>

data/app/views/hyrax/admin/analytics/work_reports/index.html.erb

@@ -8,31 +8,31 @@
   <div class="col-sm-12">
     <div class="work-reports">
 
-    <div class="panel panel-default">
+    <div class="card">
     <% if Hyrax.config.analytics? %>
       <% if current_user.ability.admin? %>
-        <div class="panel-heading"><b><%= @works_count %> <%= t('.works') %></b> <%= t('.repo_summary') %> <b><%= @pageviews.all if @pageviews %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all if @downloads %> <%= t('.downloads') %></b>.</div>
+        <div class="card-header"><b><%= @works_count %> <%= t('.works') %></b> <%= t('.repo_summary') %> <b><%= @pageviews.all if @pageviews %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all if @downloads %> <%= t('.downloads') %></b>.</div>
       <% else %>
-        <div class="panel-heading"><%= t('.access_to') %> <b><%= @works_count %> <%= t('.works') %></b>.</div>
+        <div class="card-header"><%= t('.access_to') %> <b><%= @works_count %> <%= t('.works') %></b>.</div>
       <% end %>
-        <div class="panel-body">
+        <div class="card-body">
               <% if current_user.ability.admin? %>
               <div class="row text-center">
                 <div class="nav nav-pills btn-group" role="group">
                     <% if params[:start_date] %>
-                     <a button id='summary-btn' class="btn btn-default nav-link" type="button" href="#summary" data-toggle="pill">
+                     <a button id='summary-btn' class="btn btn-secondary nav-link" type="button" href="#summary" data-toggle="pill">
                     <% else %>
                      <a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
                     <% end %>
                         <%= t('.summary') %>
                      </a>
-                      <a button id='monthly-btn' class="btn btn-default nav-link" type="button" href="#monthly" data-toggle="pill">
+                      <a button id='monthly-btn' class="btn btn-secondary nav-link" type="button" href="#monthly" data-toggle="pill">
                         <%= t('.monthly') %>
                       </a>
                     <% if params[:start_date] %>
                       <a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
                     <% else %>
-                      <a button id='range-btn' class="btn btn-default nav-link" type="button" href="#custom-range" data-toggle="pill">
+                      <a button id='range-btn' class="btn btn-secondary nav-link" type="button" href="#custom-range" data-toggle="pill">
                     <% end %>
                         <%= t('.custom_range') %>
                       </a>

data/app/views/hyrax/admin/analytics/work_reports/show.html.erb

@@ -2,7 +2,7 @@
 
 <% provide :page_header do %>
   <h1><span class="fa fa-bar-chart" aria-hidden="true"></span> <%= t('.title') %>
-  <%= link_to "#{t('.return_to_btn')}", admin_analytics_work_reports_path, class: "btn btn-primary pull-right" %>
+  <%= link_to "#{t('.return_to_btn')}", admin_analytics_work_reports_path, class: "btn btn-primary float-right" %>
   </h1>
   <br>
 <% end %>
@@ -10,47 +10,47 @@
 <div class="row">
   <div class="col-sm-12">
     <div class="work-reports">
-    
-      <div class="panel panel-default">
-        <div class="panel-heading">
+
+      <div class="card">
+        <div class="card-header">
           <div class="col-sm-10">
             <h3><%= @document %></h3>
           </div>
           <div class="col-sm-2">
-            <%= link_to "#{t('.view_work_btn')}", [main_app, @document], class: "btn btn-default pull-right" %>
+            <%= link_to "#{t('.view_work_btn')}", [main_app, @document], class: "btn btn-secondary float-right" %>
           </div>
         </div>
-        <div class="panel-body">
+        <div class="card-body">
           <div class="row">
-            <div class="col-xs-12 col-md-5">
-              <p><%= t('.deposited_by') %> <b><%= @document.depositor %></b> on <b><%= @document.date_uploaded.strftime("%Y-%m-%d") %></b></p>
+            <div class="col-12 col-md-5">
+              <p><%= t('.deposited_by') %> <b><%= @document.depositor %></b> on <b><%= cast_to_date_time_format(@document.date_uploaded, format: "%Y-%m-%d") %></b></p>
               <p><%= t('.work_type') %> <b><%= @document.human_readable_type %></b></p>
               <p><%= t('.resource_type') %> <b><%= @document.resource_type.join(", ") %></b></p>
             </div>
-            <div class="col-xs-12 col-md-5">
+            <div class="col-12 col-md-5">
               <p><%= t('.status') %> <b><%= @document.workflow_state %></b></p>
               <p><%= t('.visibility') %> <b><%= @document.visibility %></b></p>
             </div>
           </div>
         </div>
       </div>
-          
+
       <div class="row text-center">
         <div class="nav nav-pills btn-group" role="group">
             <% if params[:start_date] %>
-              <a button id='summary-btn' class="btn btn-default nav-link" type="button" href="#summary" data-toggle="pill">
+              <a button id='summary-btn' class="btn btn-secondary nav-link" type="button" href="#summary" data-toggle="pill">
             <% else %>
               <a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
             <% end %>
                 <%= t('.summary') %>
               </a>
-              <a button id='monthly-btn' class="btn btn-default nav-link" type="button" href="#monthly" data-toggle="pill">
+              <a button id='monthly-btn' class="btn btn-secondary nav-link" type="button" href="#monthly" data-toggle="pill">
                 <%= t('.monthly') %>
               </a>
             <% if params[:start_date] %>
               <a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
             <% else %>
-              <a button id='range-btn' class="btn btn-default nav-link" type="button" href="#custom-range" data-toggle="pill">
+              <a button id='range-btn' class="btn btn-secondary nav-link" type="button" href="#custom-range" data-toggle="pill">
             <% end %>
                 <%= t('.custom_range') %>
               </a>
@@ -69,7 +69,7 @@
             <div class="tab-pane" id="monthly">
               <%= render "monthly_summary" %>
             </div>
-            
+
           <% if params[:start_date] %>
             <div class="tab-pane active" id="custom-range">
           <% else %>
@@ -79,12 +79,12 @@
               <%= render "custom_range" %>
             </div>
         </div>
-         
+
           <% unless @files.nil? %>
             <%= render "work_files" %>
             <%= render "work_counts" %>
          <% end %>
-         
+
     </div>
   </div>
 </div>

data/app/views/hyrax/admin/appearances/show.html.erb

@@ -2,8 +2,8 @@
   <h1><span class="fa fa-paint-brush" aria-hidden="true"></span> <%= t('.header') %></h1>
 <% end %>
 
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="card">
+  <div class="card-body">
     <%= simple_form_for @form, url: admin_appearance_path do |f| %>
       <%= f.input :header_background_color, required: false, input_html: { type: 'color' } %>
       <%= f.input :header_text_color, required: false, input_html: { type: 'color' } %>

data/app/views/hyrax/admin/collection_types/_form.html.erb

@@ -1,18 +1,18 @@
 <%= render "shared/nav_safety_modal" %>
-<div class="panel panel-default tabs" id="collection-types-controls">
+<div class="card tabs" id="collection-types-controls">
   <ul class="nav nav-tabs" role="tablist">
-    <li class="active">
-      <a href="#metadata" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.metadata') %></a>
+    <li class="nav-item">
+      <a href="#metadata" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.metadata') %></a>
     </li>
     <% if @form.persisted? %>
-      <li>
-        <a href="#settings" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.settings') %></a>
+      <li class="nav-item">
+        <a href="#settings" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.settings') %></a>
       </li>
-      <li>
-        <a href="#participants" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.participants') %></a>
+      <li class="nav-item">
+        <a href="#participants" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.participants') %></a>
       </li>
-      <li>
-        <a href="#appearance" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.appearance') %></a>
+      <li class="nav-item">
+        <a href="#appearance" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.appearance') %></a>
       </li>
     <% end %>
   </ul>
@@ -20,25 +20,25 @@
   <%= simple_form_for @form, url: form_url, as: :collection_type, html: {class: 'nav-safety'} do |f| %>
     <div class="tab-content">
       <% if @collection_type.admin_set? %>
-        <div id="metadata" class="tab-pane active">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
+        <div id="metadata" class="tab-pane show active">
+          <div class="card labels">
+            <div class="card-body">
               <%= render 'form_metadata_admin_set', f: f %>
             </div>
           </div>
         </div>
       <% else %>
-        <div id="metadata" class="tab-pane active">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
+        <div id="metadata" class="tab-pane show active">
+          <div class="card labels">
+            <div class="card-body">
               <%= render 'form_metadata', f: f %>
             </div>
           </div>
         </div>
       <% end %>
       <div id="settings" class="tab-pane">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
+        <div class="card labels">
+          <div class="card-body">
             <%= render 'form_settings', f: f %>
           </div>
         </div>
@@ -46,24 +46,25 @@
       <% # end of form %>
       <% # TODO: The participants partial can't sit inside the other form, moved down here temporarily %>
       <div id="participants" class="tab-pane">
-        <div class="panel panel-default labels collection-types-edit-participants-tab">
-          <div class="panel-body">
+        <div class="card labels collection-types-edit-participants-tab">
+          <div class="card-body">
             <%= render 'form_participants' %>
           </div>
         </div>
       </div>
       <div id="appearance" class="tab-pane">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
+        <div class="card labels">
+          <div class="card-body">
             <%= render 'form_appearance', f: f %>
           </div>
         </div>
       </div>
-      <div class="panel-footer">
+      <div class="card-footer">
         <% if params[:action] == "new" %>
           <%= f.submit t(:'hyrax.admin.collection_types.new.submit'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection_type" %>
         <% else %>
-          <%= f.submit t(:'hyrax.admin.collection_types.edit.submit'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection_type" %>
+          <%= f.submit t(:'hyrax.admin.collection_types.edit.submit'), 
+            class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection_type", form: 'edit_collection_type' %>
         <% end %>
         <%= link_to t(:'helpers.action.cancel'), hyrax.admin_collection_types_path, class: 'btn btn-link' %>
       </div>

data/app/views/hyrax/admin/collection_types/_form_appearance.html.erb

@@ -1,5 +1,5 @@
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="card">
+  <div class="card-body">
       <%= f.input :badge_color, required: false, input_html: { type: 'color' } %>
   </div>
 </div>

data/app/views/hyrax/admin/collection_types/_form_participants.html.erb

@@ -11,9 +11,9 @@
                           html: { id: 'group-participants-form' },
                           as: :collection_type_participant do |f| %>
             <div class="form-inline add-participants-form">
-            <label class="col-md-2 col-xs-4 control-label"><%= t('.add_group') %>:</label>
+            <label class="col-md-2 col-4 col-form-label"><%= t('.add_group') %>:</label>
 
-            <div class="col-md-10 col-xs-8 form-group">
+            <div class="col-md-10 col-8 form-group">
               <%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
               <%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::GROUP_TYPE %>
               <%= f.text_field :agent_id,
@@ -38,9 +38,9 @@
                           html: { id: 'user-participants-form' },
                           as: :collection_type_participant do |f| %>
             <div class="form-inline add-participants-form">
-              <label class="col-md-2 col-xs-4 control-label"><%= t('.add_user') %>:</label>
+              <label class="col-md-2 col-4 col-form-label"><%= t('.add_user') %>:</label>
 
-              <div class="col-md-10 col-xs-8 form-group">
+              <div class="col-md-10 col-8 form-group">
                 <%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
                 <%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::USER_TYPE %>
                 <%= f.text_field :agent_id,

data/app/views/hyrax/admin/collection_types/_form_settings.html.erb

@@ -12,25 +12,25 @@
     <div class="collection-type-share-applies-to">
       <div id="sharable-applies-to-new-works-setting-checkbox-container"
            class="form-group boolean optional collection_type_share_applies_to_new_works <%= 'disabled' if f.object.share_options_disabled? %>">
-        <div class="checkbox">
+        <div class="form-check">
           <input value="0"
                  name="collection_type[share_applies_to_new_works]"
                  type="hidden"
                  <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %> />
+          <input id="collection_type_share_applies_to_new_works" <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %>
+                 class="form-check-input boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
+                 value="1"
+                 <%= "checked=\"checked\"".html_safe if f.object.share_applies_to_new_works %>"
+                 name="collection_type[share_applies_to_new_works]"
+                 type="checkbox" />
           <label id="sharable-applies-to-new-works-setting-label"
-                 class="boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
+                 class="form-check-label boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
                  for="collection_type_share_applies_to_new_works">
-            <input id="collection_type_share_applies_to_new_works" <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %>
-                   class="boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
-                   value="1"
-                   <%= "checked=\"checked\"".html_safe if f.object.share_applies_to_new_works %>"
-                   name="collection_type[share_applies_to_new_works]"
-                   type="checkbox" />
             APPLY TO NEW WORKS
           </label>
         </div>
-        <p class="help-block"><%= t('simple_form.hints.collection_type.share_applies_to_new_works') %></p>
       </div>
+      <p class="form-text"><%= t('simple_form.hints.collection_type.share_applies_to_new_works') %></p>
     </div>
     <p><%= f.input :allow_multiple_membership, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
     <p><%= f.input :require_membership, as: :boolean, disabled: true %></p>

data/app/views/hyrax/admin/collection_types/index.html.erb

@@ -4,16 +4,16 @@
     <h1><span class="fa fa-folder-open" aria-hidden="true"></span> <%= t('.header') %></h1>
   <% end %>
 
-  <div class="panel panel-default">
-    <div class="panel-heading adam">
-      <span class="panel-heading-message">
+  <div class="card">
+    <div class="card-header adam">
+      <span class="card-header-message">
         <strong><%= pluralize(@collection_types.size, 'collection type') %> </strong> in this repository
       </span>
       <%= link_to hyrax.new_admin_collection_type_path, class: 'btn btn-primary' do %>
         <%= t('.create_new_button') %>
       <% end %>
     </div>
-    <div class="panel-body">
+    <div class="card-body">
       <p><%= t('.description') %></p>
 
       <p><a class="collapse-header" data-toggle="collapse" href="#collapseAbout" aria-expanded="false" aria-controls="collapseAbout" data-expand-text="<%= t('helpers.action.more')%>" data-collapse-text="<%= t('helpers.action.less')%>"><%= t('.more_toggle_header_html') %></a></p>
@@ -62,7 +62,7 @@
           <%= t('.modal.can_delete_body_html') %>
         </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 confirm-delete-collection-type"><%= t('helpers.action.delete') %></button>
         </div>
       </div>
@@ -78,7 +78,7 @@
           <%= t('.modal.cannot_delete_body_html') %>
         </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>
     <%= link_to  t('.modal.view_collections'), hyrax.my_collections_path, class: 'btn btn-primary view-collections-of-this-type', data_dismiss: 'modal' %>
         </div>
       </div>

data/app/views/hyrax/admin/features/index.html.erb

@@ -3,8 +3,8 @@
 <% end %>
 <div class="flip row">
   <div class="col-md-12">
-    <div class="panel">
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-body">
         <div class="table-responsive">
           <table class="table table-striped">
             <thead>
@@ -30,7 +30,7 @@
               <% features.each do |feature| %>
               <tr data-feature="<%= feature.name.dasherize.parameterize %>">
                 <td class="status">
-                  <span class="<%= @feature_set.status(feature) -%>"><%= @feature_set.status(feature) -%></span>
+                  <span class="badge badge-<%= @feature_set.status(feature) -%>"><%= @feature_set.status(feature) -%></span>
                 </td>
                 <td class="name"><%= feature.name.humanize -%></td>
                 <td class="description"><%= feature.description -%></td>

data/app/views/hyrax/admin/stats/_new_users.html.erb

@@ -1,7 +1,7 @@
 <h3>Newest Users (<%= @presenter.date_filter_string %>)</h3>
 <h4>
 <%- if !@presenter.start_date.blank? %>
-  Total: <%= @presenter.recent_users.count %></div>
+  Total: <%= @presenter.recent_users.count %>
 <%- else %>
     <%= @presenter.recent_users.count %> most recent users:
 <%- end %>