hyrax 2.1.0.beta1 → 2.1.0.beta2

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

@@ -17,9 +17,9 @@
                           <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') %>
+                              <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm 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' %>
+                              <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
                             <% end %>
                           </td>
                         </tr>

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

@@ -32,14 +32,14 @@
       <div class="expanded-details">
         <p>
           <strong><%= t("hyrax.dashboard.my.collection_list.description") %></strong>
-          <br><%= collection_presenter.description.first %>
+          <br /><%= collection_presenter.description.first %>
         </p>
         <p>
           <strong><%= t("hyrax.dashboard.my.collection_list.edit_access") %></strong>
-          <br>
+          <br />
           <% if collection_presenter.edit_groups.present? %>
             <%= t("hyrax.dashboard.my.collection_list.groups") %> <%= collection_presenter.edit_groups.join(', ') %>
-            <br/>
+            <br />
           <% end %>
           <%= t("hyrax.dashboard.my.collection_list.users") %> <%= collection_presenter.edit_people.join(', ') %>
         </p>
@@ -51,7 +51,7 @@
   </td>
   <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 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 %>

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

@@ -1,7 +1,7 @@
 <tr id="document_<%= document.id %>">
 
   <td>
-    <label for="batch_document_<%= document.id %>" class="sr-only"><%=t("hyrax.dashboard.my.sr.batch_checkbox")%></label>
+    <label for="batch_document_<%= document.id %>" class="sr-only"><%= t("hyrax.dashboard.my.sr.batch_checkbox") %></label>
     <%= render 'hyrax/batch_select/add_button', document: document %>&nbsp;
   </td>
 

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

@@ -1,15 +1,20 @@
-<div class="modal fade" id="collection-remove-from-collection" tabindex="-1" role="dialog">
+<div class="modal fade" id="collection-remove-from-collection-modal" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="delete-collection-form">
         <div class="modal-body">
+          <!-- Any alert messaging mounts to this element -->
+          <div class="modal-ajax-alert"></div>
+
           <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 %>
+          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+          <button
+            type="button"
+            class="btn btn-danger modal-button-remove-collection">
+            <%= t('helpers.action.remove') %>
+          </button>
         </div>
       </div>
     </div>

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

@@ -1,15 +1,20 @@
-<div class="modal fade" id="collection-remove-subcollection" tabindex="-1" role="dialog">
+<div class="modal fade" id="collection-remove-subcollection-modal" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="delete-collection-form">
         <div class="modal-body">
+          <!-- Any alert messaging mounts to this element -->
+          <div class="modal-ajax-alert"></div>
+
           <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 %>
+          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+          <button
+            type="button"
+            class="btn btn-danger modal-button-remove-collection">
+            <%= t('helpers.action.remove') %>
+          </button>
         </div>
       </div>
     </div>

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

@@ -7,7 +7,7 @@
                 data: { turbolinks: false } %>
 <% end %>
 
-<% if presenter.collection_type_is_nestable? %>
+<% if presenter.collection_type_is_nestable? && presenter.user_can_nest_collection? %>
 <!-- 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',

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

@@ -7,11 +7,11 @@
                     '#',
                     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'  %>
+                    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'  %>
+                    class: 'btn btn-primary' %>
       <% end %>
     </div>
     <div>

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

@@ -2,7 +2,7 @@
 <tr id="document_<%= id %>">
   <td>&nbsp;
     <% if current_user and document.depositor != current_user.user_key %>
-      <i class="glyphicon glyphicon-share-alt"/>
+      <i class="glyphicon glyphicon-share-alt" />
     <% end %>
   </td>
   <td>
@@ -41,7 +41,7 @@
       <dd class="col-xs-9 col-lg-10">
         <% if document.edit_groups.present? %>
           Groups: <%= document.edit_groups.join(', ') %>
-          <br/>
+          <br />
         <% end %>
         Users: <%= document.edit_people.join(', ') %>
       </dd>

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

@@ -1,6 +1,11 @@
-<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-id="<%= id %>"
+  data-parent-id="<%= document.id %>"
+  data-post-url="<%= hyrax.dashboard_remove_parent_relationship_above_path(id, document.id) %>">
+  <div class="flex-wrapper">
+    <div class="collections-list-title">
+      <%= link_to document, [hyrax, :dashboard, document], id: "src_copy_link_#{document.id}" %>
+    </div>
+    <button class="btn btn-xs btn-danger remove-from-collection-button" <%= "disabled" unless can? :edit, document.id %>><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
+  </div>
 </li>

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

@@ -1,37 +1,14 @@
 <% if presenter.total_parent_collections <= 0 %>
