hyrax 2.0.3 → 2.1.0.beta1

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

@@ -9,7 +9,7 @@
   <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= document.id %>">
 
     <li role="menuitem" tabindex="-1">
-      <%= button_for_remove_from_collection(@collection, document, 'Remove from Collection') %>
+      <%= button_for_remove_from_collection(@collection, document, label: 'Remove from Collection') %>
     </li>
 
     <li role="menuitem" tabindex="-1">

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

@@ -1,35 +1,12 @@
-<% provide :page_title, construct_page_title( t('.header', title: @form.title.first) ) %>
+<% provide :page_title, construct_page_title( t('.header', type_title: @collection.collection_type.title, title: @form.title.first) ) %>
 
-<%= provide :page_header do %>
-  <h1><span class="fa fa-edit"></span><%= t('.header', title: @form.title.first) %></h1>
+<% provide :page_header do %>
+  <h1><span class="fa fa-edit"></span><%= t('.header', type_title: @collection.collection_type.title, title: @form.title.first) %></h1>
 <% end %>
 
-<% unless has_collection_search_parameters? %>
-  <div class="row">
-    <div class="col-md-12">
-      <%= render 'form' %>
-    </div>
+<div class="row">
+  <div class="col-md-12">
+    <%= render 'flash_msg' %>
+    <%= render 'form' %>
   </div>
-
-  <div class="row">
-    <div class="col-md-12">
-      <div class="panel panel-default">
-        <div class="panel-body">
-          <%= render 'edit_actions' %>
-
-          <div class="row m-t-3">
-            <h2 class="col-xs-12 col-sm-6"><%= t('hyrax.collection.edit.manage_items') %></h2>
-            <div class="col-xs-12 col-sm-6">
-              <%= render 'hyrax/collections/search_form', presenter: @collection %>
-            </div>
-          </div>
-          <%= render 'hyrax/my/did_you_mean' %>
-          <%= render 'hyrax/my/facet_selected' %>
-          <%= render 'sort_and_per_page', collection: @collection if @response.response['numFound'] > 0 %>
-          <%= render 'document_list', documents: @member_docs, document_list_format: "dashboard" %>
-          <%= render 'hyrax/collections/paginate' %>
-        </div>
-      </div>
-    </div>
-  </div>
-<% end %>
+</div>

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

@@ -1,7 +1,6 @@
-<% provide :page_title, construct_page_title( t('.header') ) %>
-
+<% provide :page_title, construct_page_title( t('.header', type_title: @collection.collection_type.title) ) %>
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit"></span> <%= t('.header') %></h1>
+  <h1><span class="fa fa-edit"></span> <%= t('.header', type_title: @collection.collection_type.title) %> </h1>
 <% end %>
 
 <div class="row">

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

@@ -1,36 +1,103 @@
 <% provide :page_title, construct_page_title(@presenter.title) %>
