hyrax 2.0.3 → 2.1.0.beta1

data/app/views/hyrax/homepage/_recently_uploaded.html.erb

@@ -3,12 +3,8 @@
   <p><%= t('.no_public') %></p>
 <% else %>
   <div id="recent_docs">
-    <table class="table table-bordered table-striped">
-      <tr>
-        <th scope="col"><%= t('.depositor') %></th>
-        <th scope="col"><%= t('.details') %></th>
-      </tr>
+    <ol class="list-group list-group-striped recent_uploads">
       <%= render partial: "recent_document", collection: recent_documents %>
-    </table>
+    </ol>
   </div>
 <% end %>

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

@@ -4,14 +4,14 @@
   <div class="home_share_work row">
     <div class="col-sm-12 text-center">
       <% if signed_in? %>
-        <% if create_work_presenter.many? %>
+        <% if @presenter.create_many_work_types? %>
           <%= link_to '#',
             class: "btn btn-primary btn-lg",
             data: { behavior: 'select-work', target: '#worktypes-to-create', 'create-type' => 'single' } do %>
             <i class="glyphicon glyphicon-upload"></i> <%= t('hyrax.share_button') %>
           <% end %>
         <% else # simple link to the first work type %>
-          <%= link_to new_polymorphic_path([main_app, create_work_presenter.first_model]),
+          <%= link_to new_polymorphic_path([main_app, @presenter.first_work_type]),
                 class: 'btn btn-primary' do %>
             <i class="glyphicon glyphicon-upload"></i> <%= t('hyrax.share_button') %>
           <% end %>
@@ -30,3 +30,5 @@
 <div class="row home-content">
   <%= render 'home_content' %>
 </div>
+
+<%= render '/shared/select_work_type_modal', create_work_presenter: @presenter.create_work_presenter if @presenter.draw_select_work_modal? %>

data/app/views/hyrax/my/_admin_set_action_menu.html.erb

@@ -0,0 +1,54 @@
+<% id = admin_set_presenter.id %>
+<div class="btn-group">
+  <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true">
+    <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
+    <%= t("hyrax.dashboard.my.action.select") %> <span class="caret" aria-hidden="true"></span>
+  </button>
+  <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
+    <li role="menuitem" tabindex="-1">
+      <%= link_to hyrax.admin_admin_set_path(id),
+                  class: 'itemicon itemedit',
+                  title: t("hyrax.dashboard.my.action.view_admin_set") do %>
+        <%= t("hyrax.dashboard.my.action.view_admin_set") %>
+      <% end %>
+    </li>
+    <% if can? :edit, admin_set_presenter.solr_document %>
+      <li role="menuitem" tabindex="-1">
+        <%= link_to hyrax.edit_admin_admin_set_path(id),
+                    class: 'itemicon itemedit',
+                    title: t("hyrax.dashboard.my.action.edit_admin_set") do %>
+          <%= t("hyrax.dashboard.my.action.edit_admin_set") %>
+        <% end %>
+      </li>
+    <% else %>
+      <li role="menuitem" tabindex="-1">
+        <%= link_to "#",
+                    class: 'itemicon itemedit edit-collection-deny-button',
+                    title: t("hyrax.dashboard.my.action.edit_collection") do %>
+          <%= t("hyrax.dashboard.my.action.edit_collection") %>
+        <% end %>
+      </li>
+    <% end %>
+    <li role="menuitem" tabindex="-1">
+      <%= link_to "#",
+                     class: 'itemicon itemtrash delete-collection-button',
+                     title: t("hyrax.dashboard.my.action.delete_admin_set"),
+                     data: { totalitems: admin_set_presenter.total_items ,
+                             membership: admin_set_presenter.collection_type_is_require_membership? ,
+                             hasaccess: (can?(:edit, admin_set_presenter.solr_document)) } do %>
+        <%= t("hyrax.dashboard.my.action.delete_admin_set") %>
+      <% end %>
+    </li>
+    <% if Hyrax::CollectionType.any_nestable? %>
+        <li role="menuitem" tabindex="-1">
+          <%= link_to "#",
+                      class: 'itemicon add-to-collection',
+                      title: t("hyrax.dashboard.my.action.add_to_collection"),
+                      data: { nestable: false,
+                              hasaccess: (can?(:deposit, admin_set_presenter.solr_document)) } do %>
+              <%= t("hyrax.dashboard.my.action.add_to_collection") %>
+          <% end %>
+        </li>
+    <% end %>
+  </ul>
+</div>

