hyrax 2.0.3 → 2.1.0.beta1

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

@@ -3,11 +3,15 @@
         <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"></noscript>
         <!-- The table listing the files available for upload/download -->
         <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
-
-        <h2><%= t('hyrax.base.form_files.local_upload') %></h2>
+        <% if Hyrax.config.browse_everything? %>
+          <%= t('hyrax.base.form_files.local_upload_browse_everything_html', contact_href: link_to(t("hyrax.upload.alert.contact_href_text"), hyrax.contact_form_index_path)) %>
+        <% else %>
+          <%= t('hyrax.base.form_files.local_upload_html') %>
+        <% end %>
         <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-        <div class="row fileupload-buttonbar">
-            <div class="col-xs-7">
+        <div class="fileupload-buttonbar">
+          <div class="row">
+            <div class="col-xs-12">
                 <!-- The fileinput-button span is used to style the file input field as button -->
                 <span id="addfiles" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
@@ -20,6 +24,14 @@
                     <span>Add folder...</span>
                     <input type="file" name="files[]" multiple directory webkitdirectory>
                 </span>
+                <% if Hyrax.config.browse_everything? %>
+                  <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
+                    'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
+                    'data-target' => "#{f.object.persisted? ? "#edit_#{f.object.model.model_name.param_key}_#{f.object.model.id}" : "#new_#{f.object.model.model_name.param_key}"}" ) do %>
+                    <span class="glyphicon glyphicon-plus"></span>
+                    <%= t('hyrax.upload.browse_everything.browse_files_button') %>
+                  <% end %>
+                <% end %>
                 <button type="reset" class="btn btn-warning cancel hidden">
                     <span class="glyphicon glyphicon-ban-circle"></span>
                     <span>Cancel upload</span>
@@ -27,15 +39,20 @@
                 <!-- The global file processing state -->
                 <span class="fileupload-process"></span>
             </div>
-            <!-- The global progress state -->
-            <div class="col-xs-5 fileupload-progress fade">
-                <!-- The global progress bar -->
-                <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-                    <div class="progress-bar progress-bar-success" style="width:0%;"></div>
-                </div>
-                <!-- The extended global progress state -->
-                <div class="progress-extended">&nbsp;</div>
+          </div>
+          <div class="row">
+            <div class="col-xs-12">
+              <!-- The global progress state -->
+              <div class="fileupload-progress fade">
+                  <!-- The global progress bar -->
+                  <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+                      <div class="progress-bar progress-bar-success" style="width:0%;"></div>
+                  </div>
+                  <!-- The extended global progress state -->
+                  <div class="progress-extended">&nbsp;</div>
+              </div>
             </div>
+          </div>
         </div>
         <div class="dropzone">
           <%= t('hyrax.base.form_files.dropzone') %>
@@ -43,7 +60,3 @@
      </div>
 
 <%= render 'hyrax/uploads/js_templates' %>
-<% if Hyrax.config.browse_everything? %>
-  <h2><%= t('hyrax.base.form_files.external_upload') %></h2>
-  <%= render 'browse_everything', f: f %>
-<% end %>

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

@@ -1,4 +1,5 @@
 <% if f.object.persisted? && f.object.member_ids.present? %>
   <%= render 'form_representative', f: f %>
   <%= render 'form_thumbnail', f: f %>
+  <%= render 'form_rendering', f: f %>
 <% end %>

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

@@ -1,8 +1,46 @@
+<%# Form UI behavior code and details;
+Code:
+  app/assets/javascripts/hyrax/relationships
+CSS:
+  [data-behavior="remove-relationship"] : Button to remove its parent TR from the table
+  [data-behavior="add-relationship"] : Button to clone its parent TR and inject a new row into the table
+  .message.has-warning : Used to display UI errors related to input values and server errors
+HTML Properties:
+  table:
+    [data-behavior="child-relationships"] : allows the javascript to be initialized
+    data-param-key : the parameter key value for this model type
+%>
 <h2><%= t("hyrax.works.form.in_collections") %></h2>
-<div id="collection-widget">
-  <%= f.input :member_of_collection_ids,
-              as: :select,
-              collection: f.object.collections_for_select,
-              selected: f.object.member_of_collections(params[:add_works_to_collection]),
-              input_html: { class: 'form-control', multiple: true } %>
+
+<div class="form-group" data-behavior="collection-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= f.object.member_of_collections_json %>">
+
+  <div class="form-inline">
+      <%= f.label :member_of_collection_ids %>
+      <%= f.input_field :member_of_collection_ids,
+                  prompt: :translate,
+                  data: {
+                    autocomplete: 'collection',
+                    'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/collections?access=deposit'
+                  } %>
+      <a class="btn btn-primary" data-behavior="add-relationship">Add</a>
+  </div>
+
+  <table class="table table-striped">
+    <caption><%= t('.caption') %></caption>
+    <thead>
+    <tr>
+      <th><%= t('.header.title') %></th>
+      <th><%= t('.header.actions') %></th>
+    </tr>
+    </thead>
+    <tbody>
+    </tbody>
+  </table>
 </div>