-		<div class="alert alert-warning" role="alert"><%= t('hyrax.collections.show.no_visible_parent_collections') %></div>
+  <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>
+  <ul class="collections-list">
+    <% 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>
+  <!-- Remove parent collection Modal window -->
+  <%= render 'modal_remove_from_collection' %>
 <% end %>

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

@@ -21,7 +21,7 @@
                  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>
+             <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' %>

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

@@ -1,21 +1,27 @@
 <% if @subcollection_docs.nil? || @subcollection_docs.empty? %>
-  <div class="alert alert-warning" role="alert"><%= t('hyrax.collections.show.no_visible_subcollections') %></div>
+<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>
+<ul class="collections-list">
+  <% @subcollection_docs.each do |document| %>
+  <li
+    data-id="<%= document.id %>"
+    data-parent-id="<%= id %>"
+    data-post-url="<%= hyrax.dashboard_remove_child_relationship_under_path(id, document.id) %>"
+    data-subcollection-label="<%= document.title_or_label %>">
+    <div class="flex-wrapper">
+      <div class="collections-list-title">
         <%= 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  %>
+      </div>
+      <% if can? :edit, id %>
+      <button class="btn btn-xs btn-danger remove-subcollection-button"><%= t('hyrax.collections.show.buttons.remove_this_sub_collection') %></button>
+      <% end %>
+    </div>
+  </li>
+  <% end %>
+</ul>
+<%= render 'hyrax/collections/paginate', solr_response: @subcollection_solr_response, page_param_name: :sub_collection_page %>
+<% end %>
+
+<% if can? :edit, id %>
+<%= render 'modal_remove_sub_collection' %>
 <% end %>

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

@@ -21,9 +21,9 @@
             <!-- Parent Collection(s) -->
             <% if @presenter.collection_type_is_nestable? && @presenter.total_parent_collections > 0 %>
                 <h4><%= t('.parent_collection_header') %> (<%= @presenter.total_parent_collections %>)</h4>
-                <section class="parent-collections-wrapper">
-                <%= render 'hyrax/dashboard/collections/show_parent_collections', presenter: @presenter %>
-              </section>
+                <section id="parent-collections-wrapper" class="parent-collections-wrapper">
+                  <%= render 'hyrax/dashboard/collections/show_parent_collections', presenter: @presenter %>
+                </section>
             <% end %>
 
             <!-- Collection Description(s) -->
@@ -62,14 +62,14 @@
 
       <!-- Subcollections -->
       <% if @presenter.collection_type_is_nestable? %>
-        <section class="sub-collections-wrapper">
+        <section id="sub-collections-wrapper" class="sub-collections-wrapper">
           <h4><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h4>
           <div class="row">
-            <div class="col-sm-6">
+            <div class="col-md-7">
               <%= render 'subcollection_list', id: @presenter.id, collection: @subcollection_docs %>
             </div>
             <% unless has_collection_search_parameters? %>
-              <div class="col-sm-6">
+              <div class="col-md-5">
                 <%= render 'show_subcollection_actions', presenter: @presenter %>
               </div>
             <% end %>

data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb

@@ -57,7 +57,3 @@
 
   <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, type: 'submit', class: "btn btn-primary" %>
 <% end %>
-
-<% if Flipflop.proxy_deposit? %>
-  <%= render 'hyrax/dashboard/_index_partials/proxy_rights', user: @user %>
-<% end %>

data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb

@@ -1,14 +1,16 @@
-<div class="form-group">
-  <span>
-    <i class="glyphicon glyphicon-star trophy-on" ></i> Remove Highlight Designation
-    <a href="#" id="remove_trophy_help" data-toggle="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="glyphicon glyphicon-question-sign"></i></a>
-  </span>
-  <% trophies.each do |t| %>
-    <div class="checkbox">
-      <label>
-        <%= check_box_tag "remove_trophy_#{t.id}" %>
-        <%= link_to t, [main_app, t] %>
-      </label>
-    </div>
-  <% end %>
-</div>
+<% if trophies.any? %>
+  <div class="form-group">
+    <span>
+      <i class="glyphicon glyphicon-star trophy-on"></i> Remove Highlight Designation
+      <a href="#" id="remove_trophy_help" data-toggle="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="glyphicon glyphicon-question-sign"></i></a>
+    </span>
+    <% trophies.each do |t| %>
+      <div class="checkbox">
+        <label>
+          <%= check_box_tag "remove_trophy_#{t.id}" %>
+          <%= link_to t, [main_app, t] %>
+        </label>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/hyrax/dashboard/profiles/show.html.erb

@@ -17,6 +17,12 @@
         <div class="list-group-item">
           <%= render 'hyrax/users/user_info', user: @user %>
         </div>
