hyrax 2.1.0.beta2 → 2.1.0.rc1

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

@@ -1,10 +1,12 @@
-<% 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="collection-types-wrapper">
+  <% 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 class="row">
+    <div class="col-md-12">
+      <%= render 'form' %>
+    </div>
   </div>
 </div>

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

@@ -16,7 +16,7 @@
     <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>
+      <p><a class="collapse-header" data-toggle="collapse" href="#collapseAbout" aria-expanded="false" aria-controls="collapseAbout" data-expand-text="<%= t('helpers.action.more')%>" data-collapse-text="<%= t('helpers.action.less')%>"><%= t('.more_toggle_header_html') %></a></p>
       <div id="collapseAbout" class="collapse">
         <%= t('.more_toggle_content_html') %>
       </div>

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

@@ -1,14 +1,15 @@
-<%= 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) %>
-<%= presenter.attribute_to_html(:publisher, render_as: :faceted) %>
-<%= presenter.attribute_to_html(:language, render_as: :faceted) %>
-<%= presenter.attribute_to_html(:identifier, render_as: :linked, search_field: 'identifier_tesim') %>
-<%= presenter.attribute_to_html(:keyword, render_as: :faceted) %>
-<%= presenter.attribute_to_html(:date_created, render_as: :linked, search_field: 'date_created_tesim') %>
-<%= presenter.attribute_to_html(:based_near_label) %>
-<%= presenter.attribute_to_html(:related_url, render_as: :external_link) %>
-<%= presenter.attribute_to_html(:resource_type, render_as: :faceted) %>
-<%= presenter.attribute_to_html(:source) %>
-<%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement) %>
+<%= presenter.attribute_to_html(:date_modified, label: t('hyrax.base.show.last_modified'), html_dl: true) %>
+<%= presenter.attribute_to_html(:creator, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:contributor, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:subject, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:publisher, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:language, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:identifier, render_as: :linked, search_field: 'identifier_tesim', html_dl: true) %>
+<%= presenter.attribute_to_html(:keyword, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:date_created, render_as: :linked, search_field: 'date_created_tesim', html_dl: true) %>
+<%= presenter.attribute_to_html(:based_near_label, html_dl: true) %>
+<%= presenter.attribute_to_html(:related_url, render_as: :external_link, html_dl: true) %>
+<%= presenter.attribute_to_html(:resource_type, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:source, html_dl: true) %>
+<%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement, html_dl: true) %>
+

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

@@ -10,6 +10,7 @@
       <%= f.object.errors.full_messages_for(:base).send(SimpleForm.error_method) %>
       <%= render 'form_in_works_error', f: f %>
       <%= render 'form_ordered_members_error', f: f %>
+      <%= render 'form_collections_error', f: f %>
       <%= render 'form_visibility_error', f: f %>
     </div>
   <% end %>

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

@@ -0,0 +1 @@
+<%= f.full_error(:collections) %>

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

@@ -1,5 +1,6 @@
 <h2><%= t('.header') %></h2>
-<% if presenter.member_presenters.present? %>
+<%  members = Flipflop.hide_private_files? ? presenter.exclude_unauthorized_file_sets : presenter.member_presenters %>
+<% if members.present? %>
   <table class="table table-striped related-files">
     <thead>
       <tr>
@@ -11,7 +12,7 @@
       </tr>
     </thead>
     <tbody>
-      <%= render partial: 'member', collection: presenter.member_presenters %>
+      <%= render partial: 'member', collection: members %>
     </tbody>
   </table>
 <% elsif can? :edit, presenter.id %>

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

@@ -1,8 +1,6 @@
-<table class="table table-borderless <%= dom_class(presenter) %> attributes" <%= presenter.microdata_type_to_html %>>
-  <tbody>
+<dl class="work-show <%= dom_class(presenter) %>" <%= presenter.microdata_type_to_html %>> 
     <%= render 'attribute_rows', presenter: presenter %>
-    <%= presenter.attribute_to_html(:embargo_release_date, render_as: :date) %>
-    <%= presenter.attribute_to_html(:lease_expiration_date, render_as: :date) %>
-    <%= presenter.attribute_to_html(:license, render_as: :license) %>
-  </tbody>
-</table>
+    <%= presenter.attribute_to_html(:embargo_release_date, render_as: :date, html_dl: true) %>
+    <%= presenter.attribute_to_html(:lease_expiration_date, render_as: :date, html_dl: true) %>
+    <%= presenter.attribute_to_html(:license, render_as: :license, html_dl: true) %>
+ </dl> 

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

