hyrax 2.0.3 → 2.1.0.beta1

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

@@ -0,0 +1,31 @@
+                  <h3><%= t(".#{access}.title") %></h3>
+                  <p><%= t(".#{access}.help") %></p>
+                  <p><%= t(".#{access}.help_with_works", type_title: @collection.collection_type.title) if @collection.share_applies_to_new_works? && access != 'depositors' %></p>
+                  <% if @form.permission_template.access_grants.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.permission_template.access_grants.select(&filter).each do |g| %>
+                        <tr>
+                          <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
+                          <td><%= g.agent_type.titleize %></td>
+                          <td>
+                            <% if g.admin_group? %>
+                              <%= link_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 %>
+                              <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-danger' %>
+                            <% end %>
+                          </td>
+                        </tr>
+                      <% end %>
+                      </tbody>
+                    </table>
+                  <% else %>
+                    <p><em><%= t(".#{access}.empty") %></em></p>
+                  <% end %>

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

@@ -1,45 +1,62 @@
-<% id = document.id %>
-<tr id="document_<%= id %>">
-  <td></td>
+<% id = collection_presenter.id %>
+<tr id="document_<%= id %>"
+  data-id="<%= id %>"
+  data-colls-hash="<%= collection_presenter.available_parent_collections(scope: controller) %>"
+  data-post-url="<%= hyrax.dashboard_create_nest_collection_within_path(id) %>"
+  data-post-delete-url="<%= is_admin_set ? hyrax.admin_admin_set_path(id) : hyrax.dashboard_collection_path(id) %>">
+
+  <td><% unless collection_presenter.solr_document.admin_set? %><input type="checkbox" name="batch_document_ids[]" id="batch_document_<%= id %>" value="<%= id %>" class="batch_document_selector" /><% end %></td>
   <td>
-    <div class="media">
-      <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-small pull-left"></span>
-      <div class="media-body">
-        <div class="media-heading">
-          <%#= link_to url_for_document(document), id: "src_copy_link#{id}" do %>
-          <%= link_to hyrax.dashboard_collection_path(id) do %>
-              <span class="sr-only"><%= t("hyrax.dashboard.my.sr.show_label") %> </span>
-              <%= document.title_or_label %>
+    <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>
+        <% else %>
+          <%= image_tag(collection_presenter.thumbnail_path) %>
+        <% end %>
+      </div>
+      <%= link_to collection_presenter.show_path do %>
+          <span class="sr-only"><%= t("hyrax.dashboard.my.sr.show_label") %> </span>
+          <%= collection_presenter.title_or_label %>
+      <% end %>
+
+      <%# Expand arrow %>
+      <a href="#" class="small show-more" title="Click for more details">
+        <i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></i>
+        <span class="sr-only"> <%= "#{t("hyrax.dashboard.my.sr.detail_label")} #{collection_presenter.title_or_label}" %></span>
+      </a>
+    </div>
+
+    <%# Collection details %>
+    <div id="detail_<%= id %>">
+      <div class="expanded-details">
+        <p>
+          <strong><%= t("hyrax.dashboard.my.collection_list.description") %></strong>
+          <br><%= collection_presenter.description.first %>
+        </p>
+        <p>
+          <strong><%= t("hyrax.dashboard.my.collection_list.edit_access") %></strong>
+          <br>
+          <% if collection_presenter.edit_groups.present? %>
+            <%= t("hyrax.dashboard.my.collection_list.groups") %> <%= collection_presenter.edit_groups.join(', ') %>
+            <br/>
           <% end %>
-          <a href="#" class="small" title="Click for more details">
-            <i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></i>
-            <span class="sr-only"> <%= "#{t("hyrax.dashboard.my.sr.detail_label")} #{document.title_or_label}" %></span>
-          </a>
-        </div>
+          <%= t("hyrax.dashboard.my.collection_list.users") %> <%= collection_presenter.edit_people.join(', ') %>
+        </p>
       </div>
     </div>
   </td>
-  <td class="text-center"><%= document.create_date %> </td>
-  <td class="text-center">
-    <%= render_visibility_link(document) %>
+  <td class="collection_type">
+    <span class="label label-success"><%= collection_presenter.collection_type_badge %></span>
   </td>
-  <td class="text-center">
-    <%= render 'collection_action_menu', id: id %>
+  <td><%= collection_presenter.permission_badge %>  </td>
+  <td><%= collection_presenter.total_viewable_items %></td>
+  <td class="date"><%=collection_presenter.modified_date.try(:to_formatted_s, :standard) %> </td>
+  <td>
+    <% if collection_presenter.solr_document.admin_set? %>
+      <%= render '/hyrax/my/admin_set_action_menu', admin_set_presenter: collection_presenter %>
+    <% else %>
+      <%= render '/hyrax/my/collection_action_menu', collection_presenter: collection_presenter %>
+    <% end %>
    </td>
 </tr>
