hyrax 2.0.3 → 2.1.0.beta1

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

@@ -0,0 +1,31 @@
+<div class="modal fade disable-unless-selected" id="add-to-collection-modal" tabindex="-1" role="dialog" aria-labelledby="add-to-collection-label">
+  <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-to-collection-label"><%= t('hyrax.collection.actions.nested_subcollection.modal_title') %></h4>
+      </div>
+
+      <div class="modal-body">
+        <div class="modal-ajax-alert"></div>
+        <label><%= t('hyrax.collection.actions.nested_subcollection.select_label') %></label>
+        <input type="hidden" name="source" value="<%= source %>"></input>
+        <select name="parent_id">
+          <option value="none"><%= t("hyrax.dashboard.my.action.select") %></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-source="<%= source %>">
+          <%= t('hyrax.collection.actions.nested_subcollection.button_label') %>
+        </button>
+        </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,12 @@
+<div class="modal fade" id="add-to-collection-deny-modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-body">
+        <p><%= t('hyrax.dashboard.my.action.nesting_not_allowed') %></p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal"><%= t('helpers.action.close') %></button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,12 @@
+<div class="modal fade" id="add-to-collection-permission-deny-modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-body">
+        <p><%= t('hyrax.dashboard.my.action.nesting_permission_denied') %></p>
+      </div> 
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal"><%= t('helpers.action.close') %></button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,36 @@
+<div class="modal collectiontypes fade" id="collectiontypes-to-create" tabindex="-1" role="dialog" aria-labelledby="select-collectiontype-label">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <form class="new-collection-select">
+
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.collection_type_actions.close') %>"><span aria-hidden="true">&times;</span></button>
+          <h4 class="modal-title" id="select-collectiontype-label"><%= t('hyrax.dashboard.collection_type_actions.select_type_of_collection') %></h4>
+        </div>
+
+        <div class="modal-body">
+          <% @collection_type_list_presenter.each do |row_presenter| %>
+            <div class="radio radio-button-list">
+              <label>
+                <input type="radio" name="collection_type"
+                <% if row_presenter.admin_set? %>
+                  data-path="<%= new_admin_admin_set_path %>"
+                <% else %>
+                  data-path="<%= "#{new_dashboard_collection_path}&collection_type_id=#{row_presenter.id}" %>"
+                <% end %>>
+                <h4><%= row_presenter.title %></h4>
+                <p><%= row_presenter.description %></p>
+              </label>
+            </div>
+          <% end %>
+        </div>
+
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('hyrax.dashboard.collection_type_actions.close') %>
+          </button>
+          <input type="submit" class="btn btn-primary" value="<%= t('hyrax.dashboard.collection_type_actions.create_collection') %>">
+        </div>
+      </form>
+    </div><!-- ./modal-content -->
+  </div>
+</div>

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

