hyrax 3.0.0.pre.beta3 → 3.0.0

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

@@ -8,12 +8,12 @@
   data-post-delete-url="<%= hyrax.dashboard_collection_path(id) %>">
 
     <div class="collection-title-row-content">
-      <h3 class="collection-title">
+      <h2 class="collection-title">
         <% # List multiple titles %>
         <% presenter.title.each_with_index do |title, index| %>
           <span><%= title %></span>
         <% end %>
-      </h3>
+      </h2>
       <%= presenter.permission_badge %>
       <%= presenter.collection_type_badge %>
     </div>

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

@@ -16,7 +16,7 @@
       <th><%= t("hyrax.dashboard.my.heading.access") %></th>
     <% end %>
     <th><%= t("hyrax.dashboard.my.heading.type") %></th>
-    <th><%= t("hyrax.dashboard.my.heading.visibility") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.collection.visibility") %></th>
     <th><%= t("hyrax.dashboard.my.heading.items") %></th>
     <th><%= t("hyrax.dashboard.my.heading.last_modified") %></th>
     <th><%= t("hyrax.dashboard.my.heading.action") %></th>

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

@@ -14,7 +14,7 @@
                 <legend><%= t("hyrax.collection.select_form.select_heading") %></legend>
               <ul>
                 <% if @add_works_to_collection.present? %>
-                  <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, disabled: true %>
+                  <%= text_field_tag 'member_of_collection_label', @add_works_to_collection_label, size: '90', disabled: true %>
                   <%= hidden_field_tag 'member_of_collection_ids', @add_works_to_collection %>
                 <% else %>
                   <%= text_field_tag 'member_of_collection_ids', nil,

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

@@ -7,6 +7,7 @@
   data-post-delete-url="<%= is_admin_set ? hyrax.admin_admin_set_path(id) : hyrax.dashboard_collection_path(id) %>">
 
   <td>
+    <label class="sr-only" for="batch_document_<%= id %>"><%= t('hyrax.dashboard.my.sr.batch_checkbox') %></label>
     <% if collection_presenter.allow_batch? %>
     <input type="checkbox" name="batch_document_ids[]" id="batch_document_<%= id %>" value="<%= id %>" class="batch_document_selector"
       data-hasaccess="<%= (can?(:edit, collection_presenter.solr_document)) %>" />
@@ -18,9 +19,9 @@
     <div class="thumbnail-title-wrapper">
       <div class="thumbnail-wrapper">
         <% if (collection_presenter.thumbnail_path == nil) %>
-          <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-small"></span>
+          <span class="<%= Hyrax::ModelIcon.css_class_for(::Collection) %> collection-icon-small"></span>
         <% else %>
-          <%= image_tag(collection_presenter.thumbnail_path) %>
+          <%= image_tag(collection_presenter.thumbnail_path, alt: "#{collection_presenter.title_or_label} #{t('hyrax.dashboard.my.sr.thumbnail')}") %>
         <% end %>
       </div>
       <%= link_to collection_presenter.show_path do %>

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

@@ -7,7 +7,7 @@
 
   <td>
     <div class='media'>
-      <%= link_to [main_app, document], class: 'media-left', 'aria-hidden' => true do %>
+      <%= link_to [main_app, document], class: 'media-left', 'aria-hidden': true do %>
         <%= render_thumbnail_tag document, { class: 'hidden-xs file_listing_thumbnail' }, { suppress_link: true } %>
       <% end %>
 

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

@@ -1,7 +1,7 @@
 <h2 class="sr-only"><%= t('.descriptions') %></h2>
 <dl class="dl-horizontal metadata-collections">
-  <% present_terms(@presenter, @presenter.terms_with_values) do |r, term| %>
-      <dt><%= r.label(term) %></dt>
-      <dd><%= r.value(term) %></dd>
+  <% @presenter.terms_with_values.each do |field_name| %>
+    <dt><%= collection_metadata_label(@presenter, field_name) %></dt>
+    <dd><%= collection_metadata_value(@presenter, field_name) %></dd>
   <% end %>
 </dl>

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

@@ -2,7 +2,7 @@
   <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><%= t('.select') %> <span class="caret"></span>
   </button>
   <ul class="dropdown-menu dropdown-menu-right">
-    <% if can? :edit, document %>
+    <% if can?( :edit, document ) && !workflow_restriction?(@presenter) %>
       <li>
         <%= link_to [main_app, :edit, document],
                     class: "itemicon itemedit",

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