-<div itemscope itemtype="http://schema.org/CollectionPage" class="row collection">
-  <div class="col-sm-10 pull-right">
-    <header>
-      <%= render 'hyrax/collections/collection_title', presenter: @presenter %>
-    </header>
-    <%= render 'hyrax/collections/collection_description', presenter: @presenter %>
-
-    <% unless has_collection_search_parameters? %>
-      <%= render 'show_descriptions' %>
-    <% end %>
-  </div>
-  <div class="col-sm-2">
-    <%= render 'hyrax/collections/media_display', presenter: @presenter %>
-    <% unless has_collection_search_parameters? %>
-      <%= render 'show_actions', presenter: @presenter %>
-    <% end %>
-  </div>
-</div>
-
-<div class="row">
-  <h2 class="col-xs-6 col-md-7 col-lg-6">
-    <% if has_collection_search_parameters? %>
-        Search Results within this Collection
-    <% else %>
-        <%= t('.works_in_collection') %>
-    <% end %>
-  </h2>
-  <div class="col-xs-6 col-md-5 col-lg-6"><%= render 'hyrax/collections/search_form', presenter: @presenter %></div>
-</div>
-
-<%= render 'sort_and_per_page', collection: @presenter %>
-
-<%= render_document_index @member_docs %>
-
-<%= render 'hyrax/collections/paginate' %>
+
+<% provide :page_header do %>
+  <h1><span class="fa fa-file"></span> <%= t('.header') %></h1>
+<% end %>
+
+<div class="collections-wrapper">
+  <section class="panel panel-default collections-panel-wrapper admin-show-page">
+    <div class="panel-heading">
+      <%= render 'collection_title', presenter: @presenter %>
+    </div>
+
+    <div class="panel-body">
+      <section>
+        <div itemscope itemtype="http://schema.org/CollectionPage" class="row collection">
+          <div class="col-sm-3 text-center">
+              <%= render 'hyrax/collections/media_display', presenter: @presenter %>
+              <%= link_to t('.public_view_label'), collection_path(id: @presenter.id) %>
+          </div>
+          <div class="col-sm-9 collection-description-wrapper">
+            <!-- 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>
+            <% end %>
+
+            <!-- Collection Description(s) -->
+            <section>
+              <%= render 'hyrax/collections/collection_description', presenter: @presenter %>
+            </section>
+
+            <% unless has_collection_search_parameters? %>
+              <%= render 'show_descriptions' %>
+            <% end %>
+          </div>
+        </div>
+      </section>
+
+      <!-- Search results label -->
+
+      <% if @members_count > 0 || @presenter.subcollection_count > 0 %>
+          <div class="hyc-blacklight hyc-bl-title">
+            <h2>
+              <% if has_collection_search_parameters? %>
+                  <%= t('hyrax.dashboard.collections.show.search_results') %>
+              <% end %>
+            </h2>
+          </div>
+      <% end %>
+
+      <!-- Search bar -->
+      <section class="collections-search-wrapper">
+        <div class="row">
+          <div class="col-sm-8">
+            <%# TODO: leaving this as it was causes rerouting to the public show page. needs work %>
+            <%= render 'hyrax/collections/search_form', presenter: @presenter, url: hyrax.dashboard_collection_path(@presenter.id) %>
+          </div>
+        </div>
+      </section>
+
+      <!-- Subcollections -->
+      <% if @presenter.collection_type_is_nestable? %>
+        <section class="sub-collections-wrapper">
+          <h4><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h4>
+          <div class="row">
+            <div class="col-sm-6">
+              <%= render 'subcollection_list', id: @presenter.id, collection: @subcollection_docs %>
+            </div>
+            <% unless has_collection_search_parameters? %>
+              <div class="col-sm-6">
+                <%= render 'show_subcollection_actions', presenter: @presenter %>
+              </div>
+            <% end %>
+          </div>
+        </section>
+      <% end %>
+
+      <!-- Works -->
+      <section class="works-wrapper">
+        <h4><%= t('.item_count') %> (<%= @members_count %>)</h4>
+        <% unless has_collection_search_parameters? %>
+          <%= render 'show_add_items_actions', presenter: @presenter %>
+        <% end %>
+
+        <%= render 'sort_and_per_page', collection: @presenter %>
+        <%= render_document_index @member_docs %>
+        <%= render 'hyrax/collections/paginate' %>
+      </section>
+
+    </div><!-- /panel-body -->
+  </section><!-- /collections-panel-wrapper -->
+</div><!-- /collections-wrapper -->
+
+<% if @presenter.collection_type_is_nestable? && !has_collection_search_parameters? %>
+  <%= render 'hyrax/my/collections/modal_add_to_collection', source: 'show' %>
+  <%= render 'hyrax/my/collections/modal_add_subcollection', id: @presenter.id, source: 'show' %>
+<% end %>
+
+<% unless has_collection_search_parameters? %>
+  <%= render '/shared/select_work_type_modal', create_work_presenter: @presenter.create_work_presenter if @presenter.draw_select_work_modal? %>
+<% end %>

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