+
+        <% if @presenter.trophies.any? %>
+          <div class="list-group-item">
+            <%= render 'hyrax/users/contributions', presenter: @presenter %>
+          </div>
+        <% end %>
       </div>
     </div>
   </div>

data/app/views/hyrax/dashboard/show_admin.html.erb

@@ -1,3 +1,7 @@
+<% provide :page_header do %>
+  <h1><%= t("hyrax.dashboard.title") %></h1>
+<% end %>
+
 <div class="row">
   <div class="col-md-3">
     <div class="panel panel-default">
@@ -47,7 +51,11 @@
         <div><%= t('.user_activity.subtitle') %></div>
       </div>
       <div class="panel-body text-center">
-        <div id="user-activity" style="height: 200px"><%= javascript_tag "Hyrax.statistics.userActivity = #{@presenter.user_activity.to_json}" %></div>
+        <div id="user-activity" style="height: 200px"><script>
+//<![CDATA[
+Hyrax.statistics.userActivity = <%== @presenter.user_activity.to_json %>
+//]]>
+</script></div>
       </div>
     </div>
   </div>
@@ -59,7 +67,11 @@
         <div><%= t('.repository_growth.subtitle') %></div>
       </div>
       <div class="panel-body text-center">
-        <div id="dashboard-growth" style="height: 200px"><%= javascript_tag "Hyrax.statistics.repositoryGrowth = #{@presenter.repository_growth.to_json}" %></div>
+        <div id="dashboard-growth" style="height: 200px"><script>
+//<![CDATA[
+Hyrax.statistics.repositoryGrowth = <%== @presenter.repository_growth.to_json %>
+//]]>
+</script></div>
       </div>
     </div>
   </div>
@@ -71,7 +83,11 @@
         <div><%= t('.repository_objects.subtitle') %></div>
       </div>
       <div class="panel-body text-center">
-        <div id="dashboard-repository-objects" style="height: 200px"><%= javascript_tag "Hyrax.statistics.repositoryObjects = #{@presenter.repository_objects.to_json}" %></div>
+        <div id="dashboard-repository-objects" style="height: 200px"><script>
+//<![CDATA[
+Hyrax.statistics.repositoryObjects = <%== @presenter.repository_objects.to_json %>
+//]]>
+</script></div>
       </div>
     </div>
   </div>

data/app/views/hyrax/dashboard/sidebar/_activity.html.erb

@@ -17,6 +17,12 @@
       <%= menu.nav_link(hyrax.transfers_path) do %>
         <span class="fa fa-arrows-h"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.transfers') %></span>
       <% end %>
+
+      <% if Flipflop.proxy_deposit? %>
+        <%= menu.nav_link(hyrax.depositors_path) do %>
+          <span class="fa fa-users"></span> <span class="sidebar-action-text"><%= t('hyrax.dashboard.manage_proxies') %></span>
+        <% end %>
+      <% end %>
     <% end %>
   </li>
 

data/app/views/hyrax/dashboard/works/_list_works.html.erb

@@ -1,6 +1,6 @@
 <tr id="document_<%= document.id %>">
   <td>
-    <label for="batch_document_<%= document.id %>" class="sr-only"><%=t("hyrax.dashboard.my.sr.batch_checkbox")%></label>
+    <label for="batch_document_<%= document.id %>" class="sr-only"><%= t("hyrax.dashboard.my.sr.batch_checkbox") %></label>
     <%= render 'hyrax/batch_select/add_button', document: document %>&nbsp;
   </td>
   <td>

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

@@ -0,0 +1,13 @@
+<% provide :page_header do %>
+  <h1><span class="fa fa-users"></span>  <%= t("hyrax.dashboard.manage_proxies") %></h1>
+<% end %>
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="panel panel-default">
+      <div class="panel-body">
+        <%= render 'hyrax/dashboard/_index_partials/proxy_rights', user: @user %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/hyrax/embargoes/_list_expired_active_embargoes.html.erb

@@ -31,7 +31,7 @@
         <tr>
           <td><%= render 'hyrax/batch_select/add_button', document: curation_concern %></td>
           <td class="human-readable-type"><%= curation_concern.human_readable_type %></td>
-          <td class="title"><%= link_to curation_concern, edit_embargo_path(curation_concern)  %></td>
+          <td class="title"><%= link_to curation_concern, edit_embargo_path(curation_concern) %></td>
           <td class="current-visibility"><%= visibility_badge(curation_concern.visibility) %></td>
           <td class="embargo-release-date"><%= curation_concern.embargo_release_date %></td>
           <td class="visibility-after-embargo"><%= visibility_badge(curation_concern.visibility_after_embargo) %></td>