hyrax 2.0.3 → 2.1.0.beta1

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

@@ -31,7 +31,8 @@
               </div>
 
               <div class="panel-footer">
-                <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
+                <% cancel_path = f.object.persisted? ? hyrax.admin_admin_set_path(f.object) : hyrax.dashboard_collections_path %>
+                <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default pull-right' %>
                 <%= f.button :submit, class: 'btn btn-primary pull-right'%>
               </div>
             <% end %>

data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb

@@ -15,7 +15,7 @@
                           <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
                           <td><%= g.agent_type.titleize %></td>
                           <td>
-                            <% if g.admin_group? %>
+                            <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
                               <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
                             <% else %>
                               <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-danger' %>

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

@@ -57,7 +57,7 @@
                   <% end %>
                 <% end %>
 
-                <fieldset>
+                <fieldset class="admin-set-participants">
                   <legend><%= t(".current_participants") %></legend>
                   <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
                   <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>

data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb

@@ -12,10 +12,10 @@
         <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
       <% end %>
       <div class="media-body">
-        <h4 class="media-heading">
-          <%= link_to document.title_or_label, [main_app, document], id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %>
+        <p class="media-heading">
+          <strong><%= link_to document.title_or_label, [main_app, document], id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %></strong>
           <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></i></a>
-        </h4>
+        </p>
         <%= render_collection_links(document) %>
       </div>
     </div>

data/app/views/hyrax/admin/admin_sets/edit.html.erb

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit"></span> <%= t('.header') %></h1>
+  <h1><span class="fa fa-edit"></span> <%= t('.header', title: @form.title) %></h1>
 <% end %>
 
 <div class="row">

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

@@ -0,0 +1,61 @@
+<div class="panel panel-default tabs" id="collection-types-controls">
+  <ul class="nav nav-tabs" role="tablist">
+    <li class="active">
+      <a href="#metadata" role="tab" data-toggle="tab"><%= t('hyrax.admin.collection_types.form.tab.metadata') %></a>
+    </li>
+    <% if @form.persisted? %>
+      <li>
+        <a href="#settings" role="tab" data-toggle="tab"><%= t('hyrax.admin.collection_types.form.tab.settings') %></a>
+      </li>
+      <li>
+        <a href="#participants" role="tab" data-toggle="tab"><%= t('hyrax.admin.collection_types.form.tab.participants') %></a>
+        </li>
+    <% end %>
+  </ul>
+  <% form_url = @form.id.nil? ? hyrax.admin_collection_types_path : hyrax.admin_collection_type_path(@form.id) %>
+  <%= simple_form_for @form, url: form_url, as: :collection_type 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">
+              <%= 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">
+              <%= 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">
+            <%= render 'form_settings', f: f %>
+          </div>
+        </div>
+      </div>
+      <% # 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">
+          <div class="panel-body">
+            <%= render 'form_participants' %>
+          </div>
+        </div>
+      </div>
+      <div class="panel-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" %>
+        <% end %>
+        <%= link_to t(:'helpers.action.cancel'), hyrax.admin_collection_types_path, class: 'btn btn-link' %>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,2 @@
+<%= f.input :title %>
+<%= f.input :description, as: :text %>

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

@@ -0,0 +1,2 @@
+<%= f.input :title, :input_html => { :disabled => true } %>
+<%= f.input :description, as: :text %>

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

@@ -0,0 +1,26 @@
+<h3><%= t(".#{access}.title") %></h3>
+<p><%= t(".#{access}.help") %></p>
+<% if @form.collection_type_participants.select(&filter).any? %>
+  <table class="table table-striped share-status">
+    <thead>
+      <tr>
+        <th><%= t(".#{access}.agent_name") %></th>
+        <th><%= t(".#{access}.type") %></th>
+        <th><%= t(".#{access}.action") %></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% @form.collection_type_participants.select(&filter).each do |g| %>
+      <tr>
+        <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
+        <td><%= g.agent_type.titleize %></td>
+        <td>
+          <%= button_to "Remove", hyrax.admin_collection_type_participant_path(g), method: :delete, class: 'btn btn-danger' %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <p><em><%= t(".#{access}.empty") %></em></p>
+<% end %>

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