@@ -10,6 +10,11 @@
             <span class="fa fa-paint-brush"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.appearance') %></span>
           <% end %>
         <% end %>
+        <% if can?(:manage, :collection_types) %>
+          <%= menu.nav_link(hyrax.admin_collection_types_path) do %>
+            <span class="fa fa-folder-open"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collection_types') %></span>
+          <% end %>
+        <% end %>
         <% if can?(:manage, Hyrax::Feature) %>
           <%= menu.nav_link(hyrax.edit_pages_path) do %>
             <span class="fa fa-file-text-o"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.pages') %></span>

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

@@ -1,9 +1,4 @@
   <li class="h5"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
-  <% if can? :manage_any, AdminSet %>
-    <%= menu.nav_link(hyrax.admin_admin_sets_path) do %>
-      <span class="fa fa-sitemap"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.admin_sets') %></span>
-    <% end %>
-  <% end %>
 
   <%= menu.nav_link(hyrax.my_collections_path,
                     also_active_for: hyrax.dashboard_collections_path) do %>

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

@@ -10,3 +10,13 @@
       <span class="fa fa-user"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.users') %></span>
     <% end %>
   <% end %>
+
+  <% if can? :read, :admin_dashboard %>
+    <%= menu.nav_link(hyrax.embargoes_path) do %>
+      <span class="fa fa-flag"></span> <span class="sidebar-action-text"><%= t('hyrax.embargoes.index.manage_embargoes') %></span>
+    <% end %>
+
+    <%= menu.nav_link(hyrax.leases_path) do %>
+      <span class="fa fa-flag"></span> <span class="sidebar-action-text"><%= t('hyrax.leases.index.manage_leases') %></span>
+    <% end %>
+  <% end %>

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

@@ -2,6 +2,7 @@
   <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><%= render_check_all %></th>
       <th><%= t("hyrax.dashboard.my.heading.title") %></th>
       <th class="date"><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
       <th><%= t("blacklight.search.fields.facet.suppressed_bsi") %></th>

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

@@ -1,4 +1,8 @@
 <tr id="document_<%= document.id %>">
+  <td>
+    <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>
     <div class='media'>
       <%= link_to [main_app, document], class: 'media-left', 'aria-hidden' => true do %>

data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb

@@ -11,7 +11,7 @@
         <h2 id="extraFieldsModal_<%=name %>_Label">Additional <%= label %>(s)</h2>
       </div>
       <div class="modal-body">
-        <%= sanitize values.join("<br />") %>
+        <%= values.join("<br />").html_safe %>
       </div>
       <div class="modal-footer">
         <button class="btn btn-primary" data-dismiss="modal">Close</button>

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