data/app/views/hyrax/my/_collection_action_menu.html.erb

@@ -1,25 +1,57 @@
+<% id = collection_presenter.id %>
 <div class="btn-group">
+
   <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true">
     <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
     <%= t("hyrax.dashboard.my.action.select") %> <span class="caret" aria-hidden="true"></span>
   </button>
+
   <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
     <li role="menuitem" tabindex="-1">
-      <%= link_to hyrax.edit_dashboard_collection_path(id),
+      <%= link_to hyrax.dashboard_collection_path(id),
                   class: 'itemicon itemedit',
-                  title: t("hyrax.dashboard.my.action.edit_collection") do %>
-        <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> <%= t("hyrax.dashboard.my.action.edit_collection") %>
+                  title: t("hyrax.dashboard.my.action.view_collection") do %>
+        <%= t("hyrax.dashboard.my.action.view_collection") %>
       <% end %>
     </li>
+    <% if can? :edit, collection_presenter.solr_document %>
+      <li role="menuitem" tabindex="-1">
+        <%= link_to hyrax.edit_dashboard_collection_path(id),
+                    class: 'itemicon itemedit',
+                    title: t("hyrax.dashboard.my.action.edit_collection") do %>
+          <%= t("hyrax.dashboard.my.action.edit_collection") %>
+        <% end %>
+      </li>
+    <% else %>
+      <li role="menuitem" tabindex="-1">
+        <%= link_to "#",
+                    class: 'itemicon itemedit edit-collection-deny-button',
+                    title: t("hyrax.dashboard.my.action.edit_collection") do %>
+          <%= t("hyrax.dashboard.my.action.edit_collection") %>
+        <% end %>
+      </li>
+    <% end %>
     <li role="menuitem" tabindex="-1">
-      <%= link_to hyrax.dashboard_collection_path(id),
-                  class: 'itemicon itemtrash',
+      <%= link_to "#",
+                  class: 'itemicon itemtrash delete-collection-button',
                   title: t("hyrax.dashboard.my.action.delete_collection"),
-                  method: :delete,
-                  data: {
-                    confirm: t("hyrax.dashboard.my.action.collection_confirmation", application_name: application_name) } do %>
-        <i class="glyphicon glyphicon-trash" aria-hidden="true"></i> <%= t("hyrax.dashboard.my.action.delete_collection") %>
+                  data: { totalitems: collection_presenter.total_items ,
+                          membership: collection_presenter.collection_type_is_require_membership? ,
+                          hasaccess: (can?(:edit, collection_presenter.solr_document)) } do %>
+        <%= t("hyrax.dashboard.my.action.delete_collection") %>
       <% end %>
     </li>
+    <% if Hyrax::CollectionType.any_nestable? %>
+      <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
+      <li role="menuitem" tabindex="-1">
+        <%= link_to "#",
+                    class: 'itemicon add-to-collection',
+                    title: t("hyrax.dashboard.my.action.add_to_collection"),
+                    data: { nestable: collection_presenter.collection_type_is_nestable? ,
+                            hasaccess: (can?(:read, collection_presenter.solr_document)) } do %>
+          <%= t("hyrax.dashboard.my.action.add_to_collection") %>
+        <% end %>
+      </li>
+    <% end %>
   </ul>
 </div>

data/app/views/hyrax/my/_facet_pivot.html.erb