@@ -0,0 +1,62 @@
+<h2><%= t('.add_participants') %></h2>
+<p><%= t('.instructions') %></p>
+<% access_options = options_for_select([['Manager', Hyrax::CollectionTypeParticipant::MANAGE_ACCESS], ['Creator', Hyrax::CollectionTypeParticipant::CREATE_ACCESS]]) %>
+<% unless @collection_type_participant.nil? %>
+  <%= simple_form_for @collection_type_participant,
+                      url: hyrax.admin_collection_type_participants_path,
+                      html: { id: 'group-participants-form' },
+                      as: :collection_type_participant do |f| %>
+      <div class="clearfix spacer">
+        <div class="form-inline">
+          <label class="col-md-2 col-xs-4 control-label">Add Group</label>
+
+          <div class="col-md-10 col-xs-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,
+                             placeholder: "Search for a group...",
+                             class: 'form-control' %>
+            as
+            <%= f.select :access,
+                         access_options,
+                         { prompt: "Select a role..." },
+                         class: 'form-control' %>
+
+                       <%= f.submit t('.submit'), class: 'btn btn-info' %>
+          </div>
+        </div>
+      </div>
+  <% end %>
+  <%= simple_form_for @collection_type_participant,
+                      url: hyrax.admin_collection_type_participants_path,
+                      html: { id: 'user-participants-form' },
+                      as: :collection_type_participant do |f| %>
+      <div class="clearfix spacer">
+        <div class="form-inline">
+          <label class="col-md-2 col-xs-4 control-label">Add User</label>
+
+          <div class="col-md-10 col-xs-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,
+                             placeholder: "Search for a user...",
+                             class: 'form-control' %>
+            as
+            <%= f.select :access,
+                         access_options,
+                         { prompt: "Select a role..." },
+                         class: 'form-control' %>
+
+                       <%= f.submit t('.submit'), class: 'btn btn-info' %>
+          </div>
+        </div>
+      </div>
+  <% end %>
+<% end %>
+<div>
+  <fieldset>
+    <legend><%= t('.current_participants') %></legend>
+    <%= render 'form_participant_table', access: 'managers', filter: :manager? %>
+    <%= render 'form_participant_table', access: 'creators', filter: :creator? %>
+  </fieldset>
+</div>

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

@@ -0,0 +1,39 @@
+<p><%= t('.instructions') %></p>
+
+<p><strong><%= t('.warning') %></strong></p>
+
+<div class="collection-types-settings">
+  <div class="form-inline">
+    <p><%= f.input :nestable, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
+    <p><%= f.input :discoverable, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
+    <p><%= f.input :sharable, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
+    <% # Using html instead of simple_form to allow adding of disabled class to elements through javascript settings.es6 %>
+    <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">
+          <input value="0"
+                 name="collection_type[share_applies_to_new_works]"
+                 type="hidden"
+                 <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %> >
+          <label id="sharable-applies-to-new-works-setting-label"
+                 class="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">When new works are created directly in the collection, grant sharing users and groups permissions for the new work according to their collection roles.</p>
+      </div>
+    </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>
+    <p><%= f.input :assigns_workflow, as: :boolean, disabled: true %></p>
+    <p><%= f.input :assigns_visibility, as: :boolean, disabled: true %></p>
+  </div>
+</div>

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

@@ -0,0 +1,10 @@
+<% provide :page_title, construct_page_title( t('.header') ) %>
+<% provide :page_header do %>
+  <h1><span class="fa fa-folder-open"></span> <%= t('.header') %>: <%= @form.title %></h1>
+<% end %>
+
+<div class="row">
+  <div class="col-md-12">
+    <%= render 'form' %>
+  </div>
+</div>

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

