hyrax 2.0.3 → 2.1.0.beta1

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

@@ -0,0 +1,4 @@
+<%= button_to label, hyrax.batch_edits_path,
+              method: :delete,
+              class: "btn btn-primary submits-batches",
+              data: { behavior: 'deletes-collection'} %>

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

@@ -5,4 +5,3 @@
     <%= f.hidden_field :members, :value => "remove" %>
     <%= f.submit label, :class => "btn btn-primary collection-remove-selected submits-batches" %>
 <% end %>
-

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

@@ -2,6 +2,6 @@
 <%# collection_id -- collection to be updated (use 'collection_replace_id' if you wish the form to be updated by a form value) %>
 <%# label -- button label %>
 <%= button_to label, hyrax.dashboard_collection_path(collection_id),
-              method: :put,
+              method: :post,
               class: "btn btn-primary submits-batches",
               data: { behavior: 'updates-collection' } %>

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

@@ -1,4 +1,4 @@
 <%= form_for collection, url: hyrax.dashboard_collection_path(collection), method: :put, as: 'collection' do |f| %>
   <%= single_item_action_remove_form_fields(f, document) %>
-  <%= f.submit label, class: "btn btn-primary collection-remove" %>
+  <%= f.submit label, class: "btn collection-remove #{btn_class}" %>
 <% end %>

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

@@ -0,0 +1,25 @@
+<% id = presenter.id %>
+
+<section class="collection-title-row-wrapper"
+  data-source="my"
+  data-id="<%= id %>"
+  data-colls-hash="<%= presenter.available_parent_collections(scope: controller) %>"
+  data-post-url="<%= hyrax.dashboard_create_nest_collection_within_path(id) %>"
+  data-post-delete-url="<%= hyrax.dashboard_collection_path(id) %>">
+  <% presenter.title.each_with_index do |title, index| %>
+    <% if index == 0 %>
+      <div class="collection-title-row-content">
+        <h3 class="collection-title"><%= title %></h3>
+        <%= presenter.permission_badge %>
+        <span class="label label-success">
+          <%= presenter.collection_type_badge %>
+        </span>
+      </div>
+      <div class="collection-title-row-content">
+        <%= render 'show_actions', presenter: presenter %>
+      </div>
+    <% else %>
+      <h3><%= title %></h3>
+    <% end %>
+  <% end %>
+</section>

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

@@ -5,9 +5,5 @@
 <% else %>
   <% @document_list = documents %>
   <% @disable_select_all = (@document_list.count <= 1) %>
-  <% if params[:action] == "edit" %>
-    <%= render 'form_default_group', documents: documents, docs: documents %>
-  <% else %>
-    <%= render 'show_document_list', documents: documents %>
-  <% end %>
+  <%= render 'show_document_list', documents: documents %>
 <% end %>

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

@@ -1,8 +1,8 @@
 <h2 class="sr-only"><%= t('hyrax.collection.actions.header') %></h2>
 <div class="actions-controls-collections">
-  <%= link_to t('hyrax.collection.actions.add_works.label'),
+  <%= 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_works.desc'),
+              title: t('hyrax.collection.actions.add_existing_works.desc'),
               class: 'btn btn-default',
               data: { turbolinks: false } %>
 </div>

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

@@ -0,0 +1,9 @@
+<% { notice: 'alert-success', error: 'alert-danger', alert: 'alert-warning' }.each do |type, flash_dom_class| %>
+  <% if flash[type].present? %>
+    <div class="alert <%= flash_dom_class %> alert-dismissable" role="alert">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+      <%= safe_join(Array.wrap(flash[type]).map(&:html_safe), '<br/>'.html_safe) %>
+    </div>
+    <% flash.delete(type) %>
+  <% end %>
+<% end %>

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

@@ -1,25 +1,31 @@
-<div class="panel panel-default tabs" id="collection-controls">
+<div class="panel panel-default tabs">
   <ul class="nav nav-tabs" role="tablist">
     <li class="active">
       <a href="#description" role="tab" data-toggle="tab"><%= t('.tabs.description') %></a>
     </li>
     <% if @form.persisted? %>
       <li>
-        <a href="#visibility" role="tab" data-toggle="tab"><%= t('.tabs.visibility') %></a>
+        <a href="#branding" role="tab" data-toggle="tab"><%= t('.tabs.branding') %></a>
       </li>