@@ -7,8 +7,8 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], class: "media-left" do %>
-        <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
+      <%= 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 }, { suppress_link: true } %>
       <% end %>
       <div class="media-body">
         <p class="media-heading">

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

@@ -8,16 +8,16 @@
     </div>
   <% end %>
 
-  <% if show_sort_and_per_page? && active_sort_fields.many? %>
+  <% if show_sort_and_per_page? && collection_member_sort_fields.many? %>
     <div class="sort-toggle">
       <%= form_tag dashboard_collection_path(collection), method: :get, class: 'per_page form-horizontal' do %>
          <div class="form-group form-group-lg">
            <fieldset class="col-sm-9">
              <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
              <%= label_tag(:sort, t(".sort_by")) %>
-             <%= select_tag(:sort, options_from_collection_for_select(active_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
+             <%= select_tag(:sort, options_from_collection_for_select(collection_member_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
              <%= label_tag(:per_page) do %>
-               <%= t(".show_par_page_html", select: select_tag(:per_page, options_for_select(['10', '20', '50', '100'], params[:per_page]), title: t('hyrax.dashboard.my.sr.results_per_page'))) %>
+               <%= t(".show_par_page_html", select: select_tag(:per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page, params[:per_page]), title: t('hyrax.dashboard.my.sr.results_per_page'))) %>
              <% end %>
              <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
              <button class="btn btn-info"><span class="glyphicon glyphicon-refresh"></span> <%= t('helpers.action.refresh') %></button>

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

@@ -1,7 +1,7 @@
-<% provide :page_title, construct_page_title( t('.header', type_title: @collection.collection_type.title, title: @form.title) ) %>
+<% provide :page_title, construct_page_title( t('.header', type_title: @collection.collection_type.title, title: @form.title.first) ) %>
 
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit" aria-hidden="true"></span><%= t('.header', type_title: @collection.collection_type.title, title: @form.title) %></h1>
+  <h1><span class="fa fa-edit" aria-hidden="true"></span><%= t('.header', type_title: @collection.collection_type.title, title: @form.title.first) %></h1>
 <% end %>
 
 <div class="row">

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

@@ -31,7 +31,7 @@
               <%= render 'hyrax/collections/collection_description', presenter: @presenter %>
             </section>
 
-            <% unless has_collection_search_parameters? %>
+            <% unless collection_search_parameters? %>
               <%= render 'show_descriptions' %>
             <% end %>
           </div>
@@ -43,9 +43,10 @@
       <% if @members_count > 0 || @presenter.subcollection_count > 0 %>
           <div class="hyc-blacklight hyc-bl-title">
             <h2>
-              <% if has_collection_search_parameters? %>
+              <% if collection_search_parameters? %>
                   <%= t('hyrax.dashboard.collections.show.search_results') %>
               <% end %>
+              <p class="sr-only"><%= t('hyrax.dashboard.collections.show.search_results') %></p>
             </h2>
           </div>
       <% end %>
@@ -63,12 +64,12 @@
       <!-- Subcollections -->
       <% if @presenter.collection_type_is_nestable? %>
         <section id="sub-collections-wrapper" class="sub-collections-wrapper">
-          <h4><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h4>
+          <h3><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h3>
           <div class="row">
             <div class="col-md-7">
               <%= render 'subcollection_list', id: @presenter.id, collection: @subcollection_docs %>
             </div>
-            <% unless has_collection_search_parameters? %>
+            <% unless collection_search_parameters? %>
               <div class="col-md-5">
                 <%= render 'show_subcollection_actions', presenter: @presenter %>
               </div>
@@ -79,8 +80,8 @@
 
       <!-- Works -->
       <section class="works-wrapper">
-        <h4><%= t('.item_count') %> (<%= @members_count %>)</h4>
-        <% unless has_collection_search_parameters? %>
+        <h3><%= t('.item_count') %> (<%= @members_count %>)</h3>
+        <% unless collection_search_parameters? %>
           <%= render 'show_add_items_actions', presenter: @presenter %>
         <% end %>
 
@@ -93,12 +94,12 @@
   </section><!-- /collections-panel-wrapper -->
 </div><!-- /collections-wrapper -->
 
-<% if @presenter.collection_type_is_nestable? && !has_collection_search_parameters? %>
+<% if @presenter.collection_type_is_nestable? && !collection_search_parameters? %>
   <%= render 'hyrax/my/collections/modal_add_to_collection', source: 'show' %>
   <%= render 'hyrax/my/collections/modal_add_subcollection', id: @presenter.id, source: 'show' %>
   <%= render 'hyrax/dashboard/collections/modal_parent_collection_remove_deny', source: 'show' %>
 <% end %>
 
-<% unless has_collection_search_parameters? %>
+<% unless collection_search_parameters? %>
   <%= render '/shared/select_work_type_modal', create_work_presenter: @presenter.create_work_presenter if @presenter.draw_select_work_modal? %>
 <% end %>

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

@@ -6,7 +6,7 @@
   <div class="col-md-3">
     <div class="panel panel-default">
       <div class="panel-heading">
-        <h3 class="panel-title text-center"><%= t('.registered_users') %></h3>
+        <h2 class="panel-title text-center"><%= t('.registered_users') %></h2>
       </div>
       <div class="panel-body text-center">
         <%= t('.current_registered_users') %>
@@ -18,7 +18,7 @@
   <div class="col-md-3">
     <div class="panel panel-default">
       <div class="panel-heading">
-        <h3 class="panel-title text-center"><%= t('.total_visitors') %></h3>
+        <h2 class="panel-title text-center"><%= t('.total_visitors') %></h2>
       </div>
       <div class="panel-body text-center"><%= t('.past_30_days') %>
         <div class="h3">n/a</div>
@@ -29,7 +29,7 @@
     <div class="col-md-3">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3 class="panel-title text-center"><%= t('.returning_visitors') %></h3>
+          <h2 class="panel-title text-center"><%= t('.returning_visitors') %></h2>
         </div>
         <div class="panel-body text-center"><%= t('.past_30_days') %>
           <div class="h3">n/a</div>
@@ -40,7 +40,7 @@
     <div class="col-md-3">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3 class="panel-title text-center"><%= t('.new_visitors') %></h3>
+          <h2 class="panel-title text-center"><%= t('.new_visitors') %></h2>
         </div>
         <div class="panel-body text-center"><%= t('.past_30_days') %>
           <div class="h3">n/a</div>

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

@@ -4,7 +4,7 @@
 
 <div class="panel panel-default user-activity">
   <div class="panel-heading">
-    <h3 class="panel-title "><%= t("hyrax.dashboard.user_activity.title") %></h3>
+    <h2 class="panel-title "><%= t("hyrax.dashboard.user_activity.title") %></h2>
   </div>
   <div class="panel-body">
     <%= @presenter.render_recent_activity %>
@@ -13,7 +13,7 @@
 
 <div class="panel panel-default" id="notifications">
   <div class="panel-heading">
-    <h3 class="panel-title "><%= t("hyrax.dashboard.user_notifications") %></h3>
+    <h2 class="panel-title "><%= t("hyrax.dashboard.user_notifications") %></h2>
   </div>
   <div class="panel-body">
     <%= @presenter.render_recent_notifications %>
@@ -24,7 +24,7 @@
 <% if Flipflop.proxy_deposit? %>
   <div class="panel panel-default" id="proxy_management">
     <div class="panel-heading">
-      <h3 class="panel-title "><%= t("hyrax.dashboard.current_proxies") %></h3>
+      <h2 class="panel-title "><%= t("hyrax.dashboard.current_proxies") %></h2>
     </div>
     <div class="panel-body">
       <%= render 'hyrax/dashboard/_index_partials/current_proxy_rights', user: current_user %>
@@ -35,7 +35,7 @@
 
 <div class="panel panel-default transfers">
   <div class="panel-heading">
-    <h3 class="panel-title "><%= t("hyrax.dashboard.transfer_of_ownership") %></h3>
+    <h2 class="panel-title "><%= t("hyrax.dashboard.transfer_of_ownership") %></h2>
   </div>
   <div class="panel-body">
     <%= render 'hyrax/dashboard/_index_partials/transfers', presenter: @presenter.transfers %>

data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb

@@ -1,11 +1,13 @@
   <li class="h5"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
 
   <%= menu.nav_link(hyrax.my_collections_path,
+                    onclick: "dontChangeAccordion(event);",
                     also_active_for: hyrax.dashboard_collections_path) do %>
     <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections') %></span>
   <% end %>
 
   <%= menu.nav_link(hyrax.my_works_path,
+                    onclick: "dontChangeAccordion(event);",
                     also_active_for: hyrax.dashboard_works_path) do %>
     <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>
   <% end %>

data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb

@@ -1,22 +1,26 @@
   <% if can? :review, :submissions %>
     <li class="h5"><%= t('hyrax.admin.sidebar.tasks') %></li>
-    <%= menu.nav_link(hyrax.admin_workflows_path) do %>
+    <%= menu.nav_link(hyrax.admin_workflows_path,
+                      onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.workflow_review') %></span>
     <% end %>
   <% end %>
 
   <% if can? :manage, User %>
-    <%= menu.nav_link(hyrax.admin_users_path) do %>
+    <%= menu.nav_link(hyrax.admin_users_path,
+                      onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-user" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.users') %></span>
     <% end %>
   <% end %>
 
   <% if can? :read, :admin_dashboard %>
-    <%= menu.nav_link(hyrax.embargoes_path) do %>
+    <%= menu.nav_link(hyrax.embargoes_path,
+                      onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.embargoes.index.manage_embargoes') %></span>
     <% end %>
 
-    <%= menu.nav_link(hyrax.leases_path) do %>
+    <%= menu.nav_link(hyrax.leases_path,
+                      onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.leases.index.manage_leases') %></span>
     <% end %>
   <% end %>

data/app/views/hyrax/dashboard/works/_default_group.html.erb

@@ -1,3 +1,4 @@
+<fieldset>
 <table class="table table-striped works-list">
   <caption class="sr-only"><%= t("hyrax.dashboard.my.sr.listing") %> <%= application_name %></caption>
   <thead>
@@ -6,7 +7,7 @@
       <th><%= t("hyrax.dashboard.my.heading.title") %></th>
       <th class="date text-center"><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
       <th class="text-center"><%= t("blacklight.search.fields.facet.suppressed_bsi") %></th>
-      <th class="text-center"><%= t("hyrax.dashboard.my.heading.visibility") %></th>
+      <th class="text-center"><%= t("hyrax.dashboard.my.heading.work.visibility") %></th>
       <th class="text-center"><%= t("hyrax.dashboard.my.heading.action") %></th>
     </tr>
   </thead>
@@ -18,3 +19,4 @@
   <% end %>
   </tbody>
 </table>
+</fieldset>

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

@@ -5,8 +5,8 @@
   </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' }, { suppress_link: true } %>
+      <%= 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 } %>
       <% end %>
 
       <div class='media-body'>

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

@@ -40,7 +40,7 @@
         <tr data-behavior="extra" data-id="<%= curation_concern.id %>" class="extra-embargo-info">
           <td></td>
           <td colspan=5>
-            <%= check_box_tag "embargoes[#{i}][copy_visibility]", curation_concern.id, false %>
+            <%= check_box_tag "embargoes[#{i}][copy_visibility]", curation_concern.id, true %>
             <%= t('.change_all', cc: curation_concern) %>
             <%= visibility_badge(curation_concern.visibility_after_embargo) %>?
           </td>

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

@@ -1,6 +1,5 @@
-<% if file_set.user_can_perform_any_action? %>
+<% if (can?(:download, file_set.id) || can?(:destroy, file_set.id) || can?(:edit, file_set.id)) && !workflow_restriction?(file_set.parent) %>
   <div class="btn-group">
-
     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= file_set.id %>" aria-haspopup="true" aria-expanded="false">
       <span class="sr-only"><%= t('.press_to') %> </span>
       <%= t('.header') %>

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

@@ -34,7 +34,7 @@
     </div>
     <div class="col-sm-4">
       <label for="new_user_permission_skel" class="sr-only"><%= t('.new_user_permission_skel') %></label>
-      <%= select_tag 'new_user_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
+      <%= select_tag 'new_user_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
     </div>
     <div class="col-sm-3">
       <button class="btn btn-default" id="add_new_user_skel">
@@ -55,7 +55,7 @@
     </div>
     <div class="col-sm-4">
       <label for="new_group_permission_skel" class="sr-only"><%= t('.new_group_permission_skel') %></label>
-      <%= select_tag 'new_group_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
+      <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
     </div>
     <div class="col-sm-3">
       <span class="sr-only"><%= t('.add_new_group_skel') %></span>
@@ -65,37 +65,8 @@
   </div>
 </div>
 
-<table class="table table-bordered">
-  <tr>
-    <th width="60%"><%= t('.table_title_user') %></th>
-    <th width="40%"><%= t('.table_title_access') %></th>
-  </tr>
-  <tr id="file_permissions">
-    <td>
-      <%= label_tag :owner_access, class: "control-label" do %>
-        <%= t('.depositor') %> (<span id="file_owner" data-depositor="<%= depositor %>"><%= link_to_profile depositor %></span>)
-      <% end %>
-    </td>
-    <td>
-      <%= Hyrax.config.owner_permission_levels.keys[0] %>
-    </td>
-  </tr>
-  <%= f.fields_for :permissions do |permission_fields| %>
-    <%# skip the public, registered, and depositor perms as they are displayed first at the top %>
-    <% next if ['public', 'registered', depositor].include? permission_fields.object.agent_name.downcase %>
-    <tr>
-      <td><%= permission_fields.label :agent_name, class: "control-label" do %>
-        <%= user_display_name_and_key(permission_fields.object.agent_name) %>
-      <% end %></td>
-      <td>
-        <div class="col-sm-8">
-          <%= permission_fields.select :access, Hyrax.config.permission_levels, {}, class: 'form-control select_perm' %>
-        </div>
-        <button class="btn close remove_perm" data-index="<%= permission_fields.index %>">X</button>
-      </td>
-    </tr>
-  <% end %>
-</table>
+<%= render 'currently_shared', f: f %>
+
 <script type="text/x-tmpl" id="tmpl-file-set-grant">
 <tr>
   <td><label class="control-label">{%= o.name %}</label></td>

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

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

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

@@ -1,12 +1,51 @@
 <div id="versioning_display" class="tab-pane">
   <h2><%= t('.header') %></h2>
   <%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
-    <%= hidden_field_tag('redirect_tab', 'versions') %>
-    <h3><%= t('.upload') %></h3>
-    <%= f.input :files, as: :multifile, wrapper: :vertical_file_input, required: true %>
-    <%= f.button :button, name: "update_versioning", id: "upload_submit", onclick: "confirmation_needed = false;", class: "btn btn-primary" do %>
-      <%= t('.upload') %>
-    <% end %>
+    <div id="fileuploadVersioning">
+      <!-- Redirect browsers with JavaScript disabled to the origin page -->
+      <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"/></noscript>
+
+      <%= hidden_field_tag('redirect_tab', 'versions') %>
+
+      <!-- The table listing the files available for upload/download -->
+      <div class="row fileupload-buttonbar">
+
+        <h3><%= t('.upload') %></h3>
+
+        <div class="col-xs-4">
+          <input id="file_set_files" style="display:none;" type="file" name="files[]" single/>
+          <label for="file_set_files" class="btn btn-success fileinput-button"><%= t('.choose_file') %></label>
+        </div>
+
+        <div class="col-xs-8 fileupload-progress versioning-files-progress fade">
+          <!-- The global progress bar -->
+          <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+            <div class="progress-bar progress-bar-success" style="width:0%;"></div>
+          </div>
+          <!-- The extended global progress state -->
+          <div class="progress-extended">&nbsp;</div>
+        </div> <!-- end col-xs-5 fileupload-progress fade -->
+      </div>
+
+      <div class="row versioning-files-list">
+        <div class="col-xs-12">
+          <div class="container">
+            <div role="presentation" class="table"><span class="files"></span></div>
+            <!-- The global file processing state -->
+            <span class="fileupload-process"></span>
+          </div> <!-- end container -->
+        </div> <!-- end row versioning-files-list -->
+      </div> <!-- end row versioning-files-list -->
+
+      <%= f.button :button,
+                   name: "update_versioning",
+                   id: "upload_submit",
+                   onclick: "confirmation_needed = false;",
+                   class: "btn btn-primary" do %>
+        <%= t('.upload') %>
+      <% end %>
+
+    </div> <!-- fileuploadVersioning -->
   <% end %>
 
   <%= form_for [main_app, curation_concern],
@@ -22,8 +61,15 @@
       </div>
     <% end %>
     <div id="save_version_note" class="alert hide"><%= t('.save_your_note') %></div>
-    <%= f.button :button, name: "revert_submit", id: "revert_submit", onclick: "confirmation_needed = false;", class: "btn btn-primary", type: 'submit' do %>
+    <%= f.button :button, name: "revert_submit",
+                 id: "revert_submit",
+                 onclick: "confirmation_needed = false;",
+                 class: "btn btn-primary",
+                 type: 'submit' do %>
       <%= t('.save') %>
     <% end %>
   <% end %>
+
+  <%= render 'hyrax/uploads/js_templates_versioning' %>
+
 </div> <!-- /row -->