sufia 7.2.0 → 7.3.0.rc1

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

@@ -11,6 +11,9 @@
           <%= link_to sufia.edit_admin_admin_set_path(@presenter), class: 'btn btn-primary' do %>
             <span class="fa fa-edit"></span> <%= t(:'helpers.action.edit') %>
           <% end %>
+          <%= link_to sufia.admin_admin_set_path(@presenter), class: 'btn btn-danger', data: { confirm: t('.confirm_delete'), method: :delete } do %>
+            <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
+          <% end %>
         </div>
       </div>
 

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

@@ -1,36 +1,39 @@
-<!-- START WIDGETS -->
 <div class="row">
   <div class="col-md-3">
-    <div class="widget widget-default">
-      <div class="widget-title">Registered users</div>
-      <div class="widget-subtitle">Current</div>
-      <div class="widget-int num-count"><%= @presenter.user_count %></div>
+    <div class="panel panel-default">
+      <div class="panel-heading"><div class="h3 panel-title text-center"><%= t('.registered_users') %></div></div>
+      <div class="panel-body text-center">
+        Current
+        <div class="h3"><%= @presenter.user_count %></div>
+      </div>
     </div>
   </div>
 
   <div class="col-md-3">
-    <div class="widget widget-default">
-      <div class="widget-title">Total Visitors</div>
-      <div class="widget-subtitle">Past 30 days</div>
-      <div class="widget-int">n/a</div>
+    <div class="panel panel-default">
+      <div class="panel-heading"><div class="h3 panel-title text-center"><%= t('.total_visitors') %></div></div>
+      <div class="panel-body text-center">Past 30 days
+        <div class="h3">n/a</div>
+      </div>
     </div>
   </div>
 
     <div class="col-md-3">
-      <div class="widget widget-default">
-        <div class="widget-title">Returning Visitors</div>
-        <div class="widget-subtitle">Past 30 days</div>
-        <div class="widget-int">n/a</div>
+      <div class="panel panel-default">
+        <div class="panel-heading"><div class="h3 panel-title text-center"><%= t('.returning_visitors') %></div></div>
+        <div class="panel-body text-center">Past 30 days
+          <div class="h3">n/a</div>
+        </div>
       </div>
     </div>
 
-
     <div class="col-md-3">
-      <div class="widget widget-default">
-        <div class="widget-title">New Vistors</div>
-        <div class="widget-subtitle">Past 30 days</div>
-        <div class="widget-int">n/a</div>
+      <div class="panel panel-default">
+        <div class="panel-heading"><div class="h3 panel-title text-center"><%= t('.new_visitors') %></div></div>
+        <div class="panel-body text-center">Past 30 days
+          <div class="h3">n/a</div>
+        </div>
       </div>
     </div>
 </div>
-<!-- END WIDGETS -->
+<%= render 'collections' %>

data/app/views/sufia/batch_uploads/_form.html.erb

@@ -1,10 +1,11 @@
 <%= simple_form_for [sufia, @form], html: { multipart: true } do |f| %>
   <% content_for :files_tab do %>
     <p class="switch-upload-type">To create a single work for all the files, go to <%= link_to "New Work", [:new, Sufia.primary_work_type.model_name.singular_route_key] %></p>
-        <p class="instructions"><%= t("sufia.batch_uploads.files.instructions") %></p>
+    <p class="instructions"><%= t("sufia.batch_uploads.files.instructions") %></p>
   <% end %>
   <%= render 'curation_concerns/base/guts4form', f: f, tabs: %w[files metadata relationships share] do %>
   <% end %>
+  <%= f.hidden_field :payload_concern, value: @form.payload_concern %>
 <% end %>
 
 <script type="text/javascript">

data/app/views/sufia/homepage/index.html.erb

@@ -3,9 +3,17 @@
 <% if @presenter.display_share_button? %>
   <div class="home_share_work row">
     <div class="col-sm-12 text-center">
