sufia 7.2.0 → 7.3.0.rc1

data/app/views/my/_document_list.html.erb

@@ -1,4 +1,4 @@
 <% # container for all documents in index view -%>
 <div class="table-responsive" id="documents">
-  <%= render partial: 'my/_index_partials/default_group', locals: {docs: @response.docs.map { |x| SolrDocument.new(x) }, facet_value: nil} %>
+  <%= render 'my/_index_partials/default_group', docs: @response.docs %>
 </div>

data/app/views/my/_facet_limit.html.erb

@@ -1,9 +1,9 @@
 <ul class="facet-values list-unstyled">
   <% paginator = facet_paginator(facet_field, display_facet) %>
-  <%= render_facet_limit_list paginator, solr_field %>
+  <%= render_facet_limit_list paginator, field_name %>
 
   <% unless paginator.last_page? || params[:action] == "facet" %>
     <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»',
-       sufia.dashboard_works_facet_path(solr_field), class: "more_facets_link" %></li>
+       search_facet_path(id: field_name), class: "more_facets_link" %></li>
   <% end %>
 </ul>

data/app/views/my/_index_partials/_default_group.html.erb

@@ -1,15 +1,15 @@
 <table class="table table-striped">
   <caption class="sr-only"><%= t("sufia.dashboard.my.sr.listing") %> <%= application_name %></caption>