@@ -0,0 +1,12 @@
+<div class="modal fade" id="collection-admin-set-delete-deny-modal" tabindex="-1" role="dialog" aria-labelledby="delete-admin-set-collection-deny-label">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-body">
+        <p><%= t('hyrax.dashboard.my.action.delete_admin_set_deny') %></p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal"><%= t('helpers.action.close') %></button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,19 @@
+<div class="modal fade" id="collection-to-delete-modal" tabindex="-1" role="dialog" aria-labelledby="delete-collection-label">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-body">
+        <div class="modal-ajax-alert"></div>
+        <p><%= t('hyrax.dashboard.my.action.collections_confirmation_html') %></p>
+      </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 modal-delete-button"
+          title="<%= t("hyrax.dashboard.my.action.delete_collection") %>"
+          ><%= t('helpers.action.delete') %></button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,14 @@
+<div class="modal fade" id="collection-to-delete-deny-modal" tabindex="-1" role="dialog" aria-labelledby="deny-delete-collection-label">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <form class="deny-delete-collection-form">
+        <div class="modal-body">
+          <p><%= t('hyrax.dashboard.my.action.delete_collection_deny') %></p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" data-dismiss="modal"><%= t('helpers.action.close') %></button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,14 @@
+<div class="modal fade" id="collections-to-delete-deny-modal" tabindex="-1" role="dialog" aria-labelledby="delete-collection-label">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <form class="delete-collection-form">
+        <div class="modal-body">
+          <p><%= t('hyrax.dashboard.my.action.delete_collections_deny') %></p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" data-dismiss="modal"><%= t('helpers.action.close') %></button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,18 @@
+<div class="modal fade" id="collection-empty-to-delete-modal" tabindex="-1" role="dialog" aria-labelledby="delete-empty-collection-label">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-body">
+        <div class="modal-ajax-alert"></div>
+        <p><%= t('hyrax.dashboard.my.action.collections_confirmation_no_items_html') %></p>
+      </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 modal-delete-button"
+          title="<%= t("hyrax.dashboard.my.action.delete_collection") %>">
+          <%= t('helpers.action.delete') %>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,17 @@
+<div class="modal fade" id="selected-collections-delete-modal" tabindex="-1" role="dialog" aria-labelledby="delete-collection-label">
+  <div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-body">
+          <p><%= t('hyrax.dashboard.my.action.collections_confirmation_html') %></p>
+        </div>
+        <div class="modal-footer">
+          <div style="text-align: right; display: inline-block">
+            <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+            <div style="float: right; margin-left: 10px;" >
+              <%= render 'hyrax/dashboard/collections/button_for_batch_delete_collection', label: t('helpers.action.delete') %>
+            </div>
+          </div>
+        </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,14 @@
+<div class="modal fade" id="collections-to-edit-deny-modal" tabindex="-1" role="dialog" aria-labelledby="deny-edit-collection-label">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <form class="deny-edit-collection-form">
+        <div class="modal-body">
+          <p><%= t('hyrax.dashboard.my.action.edit_collection_deny') %></p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" data-dismiss="modal"><%= t('helpers.action.close') %></button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>

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

@@ -1,8 +1,8 @@
 <ul class="nav nav-tabs" id="my_nav" role="navigation">
-  <span class="sr-only">You are currently listing your collections.  You have <%= @response.docs.count %> <%= 'collecction'.pluralize(@response.docs.count)%> </span>
+  <span class="sr-only">You are currently listing your collections.  You have <%= @response.docs.count %> <%= 'collection'.pluralize(@response.docs.count)%> </span>
     <li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_collections_path(locale: nil)) %>>
-    <%= link_to t('hyrax.dashboard.all.collections'), hyrax.dashboard_collections_path %>
-  </li>
+      <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.collections"), hyrax.dashboard_collections_path %>
+    </li>
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.my_collections_path(locale: nil)) %>>
     <%= link_to t('hyrax.dashboard.my.collections'), hyrax.my_collections_path %>
   </li>

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

@@ -1,5 +1,4 @@
 <% provide :page_title, t("hyrax.admin.sidebar.collections") %>
-
 <% provide :head do %>
   <%= rss_feed_link_tag route_set: hyrax %>
   <%= atom_feed_link_tag route_set: hyrax %>
@@ -11,28 +10,54 @@
 
 <% provide :page_header do %>
   <h1><span class="fa fa-folder-open"></span> <%= t("hyrax.admin.sidebar.collections") %></h1>
-  <div class="pull-right">
-    <% if can?(:create, Collection) %>
-      <%= link_to(
-            t(:'helpers.action.collection.new'),
-            hyrax.new_dashboard_collection_path,
-            class: 'btn btn-primary'
-          ) %>
-    <% end %>
-  </div>
 <% end %>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default<%= ' tabs' if can?(:read, :admin_dashboard) %>">