-<tr id="detail_<%= id %>"> <!--  collection detail"> -->
-  <td colspan="6">
-    <dl class="expanded-details row">
-      <dt class="col-xs-3 col-lg-2"><%= t("hyrax.dashboard.my.collection_list.description") %></dt>
-      <dd class="col-xs-9 col-lg-10"><%= document.description.first %></dd>
-      <dt class="col-xs-3 col-lg-2"><%= t("hyrax.dashboard.my.collection_list.edit_access") %></dt>
-      <dd class="col-xs-9 col-lg-10">
-      <% if document.edit_groups.present? %>
-        <%= t("hyrax.dashboard.my.collection_list.groups") %> <%= document.edit_groups.join(', ') %>
-        <br/>
-      <% end %>
-        <%= t("hyrax.dashboard.my.collection_list.users") %> <%= document.edit_people.join(', ') %>
-      </dd>
-    </dl>
-  </td>
-</tr>

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

@@ -0,0 +1,17 @@
+<div class="modal fade" id="collection-remove-from-collection" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="delete-collection-form">
+        <div class="modal-body">
+          <p><%= t('hyrax.dashboard.collections.form_relationships.modals.remove_from_collection_description') %></p>
+        </div>
+        <div class="modal-footer">
+          <%= form_tag dashboard_remove_parent_relationship_above_path(child_id, parent_id) do |f| %>
+            <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+            <%= submit_tag t('helpers.action.remove'), class: "btn btn-danger" %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,17 @@
+<div class="modal fade" id="collection-remove-subcollection" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="delete-collection-form">
+        <div class="modal-body">
+          <p><%= t('hyrax.dashboard.collections.form_relationships.modals.remove_this_sub_collection_description') %></p>
+        </div>
+        <div class="modal-footer">
+          <%= form_tag dashboard_remove_child_relationship_under_path(parent_id, child_id) do |f| %>
+            <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+            <%= submit_tag t('helpers.action.remove'), class: "btn btn-danger" %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -1,23 +1,29 @@
 <h2 class="sr-only"><%= t('hyrax.collection.actions.header') %></h2>
-<div class="actions-controls-collections">
-    <% if can? :edit, presenter.solr_document %>
-      <%= link_to t('hyrax.collection.actions.edit.label'),
-                  edit_dashboard_collection_path(presenter),
-                  title: t('hyrax.collection.actions.edit.desc'),
-                  class: 'btn btn-default' %>
-      <%= link_to t('hyrax.collection.actions.add_works.label'),
-                  hyrax.my_works_path(add_works_to_collection: presenter.id),
-                  title: t('hyrax.collection.actions.add_works.desc'),
-                  class: 'btn btn-default',
-                  data: { turbolinks: false } %>
-    <%end %>
+<% if can? :edit, presenter.solr_document %>
+    <%= link_to t('hyrax.collection.actions.edit.label'),
+                hyrax.edit_dashboard_collection_path(presenter),
+                title: t('hyrax.collection.actions.edit.desc'),
+                class: 'btn btn-primary',
+                data: { turbolinks: false } %>
+<% end %>
 
-    <% if can? :destroy, presenter.solr_document %>
-      <%= link_to t('hyrax.collection.actions.delete.label'),
-                  hyrax.dashboard_collection_path(presenter),
-                  title: t('hyrax.collection.actions.delete.desc'),
-                  class: 'btn btn-danger',
-                  data: { confirm: t('hyrax.collection.actions.delete.confirmation'),
-                          method: :delete } %>
-    <% end %>
-</div>
+<% if presenter.collection_type_is_nestable? %>
+<!-- The user should have deposit access to the parent and read access to the child (the collection we are already showing, so no test is necessary). -->
+    <%= button_tag '',
+                  class: 'btn btn-primary add-to-collection',
+                  title: t("hyrax.collection.actions.nested_subcollection.desc"),
+                  type: 'button',
+                  data: { nestable: presenter.collection_type_is_nestable?,
+                          hasaccess: true } do %>
+                  <%= t('hyrax.collection.actions.nested_subcollection.button_label') %>
+                <% end %>
+<% end %>
+
+<% if can? :destroy, presenter.solr_document %>
+    <%= link_to t('hyrax.collection.actions.delete.label'),
+                hyrax.dashboard_collection_path(presenter),
+                title: t('hyrax.collection.actions.delete.desc'),
+                class: 'btn btn-danger',
+                data: { confirm: t('hyrax.collection.actions.delete.confirmation'),
+                        method: :delete } %>
+<% end %>

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