-<% unless params[:display_type] == 'list' %>
-  <thead>
-  <tr>
-    <th><label for="check_all" class="sr-only"><%= t("sufia.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
-    <th><%= t("sufia.dashboard.my.heading.title") %></th>
-    <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%=params[:sort]== "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort]== "#{CatalogController.uploaded_field} asc" ? 'caret up' : ''%>"></i><%= t("sufia.dashboard.my.heading.date_uploaded") %></th>
-    <th><%= t("sufia.dashboard.my.heading.visibility") %></th>
-    <th><%= t("sufia.dashboard.my.heading.action") %></th>
-  </tr>
-  </thead>
+  <% unless params[:display_type] == 'list' %>
+    <thead>
+    <tr>
+      <th><label for="check_all" class="sr-only"><%= t("sufia.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
+      <th><%= t("sufia.dashboard.my.heading.title") %></th>
+      <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%= params[:sort] == "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort] == "#{CatalogController.uploaded_field} asc" ? 'caret up' : ''%>"></i><%= t("sufia.dashboard.my.heading.date_uploaded") %></th>
+      <th><%= t("sufia.dashboard.my.heading.visibility") %></th>
+      <th><%= t("sufia.dashboard.my.heading.action") %></th>
+    </tr>
+    </thead>
   <% end %>
   <tbody>
   <% docs.each_with_index do |document, counter| %>

data/app/views/my/_index_partials/_list_collections.html.erb

@@ -3,7 +3,7 @@
   <td></td>
   <td>
     <div class="media">
-      <span class="fa fa-cubes collection-icon-small pull-left"></span>
+      <span class="<%= Sufia::ModelIcon.css_class_for(Collection) %> collection-icon-small pull-left"></span>
       <div class="media-body">
         <div class="media-heading">
           <%= link_to document, id: "src_copy_link#{id}" do %>

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

@@ -3,17 +3,17 @@
     <%= render 'collections/form_for_select_collection', user_collections: @user_collections %>
   </div>
 
-  <% if on_my_works? %>
-    <div class="batch-toggle">
-      <% session[:batch_edit_state] = "on" %>
-      <div class="button_to-inline">
-        <%= batch_edit_continue "Edit Selected" %>
-      </div>
+  <div class="batch-toggle">
+    <% session[:batch_edit_state] = "on" %>
+    <div class="button_to-inline">
+      <%= batch_edit_continue "Edit Selected" %>
+    </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" } %>
-    </div>
-  <% end %>
+    <% end %>
+  </div>
 
   <div class="sort-toggle">
     <% if @response.response['numFound'] > 1 && !sort_fields.empty? %>

data/app/views/records/edit_fields/_rights.html.erb

@@ -4,4 +4,3 @@
     include_blank: true,
     item_helper: license_service.method(:include_current_value),
     input_html: { class: 'form-control' } %>
-<%= render "curation_concerns/file_sets/rights_modal" %>

data/app/views/shared/_footer.html.erb

@@ -1,4 +1,4 @@
-<footer class="navbar navbar-inverse">
+<footer class="navbar navbar-inverse site-footer">
   <div class="container-fluid">
     <div class="navbar-text text-left">
         <p>A service of <a href="http://projecthydra.org/" class="navbar-link" target="_blank">Project Hydra</a>.</p>

data/app/views/shared/_select_work_type_modal.html.erb

@@ -0,0 +1,34 @@
+<div class="modal fade" id="worktypes-to-create" tabindex="-1" role="dialog" aria-labelledby="select-worktype-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('sufia.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="select-worktype-label"><%= t('sufia.dashboard.heading_actions.select_type_of_work') %></h4>
+      </div>
+      <form class="new-work-select">
+        <div class="modal-body">
+          <% create_work_presenter.each do |row_presenter| %>
+            <div class="select-worktype">
+              <label>
+                <input type="radio" name="payload_concern" value="<%= row_presenter.concern %>"
+                                                             data-single="<%= new_polymorphic_path([main_app, row_presenter.concern]) %>"
+                                                             data-batch="<%= sufia.new_batch_upload_path(payload_concern: row_presenter.concern) %>">
+                <div class="select-work-icon">
+                  <span class="<%= row_presenter.icon_class %>"></span>
+                </div>
+                <div class="select-work-description">
+                  <h3><%= row_presenter.name %></h3>
+                  <p><%= row_presenter.description %></p>
+                </div>
+              </label>
+            </div>
+          <% end %>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('sufia.dashboard.heading_actions.close') %></button>
+          <input type="submit" class="btn btn-primary" value="Submit">
+        </div>
+      </form>
+    </div>
+  </div>
+</div>

data/app/views/sufia/admin/_collections.html.erb

@@ -0,0 +1,31 @@
+<div class="row">
+  <div class="col-md-12">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <div class="panel-title">
+          <h3><%= t('.title') %></h3>
+          <div><%= t('.subtitle') %></div>
+        </div>
+      </div>
+      <div class="panel-body">
+        <table class="table table-striped">
+          <thead>
+            <tr>
+              <th><%= t('.collection') %></th>
+              <th><%= t('.works') %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% @admin_set_rows.each do |row| %>
+              <tr>
+                <td><%= row.first %></td>
+                <td><%= row.second %></td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
+

data/app/views/sufia/admin/_sidebar.html.erb

@@ -1,23 +1,35 @@
-                <!-- START X-NAVIGATION -->
-                <ul class="x-navigation">
-                    <li class="xn-logo">
-                        <%= link_to root_path do %>
-                          <span class="glyphicon glyphicon-globe"></span>
-                          <%= application_name %>
-                        <% end %>
-                        <a href="#" class="x-navigation-control"></a>
-                    </li>
-                    <li><%= link_to sufia.admin_stats_path do %>
-                          <span class="fa fa-bar-chart"></span> <%= t('sufia.admin.sidebar.statistics') %>
-                        <% end %>
-                    </li>
-                    <li><%= link_to sufia.admin_features_path do %>
-                          <span class="fa fa-cog"></span> <%= t('sufia.admin.sidebar.settings') %>
-                        <% end %>
-                    </li>
-                    <li><%= link_to sufia.admin_admin_sets_path do %>
-                      <span class="fa fa-sitemap"></span> <%= t('sufia.admin.sidebar.admin_sets') %>
-                        <% end %>
-                    </li>
-                </ul>
-
+<ul class="nav nav-pills nav-stacked">
+  <li class="<%= 'active' if current_page? sufia.admin_stats_path %>">
+    <%= link_to sufia.admin_stats_path do %>
+      <span class="fa fa-bar-chart"></span> <%= t('sufia.admin.sidebar.statistics') %>
+    <% end %>
+  </li>
+  <li class="<%= 'active' if current_page? sufia.admin_features_path %>">
+    <%= link_to sufia.admin_features_path do %>
+      <span class="fa fa-cog"></span> <%= t('sufia.admin.sidebar.settings') %>
+    <% end %>
+  </li>
+  <li class="<%= 'active' if current_page? sufia.admin_admin_sets_path %>">
+    <%= link_to sufia.admin_admin_sets_path do %>
+      <span class="fa fa-sitemap"></span> <%= t('sufia.admin.sidebar.admin_sets') %>
+    <% end %>
+  </li>
+  <li>
+    <a role="button" class="collapsed collapse-toggle" data-toggle="collapse" href="#collapseWorkflows" aria-expanded="false" aria-controls="collapseWorkflows">
+      <span class="fa fa-code-fork"></span>
+      <span><%= t('sufia.admin.sidebar.workflow') %></span>
+    </a>
+    <ul class="collapse nav nav-pills nav-stacked" id="collapseWorkflows">
+      <li class="<%= 'active' if current_page? curation_concerns.admin_workflow_path %>">
+        <%= link_to curation_concerns.admin_workflow_path do %>
+          <span class="fa fa-flag"></span> <%= t('sufia.admin.sidebar.workflow_review') %>
+      <% end %>
+      </li>
+      <li class="<%= 'active' if current_page? curation_concerns.admin_workflow_roles_path %>">
+        <%= link_to curation_concerns.admin_workflow_roles_path do %>
+          <span class="fa fa-users"></span> <%= t('sufia.admin.sidebar.workflow_roles') %>
+      <% end %>
+      </li>
+    </ul>
+  </li>
+</ul>

data/app/views/sufia/admin/admin_sets/_form.html.erb

@@ -1,18 +1,41 @@
-    <%= simple_form_for @form, url: [sufia, :admin, @form] do |f| %>
-      <div class="panel panel-default">
-        <div class="panel-body">
-          <%= f.input :title %>
-          <%= f.input :description, as: :text %>
+<div class="panel panel-default tabs" id="admin-set-controls">
+  <ul class="nav nav-tabs" role="tablist">
+    <li class="active">
+      <a href="#description"><%= t('.tabs.description') %></a>
+    </li>
+    <% if @form.persisted? %>
+      <li>
+        <a href="#participants"><%= t('.tabs.participants') %></a>
+      </li>
+      <li>
+        <a href="#visibility"><%= t('.tabs.visibility') %></a>
+      </li>
+    <% end %>
+  </ul>
+  <div class="tab-content">
+    <div id="description" class="tab-pane active">
+      <div class="panel panel-default labels">
+        <%= simple_form_for @form, url: [sufia, :admin, @form] do |f| %>
+          <div class="panel-body">
+            <%= render 'form_metadata', f: f %>
+
+            <% if f.object.persisted? && f.object.member_ids.present? %>
+              <%= f.input :thumbnail_id, collection: @form.select_files %>
+            <% end %>
 
-          <% if f.object.persisted? && f.object.member_ids.present? %>
-            <%= f.input :thumbnail_id, collection: @form.select_files %>
-          <% end %>
-          
-        </div>
-        <div class="panel-footer">
-          <%= link_to 'Cancel', sufia.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
-          <%= f.button :submit, class: 'btn btn-primary pull-right'%>
-        </div>
+            <%= f.input :workflow_name, as: :select, collection: f.object.workflows %>
+
+          </div>
+          <div class="panel-footer">
+            <%= link_to 'Cancel', sufia.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
+            <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+          </div>
+        <% end %>
       </div>
+    </div>
+    <% if @form.persisted? %>
+      <%= render 'form_participants' %>
+      <%= render 'form_visibility' %>
     <% end %>
-
+  </div>
+</div>

data/app/views/sufia/admin/admin_sets/_form_metadata.html.erb

@@ -0,0 +1,2 @@
+<%= f.input :title %>
+<%= f.input :description, as: :text %>

data/app/views/sufia/admin/admin_sets/_form_participant_table.html.erb

@@ -0,0 +1,21 @@
+                  <h3><%= t(".#{access}.title") %></h3>
+                  <p><%= t(".#{access}.help") %></p>
+                  <table class="table table-striped share-status">
+                    <thead>
+                      <tr>
+                        <th><%= t(".#{access}.agent_name") %></th>
+                        <th><%= t(".#{access}.type") %></th>
+                        <th><%= t(".#{access}.action") %></th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                    <% @form.permission_template.access_grants.select(&filter).each do |g| %>
+                      <tr>
+                        <td><%= g.agent_id %></td> 
+                        <td><%= g.agent_type.titleize %></td> 
+                        <td><%= button_to t(".#{access}.remove"), sufia.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-danger' %></td>
+                      </tr>
+                    <% end %>
+                    </tbody>
+                  </table>
+

data/app/views/sufia/admin/admin_sets/_form_participants.html.erb

@@ -0,0 +1,68 @@
+          <div id="participants" class="tab-pane">
+            <div class="panel panel-default labels">
+              <div class="panel-body">
+                <h2><%= t('.add_participants') %></h2>
+                <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
+                <%= simple_form_for @form.permission_template,
+                                    url: [sufia, :admin, @form, :permission_template],
+                                    html: { id: 'group-participants-form' } do |f| %>
+                  <div class="clearfix spacer">
+                  <%= f.fields_for 'access_grants_attributes',
+                                   f.object.access_grants.build(agent_type: 'group'),
+                                   index: 0 do |builder| %>
+                    <div class="form-inline">
+                      <label class="col-md-2 col-xs-4 control-label"><%= t('.add_group') %></label>
+
+                      <div class="col-md-10 col-xs-8 form-group">
+                        <%= builder.hidden_field :agent_type %>
+                        <%= builder.text_field :agent_id,
+                                         placeholder: "Search for a group...",
+                                         class: 'form-control' %>
+                        as
+                        <%= builder.select :access,
+                                     access_options,
+                                     { prompt: "Select a role..." },
+                                     class: 'form-control' %>
+
+                                   <%= f.submit t('helpers.submit.sufia_permission_template_access.create'), class: 'btn btn-info' %>
+                      </div>
+                    </div>
+                  <% end %>
+                  </div>
+                <% end %>
+
+                <%= simple_form_for @form.permission_template,
+                                    url: [sufia, :admin, @form, :permission_template],
+                                    html: { id: 'user-participants-form' } do |f| %>
+                  <%= f.fields_for 'access_grants_attributes',
+                                   f.object.access_grants.build(agent_type: 'user'),
+                                   index: 0 do |builder| %>
+                    <div class="form-inline add-users">
+                      <label class="col-md-2 col-xs-4 control-label"><%= t('.add_user') %></label>
+
+                      <div class="col-md-10 col-xs-8 form-group">
+                        <%= builder.hidden_field :agent_type %>
+                        <%= builder.text_field :agent_id,
+                                         placeholder: "Search for a user...",
+                                         class: 'form-control' %>
+                        as
+                        <%= builder.select :access,
+                                     access_options,
+                                     { prompt: "Select a role..." },
+                                     class: 'form-control' %>
+
+                        <%= f.submit t('helpers.submit.sufia_permission_template_access.create'), class: 'btn btn-info' %>
+                      </div>
+                    </div>
+                  <% end %>
+                <% end %>
+
+                <fieldset>
+                  <legend><%= t(".current_participants") %></legend>
+                  <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
+                  <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
+                  <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
+                </fieldset>
+              </div>
+            </div>
+          </div>

data/app/views/sufia/admin/admin_sets/_form_visibility.html.erb

@@ -0,0 +1,58 @@
+          <div id="visibility" class="tab-pane">
+            <div class="panel panel-default labels">
+              <%= simple_form_for @form.permission_template,
+                                  url: [sufia, :admin, @form, :permission_template] do |f| %>
+                <div class="panel-body">
+                  <p><%= t('.page_description') %></p>
+                  <h3><%= t('.release.title') %></h3>
+                  <p><%= t('.release.description') %></p>
+                  <div id="release-no-delay" class="radio">
+                    <label>
+                      <%= f.radio_button :release_period, Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY %>
+                      <%= t('.release.no_delay') %>
+                    </label>
+                  </div>
+                  <div id="release-varies" class="radio">
+                    <label>
+                      <%= f.radio_button :release_period, '', checked: !f.object.release_varies.blank? %>
+                      <%= t('.release.varies.description') %>
+                    </label>
+                    <ul>
+                      <li class="radio form-inline">
+                        <label>
+                          <%= f.radio_button :release_varies, Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE %>
+                          <%= t('.release.varies.between') %>
+                        </label>
+                        <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control' %>
+                      </li>
+                      <li class="radio form-inline">
+                        <label>
+                          <%= f.radio_button :release_varies, Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO %>
+                          <%= t('.release.varies.between') %>
+                          <%= f.collection_select :release_embargo, f.object.embargo_options, :first, :last, prompt: t('.release.varies.embargo.select') %>
+                        </label>
+                      </li>
+                    </ul>
+                  </div>
+                  <div id="release-fixed" class="radio form-inline">
+                    <label>
+                      <%= f.radio_button :release_period, Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED %>
+                      <%= t('.release.fixed') %>
+                    </label>
+                    <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control' %>
+                  </div>
+                  <h3><%= t('.visibility.title') %></h3>
+                  <p><%= t('.visibility.description') %></p>
+                  <%# List each option in a <div class='radio'> tag %>
+                  <%= f.collection_radio_buttons :visibility, f.object.visibility_options, :first, :last, item_wrapper_tag: :div, item_wrapper_class: 'radio' do |b| %>
+                    <%# NOTE: Bug in simple_form causes nested labels: https://github.com/plataformatec/simple_form/issues/1190 This block is a workaround. %>
+                    <% b.radio_button + b.text %>
+                  <% end %>
+                </div>
+                <div class="panel-footer">
+                  <%= link_to t('.cancel'), sufia.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
+                  <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+                </div>
+              <% end %>
+            </div>
+          </div>

data/app/views/sufia/admin/admin_sets/index.html.erb

@@ -7,40 +7,36 @@
   </div>
 <% end %>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-body">
-        <% if @admin_sets.present? %>
-          <div class="table-responsive">
-            <table class="table table-striped datatable">
-              <thead>
-                <tr>
-                  <th>Title</th>
-                  <th>Date created</th>
-                  <th>Creator</th>
-                  <th>Works</th>
-                </tr>
-              </thead>
-              <tbody>
-                <% @admin_sets.each do |admin_set| %>
-                  <tr>
-                    <td><%= link_to admin_set.title.first, [sufia, :admin, admin_set] %></td>
-                    <td><%= admin_set.create_date %></td>
-                    <td><%= safe_join(admin_set.creator) %></td>
-                    <td><%= controller.presenter_class.new(admin_set, current_ability).total_items %></td>
-                  </tr>
-                <% end %>
-              </tbody>
-            </table>
-          <% else %>
-            <p>No administrative sets have been created.</p>
-            <%= link_to sufia.new_admin_admin_set_path, class: 'btn btn-primary' do %>
-              <span class="fa fa-edit"></span> <%= t(:'helpers.action.admin_set.new') %>
+<div class="panel panel-default">
+  <div class="panel-body">
+    <% if @admin_sets.present? %>
+      <div class="table-responsive">
+        <table class="table table-striped datatable">
+          <thead>
+            <tr>
+              <th>Title</th>
+              <th>Date created</th>
+              <th>Creator</th>
+              <th>Works</th>
+            </tr>
+          </thead>
+          <tbody>
+            <% @admin_sets.each do |admin_set| %>
+              <tr>
+                <td><%= link_to admin_set.title.first, [sufia, :admin, admin_set] %></td>
+                <td><%= admin_set.create_date %></td>
+                <td><%= safe_join(admin_set.creator) %></td>
+                <td><%= controller.presenter_class.new(admin_set, current_ability).total_items %></td>
+              </tr>
             <% end %>
-          <% end %>
-        </div>
+          </tbody>
+        </table>
       </div>
-    </div>
+      <% else %>
+        <p>No administrative sets have been created.</p>
+        <%= link_to sufia.new_admin_admin_set_path, class: 'btn btn-primary' do %>
+          <span class="fa fa-edit"></span> <%= t(:'helpers.action.admin_set.new') %>
+        <% end %>
+      <% end %>
   </div>
 </div>