@@ -9,10 +9,10 @@
   <div class="row">
     <div class="col-md-12 form-actions">
       <%= f.submit(
-        (curation_concern.persisted? ? "Update Attached File" : %(Attach to #{parent.human_readable_type})),
+        (curation_concern.persisted? ? "Update Attached File" : %(Attach to #{@parent.human_readable_type})),
         class: 'btn btn-primary'
       ) %>
-      <%= link_to 'Cancel', parent_path(parent), class: 'btn btn-link' %>
+      <%= link_to 'Cancel', parent_path(@parent), class: 'btn btn-link' %>
     </div>
   </div>
 <% end %>

data/app/views/hyrax/file_sets/_show_characterization_details.html.erb

@@ -1,7 +1,7 @@
 <% @presenter.characterization_metadata.keys.each do |term| %>
   <div>
     <% additional_values = @presenter.secondary_characterization_values(term) %>
-    <%= @presenter.label_for_term(term) %>: <%= sanitize @presenter.primary_characterization_values(term).join("<br />") %>
+    <%= @presenter.label_for_term(term) %>: <%= @presenter.primary_characterization_values(term).join("<br />").html_safe %>
     <% unless additional_values.empty? %>
       <%= render partial: "extra_fields_modal", locals: { name: term, values: additional_values } %>
     <% end %>

data/app/views/hyrax/file_sets/media_display/_image.html.erb

@@ -5,13 +5,11 @@
                     class: "representative-media",
                     alt: "",
                     role: "presentation" %>
-      <%= link_to hyrax.download_path(file_set),
+      <%= link_to t('hyrax.file_set.show.downloadable_content.image_link'),
+                  hyrax.download_path(file_set),
                   data: { turbolinks: false, label: file_set.id },
                   target: :_blank,
-                  id: "file_download",
-                  class: "btn btn-default" do %>
-          <%= t('hyrax.file_set.show.downloadable_content.image_link') %>
-      <% end %>
+                  id: "file_download" %>
     </div>
 <% else %>
     <div>

data/app/views/hyrax/file_sets/media_display/_office_document.html.erb

@@ -5,14 +5,12 @@
                     class: "representative-media",
                     alt: "",
                     role: "presentation" %>
-      <%= link_to hyrax.download_path(file_set),
+      <%= link_to t('hyrax.file_set.show.downloadable_content.office_link'),
+                  hyrax.download_path(file_set),
                   data: { turbolinks: false },
                   target: :_blank,
                   id: "file_download",
-                  data: { label: file_set.id },
-                  class: "btn btn-default" do %>
-          <%= t('hyrax.file_set.show.downloadable_content.office_link') %>
-      <% end %>
+                  data: { label: file_set.id } %>
     </div>
 <% else %>
     <div>

data/app/views/hyrax/file_sets/media_display/_pdf.html.erb

@@ -5,14 +5,12 @@
                     class: "representative-media",
                     alt: "",
                     role: "presentation" %>
-      <%= link_to hyrax.download_path(file_set),
+      <%= link_to t('hyrax.file_set.show.downloadable_content.pdf_link'),
+                  hyrax.download_path(file_set),
                   data: { turbolinks: false },
                   target: :_blank,
                   id: "file_download",
-                  data: { label: file_set.id },
-                  class: "btn btn-default" do %>
-          <%= t('hyrax.file_set.show.downloadable_content.pdf_link') %>
-      <% end %>
+                  data: { label: file_set.id } %>
     </div>
 <% else %>
     <div>

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

@@ -1,11 +1,11 @@
 <% presenter = featured.presenter %>
 <li class="featured-item" data-id="<%= presenter.id %>">
-  <div class="main row">
-    <div class="col-sm-3">
-      <%= render_thumbnail_tag presenter, { width: 90 } %>
+  <div class="row">
+    <div class="col-sm-2">
+      <%= render_thumbnail_tag presenter %>
     </div>
-    <div class="col-sm-9">
+    <div class="col-sm-10">
       <%= render 'hyrax/homepage/featured_fields', featured: presenter %>
     </div>
-  </div>
+</div>
 </li>

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

@@ -1,16 +1,12 @@
-<h3>
-  <span class="sr-only">Title</span>
-  <%= link_to truncate(featured.title.first, length: 28, separator: ' '), [main_app, featured] %>
-</h3>
 <div>
-  <span class="sr-only">Depositor</span>
-  <%= link_to_profile featured.depositor("no depositor value") %>
-</div>
-<div>
-  <span class="sr-only">File type</span>
-  <%= link_to_facet_list(featured.resource_type, 'resource_type', 'no resource specified') %>
-</div>
-<div>
-  <span class="sr-only">Keywords</span>
-  <%= link_to_facet_list(featured.keyword, 'keyword', 'no keywords specified') %>
+  <div class="featured-item-title">
+    <span class="sr-only"><%= t('hyrax.homepage.featured_works.document.title_label') %></span>
+    <h3><%= link_to featured.title.first, [main_app, featured] %></h3>
+  </div>
+  <div class="featured-item-depositor">
+    <span class="featured-label"><%= t('hyrax.homepage.featured_works.document.depositor_label') %>:</span> <%= link_to_profile featured.depositor(t('hyrax.homepage.featured_works.document.depositor_missing')) %>
+  </div>
+  <div class="featured-item-keywords">
+    <span class="featured-label"><%= t('hyrax.homepage.featured_works.document.keyword_label') %>:</span> <%= link_to_facet_list(featured.keyword, 'keyword', t('hyrax.homepage.featured_works.document.keyword_missing')) %>
+  </div>
 </div>

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

@@ -13,7 +13,7 @@
     <%= f.submit("Save order", class: 'btn btn-default') %>
   <% end %>
 <% else %>
-  <ol id="featured_works">
+  <ol class="list-group list-group-striped" id="featured_works">
     <%= render partial: 'featured', collection: @featured_work_list.featured_works %>
   </ol>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div class="col-xs-12 col-sm-6">
-  <ul id="homeTabs" class="nav nav-tabs">
+  <ul id="homeTabs" class="nav nav-pills">
     <li class="active"><a href="#featured_container" data-toggle="tab" role="tab" id="featureTab"><%= t('hyrax.homepage.featured_works.tab_label') %></a></li>
     <li><a href="#recently_uploaded" data-toggle="tab" role="tab" id="recentTab"><%= t('hyrax.homepage.recently_uploaded.tab_label') %></a></li>
   </ul>
@@ -15,7 +15,7 @@
 
 <div class="col-xs-12 col-sm-6">
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-pills" role="tablist">
     <li class="active"><a aria-expanded="true" href="#tab-col2-first" role="tab" data-toggle="tab"><%= t('hyrax.homepage.admin_sets.title') %></a></li>
     <li class=""><a aria-expanded="false" href="#tab-col2-second" role="tab" data-toggle="tab"><%= t('hyrax.homepage.featured_researcher.tab_label') %></a></li>
   </ul>

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

@@ -1,16 +1,18 @@
-    <tr>
-      <td class="col-sm-2">
-        <%= link_to_profile recent_document.depositor("no depositor value") %>
+<li class="recent-item">
+    <div class="row">
+      <div class="col-sm-2">
         <%= link_to [main_app, recent_document] do %>
-          <%= render_thumbnail_tag recent_document, { width: 45 }, suppress_link: true %>
+          <%= render_thumbnail_tag recent_document, suppress_link: true %>
         <% end %>
-      </td>
-      <td>
-        <h3>
-          <span class="sr-only">Title</span><%= link_to truncate(recent_document.to_s, length: 28, separator: ' '), [main_app, recent_document] %>
-        </h3>
+      </div>
+      <div class="col-sm-10">
+        <span class="sr-only"><%= t('hyrax.homepage.recently_uploaded.document.title_label') %></span><h3><%= link_to recent_document.to_s, [main_app, recent_document] %></h3>
         <p>
-          <span class="sr-only">Keywords</span><%= link_to_facet_list(recent_document.keyword, 'keyword', 'no keywords specified').html_safe %>
+          <span class="recent-label"><%= t('hyrax.homepage.recently_uploaded.document.depositor_label') %>:</span> <%= link_to_profile recent_document.depositor(t('hyrax.homepage.recently_uploaded.document.depositor_missing')) %>
         </p>
-      </td>
-    </tr>
+        <p>
+          <span class="recent-label"><%= t('hyrax.homepage.recently_uploaded.document.keyword_label') %>:</span> <%= link_to_facet_list(recent_document.keyword, 'keyword', t('hyrax.homepage.recently_uploaded.document.keyword_missing')).html_safe %>
+        </p>
+      </div>
+    </div>
+</li>