hyrax 3.4.2 → 4.0.0.beta2

data/app/views/hyrax/my/works/_list_works.html.erb

@@ -7,14 +7,15 @@
 
   <td>
     <div class='media'>
-      <%= link_to [main_app, document], class: 'media-left' 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 } %>
+      <%= link_to [main_app, document], class: 'mr-2' do %>
+        <%= 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'>
-        <div class='media-heading'>
-
-          <%= link_to [main_app, document], id: "src_copy_link#{document.id}", class: 'document-title' do %>
+        <%= link_to [main_app, document], id: "src_copy_link#{document.id}", class: 'document-title' do %>
             <span class="sr-only">
               <%= t("hyrax.dashboard.my.sr.show_label") %>
             </span>
@@ -23,8 +24,6 @@
 
           <br />
           <%= render_collection_links(document) %>
-
-        </div>
       </div>
     </div>
   </td>

data/app/views/hyrax/my/works/_tabs.html.erb

@@ -1,13 +1,13 @@
+<% current_page_works = current_page?(hyrax.dashboard_works_path(locale: nil)) %>
 <ul class="nav nav-tabs" id="my_nav" role="list">
-  <li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_works_path(locale: nil)) %>>
+  <li<%= ' class="nav-item"'.html_safe if current_page_works %>>
     <% if params[:add_works_to_collection].present? && params[:add_works_to_collection_label].present? %>
-      <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path(add_works_to_collection: params[:add_works_to_collection], add_works_to_collection_label: params[:add_works_to_collection_label]) %>
+      <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path(add_works_to_collection: params[:add_works_to_collection], add_works_to_collection_label: params[:add_works_to_collection_label]), class: "nav-link#{' active' if current_page_works}" %>
     <% else %>
-      <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path %>
+      <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path, class: "nav-link#{' active' if current_page_works}" %>
     <% end %>
-    
   </li>
-  <li<%= ' class="active"'.html_safe if current_page?(hyrax.my_works_path(locale: nil)) %>>
-    <%= link_to t('hyrax.dashboard.my.your_works'), hyrax.my_works_path %>
+  <li<%= ' class="nav-item"'.html_safe if !current_page_works %>>
+    <%= link_to t('hyrax.dashboard.my.your_works'), hyrax.my_works_path, class: "nav-link#{' active' if !current_page_works}" %>
   </li>
 </ul>

data/app/views/hyrax/my/works/index.html.erb

@@ -16,20 +16,20 @@
 <% provide :page_header do %>
   <h1><span class="fa fa-file" aria-hidden="true"></span> <%= t("hyrax.admin.sidebar.works") %></h1>
   <% if current_ability.can_create_any_work? %>
-    <div class="pull-right">
+    <div class="float-right">
       <% if @create_work_presenter.many? %>
         <% if Flipflop.batch_upload? %>
           <%= link_to(
                 t(:'helpers.action.batch.new'),
                 '#',
-                data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'batch' },
+                data: { behavior: "select-work", toggle: 'modal', target: "#worktypes-to-create", 'create-type' => 'batch' },
                 class: 'btn btn-primary'
               ) %>
         <% end %>
         <%= link_to(
               t(:'helpers.action.work.new'),
               '#',
-              data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'single' },
+              data: { behavior: "select-work", toggle: 'modal', target: "#worktypes-to-create", 'create-type' => 'single' },
               id: 'add-new-work-button',
               class: 'btn btn-primary'
             ) %>
@@ -54,23 +54,25 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default <%= 'tabs' if current_page?(hyrax.dashboard_works_path(locale: nil)) || @managed_works_count > 0 %>">
+    <div class="<%= 'tabs' if current_page?(hyrax.dashboard_works_path(locale: nil)) || @managed_works_count > 0 %>">
       <%= render 'tabs' if current_page?(hyrax.dashboard_works_path(locale: nil)) || @managed_works_count > 0 %>