@@ -0,0 +1,88 @@
+<div class="collection-types-wrapper">
+  <% # for modal dialogue setup and interaction see app/assets/javascripts/collection_types.es6 %>
+  <% provide :page_header do %>
+    <h1><span class="fa fa-folder-open"></span> <%= t('.header') %></h1>
+  <% end %>
+
+  <div class="panel panel-default">
+    <div class="panel-heading adam">
+      <span class="panel-heading-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">
+      <p><%= t('.description') %></p>
+
+      <p><a class="collapse-header" data-toggle="collapse" href="#collapseAbout" aria-expanded="false" aria-controls="collapseAbout"><%= t('.more_toggle_header_html') %></a></p>
+      <div id="collapseAbout" class="collapse">
+        <%= t('.more_toggle_content_html') %>
+      </div>
+
+      <h3>Current Collection Types</h3>
+      <table class="table collection-types-table">
+         <thead>
+           <tr>
+             <th><%= t('.table.name') %></th>
+             <th><%= t('.table.actions') %></th>
+           </tr>
+         </thead>
+         <tbody>
+           <% @collection_types.each do |collection_type| %>
+             <tr>
+               <td><%= collection_type.title %></td>
+               <td>
+                 <%= link_to hyrax.edit_admin_collection_type_path(collection_type), class: 'btn btn-primary btn-sm', data: { turbolinks: false } do %>
+                  <%= t('helpers.action.edit') %>
+                 <% end %>
+                 <% unless collection_type.admin_set? || collection_type.user_collection? %>
+                  <button class="btn btn-danger btn-sm delete-collection-type" 
+                          data-collection-type="<%= collection_type.to_json %>"
+                          data-collection-type-index="<%= hyrax.dashboard_collections_path({ 'f[collection_type_gid_ssim][]' => collection_type.gid, 'f[has_model_ssim][]' => 'Collection' }) %>"
+                          data-has-collections="<%= collection_type.collections? %>">
+                    <%= t('helpers.action.delete') %>
+                  </button>
+                  <% end %>
+               </td>
+             </tr>
+           <% end %>
+         </tbody>
+      </table>
+    </div>
+  </div>
+
+  <!-- Modal window: Delete collection type confirmation -->
+  <div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteModalLabel">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-body">
+          <h4 class="screen-hidden" id="deleteModalLabel"><%= t('.modal.header_can_delete') %></h4>
+          <%= 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-danger confirm-delete-collection-type"><%= t('helpers.action.delete') %></button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Modal window: Can't delete the collection type -->
+  <div class="modal fade" id="deleteDenyModal" tabindex="-1" role="dialog" aria-labelledby="deleteDenyModalLabel">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-body">
+          <h4 class="screen-hidden" id="deleteDenyModalLabel"><%= t('.modal.header_cannot_delete') %></h4>
+          <%= 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>
+	  <%= link_to  t('.modal.view_collections'), hyrax.my_collections_path, class: 'btn btn-primary view-collections-of-this-type', data_dismiss: 'modal' %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</div>

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

@@ -0,0 +1,10 @@
+<% provide :page_title, construct_page_title( t('.header') ) %>
+<% provide :page_header do %>
+  <h1><span class="fa fa-folder-open"></span> <%= t('.header') %></h1>
+<% end %>
+
+<div class="row">
+  <div class="col-md-12">
+    <%= render 'form' %>
+  </div>
+</div>

data/app/views/hyrax/base/_attribute_rows.html.erb

@@ -1,3 +1,4 @@
+<%= presenter.attribute_to_html(:date_modified, label: t('hyrax.base.show.last_modified')) %>
 <%= presenter.attribute_to_html(:creator, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:contributor, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:subject, render_as: :faceted) %>

data/app/views/hyrax/base/_citations.html.erb