+      <% if @collection.discoverable? %>
+      <li>
+        <a href="#discovery" role="tab" data-toggle="tab"><%= t('.tabs.discovery') %></a>
+      </li>
+      <% end %>
+      <% if @collection.sharable? %>
       <li>
         <a href="#sharing" role="tab" data-toggle="tab"><%= t('.tabs.sharing') %></a>
       </li>
+      <% end %>
     <% end %>
   </ul>
-  <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor' } do |f| %>
 
-  <div class="tab-content">
+  <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor' } do |f| %>
+    <div class="tab-content">
       <div id="description" class="tab-pane active">
         <div class="panel panel-default labels">
           <div class="panel-body">
 
-            <h2 class="non lower"><%= t('hyrax.collection.form.description') %></h2>
             <div id="base-terms">
               <% f.object.primary_terms.each do |term| %>
                 <%= render_edit_field_partial(term, f: f) %>
@@ -46,6 +52,12 @@
               </div>
             <% end %>
             <%= hidden_field_tag :type, params[:type] %>
+            <%= hidden_field_tag :stay_on_edit, true %>
+            <%= hidden_field_tag :collection_type_gid, @collection.collection_type_gid %>
+            <!-- parent_id may be passed from the nested collections controller to allow a subcollection relationship to be added as collection is created -->
+            <% if params[:parent_id].present? %>
+              <%= hidden_field_tag :parent_id, params[:parent_id] %>
+            <% end %>
             <% if params[:batch_document_ids].present? %>
               <% params[:batch_document_ids].each do |batch_item| %>
                 <input type="hidden" name="batch_document_ids[]" value="<%= batch_item %>"/>
@@ -53,34 +65,44 @@
             <% end %>
           </div>
         </div>
-      </div>
+      </div> <!-- end description -->
 
-      <div id="visibility" class="tab-pane">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
-            <%= render 'form_permission', f: f %>
+      <% if @form.persisted? %>
+        <div id="branding" class="tab-pane">
+          <div class="panel panel-default labels">
+            <div class="panel-body">
+              <%= render 'form_branding', f: f %>
+            </div>
           </div>
         </div>
-      </div>
 
-      <div id="sharing" class="tab-pane">
-        <div class="panel panel-default labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
-          <div class="panel-body">
-            <%= render 'form_share', f: f %>
+        <div id="discovery" class="tab-pane">
+          <div class="panel panel-default labels">
+            <div class="panel-body">
+              <%= render 'form_discovery', f: f %>
+            </div>
           </div>
         </div>
-      </div>
+
+        <div id="sharing" class="tab-pane">
+          <div class="panel panel-default labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
+            <div class="panel-body">
+              <%= render 'form_share', f: f %>
+            </div>
+          </div>
+        </div>
+      <% end %>
 
       <div class="panel-footer">