-      <div class="panel-heading">
-        <% if current_page?(hyrax.my_works_path(locale: nil)) %>
-          <span class="count-display"><%= I18n.t('hyrax.my.count.works.you_own', total_count: @response.total_count).html_safe %></span>
-        <% elsif current_page?(hyrax.dashboard_works_path(locale: nil)) && !current_ability.admin? %>
-          <span class="count-display"><%= I18n.t('hyrax.my.count.works.you_manage', total_count: @response.total_count).html_safe %></span>
-        <% else %>
-          <span class="count-display"><%= I18n.t('hyrax.my.count.works.in_repo', total_count: @response.total_count).html_safe %></span>
-        <% end %>
-      </div>
-      <div class="panel-body">
-        <%= render 'search_header' %>
-        <h2 class="sr-only"><%= t('hyrax.my.count.works.works_listing') %></h2>
-        <%= render 'document_list' %>
+      <div class="card">
+        <div class="card-header">
+          <% if current_page?(hyrax.my_works_path(locale: nil)) %>
+            <span class="count-display"><%= I18n.t('hyrax.my.count.works.you_own', total_count: @response.total_count).html_safe %></span>
+          <% elsif current_page?(hyrax.dashboard_works_path(locale: nil)) && !current_ability.admin? %>
+            <span class="count-display"><%= I18n.t('hyrax.my.count.works.you_manage', total_count: @response.total_count).html_safe %></span>
+          <% else %>
+            <span class="count-display"><%= I18n.t('hyrax.my.count.works.in_repo', total_count: @response.total_count).html_safe %></span>
+          <% end %>
+        </div>
+        <div class="card-body">
+          <%= render 'search_header' %>
+          <h2 class="sr-only"><%= t('hyrax.my.count.works.works_listing') %></h2>
+          <%= render 'document_list' %>
 
-        <%= render 'results_pagination' %>
+          <%= render 'results_pagination' %>
+        </div>
       </div>
     </div>
   </div>

data/app/views/hyrax/notifications/_notifications.html.erb

@@ -25,7 +25,7 @@
                       title: t('hyrax.mailbox.delete'),
                       method: :delete do %>
                   <span class="sr-only"><%= I18n.t('hyrax.dashboard.delete_notification') %></span>
-                <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
+                <i class="fa fa-trash" aria-hidden="true"></i>
                 <% end %>
             </td>
           </tr>

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

@@ -2,14 +2,14 @@
   <h1><span class="fa fa-bell"></span>  <%= t("hyrax.admin.sidebar.notifications") %></h1>
   <%= link_to hyrax.delete_all_notifications_path,
               method: :delete,
-              class: 'btn btn-danger pull-right',
+              class: 'btn btn-danger float-right',
               title: 'Delete all user notifications' do %>
-    <i class="glyphicon glyphicon-trash"></i> <%= t('hyrax.admin.sidebar.delete_all') %>
+    <i class="fa fa-trash"></i> <%= t('hyrax.admin.sidebar.delete_all') %>
   <% end %>
 <% end %>
 
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="card">
+  <div class="card-body">
     <%= render "notifications", messages: @messages %>
   </div>
 </div>

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

@@ -16,7 +16,7 @@
         <% @operations.each do |op| %>
           <tr>
             <td><%= link_to op.operation_type, hyrax.user_operation_path(params[:user_id], op) %></td>
-            <td><span class="label <%= op.status == 'failure' ? 'label-danger' : 'label-success' %>"><%= op.status %></span></td>
+            <td><span class="badge <%= op.status == 'failure' ? 'badge-danger' : 'badge-success' %>"><%= op.status %></span></td>
             <td>
               <relative-time datetime="<%= op.updated_at.getutc.iso8601 %>" title="<%= op.updated_at.to_formatted_s(:standard) %>">
                 <%= op.updated_at.to_formatted_s(:long_ordinal) %>

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

@@ -3,7 +3,7 @@
   <h1><%= @operation.operation_type %> status</h1>
 <% end %>
 