+
+<script type="text/x-tmpl" id="tmpl-collection">
+<tr>
+  <td>{%= o.title %}</td>
+  <td><button class="btn btn-danger" data-behavior="remove-relationship" data-confirm-text="<%= t('.confirm.text') %>" data-confirm-cancel="<%= t('.confirm.cancel') %>" data-confirm-remove="<%= t('.confirm.remove') %>"><%= t('.actions.remove') %></button></td>
+</tr>
+</script>

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

@@ -1,6 +1,3 @@
-        <div class="form-instructions">
-          <p>The more descriptive information you provide the better we can serve your needs.</p>
-        </div>
         <div class="base-terms">
           <% f.object.primary_terms.each do |term| %>
             <%= render_edit_field_partial(term, f: f) %>

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

@@ -45,8 +45,9 @@
       <% end %>
     <% end %>
     <br>
+    <% cancel_path = f.object.persisted? ? polymorphic_path([main_app, f.object]) : hyrax.my_works_path %>
     <%= link_to t(:'helpers.action.cancel'),
-                hyrax.dashboard_path,
+                cancel_path,
                 class: 'btn btn-default' %>
     <%# TODO: If we start using ActionCable, we could listen for object updates and
               alert the user that the object has changed by someone else %>

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

@@ -3,13 +3,14 @@
   <%= f.input :admin_set_id, as: :select,
       include_blank: false,
       collection: Hyrax::AdminSetOptionsPresenter.new(Hyrax::AdminSetService.new(controller)).select_options,
-      input_html: { class: 'form-control' } %>
+      input_html: { class: 'form-control' },
+      selected: AdminSet::DEFAULT_ID %>
 <% end %>
 
 <%= render 'form_in_works', f: f %>
 <%= render 'form_member_of_collections', f: f %>
 
 <% if f.object.persisted? %>
-  <h3><%= t("hyrax.works.form.in_this_work") %></h3>
+  <h2><%= t("hyrax.works.form.in_this_work") %></h2>
   <%= render 'form_child_work_relationships', f: f  %>
 <% end %>

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

@@ -0,0 +1,14 @@
+<div class="row">
+  <div class="col-md-12">
+    <fieldset id="representative-media">
+      <legend>
+        <%= t("hyrax.base.form_rendering.legend_html") %>
+      </legend>
+      <p><%= t("hyrax.base.form_rendering.help_html") %></p>
+      <%= f.select :rendering_ids,
+                   f.object.select_files,
+                   { include_blank: true },
+                   { class: 'form-control', multiple: true } %>
+    </fieldset>
+  </div>
+</div>

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

@@ -2,9 +2,9 @@
     <div class="col-md-12">
       <fieldset id="representative-media">
         <legend>
-          Representative Media
+          <%= t("hyrax.base.form_representative.legend_html") %>
         </legend>
-        <p>Select the file with media that represents this <%= f.object.human_readable_type %>.</p>
+        <p><%= t("hyrax.base.form_representative.help_html") %></p>
         <%= f.select :representative_id, @form.select_files, {}, { class: 'form-control' } %>
       </fieldset>
     </div>

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

@@ -1,4 +1,6 @@
-<h2>Sharing With</h2>
+<p><%= t('.directions') %></p>
+<h2><%= t('.add_sharing') %></h2>
+
 <% depositor = f.object.depositor %>
 
 <div class="alert alert-info hidden" id="save_perm_note">Permissions are
@@ -8,6 +10,47 @@
   <span id="permissions_error_text"></span>
 </div>
 