@@ -0,0 +1,26 @@
+<% if !subfacet ||= false %>
+  <ul class="dropdown-menu pivot-facet list-unstyled">
+<%end %>
+
+  <% display_facet.items.each do |item| -%>
+    <li>
+      <span class="facet-values">
+        <% # This prevents model Collection from being shown as a second filter along with the collection type. %>
+        <% item.fq= {} if subfacet %>
+
+        <% # The unless prevents Collection from being included in the select list for the Collection Type filter. %>
+        <%= render_facet_item(item.field, item) unless subfacet != true && item.value == "Collection" %>
+      </span>
+
+      <% unless item.items.blank? %>
+        <%= render partial: 'facet_pivot', locals: { subfacet: true,
+                                                     display_facet: item,
+                                                     field_name: field_name,
+                                                     solr_field: field_name } %>
+      <% end %>
+    </li>
+  <% end %>
+
+<% if !subfacet %>
+  </ul>
+<% end %>

data/app/views/hyrax/my/_search_header.html.erb

@@ -12,18 +12,4 @@
   </div>
 </div>
 
-<div class="batch-info">
-  <%= render 'hyrax/dashboard/collections/form_for_select_collection', user_collections: @user_collections %>
-
-  <div class="batch-toggle">
-    <% session[:batch_edit_state] = "on" %>
-    <div class="button_to-inline">
-      <%= button_to "Edit Selected", hyrax.edit_batch_edits_path, method: :get, class: "btn btn-update btn-primary hidden submits-batches", data: { behavior: 'batch-edit' }, id: 'batch-edit' %>
-    </div>
-    <% if on_my_works? %>
-      <%= batch_delete %>
-      <%= button_tag "Add to Collection", class: 'btn btn-primary submits-batches submits-batches-add',
-          data: { toggle: "modal", target: "#collection-list-container" } %>
-    <% end %>
-  </div>
-</div>
+<%= render 'batch_actions' %>

data/app/views/hyrax/my/_sort_and_per_page.html.erb

@@ -1,17 +1,16 @@
+<% if show_sort_and_per_page? %>
   <div class="sort-toggle">
-    <% if @response.response['numFound'] > 1 %>
       <%= form_tag search_action_for_dashboard, method: :get, class: 'per_page form-inline' do %>
-            <div class="form-group">
-              <fieldset class="col-xs-12">
-                <legend class="sr-only"><%= t('hyrax.dashboard.my.sr.results_per_page') %></legend>
-                <%= 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, :utf8)) %>
-              </fieldset>
-            </div>
-
+        <div class="form-group">
+          <fieldset class="col-xs-12">
+            <legend class="sr-only"><%= t('hyrax.dashboard.my.sr.results_per_page') %></legend>
+            <%= 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, :utf8)) %>
+          </fieldset>
+        </div>
       <% end %>
-    <% end %>
   </div>
+<% end %>

data/app/views/hyrax/my/_work_action_menu.html.erb

@@ -8,22 +8,24 @@
 
   <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= document.id %>">
 
-    <li role="menuitem" tabindex="-1">
-      <%= link_to [main_app, :edit, document] do %>
-        <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
-        <span> <%= t("hyrax.dashboard.my.action.edit_work") %> </span>
-      <% end %>
-    </li>
+    <% if can? :edit, document.id %>
+      <li role="menuitem" tabindex="-1">
+        <%= link_to [main_app, :edit, document] do %>
+          <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
+          <span> <%= t("hyrax.dashboard.my.action.edit_work") %> </span>
+        <% end %>
+      </li>
 