@@ -1,6 +1,4 @@
 <h2><%= t('.header') %></h2>
-<table class="table table-borderless relationships">
-  <tbody>
-    <%= render 'relationships_parent_rows', presenter: presenter %>
-  </tbody>
-</table>
+<dl class="work-show">
+<%= render 'relationships_parent_rows', presenter: presenter %>
+</dl>

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

@@ -1,6 +1,5 @@
-<tr>
-  <th><%= t(".label", type: type.humanize) %></th>
-  <td>
+<dt> <%= t(".label", type: type.humanize) %> </dt>
+<dd>
     <% if items.blank? %>
       <p><%= t('.empty', type: type.humanize) %></p>
     <% else %>
@@ -12,5 +11,5 @@
         <% end %>
       </ul>
     <% end %>
-  </td>
-</tr>
+  </dd>
+

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

@@ -11,5 +11,6 @@
 <% end %>
 
 <% if current_user %>
-  <%= presenter.attribute_to_html(:admin_set, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:admin_set, render_as: :faceted, html_dl: true) %>
 <% end %>
+

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

@@ -13,6 +13,12 @@
           <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Attach Child <span class="caret"></span>
           </button>
+
+          <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
+          <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
+              class: 'btn btn-default submits-batches submits-batches-add',
+              data: { toggle: "modal", target: "#collection-list-container" } %>
+
           <ul class="dropdown-menu">
             <% presenter.valid_child_concerns.each do |concern| %>
               <li>
@@ -32,7 +38,11 @@
           data: { behavior: 'unfeature' },
           class: presenter.display_feature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
   <% end %>
+</div>
 
 <!-- COinS hook for Zotero -->
   <span class="Z3988" title="<%= export_as_openurl_ctx_kev(presenter) %>"></span>
-</div>
+<!-- Render Modals -->
+  <%= render 'hyrax/dashboard/collections/form_for_select_collection', user_collections: @user_collections %>
+
+

data/app/views/hyrax/batch_edits/edit.html.erb

@@ -50,25 +50,65 @@
         </div><!-- #descriptions_display -->
 
         <div id="permissions_display" class="tab-pane">
-          <%= simple_form_for @form.model,
-                              url: hyrax.batch_edits_path,
-                              method: :put,
-                              remote: true,
-                              html: { id: "form_permissions", class: "ajax-form"},
-                              data: { 'param-key' => @form.model_name.param_key } do |f| %>
-            <%= hidden_field_tag('update_type', 'update') %>
-            <%= hidden_field_tag('key', 'permissions') %>
-            <%= render "hyrax/base/form_permission", f: f %>
-            <%= render "hyrax/base/form_share", f: f %>
+          <div class="row">
+            <%= simple_form_for @form,
+                                url: hyrax.batch_edits_path,
+                                method: :put,
+                                remote: true,
+                                builder: Hyrax::FormBuilder,
+                                html: { id: "form_permissions_visibility", class: "ajax-form"},
+                                data: { 'param-key' => @form.model_name.param_key } do |f| %>
+              <div class="col-xs-12 col-sm-4">
+                <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_permissions_visibility" id="expand_link_permissions_visibility">
+                  <%= f.input_label "Visibility" %> <span class="chevron"></span>
+                </a>
+              </div>
+              <div id="collapse_permissions_visibility" class="collapse scrolly col-xs-12 col-sm-7">
+                <%= hidden_field_tag('update_type', 'update') %>
+                <%= hidden_field_tag('key', 'permissions') %>
+                <%= render "hyrax/base/form_permission", f: f %>
 
-            <% @form.batch_document_ids.each do |batch_id| %>
-              <%= hidden_field_tag "batch_document_ids[]", batch_id %>
+                <% @form.batch_document_ids.each do |batch_id| %>
+                  <%= hidden_field_tag "batch_document_ids[]", batch_id %>
+                <% end %>
+                <div>
+                  <%= f.submit "Save changes", class: 'btn btn-primary field-save', id: "permissions_visibility_save" %>
+                  <a class="btn btn-default" data-toggle="collapse" data-parent="#row_permissions_visibility" href="#collapse_permissions_visibility">Cancel </a>
+                  <div class="status fleft"></div>
+                </div>
+              </div>
             <% end %>