+
+<p class="sr-only">Use the add button to give access to one <%=t('hyrax.account_label') %> at a time (it will be added to the list below).
+  Select the user, by name or <%= t('hyrax.account_label') %>. Then select the access level you wish to grant and click on Add this
+  <%= t('hyrax.account_label') %> to complete adding the permission.
+</p>
+
+<fieldset class="form-group row permission-add-group">
+  <legend class="col-sm-3 permissions-add-group-label">
+    <%= t('hyrax.admin.admin_sets.form_participants.add_group') %>
+  </legend>
+  <div class="col-sm-9 form-inline">
+    <label for="new_group_name_skel" class="sr-only">Group</label>
+    <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), class: 'form-control' %>
+    <label for="new_group_permission_skel" class="sr-only">Access type to grant</label>
+    <%= select_tag 'new_group_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
+
+    <button class="btn btn-default" id="add_new_group_skel">
+      <span>Add<span class="sr-only"> this group</span></span>
+    </button>
+    <br /><span id="directory_group_result"></span>
+  </div>
+</fieldset>
+
+<fieldset class="form-group row permission-add-user">
+  <legend class="col-sm-3 permissions-add-user-label">
+    <%= t('hyrax.admin.admin_sets.form_participants.add_user') %>
+  </legend>
+  <div class="col-sm-9 form-inline">
+    <label for="new_user_name_skel" class="sr-only"><%= t('hyrax.account_label') %> (without the <%= t('hyrax.directory.suffix') %> part)</label>
+    <%= text_field_tag 'new_user_name_skel', nil %>
+    <label for="new_user_permission_skel" class="sr-only">Access type to grant</label>
+    <%= select_tag 'new_user_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
+    <button class="btn btn-default" id="add_new_user_skel">
+      <span>Add<span class="sr-only"> this <%= t('hyrax.account_label') %></span></span>
+    </button>
+    <br /> <span id="directory_user_result"></span>
+  </div>
+</fieldset>
+
+<h2><%= t('.currently_sharing') %></h2>
+
 <table class="table">
   <tr id="file_permissions">
     <td width="20%">
@@ -36,46 +79,6 @@
   <% end %>
 </table>
 
-<h2>Share work with other users</h2>
-<p class="sr-only">Use the add button to give access to one <%=t('hyrax.account_label') %> at a time (it will be added to the list below).
-  Select the user, by name or <%= t('hyrax.account_label') %>. Then select the access level you wish to grant and click on Add this
-  <%= t('hyrax.account_label') %> to complete adding the permission.
-</p>
-<div class="form-group row">
-  <div class="col-sm-5">
-    <label for="new_user_name_skel" class="sr-only"><%= t('hyrax.account_label') %> (without the <%= t('hyrax.directory.suffix') %> part)</label>
-    <%= text_field_tag 'new_user_name_skel', nil %>
-  </div>
-  <div class="col-sm-4">
-    <label for="new_user_permission_skel" class="sr-only">Access type to grant</label>
-    <%= select_tag 'new_user_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
-  </div>
-  <div class="col-sm-3">
-    <button class="btn btn-default" id="add_new_user_skel">
-      <span class="sr-only">Add this <%= t('hyrax.account_label') %></span>
-      <span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span>
-    </button>
-    <br /> <span id="directory_user_result"></span>
-  </div>
-</div>
-
-<h2>Share work with groups of users</h2>
-<p class="sr-only">Use the add button to give access to one group at a time (it will be added to the list below).</p>
-<div class="form-group row">
-  <div class="col-sm-5">
-    <label for="new_group_name_skel" class="sr-only">Group</label>
-    <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), class: 'form-control' %>
-  </div>
-  <div class="col-sm-4">
-    <label for="new_group_permission_skel" class="sr-only">Access type to grant</label>
-    <%= select_tag 'new_group_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
-  </div>
-  <div class="col-sm-3">
-    <span class="sr-only">Add this group</span>
-    <button class="btn btn-default" id="add_new_group_skel"><i class="glyphicon glyphicon-plus"></i></button>
-    <br /><span id="directory_group_result"></span>
-  </div>
-</div>
 
 <script type="text/x-tmpl" id="tmpl-work-grant">
 <tr>

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

@@ -2,9 +2,9 @@
     <div class="col-md-12">
       <fieldset id="representative-image">
         <legend>
-           Thumbnail
+          <%= t("hyrax.base.form_thumbnail.legend_html") %>
         </legend>
-        <p>Select the file to be used as the thumbnail for this <%= f.object.human_readable_type %>.</p>
+        <p><%= t("hyrax.base.form_thumbnail.help_html") %></p>
         <%= f.select :thumbnail_id, @form.select_files, {}, { class: 'form-control' } %>
       </fieldset>
     </div>

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

@@ -12,14 +12,14 @@
             <li role="presentation">
           <% end %>
               <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
-                <i class="fa icon-<%= tab %>"></i> <%= t("hyrax.works.form.tab.#{tab}") %>
+                <%= t("hyrax.works.form.tab.#{tab}") %>
               </a>
             </li>
         <% end %>
 
         <li role="presentation" id="tab-share" class="hidden">
           <a href="#share" aria-controls="share" role="tab" data-toggle="tab">
-            <i class="fa icon-share"></i> <%= t("hyrax.works.form.tab.share") %>
+            <%= t("hyrax.works.form.tab.share") %>
           </a>
         </li>
       </ul>

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

@@ -2,11 +2,10 @@
   <td class="thumbnail">
     <%= render_thumbnail_tag member %>
   </td>