@@ -0,0 +1,25 @@
+<h2 class="sr-only"><%= t('hyrax.collection.actions.header') %></h2>
+<div class="text-right">
+  <% if can? :deposit, presenter.solr_document %>
+    <div>
+      <% if @presenter.create_many_work_types? %>
+        <%= link_to t('hyrax.collection.actions.add_new_work.label'),
+                    '#',
+                    title: t('hyrax.collection.actions.add_new_work.desc'),
+                    data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'single', add_works_to_collection: presenter.id },
+                    class: 'btn btn-primary deposit-new-work-through-collection'  %>
+      <% else # simple link to the first work type %>
+        <%= link_to t('hyrax.collection.actions.add_new_work.label'),
+                    new_polymorphic_path([main_app, @presenter.first_work_type], add_works_to_collection: presenter.id),
+                    class: 'btn btn-primary'  %>
+      <% end %>
+    </div>
+    <div>
+      <%= link_to t('hyrax.collection.actions.add_existing_works.label'),
+                  hyrax.my_works_path(add_works_to_collection: presenter.id),
+                  title: t('hyrax.collection.actions.add_existing_works.desc'),
+                  class: 'btn btn-link side-arrows',
+                  data: { turbolinks: false } %>
+    </div>
+  <% end %>
+</div>

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

@@ -1,10 +1,11 @@
-<table class="table table-striped">
+<table class="table table-striped collections-list-table collection-works-table">
   <caption class="sr-only">List of items in this collection</caption>
   <thead>
   <tr>
     <th>&nbsp;</th>
-    <th>Title</th>
-    <th>Date Uploaded</th>
+    <th class="title-column">Title</th>
+    <th>Date added</th>
+    <th>Owner</th>
     <th>Visibility</th>
     <% if current_user %>
       <th>Action</th>

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

@@ -11,21 +11,22 @@
         <%= 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>
   </td>
   <td class="text-center"><%= document.date_uploaded %> </td>
+  <td class="text-center"></td>
   <td class="text-center">
     <%= render_visibility_link(document) %>
   </td>
-  <% if current_user %>
+  <% if current_user and can? :edit, @collection %>
     <td class="text-center">
-      <%= render 'show_document_list_menu', document: document %>
+      <%= button_for_remove_from_collection @collection, document, label: "Remove", btn_class: "btn-danger btn-xs" %>
     </td>
   <% end %>
 </tr>

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

@@ -0,0 +1,6 @@
+<li style="margin: 5px 0">
+	<%# TODO: move styling into CSS %>
+	<strong><%= link_to document, [hyrax, :dashboard, document], id: "src_copy_link_#{document.id}" %></strong>
+	<button class="btn btn-xs btn-danger remove-from-collection-button pull-right" <%= "disabled" unless can? :edit, document.id %>><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
+	<%= render 'modal_remove_from_collection', child_id: id, parent_id: document.id %>
+</li>

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

@@ -0,0 +1,37 @@
+<% if presenter.total_parent_collections <= 0 %>
+		<div class="alert alert-warning" role="alert"><%= t('hyrax.collections.show.no_visible_parent_collections') %></div>
+<% else %>
+	<div id="remove_parent_collection">
+	  <% if presenter.use_parent_more_less? %>
+	  	<div class="less-parent-collections-block" id="less-parent-collections">
+				<ul>
+		  		<% presenter.visible_parent_collections.each do |document| %>
+		      	<%= render 'hyrax/dashboard/collections/show_parent_collection_row', id: presenter.id, document: document %>
+		  		<% end %>
+				</ul>
+	  		<% if presenter.more_parent_collections? %>
+	  				<button id="show-more-parent-collections" class="btn show-more-parent-collections-btn"><%= t("hyrax.collections.show.show_more_parent_collections") %></button>
+	  		<% end %>
+	  	</div>
+	  	<% if presenter.more_parent_collections? %>
+	  		<div class="more-parent-collections-block" id="more-parent-collections">
+					<ul>
+		  			<% presenter.more_parent_collections.each do |document| %>
+		      		<%= render 'hyrax/dashboard/collections/show_parent_collection_row', id: presenter.id, document: document %>
+		  			<% end %>
+					</ul>
+	  			<button id="show-less-parent-collections" class="btn show-less-parent-collections-btn"><%= t("hyrax.collections.show.show_less_parent_collections") %></button>
+	  		</div>
+	  	<% end %>
+	  <% else %>
+			<ul>
+				<% presenter.parent_collections.documents.each do |document| %>
+		    	<%= render 'hyrax/dashboard/collections/show_parent_collection_row', id: presenter.id, document: document %>
+				<% end %>
+			</ul>
+	    <div class="row">
+	      <%= render 'hyrax/collections/paginate', solr_response: presenter.parent_collections, page_param_name: :parent_collection_page  %>
+	    </div>
+	  <% end %>
+	<div>
+<% end %>

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