-    <li role="menuitem" tabindex="-1">
-      <%= link_to [main_app, document],
-                  method: :delete,
-                  data: {
-                    confirm: t("hyrax.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
-        <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-        <span> <%= t("hyrax.dashboard.my.action.delete_work") %> </span>
-      <% end %>
-    </li>
+      <li role="menuitem" tabindex="-1">
+        <%= link_to [main_app, document],
+                    method: :delete,
+                    data: {
+                      confirm: t("hyrax.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
+          <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
+          <span> <%= t("hyrax.dashboard.my.action.delete_work") %> </span>
+        <% end %>
+      </li>
+    <% end %>
 
     <li role="menuitem" tabindex="-1">
       <%= display_trophy_link(current_user, document.id) do |text| %>

data/app/views/hyrax/my/collections/_batch_actions.html.erb

@@ -0,0 +1,5 @@
+<div class="batch-info">
+  <div class="batch-toggle">
+    <button id="delete-collections-button" class="btn btn-danger delete-collections-button"><%= t("hyrax.dashboard.my.action.delete_collections") %></button>
+  </div>
+</div>

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

@@ -1,18 +1,27 @@
-<table class="table table-striped">
+<table id="collections-list-table" class="table table-striped collections-list-table">
   <caption class="sr-only"><%= t("hyrax.dashboard.my.sr.listing") %> <%= application_name %></caption>
-  <% unless params[:display_type] == 'list' %>
-    <thead>
-    <tr>
-      <th><%= t("hyrax.dashboard.my.heading.title") %></th>
-      <th><%= 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>
-  <% end %>
+  <thead>
+  <tr>
+    <th class="check-all">
+      <label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label>
+      <input type="checkbox" name="check_all" id="check_all" value="yes" />
+    </th>
+    <th><%= t("hyrax.dashboard.my.heading.title") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.type") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.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>
+  </tr>
+  </thead>
   <tbody>
   <% docs.each_with_index do |document, counter| %>
-    <%= render 'list_collections', document: document, counter: counter %>
+    <% collection_presenter = if document.admin_set?
+                                Hyrax::AdminSetPresenter.new(document, current_ability, nil)
+                              else
+                                Hyrax::CollectionPresenter.new(document, current_ability, nil)
+                              end %>
+    <%= render 'list_collections', collection_presenter: collection_presenter, counter: counter, is_admin_set: document.admin_set? %>
   <% end %>
   </tbody>
 </table>

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

@@ -1,43 +1,65 @@
-<% id = document.id %>
-<tr id="document_<%= id %>">
+<% id = collection_presenter.id%>
+
+<%# Data attributes referenced by the javascript for row actions %>
+<tr id="document_<%= id %>"
+  data-source="my"
+  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 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, id: "src_copy_link#{id}" 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 date"><%= document.create_date.try(:to_formatted_s, :standard) %> </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 'hyrax/my/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="4">
-    <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/my/collections/_modal_add_subcollection.html.erb

@@ -0,0 +1,38 @@
+<div class="modal fade disable-unless-selected" id="add-subcollection-modal-<%= id %>" tabindex="-1" role="dialog" aria-labelledby="add-subcollection-label">
+<% collection = Collection.find id %>
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="add-subcollection-label"><%= t('hyrax.collection.actions.nest_collections.modal_title') %></h4>
+      </div>
+
+      <div class="modal-body">
+        <div class="modal-ajax-alert"></div>
+        <label><%= t('hyrax.collection.actions.nest_collections.select_label') %></label>
+        <input type="hidden" name="source" value="<%= source %>"></input>
+        <select name="child_id">
+          <option value="none"><%= t("hyrax.dashboard.my.action.select") %></option>
+          <% colls = Hyrax::Collections::NestedCollectionQueryService.available_child_collections(parent: collection, scope: controller, limit_to_id: nil) %>
+          <% colls.each {|coll| %>
+            <option  value="<%= coll.id %>"><%= coll.title.first %></option>
+          <% } %>
+        </select>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+        <button
+          disabled
+          type="button"
+          class="btn btn-primary modal-add-button modal-submit-button"
+          data-post-url="<%= dashboard_create_nest_collection_under_path(collection.id) %>"
+          data-source="<%= source %>">
+          <%= t('hyrax.collection.actions.nest_collections.button_label') %>
+        </button>
+      </div>
+
+    </div>
+  </div>
+</div>