-      <%= link_to [:new, Sufia.primary_work_type.model_name.singular_route_key],
-            class: "btn btn-primary btn-lg" do %>
-        <i class="glyphicon glyphicon-upload"></i> <%= t('sufia.share_button') %>
+      <% if signed_in? %>
+        <%= link_to '#',
+          class: "btn btn-primary btn-lg",
+          data: { behavior: 'select-work', target: '#worktypes-to-create', 'create-type' => 'single' } do %>
+          <i class="glyphicon glyphicon-upload"></i> <%= t('sufia.share_button') %>
+        <% end %>
+      <% else %>
+        <%= link_to sufia.dashboard_index_path,
+          class: "btn btn-primary btn-lg" do %>
+          <i class="glyphicon glyphicon-upload"></i> <%= t('sufia.share_button') %>
+        <% end %>
       <% end %>
       <p><a href="/terms/">Terms of Use</a></p>
     </div>

data/app/views/sufia/uploads/_js_templates.html.erb

@@ -33,10 +33,19 @@
 
 <!-- function used by the following template -->
 <script type="text/javascript">
-  function setAllResourceTypes() {
-    var firstResourceType = $(".resource_type_dropdown")[0].value;
+  function setAllResourceTypes(resourceTypeId) {
+    var firstResourceType = $("#resource_type_" + resourceTypeId.toString())[0];
+    var selected_options = [];
+    for (var i = 0; i < firstResourceType.length; i++) {
+      if (firstResourceType.options[i].selected) {
+        selected_options.push(firstResourceType.options[i].value);
+      }
+    }
     $(".resource_type_dropdown").each(function(index, element) {
-      element.value = firstResourceType;
+      for(var i=0; i< this.length; i++) {
+        this.options[i].selected =
+          $.inArray(this.options[i].value, selected_options) > -1 ? true : false;
+      }
     });
   }
 </script>
@@ -71,15 +80,10 @@
                 </div>
                 <label for="resource_type_{%=file.id%}" class="col-sm-5 control-label">Resource Type</label>
                 <div class="col-sm-7">
-                  <select class="form-control resource_type_dropdown" name="resource_type[{%=file.id%}]" id="resource_type_{%=file.id%}" value="{%=file.name%}">
-                    <% ResourceTypesService.select_options.each do |type| %>
-                      <option value="<%= type[0] %>"><%= type[1] %></option>
-                    <% end %>
+                  <select class="form-control resource_type_dropdown" multiple="multiple" size="6" name="resource_type[{%=file.id%}][]" id="resource_type_{%=file.id%}" value="{%=file.name%}">
+                    <%= options_for_select(ResourceTypesService.select_options) %>
                   </select>
-                  <!-- TODO: Why is the button drawn for all files? -->
-                  {% if (i == 0) { %}
-                    <button class="btn pull-right resource_type_button" onClick="setAllResourceTypes(); return false;">Set all to this Resource Type</button>
-                  {% } %}
+                  <button class="btn pull-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;">Set all to this Resource Type</button>
                 </div>
               </div>
             </div>

data/app/views/users/_user_row.html.erb

@@ -0,0 +1,10 @@
+<tr>
+  <td><%= link_to sufia.profile_path(user) do %>
+        <%= image_tag(user.avatar.url(:thumb), width: 30) if user.avatar.file %>
+      <% end %>
+  </td>
+   <td><%= link_to user.name, sufia.profile_path(user) %></td>
+   <td><%= link_to user.user_key, sufia.profile_path(user) %></td>
+   <td><%= user.department %></td>
+   <td><%= number_of_works(user) %></td>
+</tr>

data/app/views/users/index.html.erb

@@ -13,18 +13,7 @@
         </tr>
     </thead>
     <tbody>
-        <% @users.each do |user| %>
-            <tr>
-              <td><%= link_to sufia.profile_path(user) do %>
-                    <%= image_tag(user.avatar.url(:thumb), width: 30) if user.avatar.file %>
-                  <% end %>
-              </td>
-               <td><%= link_to user.name, sufia.profile_path(user) %></td>
-               <td><%= link_to user.user_key, sufia.profile_path(user) %></td>
-               <td><%= user.department %></td>
-               <td><%= number_of_works(user) %></td>
-            </tr>
-         <% end %>
+    <%= render partial: 'user_row', collection: @users, as: :user %>
     </tbody>
 </table>
 <div class="pager">

data/config/features.rb

@@ -4,6 +4,8 @@ Flipflop.configure do
   strategy :active_record, class: Sufia::Feature
   strategy :default
 
+  # Note, if this is deactivated, a default admin set will be created and all
+  # works will be assigned to it when they are created.
   feature :assign_admin_set,
           default: true,
           description: "Ability to assign uploaded items to an admin set"

data/config/locales/sufia.en.yml

@@ -10,6 +10,9 @@ en:
       contact:          "Contact"
     product_name:       "Sufia"
     product_twitter_handle: "@HydraSphere"
+    icons:
+      collection:       'fa fa-cubes'
+      default:          'fa fa-cube'
     institution_name:   "Institution Name"
     institution_name_full: "The Institution Name"
     sort_label: "Sort the listing of items"
@@ -48,6 +51,10 @@ en:
       button:
         html: '<span class="glyphicon glyphicon-search"></span> Go'
         text: "Search"
+    select_type:
+      name:        "Work"
+      description: "General purpose worktype"
+      icon_class : 'fa fa-file-text-o'
     upload:
       my_computer:
         sr_tab_label: "Access Files from"
@@ -104,14 +111,26 @@ en:
         shares: "Shares"
       works:
         menu: "Works"
-        new: "New"
+        new: "New Work"
         my: "My Works"
         batch: "Batch Create"
       collections:
         menu: "Collections"
         my: "My Collections"
         new: "New Collection"
+      notifications: "Notifications"
+      profile:
+        sr_action: "View"
+        sr_target: "profile"
+        view: "View Profile"
+        edit: "Edit Profile"
+        logout: "Logout"
+        login: "Login"
     dashboard:
+      heading_actions:
+        close:                  "Close"
+        create_work:            "Create work"
+        select_type_of_work:    "Select type of work"
       title:                    "My Dashboard"
       view_collections:         "View Collections"
       create_collection:        "Create Collection"
@@ -219,14 +238,12 @@ en:
         title: "Filename will be the default title. Please provide a more meaningful title, and filenames will still be preserved by the system."
         resource_type: "You may select multiple types to apply to all files"
     works:
-      new:
-        header: Add New Work
-        in_collections: This Work in Collections
-        in_this_work: Other Works in this Work
-        in_other_works: This Work in Other Works
+      create:
+        header: "Add New %{type}"
         after_create_html: "Your files are being processed by %{application_name} in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
       edit:
-        header: Edit Work
+        breadcrumb: 'Edit'
+      form:
         in_collections: This Work in Collections
         in_this_work: Other Works in this Work
         in_other_works: This Work in Other Works
@@ -236,8 +253,10 @@ en:
           files:         "Files"
           relationships: "Relationships"
           share:         "Share"
+      update:
+        header: Edit Work
       progress:
-        header: Save Work
+        header: "Save Work"
       show:
         no_preview: No preview available
     batch_uploads:
@@ -265,13 +284,14 @@ en:
           label: "Delete"
           desc: "Delete this collection"
           confirmation: "Delete this collection?"
+      document_list:
+        edit: "Edit"
+        no_visible_works: "The collection is either empty or does not contain items to which you have access."
       edit:
         manage_items: "Manage Items in this Collection"
+      form:
         description: "Descriptions"
         additional_fields: "Additional fields"
-      document_list:
-        edit: "Edit"
-        no_visible_works: "The collection is either empty or does not contain items to which you have access."
       select_form:
         title: "Add to collection"
         no_collections: "You do not have access to any existing collections. You may create a new collection."
@@ -290,8 +310,6 @@ en:
       browse_view: "Browse View"
       show:
         download: "Download the file"
-    work:
-      browse_view: "Browse View"
     footer:
       copyright_html: "<strong>Copyright &copy; 2016 Project Hydra</strong> Licensed under the Apache License, Version 2.0"
     admin:
@@ -300,13 +318,85 @@ en:
           header:         "Edit Administrative Set"
         new:
           header:         "Create New Administrative Set"
+        delete:
+          notification:   "Administrative set successfully deleted"
+        form:
+          tabs:
+            description:        "Description"
+            participants:       "Participants"
+            visibility:         "Release and Visibility"
+        form_participants:
+          add_group:            "Add group:"
+          add_user:             "Add user:"
+          add_participants:     "Add Participants"
+          current_participants: "Current Participants"
+        form_participant_table:
+          managers:
+            title:              "Managers"
+            help:               "Managers of this administrative set can edit the set metadata, participants, and release and visibility settings. Managers can also edit work metadata, add to or remove files from a work, and add new works to the set."
+            agent_name:         "Managers of This Set"
+            type:               "Type"
+            action:             "Action"
+            remove:             "Remove"
+          depositors:
+            title:              "Depositors"
+            help:               "Depositors can add new works to this administrative set."
+            agent_name:         "Depositors of This Set"
+            type:               "Type"
+            action:             "Action"
+            remove:             "Remove"
+          viewers:
+            title:              "Viewers"
+            help:               "Viewers of this administrative set can view works in the set regardless of the visibility settings applied to the work. For example, viewers can view works in this set even if the works are currently embargoed or restricted."
+            agent_name:         "Viewers of This Set"
+            type:               "Type"
+            action:             "Action"
+            remove:             "Remove"
+        form_visibility:
+          page_description:     "Release and visibility settings control when works added to this set are made available for discovery and download and who can discover and download them."
+          release:
+            title:              "Release"
+            description:        "You can impose a delay (embargo) before works in this administrative set are released for discovery and download."
+            no_delay:           "No delay -- release all works as soon as they are deposited"
+            varies:
+              description:      "Varies -- depositors can set the release date for an individual work:"
+              between:          "Between \"now\" and"
+              embargo:
+                select:         "Select embargo period.."
+                6mos:           "6 months after deposit"
+                1yr:            "1 year after deposit"
+                2yrs:           "2 years after deposit"
+                3yrs:           "3 years after deposit"
+            fixed:              "Fixed -- delay release of all works until"
+          visibility:
+            title:              "Visibility"
+            description:        "After its release date, works in this set can be discovered and downloaded by:"
+            everyone:           "Everyone -- all works in this set will be public"
+            varies:             "Varies -- default is public, but depositors can restrict the visibility of individual works"
+            institution:        "Institution -- all works will be visible only to authenticated users of this institution"
+            restricted:         "Restricted -- all works will be visible only to repository managers and managers and reviewers of this administrative set"
+          cancel:               "Cancel"
         show:
           header:           "Administrative Set"
           item_list_header: "Works in This Set"
+          confirm_delete:   "Are you sure you wish to delete this Administrative Set? This action cannot be undone."
+      collections:
+        collection:         "Collection"
+        subtitle:           "Recent collection activity"
+        title:              "Collections"
+        works:              "Works"
+      show:
+        registered_users:   "Registered users"
+        total_visitors:     "Total Visitors"
+        returning_visitors: "Returning Visitors"
+        new_visitors:       "New Visitors"
       sidebar:
         admin_sets: "Administrative Sets"
         settings:   "Settings"
         statistics: "Statistics"
+        workflow: "Workflows"
+        workflow_review: "Review"
+        workflow_roles: "Roles"
       stats:
         registered: "Registered"
         deposited_form:
@@ -323,7 +413,9 @@ en:
 
   simple_form:
     labels:
-      generic_work: &work_labels
+      collection:
+        total_items:      "Total Items"
+        size:             "Size"
         based_near:       "Location"
         description:      "Abstract or Summary"
         keyword:          "Keyword"
@@ -332,27 +424,7 @@ en:
         files:            "Upload a new version of this file from your computer"
         collection_ids:   "Add as member of collection"
         admin_set_id:     "Add as member of administrative set"
-      collection:
-        total_items:      "Total Items"
-        size:             "Size"
-        <<: *work_labels
-
     hints:
-      generic_work:
-        resource: "Pre-defined categories to describe the type of content being uploaded, such as &quot;article&quot; or &quot;dataset.&quot;  More than one type may be selected."
-        title: "A name to aid in identifying a work."
-        keyword: "Words or phrases you select to describe what the work is about. These are used to search for content."
-        subject: "Headings or index terms describing what the work is about; these do need to conform to an existing vocabulary."
-        creator: "The person or group responsible for the work. Usually this is the author of the content. Personal names should be entered with the last name first, e.g. &quot;Smith, John.&quot;."
-        related_url: "A link to a website or other specific content (audio, video, PDF document) related to the work. An example is the URL of a research project from which the work was derived."
-        based_near: "A place name related to the work, such as its site of publication, or the city, state, or country the work contents are about. Calls upon the <a href='http://www.geonames.org'>GeoNames web service</a>."
-        contributor: "A person or group you want to recognize for playing a role in the creation of the work, but not the primary role."
-        date_created: "The date on which the work was generated."
-        description: "Free-text notes about the work. Examples include abstracts of a paper or citation information for a journal article."
-        identifier: "A unique handle identifying the work. An example would be a DOI for a journal article, or an ISBN or OCLC number for a book."
-        language: "The language of the work's content."
-        publisher: "The person or group making the work available. Generally this is the institution."
-        rights: "Licensing and distribution information governing access to the work. Select from the provided drop-down list."
       collection:
         resource_type: "Pre-defined categories to describe the type of content being uploaded, such as &quot;article&quot; or &quot;dataset.&quot;  More than one type may be selected."
         title: "A name to aid in identifying a collection."
@@ -379,6 +451,8 @@ en:
       relationships_parent_row_empty:
         label: "In %{type}:"
         empty: "There are no %{type} relationships."
+      show:
+        last_modified: "Last modified: %{value}"
       metadata:
         header: Descriptions
         attribute_name_label: Attribute Name
@@ -387,6 +461,10 @@ en:
         local_upload: Add Local Files
         external_upload: Cloud Providers
         dropzone: "Drop files here."
+      form_progress:
+        requirements:          Requirements
+        required_descriptions: Describe your work
+        required_files:        Add files
       items:
         header: Items
         thumbnail: Thumbnail
@@ -406,7 +484,7 @@ en:
       groups_description:
         description_html: >
           The list of groups in the drop-down marked "Select a group" is a list of User Managed Groups that
-          you are a member of.  You may select a specific group and assign an access level for a file 
+          you are a member of.  You may select a specific group and assign an access level for a file
           within %{application_name}, similarly to adding user access levels.
     visibility:
       open:
@@ -420,7 +498,7 @@ en:
       private:
         label_html: Private
     single_use_links:
-      copy: 
+      copy:
         button: Copy
   blacklight:
     search:
@@ -430,14 +508,21 @@ en:
           contributor: Contributors
           keyword: Keyword
 
-
   helpers:
     action:
       admin_set:
         new: "Create new administrative set"
       cancel: "Cancel"
+      delete: "Delete"
       edit: "Edit"
     submit:
       admin_set:
         create: 'Save'
         update: 'Save'
+      sufia_permission_template:
+        create: 'Save'
+        update: 'Save'
+      sufia_permission_template_access:
+        create: 'Add'
+      create: 'Save'
+      update: 'Save'