@@ -2,10 +2,14 @@
     <% if Hyrax.config.citations? %>
       <%= link_to "Citations", hyrax.citations_work_path(presenter), id: 'citations', class: 'btn btn-default' %>
     <% end %>
-    <div class='citations-heading'><%= t('.header') %></div>
-    <p class='citations-list'>
-    <%= link_to 'EndNote', polymorphic_path([main_app, presenter], format: 'endnote') %>
-    | <%= link_to 'Zotero', hyrax.zotero_path, id: 'zoteroLink', name: 'zotero' %>
-    | <%= link_to 'Mendeley', hyrax.mendeley_path, id: 'mendeleyLink', name: 'mendeley' %>
-    </p>
+    <div class="btn-group">
+      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <%= t('.header') %> <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li><%= link_to 'EndNote', polymorphic_path([main_app, presenter], format: 'endnote') %></li>
+        <li><%= link_to 'Zotero', hyrax.zotero_path, id: 'zoteroLink', name: 'zotero' %></li>
+        <li><%= link_to 'Mendeley', hyrax.mendeley_path, id: 'mendeleyLink', name: 'mendeley' %></li>
+      </ul>
+    </div>
 </div>

data/app/views/hyrax/base/_form_child_work_relationships.html.erb

@@ -10,39 +10,32 @@ HTML Properties:
     [data-behavior="child-relationships"] : allows the javascript to be initialized
     data-param-key : the parameter key value for this model type
 %>
-<div class="form-group multi_value optional managed">
-  <%= link_to "Attach New Work", polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
-
-  <table class="table table-striped related-files" data-behavior="child-relationships" data-param-key="<%= f.object.model_name.param_key %>">
+<div class="form-group" data-behavior="child-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= f.object.work_members_json %>">
+  <div class="form-inline">
+      <%= f.label :find_child_work %>
+      <%= f.input_field :find_child_work,
+                        prompt: :translate,
+                        autocomplete: 'off',
+                        data: {
+                          autocomplete: 'work',
+                          'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/find_works',
+                          'exclude-work': f.object.model.id # exclude this item from the result set.
+                        } %>
+      <a class="btn btn-primary" data-behavior="add-relationship">Add</a>
+  </div>
+  <div class="message has-warning hidden"></div>
+  <div style="margin-top: 10px">
+    <%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
+  </div>
+  <table class="table table-striped">
+    <caption><%= t('.caption') %></caption>
     <thead>
     <tr>
-      <th>Child Work</th>
-      <th>Actions</th>
+      <th><%= t('.header.title') %></th>
+      <th><%= t('.header.actions') %></th>
     </tr>
     </thead>
     <tbody>
-
-    <%= f.fields_for :work_members do |row| %>
-        <tr>
-          <td>
-            <%= link_to row.object.title.first, [main_app, row.object] %>
-          </td>
-          <td>
-            <a class="btn btn-danger" data-behavior="remove-relationship" data-index="<%= row.index %>">Remove</a>
-          </td>
-        </tr>
-    <% end %>
-    <tr>
-      <td>
-        <%= render "find_work_widget", f: f,
-                                       name: 'child_work',
-                                       id: f.object.model.id %>
-        <div class="message has-warning hidden"></div>
-      </td>
-      <td>
-        <a class="btn btn-primary" data-behavior="add-relationship">Add</a>
-      </td>
-    </tr>
     </tbody>
   </table>
 </div>
@@ -50,6 +43,6 @@ HTML Properties:
 <script type="text/x-tmpl" id="tmpl-child-work">
 <tr>
   <td>{%= o.title %}</td>
-  <td><button class="btn btn-danger" data-behavior="remove-relationship">Remove</button></td>
+  <td><button class="btn btn-danger" data-behavior="remove-relationship" data-confirm-text="<%= t('.confirm.text') %>" data-confirm-cancel="<%= t('.confirm.cancel') %>" data-confirm-remove="<%= t('.confirm.remove') %>"><%= t('.actions.remove') %></button></td>
 </tr>
 </script>