-        <% if params[:action] == "new" %>
-          <%= f.submit t(:'hyrax.collection.select_form.create'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection" %>
+        <% if @collection.persisted? %>
+          <%= f.submit t(:'hyrax.collection.select_form.update'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection", data: { turbolinks: false } %>
+          <%= link_to t(:'helpers.action.cancel'), hyrax.dashboard_collection_path(@collection), class: 'btn btn-link' %>
         <% else %>
-          <%= f.submit t(:'hyrax.collection.select_form.update'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
+          <%= f.submit t(:'hyrax.collection.select_form.create'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection" %>
+          <%= link_to t(:'helpers.action.cancel'), hyrax.my_collections_path, class: 'btn btn-link' %>
         <% end %>
-        <%= link_to t(:'helpers.action.cancel'), main_app.root_path, class: 'btn btn-link' %>
       </div>
+    </div> <!-- end tab-content -->
+  <% end # simple_form_for %>
 
-  <% end %>
-  <% # end of form %>
-
-</div>
+</div> <!-- end collection-controls -->

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

@@ -0,0 +1,153 @@
+<div class="set-access-controls">
+  <h3><%= t('.branding.label') %></h3>
+  <p><%= t('.branding.description') %></p>
+  <label><strong><%= t('.banner.label') %></strong></label>
+  <p><%= t('.banner.description') %>.</p>
+
+  <div id="fileupload">
+    <!-- Redirect browsers with JavaScript disabled to the origin page -->
+    <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"></noscript>
+    <!-- The table listing the files available for upload/download -->
+
+    <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+    <div class="row fileupload-buttonbar">
+      <div class="col-xs-4">
+        <!-- The fileinput-button span is used to style the file input field as button -->
+        <span class="btn btn-success fileinput-button">
+          <span class="glyphicon glyphicon-plus"></span>
+          <span>Choose File</span>
+          <input type="file" name="files[]" single>
+        </span>
+      </div> <!-- end col-xs-4 -->
+
+      <!-- The global progress state -->
+      <div class="col-xs-8 fileupload-progress branding-banner-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> <!-- end row fileupload-buttonbar -->
+
+    <div class="row branding-banner-list">
+      <div class="col-xs-12">
+        <div class="container">
+        <% if f.object.banner_info[:file] %>
+          <div id="banner">
+            <div class="row branding-banner-row">
+              <div class="col-sm-3">
+                <span class="name">
+                  <span><%= f.object.banner_info[:file] %></span>
+                  <input type="hidden" name="banner_unchanged" value="true">
+                </span>
+              </div>
+
+              <div class="col-sm-2">
+                <button class="btn btn-danger delete branding-banner-remove" data-type="DELETE" data-url="/" onclick=$("#banner").remove(); >
+                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="controls-remove-text">Remove</span>
+                  <span class="sr-only">
+                    previous
+                    <span class="controls-field-name-text">Remove Current Banner</span>
+                  </span>
+                </button>
+              </div> <!-- end col-sm-2 -->
+            </div> <!-- row branding-banner-row -->
+
+            <% if f.object.banner_info[:relative_path] %>
+            <div class="banner-image" >
+              <i><%= image_tag(f.object.banner_info[:relative_path],
+                               size: "800x100",
+                               alt: "Unable to display banner: #{f.object.banner_info[:file]}") %></i>
+            </div>
+            <% end %>
+          </div> <!-- end banner -->
+          <div role="presentation" class="table table-striped"><span class="files"></span></div>
+        <% else %>
+          <div role="presentation" class="table table-striped"><span class="files"></span></div>
+        <% end %>
+
+          <!-- The global file processing state -->
+          <span class="fileupload-process"></span>
+        </div> <!-- end container -->
+      </div> <!-- end row branding-banner-list -->
+    </div> <!-- end row branding-banner-list -->
+  </div> <!-- fileupload -->
+
+  <%= render 'hyrax/uploads/js_templates_branding' %>
+
+  <label><strong><%= t('.logo.label') %></strong></label>
+  <p><%= t('.logo.description') %></p>
+
+  <div id="fileuploadlogo">
+    <!-- Redirect browsers with JavaScript disabled to the origin page -->
+    <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"></noscript>
+    <!-- The table listing the files available for upload/download -->
+
+    <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+    <div class="row fileupload-buttonbar">
+      <div class="col-xs-4">
+        <!-- The fileinput-button span is used to style the file input field as button -->
+        <span class="btn btn-success fileinput-button">
+          <span class="glyphicon glyphicon-plus"></span>
+          <span>Choose File</span>
+          <input type="file" name="files[]" single>
+        </span>
+      </div> <!-- end col-xs-4 -->
+
+      <!-- The global progress state -->
+      <div class="col-xs-8 fileupload-progress branding-logo-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-8 fileupload-progress branding-logo-progress fade -->
+    </div> <!-- end row fileupload-buttonbar -->
+
+    <div class="row branding-logo-list">
+      <div class="col-xs-12">
+        <div class="container">
+          <% i = 0 %>
+          <% f.object.logo_info.each_with_index do |linfo, i| %>
+            <div class="row branding-logo-row" id="logorow_<%= i %>">
+              <div class="col-sm-3">
+                <span class="name">
+                  <span><%= linfo[:file] %></span>
+                <input type="hidden" name="logo_files[]" value="<%= linfo[:full_path] %>">
+                </span>
+              </div>
+
+              <div class="col-sm-4 branding-logo-input">
+                <label for="linkurl_<%= i %>">Link URL:
+                  <input id="linkurl_<%= i %>" class="branding-logo-input" type="text" name="linkurl[]" value="<%= linfo[:linkurl] %>"></input>
+                </label>
+                <label for="alttext_<%= i %>">Alt Text:
+                  <input id="alttext_<%= i %>" class="branding-logo-input" type="text" name="alttext[]" value="<%= linfo[:alttext] %>"></input>
+                </label>
+              </div>
+
+              <div class="col-sm-2">
+                <button class="btn btn-danger delete branding-logo-remove" data-type="DELETE" data-url="/" onclick=$("#logorow_<%= i %>").remove(); >
+                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="controls-remove-text">Remove</span>
+                   <span class="sr-only">
+                    previous
+                    <span class="controls-field-name-text">Remove Logo <%= i + 1 %></span>
+                  </span>
+                </button>
+              </div> <!-- end col-sm-2 -->
+            </div> <!-- row logorow -->
+          <% end %>
+          <span class="files"></span>
+        </div> <!-- end container -->
+
+        <!-- The global file processing state -->
+        <span class="fileupload-process"></span>
+      </div> <!-- end col-xs-12 -->
+    </div> <!-- end row branding-logo-list -->
+  </div> <!-- end fileuploadlogo -->
+</div> <!-- end set-access-controls -->

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

@@ -0,0 +1,27 @@
+<%# This was renamed from _default_group to prevent if from being used for All Collection index which needs to use my/collections/_default_group %>
+<%# TODO: This partial is obsolete and has been renamed for now. Needs cleanup of this and other referenced unneeded items. %>
+
+<table class="table table-striped">
+  <caption class="sr-only"><%= t("hyrax.dashboard.my.sr.listing") %> <%= application_name %></caption>
+  <thead>
+  <tr>
+    <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
+    <th><%= t("hyrax.dashboard.my.heading.title") %></th>
+    <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%= params[:sort] == "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort] == "#{CatalogController.uploaded_field} asc" ? 'caret up' : ''%>"></i><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.visibility") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.action") %></th>
+  </tr>
+  </thead>
+  <tbody>
+  <% docs.each_with_index do |document, counter| %>
+    <% # Collection members may be collections or works %>
+    <% if document.collection? %>
+      <%= render 'list_collections', document: document, counter: counter %>
+    <% else %>
+      <%= render 'list_works', document: document, counter: counter, presenter: Hyrax::WorkShowPresenter.new(document, current_ability) %>
+    <% end %>
+  <% end %>
+  </tbody>
+</table>
+<%= render 'modal_delete_collection_deny' %>
+<%= render 'modal_edit_deny' %>

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

@@ -0,0 +1,18 @@
+<div class="set-access-controls">
+
+  <p><%= t('.para1') %></p>
+  <p><%= t('.para2') %></p>
+
+  <div class="form-group">
+    <label class="radio">
+      <input type="radio" id="visibility_open" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if @collection.open_access? %> checked="true"<% end %>/><strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
+    </label>
+    <label class="radio">
+      <input type="radio" id="visibility_registered" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if @collection.authenticated_only_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
+    </label>
+    <label class="radio">
+      <input type="radio" id="visibility_restricted" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE%>" <% if @collection.private_access? %> checked="true"<% end %>/><strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
+    </label>
+  </div>
+
+</div>

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

@@ -1,90 +1,78 @@
-<% depositor = f.object.depositor %>
+<div id="participants" class="tab-pane">
+  <div class="panel panel-default labels edit-sharing-tab">
+    <div class="panel-body">
 
-<fieldset>
-  <legend>
-    Share With <small>(optional)</small>
-  </legend>
+      <section class="section-add-sharing">
+        <p><%= t('.note') %></p>
+        <h3><%= t('.add_sharing') %></h3>
 
-  <div class="alert alert-info hidden" id="save_perm_note">Permissions are
-  <strong>not</strong> saved until the &quot;Update Collection&quot; button is pressed at the bottom of the page.</div>
+        <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
 
-  <div class="alert alert-warning hidden" role="alert" id="permissions_error">
-    <span id="permissions_error_text"></span>
-  </div>
+        <%= simple_form_for @form.permission_template,
+                            url: [hyrax, :dashboard, @form, :permission_template],
+                            html: { id: 'group-participants-form' } do |f| %>
+          <div class="clearfix spacer">
+            <%= f.fields_for 'access_grants_attributes',
+                             f.object.access_grants.build(agent_type: 'group'),
+                             index: 0 do |builder| %>
+
+              <div class="form-inline add-sharing-form">
+                <label class="col-md-2 col-xs-4 control-label"><%= t('.add_group') %>:</label>
+                <div class="col-md-10 col-xs-8 form-group">
+                  <%= builder.hidden_field :agent_type %>
+                  <%= builder.text_field :agent_id,
+                                         placeholder: "Search for a group...",
+                                         class: 'form-control search-input' %>
+                  as
+                  <%= builder.select :access,
+                                     access_options,
+                                     { prompt: "Select a role..." },
+                                     class: 'form-control' %>
 
-  <table class="table">
-    <tr id="file_permissions">
-      <td width="20%">
-        <%= Hyrax.config.owner_permission_levels.keys[0] %>
-      </td>
-      <td width="60%">
-        <%= label_tag :owner_access, class: "control-label" do %>
-          Depositor (<span id="file_owner" data-depositor="<%= depositor %>"><%= link_to_profile depositor %></span>)
+                  <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
+                </div>
+              </div>
+            <% end %>
+          </div>
         <% end %>
-      </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.select :access, Hyrax.config.permission_levels, {}, class: 'form-control select_perm' %>
-        </td>
-        <td>
-          <%= permission_fields.label :agent_name, class: "control-label" do %>
-            <%= user_display_name_and_key(permission_fields.object.agent_name) %>
-          <% end %>
-          <button class="btn close remove_perm" data-index="<%= permission_fields.index %>">&times;</button>
-        </td>
-      </tr>
-    <% end %>
-  </table>
 
-  <h4>Share work with other users</h4>
-  <p class="sr-only">Use the add button to give access to one <%=t('hyrax.account_label') %> at a time (it will be added to the list below).
-    Select the user, by name or <%= t('hyrax.account_label') %>. Then select the access level you wish to grant and click on Add this
-    <%= t('hyrax.account_label') %> to complete adding the permission.
-  </p>
-  <div class="form-group row">
-    <div class="col-sm-5">
-      <label for="new_user_name_skel" class="sr-only"><%= t('hyrax.account_label') %> (without the <%= t('hyrax.directory.suffix') %> part)</label>
-      <%= text_field_tag 'new_user_name_skel', nil %>
-    </div>
-    <div class="col-sm-4">
-      <label for="new_user_permission_skel" class="sr-only">Access type to grant</label>
-      <%= select_tag 'new_user_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
-    </div>
-    <div class="col-sm-3">
-      <button class="btn btn-default" id="add_new_user_skel">
-        <span class="sr-only">Add this <%= t('hyrax.account_label') %></span>
-        <span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span>
-      </button>
-      <br /> <span id="directory_user_result"></span>
-    </div>
-  </div>
+        <%= simple_form_for @form.permission_template,
+                            url: [hyrax, :dashboard, @form, :permission_template],
+                            html: { id: 'user-participants-form' } do |f| %>
+          <div class="clearfix spacer">
+
+            <%= f.fields_for 'access_grants_attributes',
+                             f.object.access_grants.build(agent_type: 'user'),
+                             index: 0 do |builder| %>
+
+            <div class="form-inline add-users">
+              <label class="col-md-2 col-xs-4 control-label"><%= t('.add_user') %>:</label>
+              <div class="col-md-10 col-xs-8 form-group">
+                <%= builder.hidden_field :agent_type %>
+                <%= builder.text_field :agent_id,
+                                       placeholder: "Search for a user..." %>
+                as
+                <%= builder.select :access,
+                                   access_options,
+                                   { prompt: "Select a role..." },
+                                   class: 'form-control' %>
+
+                <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
+              </div>
+            </div>
+            <% end %>
+          </div>
+        <% end %>
+        <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note')%></p>
+      </section>
+
+      <section class="section-collection-sharing">
+        <legend><%= t(".current_shared") %></legend>
+        <%= render 'form_share_table', access: 'managers', filter: :manage? %>
+        <%= render 'form_share_table', access: 'depositors', filter: :deposit? %>
+        <%= render 'form_share_table', access: 'viewers', filter: :view? %>
+      </section>
 
-  <h4>Share work with groups of users</h4>
-  <p class="sr-only">Use the add button to give access to one group at a time (it will be added to the list below).</p>
-  <div class="form-group row">
-    <div class="col-sm-5">
-      <label for="new_group_name_skel" class="sr-only">Group</label>
-      <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), class: 'form-control' %>
-    </div>
-    <div class="col-sm-4">
-      <label for="new_group_permission_skel" class="sr-only">Access type to grant</label>
-      <%= select_tag 'new_group_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
-    </div>
-    <div class="col-sm-3">
-      <span class="sr-only">Add this group</span>
-      <button class="btn btn-default" id="add_new_group_skel"><i class="glyphicon glyphicon-plus"></i></button>
-      <br /><span id="directory_group_result"></span>
     </div>
   </div>
-
-  <script type="text/x-tmpl" id="tmpl-collection-grant">
-  <tr>
-    <td>{%= o.accessLabel %}</td>
-    <td><label class="control-label">{%= o.name %}</label> <button class="btn close">&times;</button></td>
-  </tr>
-  </script>
-</fieldset>
+</div>