-<p><strong>Status:</strong> <span class="label <%= @operation.status == 'failure' ? 'label-danger' : 'label-success' %>"><%= @operation.status %></span></p>
+<p><strong>Status:</strong> <span class="badge <%= @operation.status == 'failure' ? 'badge-danger' : 'badge-success' %>"><%= @operation.status %></span></p>
 <p><strong>Message:</strong> <span class="message"><%= @operation.message %></span></p>
 
 <% if @operation.children.any? %>
@@ -19,7 +19,7 @@
           <% @operation.children.each do |op| %>
             <tr>
               <td><%= link_to op.operation_type, hyrax.user_operation_path(params[:user_id], op) %></td>
-              <td><span class="label <%= op.status == 'failure' ? 'label-danger' : 'label-success' %>"><%= op.status %></span></td>
+              <td><span class="badge <%= op.status == 'failure' ? 'badge-danger' : 'badge-success' %>"><%= op.status %></span></td>
               <td><%= op.message %></td>
             </tr>
           <% end %>

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

@@ -1,83 +1,95 @@
 <%= 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="#about" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.about_page') %></a>
+    <li class="nav-item">
+      <a href="#about" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.about_page') %>
+      </a>
     </li>
-    <li>
-      <a href="#help" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.help_page') %></a>
+    <li class="nav-item">
+      <a href="#help" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.help_page') %>
+      </a>
     </li>
-    <li>
-      <a href="#agreement" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.agreement_page') %></a>
+    <li class="nav-item">
+      <a href="#agreement" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.agreement_page') %>
+      </a>
     </li>
-    <li>
-      <a href="#terms" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.terms_page') %></a>
+    <li class="nav-item">
+      <a href="#terms" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.pages.tabs.terms_page') %>
+      </a>
     </li>
   </ul>
+
   <div class="tab-content">