-            <div class="row">
-              <%= f.submit "Save changes", class: 'btn btn-primary', id: 'permissions_save' %>
-              <div id="status_permissions" class="status fleft"></div>
-            </div>
-          <% end %>
+          </div>
+
+          <div class="row">
+            <%= simple_form_for @form,
+                                url: hyrax.batch_edits_path,
+                                method: :put,
+                                remote: true,
+                                builder: Hyrax::FormBuilder,
+                                html: { id: "form_permissions", class: "ajax-form"},
+                                data: { 'param-key' => @form.model_name.param_key } do |f| %>
+              <div class="col-xs-12 col-sm-4">
+                <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_permissions_sharing" id="expand_link_permissions_sharing">
+                  <%= f.input_label "Sharing" %> <span class="chevron"></span>
+                </a>
+              </div>
+              <div id="collapse_permissions_sharing" class="collapse scrolly col-xs-12 col-sm-7">
+                <%= hidden_field_tag('update_type', 'update') %>
+                <%= hidden_field_tag('key', 'permissions') %>
+                <%= render "hyrax/base/form_share", f: f %>
+
+                <% @form.batch_document_ids.each do |batch_id| %>
+                  <%= hidden_field_tag "batch_document_ids[]", batch_id %>
+                <% end %>
+                <div>
+                  <%= f.submit "Save changes", class: 'btn btn-primary field-save', id: "permissions_sharing_save" %>
+                  <a class="btn btn-default" data-toggle="collapse" data-parent="#row_permissions_sharing" href="#collapse_permissions_sharing">Cancel </a>
+                  <div class="status fleft"></div>
+                </div>
+              </div>
+            <% end %>
+          </div>
         </div>
       </div> <!-- .tab-content -->
     </div>

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

@@ -19,7 +19,7 @@
     </div>
   </td>
   <td class="collection_type">
-    <span class="label label-success"><%= collection_presenter.collection_type_badge %></span>
+    <%= collection_presenter.collection_type_badge %>
   </td>
   <td class="text-center date"><%= collection_presenter.modified_date.try(:to_formatted_s, :standard) %> </td>
   <td class="text-center">

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

@@ -11,7 +11,7 @@
 
       <div class="hyc-title">
         <h1><%= @presenter.title.first %></h1>
-        <span class="label label-success"><%= @presenter.collection_type_badge %></span>
+        <%= @presenter.collection_type_badge %>
         <%= @presenter.permission_badge %>
       </div>
 

data/app/views/hyrax/content_blocks/_form.html.erb

@@ -1,20 +1,20 @@
-<%= render "modal_content_block" %>
+<%= render "shared/nav_safety_modal" %>
 <div class="panel panel-default tabs">
   <ul class="nav nav-tabs" role="tablist">
     <li class="active">
-      <a href="#announcement_text" role="tab" data-toggle="tab" class="show-confirm"><%= t(:'hyrax.content_blocks.tabs.announcement_text') %></a>
+      <a href="#announcement_text" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.announcement_text') %></a>
     </li>
     <li>
-      <a href="#marketing" role="tab" data-toggle="tab" class="show-confirm"><%= t(:'hyrax.content_blocks.tabs.marketing_text') %></a>
+      <a href="#marketing" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.marketing_text') %></a>
     </li>
     <li>
-      <a href="#researcher" role="tab" data-toggle="tab" class="show-confirm"><%= t(:'hyrax.content_blocks.tabs.featured_researcher') %></a>
+      <a href="#researcher" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.featured_researcher') %></a>
     </li>
   </ul>
   <div class="tab-content">
     <div id="announcement_text" class="tab-pane active">
       <div class="panel panel-default labels">
-        <%= simple_form_for ContentBlock.for(:announcement), url: hyrax.content_block_path(ContentBlock.for(:announcement)) do |f| %>
+        <%= simple_form_for ContentBlock.for(:announcement), url: hyrax.content_block_path(ContentBlock.for(:announcement)), html: {class: 'nav-safety'} do |f| %>
           <div class="panel-body">
             <div class="field form-group">
                 <%= f.label :announcement %><br />
@@ -30,7 +30,7 @@
     </div>
     <div id="marketing" class="tab-pane">
       <div class="panel panel-default labels">
-        <%= simple_form_for ContentBlock.for(:marketing), url: hyrax.content_block_path(ContentBlock.for(:marketing)) do |f| %>
+        <%= simple_form_for ContentBlock.for(:marketing), url: hyrax.content_block_path(ContentBlock.for(:marketing)), html: {class: 'nav-safety'} do |f| %>
           <div class="panel-body">
             <div class="field form-group">
                 <%= f.label :marketing %><br />
@@ -46,7 +46,7 @@
     </div>
     <div id="researcher" class="tab-pane">
       <div class="panel panel-default labels">