-      <%= render 'tabs' if can?(:read, :admin_dashboard) %>
-      <div class="panel-body">
-        <%= render 'search_header' %>
-        <h2 class="sr-only">Collections listing</h2>
-        <%= render 'hyrax/my/document_list' %>
+<div class="collections-wrapper">
+  <section class="tabs-row">
+    <!-- Page tabs -->
+    <nav><%= render 'tabs' if @managed_collection_count > 0 %></nav>
+
+    <% if can?(:create_any, Collection) && @collection_type_list_presenter.any? %>
+      <% if @collection_type_list_presenter.many? %>
+        <% # modal to select type %>
+        <button type="button"
+          class="btn btn-primary"
+          data-toggle="modal"
+          data-target="#collectiontypes-to-create"
+          data-behavior="select-collection">
+          <%= t(:'helpers.action.collection.new')%>
+        </button>
+      <% else @collection_type_list_presenter.any? %>
+        <% # link directly to create collection form with type %>
+        <%= link_to(t('helpers.action.collection.new'), "#{new_dashboard_collection_path}&collection_type_id=#{@collection_type_list_presenter.first_collection_type.id}", class: 'btn btn-primary') %>
+      <% end %>
+    <% end %>
+  </section>
 
-        <%= render 'results_pagination' %>
-      </div>
+  <%# Collections list %>
+  <div class="panel panel-default collections-panel-wrapper">
+    <div class="panel-heading">
+      <h3 class="panel-title"><strong><%= @response.docs.count %> collections</strong> in the repository</h3>
+    </div>
+    <div class="panel-body">
+      <h2 class="sr-only">Collections listing</h2>
+      <%= render 'search_header' %>
+      <%= render 'hyrax/my/document_list' %>
+      <%= render 'results_pagination' %>
     </div>
   </div>
-</div>
+
+  <!-- Render Modals -->
+  <%= render 'modal_add_to_collection', source: "my" %>
+  <%= render 'modal_add_to_collection_deny' %>
+  <%= render 'modal_add_to_collection_permission_deny' %>
+  <%= render 'modal_collection_types_to_create' %>
+  <%= render 'modal_delete_admin_set_deny' %>
+  <%= render 'modal_delete_collection' %>
+  <%= render 'modal_delete_collection_deny' %>
+  <%= render 'modal_delete_deny' %>
+  <%= render 'modal_delete_empty_collection' %>
+  <%= render 'modal_delete_selected_collections' %>
+  <%= render 'modal_edit_deny' %>
+
+</div><!-- /collections-wrapper -->

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

@@ -0,0 +1,14 @@
+<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 t('hyrax.dashboard.my.action.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>
+    <%= batch_delete %>
+    <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
+        class: 'btn btn-primary submits-batches submits-batches-add',
+        data: { toggle: "modal", target: "#collection-list-container", turbolinks: false } %>
+  </div>
+</div>

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

@@ -1,17 +1,15 @@
 <table class="table table-striped works-list">
   <caption class="sr-only"><%= t("hyrax.dashboard.my.sr.listing") %> <%= application_name %></caption>
-  <% unless params[:display_type] == 'list' %>
-    <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><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
-      <th><%= t("hyrax.dashboard.my.heading.highlighted") %></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><%= render_check_all %></th>
+    <th><%= t("hyrax.dashboard.my.heading.title") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.highlighted") %></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| %>
       <%= render 'list_works', document: document, counter: counter, presenter: Hyrax::WorkShowPresenter.new(document, current_ability) %>

data/app/views/hyrax/my/works/_tabs.html.erb

@@ -1,7 +1,7 @@
 <ul class="nav nav-tabs" id="my_nav" role="navigation">
   <span class="sr-only">You are currently listing your works.  You have <%= @response.docs.count %> <%= 'work'.pluralize(@response.docs.count)%> </span>
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_works_path(locale: nil)) %>>
-    <%= link_to t('hyrax.dashboard.all.works'), hyrax.dashboard_works_path %>
+    <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path, data: { turbolinks: false } %>
   </li>
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.my_works_path(locale: nil)) %>>
     <%= link_to t('hyrax.dashboard.my.works'), hyrax.my_works_path, data: { turbolinks: false } %>

data/app/views/hyrax/my/works/index.html.erb