-  <td class="attribute filename"><%= link_to(member.link_name, contextual_path(member, @presenter)) %></td>
-  <td class="attribute date_uploaded"><%= member.try(:date_uploaded) %></td>
-  <td class="attribute permission"><%= member.permission_badge %></td>
+  <td class="attribute attribute-filename"><%= link_to(member.link_name, contextual_path(member, @presenter)) %></td>
+  <td class="attribute attribute-date_uploaded"><%= member.try(:date_uploaded) %></td>
+  <td class="attribute attribute-permission"><%= member.permission_badge %></td>
   <td>
     <%= render 'actions', member: member %>
   </td>
 </tr>
-

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

@@ -1,8 +1,4 @@
-<h2><%= t('.header') %></h2>
-<table class="table table-striped <%= dom_class(presenter) %> attributes" <%= presenter.microdata_type_to_html %>>
-  <thead>
-    <tr><th><%= t('.attribute_name_label') %></th><th><%= t('.attribute_values_label') %></th></tr>
-  </thead>
+<table class="table table-borderless <%= dom_class(presenter) %> attributes" <%= presenter.microdata_type_to_html %>>
   <tbody>
     <%= render 'attribute_rows', presenter: presenter %>
     <%= presenter.attribute_to_html(:embargo_release_date, render_as: :date) %>

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

@@ -1,5 +1,5 @@
 <h2><%= t('.header') %></h2>
-<table class="table table-striped relationships">
+<table class="table table-borderless relationships">
   <tbody>
     <%= render 'relationships_parent_rows', presenter: presenter %>
   </tbody>

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

@@ -6,7 +6,7 @@
     <% else %>
       <ul class="tabular">
         <% items.each do |item| %>
-          <li class='attribute title'>
+          <li class='attribute attribute-title'>
             <%= link_to item.title.first, url_for_document(item) %>
           </li>
         <% end %>

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

@@ -1,6 +1,12 @@
 <% if presenter.representative_id.present? && presenter.representative_presenter.present? %>
-  <%= media_display presenter.representative_presenter %>
+  <% if defined?(viewer) && viewer %>
+    <%= PulUvRails::UniversalViewer.script_tag %>
+    <div class="viewer-wrapper">
+      <div class="uv viewer" data-uri="<%= main_app.polymorphic_path [main_app, :manifest, presenter] %>"></div>
+    </div>
+  <% else %>
+    <%= media_display presenter.representative_presenter %>
+  <% end %>
 <% else %>
   <%= image_tag 'default.png', class: "canonical-image" %>
 <% end %>
-

data/app/views/hyrax/base/_work_title.erb

@@ -1,9 +1,16 @@
 <% presenter.title.each_with_index do |title, index| %>
-    <% if index == 0 %>
-        <h1>
-            <%= title %> <%= presenter.permission_badge %> <%= presenter.workflow.badge %>
-        </h1>
-    <% else %>
-        <h1><%= title %></h1>
-    <% end %>
+  <div class="row">
+    <div class="col-sm-8">
+      <% if index == 0 %>
+        <h2><%= title %>
+          <small class="text-muted"><%= presenter.permission_badge %> <%= presenter.workflow.badge %></small>
+        </h2>
+      <% else %>
+        <h2><%= title %></h2>
+      <% end %>
+    </div>
+    <div class="col-sm-4 text-right">
+      <%= render "show_actions", presenter: presenter %>
+    </div>
+  </div>
 <% end %>

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

@@ -0,0 +1,4 @@
+<h1 class="work-type-tag">
+  <span class="<%= Hyrax::ModelIcon.css_class_for(presenter.model) %>" aria-hidden="true"></span>
+  <%= presenter.human_readable_type %>
+</h1>

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

@@ -1,18 +1,18 @@
-<div id="workflow_controls"class="panel panel-default workflow-affix">
+<div id="workflow_controls" class="panel panel-workflow">
   <div class="panel-heading">
     <a data-toggle="collapse" href="#workflow_controls_collapse">
-      <h2 class="panel-title">Review and Approval</h2>
+      <h2 class="panel-title">Review and Approval <i class="fa fa-chevron-right pull-right"></i></h2>
     </a>
   </div>
-  <div id="workflow_controls_collapse" class="row panel-body panel-collapse collapse">
-    <%= form_tag main_app.hyrax_workflow_action_path(presenter), method: :put do %>
+  <%= form_tag main_app.hyrax_workflow_action_path(presenter), method: :put do %>
+    <div id="workflow_controls_collapse" class="panel-body panel-collapse collapse">
       <div class="col-sm-3 workflow-actions">
         <h3>Actions</h3>
 
         <% presenter.workflow.actions.each do |key, label| %>
           <div class="radio">
             <label>
-              <input type="radio" name="workflow_action[name]" id="workflow_action_name_<%= key %>" value="<%= key %>">
+              <%= radio_button_tag 'workflow_action[name]', key, key == 'comment_only' %>
               <%= label %>
             </label>
           </div>
@@ -34,6 +34,6 @@
           <% end %>
         </dl>
       </div>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 </div>