-        <%= simple_form_for ContentBlock.for(:researcher), url: hyrax.content_block_path(ContentBlock.for(:researcher)) do |f| %>
+        <%= simple_form_for ContentBlock.for(:researcher), url: hyrax.content_block_path(ContentBlock.for(:researcher)), html: {class: 'nav-safety'} do |f| %>
           <div class="panel-body">
             <div class="field form-group">
                 <%= f.label :researcher %><br />
@@ -62,3 +62,4 @@
     </div>
   </div>
 </div>
+<%= tinymce :content_block %>

data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb

@@ -0,0 +1,17 @@
+<div class="clearfix proxy-rights">
+  <div class="row">
+    <div class="col-xs-6">
+      <table class="table table-condensed table-striped" id="authorizedProxies">
+        <tbody>
+        <% if user.can_receive_deposits_from.count == 0 %>
+          <%= t('hyrax.dashboard.no_proxies') %>
+        <% else %>
+          <% user.can_receive_deposits_from.each do |depositor| %>
+            <tr><td class="depositor-name"><%= depositor.name %></td></tr>
+          <% end %>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

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

@@ -15,9 +15,7 @@
         <% end %>
       </h3>
       <%= presenter.permission_badge %>
-      <span class="label label-success">
-        <%= presenter.collection_type_badge %>
-      </span>
+      <%= presenter.collection_type_badge %>
     </div>
     <div class="collection-title-row-content">
       <%= render 'show_actions', presenter: presenter %>

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

@@ -0,0 +1,30 @@
+<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>
+  <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>
+    <% if !current_ability.admin? %>
+      <th><%= t("hyrax.dashboard.my.heading.access") %></th>
+    <% end %>
+    <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| %>
+    <% 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/dashboard/collections/_form_branding.html.erb

@@ -123,10 +123,10 @@
 
               <div class="col-sm-4 branding-logo-input">
                 <label for="linkurl_<%= i %>">Link URL:
-                  <input id="linkurl_<%= i %>" class="branding-logo-input" type="text" name="linkurl[]" value="<%= linfo[:linkurl] %>" /><input />
+                  <input id="linkurl_<%= i %>" class="branding-logo-input" type="text" name="linkurl[]" value="<%= linfo[:linkurl] %>" />
                 </label>
                 <label for="alttext_<%= i %>">Alt Text:
-                  <input id="alttext_<%= i %>" class="branding-logo-input" type="text" name="alttext[]" value="<%= linfo[:alttext] %>" /><input />
+                  <input id="alttext_<%= i %>" class="branding-logo-input" type="text" name="alttext[]" value="<%= linfo[:alttext] %>" />
                 </label>
               </div>
 

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

@@ -1,5 +1,5 @@
 <div role="dialog" class="modal collection-list-modal fade" id="collection-list-container" tabindex="-1" aria-labelledby="col_add_title">
-  <div class="modal-dialog">
+  <div class="modal-dialog text-left">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

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

@@ -31,7 +31,7 @@
                                        { prompt: "Select a role..." },
                                        class: 'form-control' %>
 
-                    <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button' %>
+                    <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button', :disabled => true %>
                   </div>
                 </div>
               <% end %>
@@ -62,7 +62,7 @@
                                      { prompt: "Select a role..." },
                                      class: 'form-control' %>
 
-                  <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button' %>
+                  <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button', :disabled => true %>
                 </div>
               </div>
               <% end %>

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

@@ -1,3 +1,4 @@
+<% # used by All and Managed Collections tabs %>
 <% id = collection_presenter.id %>
 <tr id="document_<%= id %>"
   data-id="<%= id %>"
@@ -5,7 +6,14 @@
   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>
+    <% if collection_presenter.allow_batch? %>
+    <input type="checkbox" name="batch_document_ids[]" id="batch_document_<%= id %>" value="<%= id %>" class="batch_document_selector"
+      data-hasaccess="<%= (can?(:edit, collection_presenter.solr_document)) %>" />
+    <% else %>
+    <input type="checkbox" class="disabled" disabled=true />
+    <% end %>
+  </td>
   <td>
     <div class="thumbnail-title-wrapper">
       <div class="thumbnail-wrapper">
@@ -46,8 +54,11 @@
       </div>
     </div>
   </td>
+  <% if !current_ability.admin? %>
+    <td><%= collection_presenter.managed_access %></td>
+  <% end %>
   <td class="collection_type">
-    <span class="label label-success"><%= collection_presenter.collection_type_badge %></span>
+    <%= collection_presenter.collection_type_badge %>
   </td>
   <td><%= collection_presenter.permission_badge %>  </td>
   <td><%= collection_presenter.total_viewable_items %></td>