@@ -13,7 +13,7 @@
   <h1><span class="fa fa-file"></span> <%= t("hyrax.admin.sidebar.works") %></h1>
   <% if current_ability.can_create_any_work? %>
     <div class="pull-right">
-      <% if create_work_presenter.many? %>
+      <% if @create_work_presenter.many? %>
         <% if Flipflop.batch_upload? %>
           <%= link_to(
                 t(:'helpers.action.batch.new'),
@@ -32,13 +32,13 @@
         <% if Flipflop.batch_upload? %>
           <%= link_to(
               t(:'helpers.action.batch.new'),
-              hyrax.new_batch_upload_path(payload_concern: create_work_presenter.first_model),
+              hyrax.new_batch_upload_path(payload_concern: @create_work_presenter.first_model),
               class: 'btn btn-primary'
               ) %>
         <% end %>
         <%= link_to(
               t(:'helpers.action.work.new'),
-              new_polymorphic_path([main_app, create_work_presenter.first_model]),
+              new_polymorphic_path([main_app, @create_work_presenter.first_model]),
               class: 'btn btn-primary'
             ) %>
       <% end %>
@@ -48,8 +48,8 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default<%= ' tabs' if can?(:read, :admin_dashboard) %>">
-      <%= render 'tabs' if can?(:read, :admin_dashboard) %>
+    <div class="panel panel-default <%= 'tabs' if current_page?(hyrax.dashboard_works_path(locale: nil)) || @managed_works_count > 0 %>">
+      <%= render 'tabs' if current_page?(hyrax.dashboard_works_path(locale: nil)) || @managed_works_count > 0 %>
       <div class="panel-body">
         <%= render 'search_header' %>
         <h2 class="sr-only">Works listing</h2>
@@ -60,3 +60,5 @@
     </div>
   </div>
 </div>
+
+<%= render '/shared/select_work_type_modal', create_work_presenter: @create_work_presenter if @create_work_presenter.many? %>

data/app/views/hyrax/notifications/_notifications.html.erb

@@ -12,13 +12,13 @@
       <tbody>
         <% messages.each do |msg| %>
           <tr>
-            <td data-sort="<%= msg.last_message.created_at.getutc.iso8601(5) %>">
+            <td>
               <relative-time datetime="<%= msg.last_message.created_at.getutc.iso8601 %>" title="<%= msg.last_message.created_at.to_formatted_s(:standard) %>">
                 <%= msg.last_message.created_at.to_formatted_s(:long_ordinal) %>
               </relative-time>
             </td>
-            <td><%= sanitize msg.last_message.subject %></td>
-            <td><%= sanitize msg.last_message.body %></td>
+            <td><%= msg.last_message.subject.html_safe %></td>
+            <td><%= msg.last_message.body.html_safe %></td>
             <td>
               <%= link_to hyrax.notification_path(msg.id),
                       class: "itemicon itemtrash",

data/app/views/hyrax/permissions/confirm_access.html.erb

@@ -3,7 +3,7 @@
     <h4>Apply changes to contents?<h4>
   </div>
   <div class="panel-body">
-      <%= sanitize I18n.t("hyrax.upload.change_access_message_html", curation_concern: curation_concern) %>
+      <%= I18n.t("hyrax.upload.change_access_message_html", curation_concern: curation_concern).html_safe %>
   </div>
   <div class="form-actions panel-footer">
     <%= button_to I18n.t("hyrax.upload.change_access_yes_message"), hyrax.copy_access_permission_path(curation_concern), class: 'btn btn-primary' %>

data/app/views/hyrax/stats/file.html.erb

@@ -1,6 +1,6 @@
 <!-- Adapted from jquery-flot examples https://github.com/flot/flot/blob/master/examples/visitors/index.html -->
 <%= javascript_tag do %>
-  var hyrax_item_stats = <%= raw json_escape @stats.to_flot.to_json %>;
+  var hyrax_item_stats = <%= @stats.to_flot.to_json.html_safe %>;
 <% end %>
 
 <%= content_tag :h1, @file_set, class: "lower" %>