-  <div id="about" class="tab-pane active">
-    <div class="panel panel-default labels">
-      <%= simple_form_for ContentBlock.for(:about), url: hyrax.page_path(ContentBlock.for(:about)), html: { class: 'nav-safety' } do |f| %>
-        <div class="panel-body">
-          <div class="field form-group">
-              <%= f.label :about %><br />
-              <%= f.text_area :about, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+    <div id="about" class="tab-pane show active">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:about), url: hyrax.page_path(ContentBlock.for(:about)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+                <%= f.label :about %><br />
+                <%= f.text_area :about, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
           </div>
-        </div>
-        <div class="panel-footer">
-          <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-          <%= f.button :submit, class: 'btn btn-primary pull-right' %>
-        </div>
-      <% end %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
     </div>
-  </div>
-  <div id="help" class="tab-pane">
-    <div class="panel panel-default labels">
-      <%= simple_form_for ContentBlock.for(:help), url: hyrax.page_path(ContentBlock.for(:help)), html: { class: 'nav-safety' } do |f| %>
-        <div class="panel-body">
-          <div class="field form-group">
-              <%= f.label :help %><br />
-              <%= f.text_area :help, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+    <div id="help" class="tab-pane">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:help), url: hyrax.page_path(ContentBlock.for(:help)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+                <%= f.label :help %><br />
+                <%= f.text_area :help, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
           </div>
-        </div>
-        <div class="panel-footer">
-          <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-          <%= f.button :submit, class: 'btn btn-primary pull-right' %>
-        </div>
-      <% end %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
     </div>
-  </div>
-  <div id="agreement" class="tab-pane">
-    <div class="panel panel-default labels">
-      <%= simple_form_for ContentBlock.for(:agreement), url: hyrax.page_path(ContentBlock.for(:agreement)), html: { class: 'nav-safety' } do |f| %>
-        <div class="panel-body">
-          <div class="field form-group">
-              <%= f.label :agreement %><br />
-              <%= f.text_area :agreement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+    <div id="agreement" class="tab-pane">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:agreement), url: hyrax.page_path(ContentBlock.for(:agreement)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+                <%= f.label :agreement %><br />
+                <%= f.text_area :agreement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
           </div>
-        </div>
-        <div class="panel-footer">
-          <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-          <%= f.button :submit, class: 'btn btn-primary pull-right' %>
-        </div>
-      <% end %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+          </div>
+        <% end %>
+      </div>
     </div>
-  </div>
-  <div id="terms" class="tab-pane">
-    <div class="panel panel-default labels">
-      <%= simple_form_for ContentBlock.for(:terms), url: hyrax.page_path(ContentBlock.for(:terms)), html: { class: 'nav-safety' } do |f| %>
-        <div class="panel-body">
-          <div class="field form-group">
-              <%= f.label :terms %><br />
-              <%= f.text_area :terms, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+    <div id="terms" class="tab-pane">
+      <div class="card labels">
+        <%= simple_form_for ContentBlock.for(:terms), url: hyrax.page_path(ContentBlock.for(:terms)), html: { class: 'nav-safety' } do |f| %>
+          <div class="card-body">
+            <div class="field form-group">
+                <%= f.label :terms %><br />
+                <%= f.text_area :terms, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
+          </div>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
-        </div>
-        <div class="panel-footer">
-          <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-          <%= f.button :submit, class: 'btn btn-primary pull-right' %>
-        </div>
-      <% end %>
+        <% end %>
+      </div>
     </div>
   </div>
+
 </div>
 <%= tinymce :content_block %>

data/app/views/hyrax/permissions/confirm.html.erb

@@ -1,14 +1,14 @@
-<div class="panel panel-default permissions-confirm">
-  <div class="panel-heading">
+<div class="card permissions-confirm">
+  <div class="card-header">
     <h4>Apply changes to contents?<h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
       <%= I18n.t("hyrax.upload.change_permissions_message_html",
         curation_concern_human_readable_type: curation_concern.human_readable_type,
         curation_concern: curation_concern,
         visibility_badge: visibility_badge(curation_concern.visibility)).html_safe %>
   </div>
-  <div class="form-actions panel-footer">
+  <div class="form-actions card-footer">
     <%= button_to "Yes please.", main_app.copy_hyrax_permission_path(curation_concern), class: 'btn btn-primary' %>
     <%= link_to "No. I'll update it manually.", [main_app, curation_concern], class: 'btn' %>
   </div>

data/app/views/hyrax/permissions/confirm_access.html.erb

@@ -1,11 +1,11 @@
-<div class="panel panel-default permissions-confirm">
-  <div class="panel-heading">
+<div class="card permissions-confirm">
+  <div class="card-header">
     <h4><%= I18n.t("hyrax.upload.change_access_title_html") %><h4>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
       <%= sanitize I18n.t("hyrax.upload.change_access_message_html", curation_concern: curation_concern) %>
   </div>
-  <div class="form-actions panel-footer">
+  <div class="form-actions card-footer">
     <%= button_to I18n.t("hyrax.upload.change_access_yes_message"), hyrax.copy_access_permission_path(curation_concern), class: 'btn btn-primary' %>
     <%= link_to I18n.t("hyrax.upload.change_access_no_message"), [main_app, curation_concern], class: 'btn' %>
   </div>

data/app/views/hyrax/stats/file.html.erb

@@ -13,7 +13,7 @@
   <div class="col-sm-12">
     <%= content_tag :h2, "File Analytics" %>
     <div class="alert alert-info">
-      <span class="glyphicon glyphicon-signal large-icon"></span>
+      <span class="fa fa-signal large-icon"></span>
       <%= content_tag :strong, @stats.total_pageviews %> views and <%= content_tag :strong, @stats.total_downloads %> downloads since <%= @stats.created.strftime("%B %-d, %Y") %>
     </div>
     <div class="stats-container">

data/app/views/hyrax/stats/work.html.erb

@@ -11,7 +11,7 @@
   <div class="col-sm-12">
     <%= content_tag :h2, "#{t('.header')}" %>
     <div class="alert alert-info">
-      <span class="glyphicon glyphicon-signal large-icon"></span>
+      <span class="fa fa-signal large-icon"></span>
         <%= t('total_view', count: @pageviews.range(Hyrax.config.analytics_start_date.to_date, Time.zone.today)) %>
         <%= t('download', count: @downloads.range(Hyrax.config.analytics_start_date.to_date, Time.zone.today)) %>
     </div>

data/app/views/hyrax/transfers/_received.html.erb

@@ -23,15 +23,15 @@
         <% if req.pending? %>
             <div class="btn-group">
               <button class="btn btn-sm btn-primary" href="#"><%= t(".accept") %></button>
-              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"><span class="caret"></span></button>
+              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"></button>
               <ul class="dropdown-menu">
-                <li>
+                <li class="dropdown-item">
                   <%= link_to t(".allow_depositor_to_retain_edit_access"), hyrax.accept_transfer_path(req), method: :put, class: 'accept-retain', title: t(".accept_the_file_and_allow_the_original_depositor_to_retain_access_to_edit_the_file_and_metadata") %>
                 </li>
-                <li>
+                <li class="dropdown-item">
                   <%= link_to t(".remove_depositor_access"), hyrax.accept_transfer_path(req, reset: true), method: :put, class: 'accept-reset', title: t(".accept_the_file_remove_access_from_the_original_depositor") %>
                 </li>
-                <li>
+                <li class="dropdown-item">
                   <%= link_to t(".authorize_depositor_as_proxy"), hyrax.accept_transfer_path(req, sticky: true), method: :put, class: 'accept-stick', title: t(".accept_the_file_and_allow_the_original_depositor_to_retain_access_and_authorize") %>
                 </li>
               </ul>
@@ -49,7 +49,7 @@
       <td><%= req.sender_comment %></td>
     </tr>
     <% else %>
-      <% Rails.logger.error "A proxy request has no sender: #{req.inspect}" %>
+      <% Hyrax.logger.error "A proxy request has no sender: #{req.inspect}" %>
     <% end %>
   <% end %>
   </tbody>

data/app/views/hyrax/transfers/_sent.html.erb

@@ -32,7 +32,7 @@
           <td><%= req.sender_comment %></td>
         </tr>
       <% else %>
-          <% Rails.logger.error "A proxy request has no receiver: #{req.inspect}" %>
+          <% Hyrax.logger.error "A proxy request has no receiver: #{req.inspect}" %>
       <% end %>
     <% end %>
   </tbody>

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

@@ -4,11 +4,11 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title h2"><%= t("hyrax.dashboard.transfers_sent") %></h2>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title h2"><%= t("hyrax.dashboard.transfers_sent") %></h2>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= @presenter.render_sent_transfers %>
       </div>
     </div>
@@ -17,11 +17,11 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title h2"><%= t("hyrax.dashboard.transfers_received") %></h2>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title h2"><%= t("hyrax.dashboard.transfers_received") %></h2>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= @presenter.render_received_transfers %>
       </div>
     </div>

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

@@ -5,7 +5,7 @@
 <span class="sr-only"><%= t(:'.sr_only_description', work_title: @proxy_deposit_request.to_s) %></span>
 
 <%= simple_form_for @proxy_deposit_request,
-             url: hyrax.work_transfers_path(@work) do |f| %>
+             url: hyrax.work_transfers_path(params[:id]) do |f| %>
   <%= f.input :transfer_to,
         placeholder: t(:'.placeholder') %>
   <%= f.input :sender_comment %>

data/app/views/hyrax/uploads/_js_templates.html.erb

@@ -1,5 +1,5 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
+<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
@@ -12,18 +12,18 @@
         </td>
         <td>
             <p class="size">Processing...</p>
-            <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
+            <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div></div>
         </td>
         <td class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
-                    <span class="glyphicon glyphicon-upload"></span>
+                    <span class="fa fa-upload"></span>
                     <span><%= t('.start') %></span>
                 </button>
             {% } %}
             {% if (!i) { %}
                 <button class="btn btn-sm btn-warning cancel">
-                    <span class="glyphicon glyphicon-ban-circle"></span>
+                    <span class="fa fa-ban"></span>
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
@@ -63,28 +63,28 @@
             </div>
             <div class="col-sm-6">
               {% if (file.error) { %}
-                  <div><span class="label label-danger">Error</span> {%=file.error%}</div>
+                  <div><span class="badge badge-danger">Error</span> {%=file.error%}</div>
               {% } %}
               <span class="size">{%=o.formatFileSize(file.size)%}</span>
-              <button class="btn btn-sm btn-danger delete pull-right" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="glyphicon glyphicon-trash"></span>
+              <button class="btn btn-sm btn-danger delete float-right" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
+                  <span class="fa fa-trash"></span>
                   <span><%= t('helpers.action.delete') %></span>
               </button>
             </div>
           </div>
           <div class="row">
-            <div class="col-sm-12 form-horizontal">
-              <div class="form-group">
-                <label for="title_{%=file.id%}" class="col-sm-5 control-label"><%= t('.display_label') %></label>
+            <div class="col-sm-12">
+              <div class="form-group row">
+                <label for="title_{%=file.id%}" class="col-sm-5 col-form-label"><%= t('.display_label') %></label>
                 <div class="col-sm-7 padding-bottom">
                   <input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
                 </div>
-                <label for="resource_type_{%=file.id%}" class="col-sm-5 control-label">Resource Type</label>
+                <label for="resource_type_{%=file.id%}" class="col-sm-5 col-form-label">Resource Type</label>
                 <div class="col-sm-7 padding-bottom">
                   <select class="form-control resource_type_dropdown" multiple="multiple" size="6" name="resource_type[{%=file.id%}][]" id="resource_type_{%=file.id%}" value="{%=file.name%}">
                     <%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
                   </select>
-                  <button class="btn btn-default pull-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;"><%= t('.set_all_to_this_resource_type') %></button>
+                  <button class="btn btn-secondary float-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;"><%= t('.set_all_to_this_resource_type') %></button>
                 </div>
               </div>
             </div>
@@ -116,7 +116,7 @@
                 <input type="hidden" name="uploaded_files[]" value="{%=file.id%}">
             </p>
             {% if (file.error) { %}
-                <div><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</div>
+                <div><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</div>
             {% } %}
         </td>
         <td>
@@ -124,7 +124,7 @@
         </td>
         <td class="text-right">
             <button class="btn btn-sm btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                <span class="glyphicon glyphicon-trash"></span>
+                <span class="fa fa-trash"></span>
                 <%= t('helpers.action.delete') %>
             </button>
         </td>

data/app/views/hyrax/uploads/_js_templates_branding.html.erb

@@ -1,7 +1,7 @@
 <!-- The template to display files available for upload -->
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade">
+    <tr class="template-upload fade show">
       <td>
         <span class="preview"></span>
       </td>
@@ -46,13 +46,13 @@
                   <input type="hidden" name="banner_files[]" value="{%=file.id%}">
                 </span>
                 {% if (file.error) { %}
-                  <span><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</span>
+                  <span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
                 {% } %}
               </div>
 
               <div class="col-sm-2">
                 <button class="btn btn-link remove branding-banner-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}" onclick=$("#banner").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="fa fa-times"></span>
                   <span class="controls-remove-text"><%= t('.remove') %></span>
                   <span class="sr-only">
                     <%= t('.previous') %>
@@ -88,7 +88,7 @@
                 </span>
 
                 {% if (file.error) { %}
-                    <span><span class="label label-danger">Error</span> {%=file.error%}</span>
+                    <span><span class="badge badge-danger">Error</span> {%=file.error%}</span>
                 {% } %}
               </div>
 
@@ -104,7 +104,7 @@
               <div class="col-sm-2 text-right">
                 <span class="input-group-btn field-controls">
             <button class="btn btn-sm btn-danger delete branding-logo-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                    <span class="glyphicon glyphicon-remove"></span>
+                    <span class="fa fa-times"></span>
                     <span class="controls-remove-text">Remove</span>
                     <span class="sr-only">
                       <%= t('.previous') %>