@@ -0,0 +1,26 @@
+<% if presenter.collection_type_is_nestable? %>
+  <!-- The user should have deposit access to the parent (the collection we are showing) and read access to the child -->
+  <% if presenter.user_can_nest_collection? %>
+    <div class="text-right">
+      <div>
+        <div class="sr-only"><% t('hyrax.collection.actions.nest_collections.desc') %></div>
+        <%= button_tag t('hyrax.collection.actions.nest_collections.button_label'),
+              class: 'btn btn-primary add-subcollection',
+              title: t('hyrax.collection.actions.nest_collections.desc'),
+              data: { nestable: true,
+                      hasaccess: true,
+                      presenter_id: presenter.id } %>
+      </div>
+      <div>
+        <!-- The user should must have the ability to create a new collection of parent's type -->
+        <% if presenter.user_can_create_new_nest_collection? %>
+          <div class="sr-only"><% t('hyrax.collection.actions.add_new_nested_collection.desc') %></div>
+          <%= link_to t('hyrax.collection.actions.add_new_nested_collection.label'),
+            hyrax.dashboard_create_subcollection_under_path(parent_id: presenter.id),
+            title: t('hyrax.collection.actions.add_new_nested_collection.desc'),
+            class: 'btn btn-link side-arrows' %>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% end %>

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

@@ -1,32 +1,33 @@
 <div class="batch-info">
   <%= render 'form_for_select_collection', user_collections: @user_collections %>
 
-  <% if params[:action] == "edit" && @response.response['numFound'] > 1 %>
-  <div class="batch-toggle">
-    <% session[:batch_edit_state] = "on" %>
-    <%= button_for_remove_selected_from_collection collection %>
-  </div>
+  <% if params[:action] == "edit" && show_sort_and_per_page? %>
+    <div class="batch-toggle">
+      <% session[:batch_edit_state] = "on" %>
+      <%= button_for_remove_selected_from_collection collection %>
+    </div>
+  <% end %>
+
+  <% if show_sort_and_per_page? && active_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, 'Sort By:') %>
+             <%= select_tag(:sort, options_from_collection_for_select(active_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
+             <%= label_tag(:per_page) do %>
+                 Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], params[:per_page]), title: t('hyrax.dashboard.my.sr.results_per_page')) %>
+                 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>
+           </fieldset>
+           <div class="col-sm-3">
+             <%= render 'view_type_group' %>
+           </div>
+         </div>
+       <% end %>
+    </div>
   <% end %>
-   <div class="sort-toggle">
-     <%# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {action: "index"} but I'm not sure -%>
-     <% if @response.response['numFound'] > 1 && !sort_fields.empty? %>
-        <%= form_tag collection_path(collection), method: :get, class: 'per_page form-horizontal' do %>
-             <div class="form-group form-group-lg">
-               <fieldset class="col-xs-12 col-sm-9 col-md-8 col-lg-10">
-                 <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
-                 <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
-                 <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
-                 <%= label_tag(:per_page) do %>
-                     Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page") %>
-                     per page
-                 <% end %>
-                 <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
-                 &nbsp;&nbsp;&nbsp;
-                 <button class="btn btn-info"><span class="glyphicon glyphicon-refresh"></span> Refresh</button>
-               </fieldset>
-               <%= render 'view_type_group' %>
-             </div>
-         <% end %>
-      <% end %>
-   </div>
 </div>

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

@@ -0,0 +1,21 @@
+<% if @subcollection_docs.nil? || @subcollection_docs.empty? %>
+  <div class="alert alert-warning" role="alert"><%= t('hyrax.collections.show.no_visible_subcollections') %></div>
+<% else %>
+<div id="remove_subcollection">
+  <ul>
+    <% @subcollection_docs.each do |document| %>
+     <li style="margin: 5px 0">
+   	   <%# TODO: move styling into CSS %>
+       <strong>
+        <%= link_to document.title_or_label, [hyrax, :dashboard, document], id: "src_copy_link_#{document.id}" %>
+        </strong>
+         <% if can? :edit, id %>
+          <button class="btn btn-xs btn-danger remove-subcollection-button pull-right"><%= t('hyrax.collections.show.buttons.remove_this_sub_collection') %></button>
+          <%= render 'modal_remove_sub_collection', parent_id: id, child_id: document.id %>
+         <% end %>
+      </li>
+    <% end %>
+  <ul>
+</div>
+<%= render 'hyrax/collections/paginate', solr_response: @subcollection_solr_response, page_param_name: :sub_collection_page  %>
+<% end %>