hyrax 2.1.0 → 2.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.github/ISSUE_TEMPLATE.md +1 -1
- data/.github/PULL_REQUEST_TEMPLATE.md +5 -0
- data/.rubocop.yml +8 -1
- data/README.md +3 -11
- data/app/actors/hyrax/actors/file_set_actor.rb +6 -1
- data/app/assets/javascripts/hyrax.js +1 -1
- data/app/assets/javascripts/hyrax/editor.es6 +8 -0
- data/app/assets/javascripts/hyrax/save_work/save_work_control.es6 +20 -1
- data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +1 -0
- data/app/assets/stylesheets/hyrax/_breadcrumbs.scss +25 -0
- data/app/assets/stylesheets/hyrax/_collections.scss +6 -0
- data/app/assets/stylesheets/hyrax/_file-listing.scss +5 -0
- data/app/assets/stylesheets/hyrax/_file_upload.scss +14 -0
- data/app/assets/stylesheets/hyrax/_form-progress.scss +6 -0
- data/app/assets/stylesheets/hyrax/_hyrax.scss +1 -1
- data/app/assets/stylesheets/hyrax/_styles.scss +6 -0
- data/app/assets/stylesheets/hyrax/dashboard.scss +4 -5
- data/app/builders/hyrax/bootstrap_breadcrumbs_builder.rb +10 -4
- data/app/controllers/concerns/hyrax/admin/stats_behavior.rb +25 -1
- data/app/controllers/concerns/hyrax/breadcrumbs_for_collections.rb +6 -2
- data/app/controllers/concerns/hyrax/controller.rb +1 -1
- data/app/controllers/concerns/hyrax/deny_access_override_behavior.rb +1 -1
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +1 -1
- data/app/controllers/hyrax/admin/admin_sets_controller.rb +1 -1
- data/app/controllers/hyrax/dashboard/collections_controller.rb +2 -2
- data/app/controllers/hyrax/downloads_controller.rb +1 -1
- data/app/controllers/hyrax/featured_works_controller.rb +1 -5
- data/app/controllers/hyrax/homepage_controller.rb +1 -1
- data/app/controllers/hyrax/single_use_links_controller.rb +1 -1
- data/app/controllers/hyrax/transfers_controller.rb +1 -1
- data/app/controllers/hyrax/users_controller.rb +1 -0
- data/app/helpers/hyrax/citations_behaviors/publication_behavior.rb +2 -2
- data/app/helpers/hyrax/collections_helper.rb +1 -1
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +2 -2
- data/app/jobs/characterize_job.rb +1 -1
- data/app/jobs/fixity_check_job.rb +1 -1
- data/app/jobs/import_url_job.rb +12 -1
- data/app/models/checksum_audit_log.rb +1 -1
- data/app/models/concerns/hyrax/ability.rb +1 -1
- data/app/models/hyrax/collection_type.rb +1 -1
- data/app/models/hyrax/operation.rb +4 -6
- data/app/models/hyrax/permission_template_access.rb +5 -5
- data/app/models/sipity/entity.rb +1 -1
- data/app/presenters/hyrax/admin_set_presenter.rb +9 -2
- data/app/presenters/hyrax/admin_stats_presenter.rb +52 -6
- data/app/presenters/hyrax/inspect_work_presenter.rb +1 -1
- data/app/presenters/hyrax/workflow_presenter.rb +1 -1
- data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +3 -5
- data/app/search_builders/hyrax/filter_suppressed_with_roles.rb +5 -1
- data/app/search_builders/hyrax/my/works_search_builder.rb +2 -1
- data/app/services/hyrax/collection_size_service.rb +12 -0
- data/app/services/hyrax/collections/nested_collection_query_service.rb +2 -2
- data/app/services/hyrax/graph_exporter.rb +6 -1
- data/app/services/hyrax/license_service.rb +1 -9
- data/app/services/hyrax/qa_select_service.rb +28 -0
- data/app/services/hyrax/rights_statement_service.rb +1 -1
- data/app/services/hyrax/tolerant_select_service.rb +23 -0
- data/app/services/hyrax/workflow/permission_query.rb +1 -1
- data/app/services/hyrax/workflow/sipity_actions_generator.rb +1 -1
- data/app/strategies/hyrax/strategies/yaml_strategy.rb +1 -1
- data/app/views/_logo.html.erb +1 -1
- data/app/views/catalog/_search_form.html.erb +1 -1
- data/app/views/hyrax/admin/collection_types/index.html.erb +1 -1
- data/app/views/hyrax/admin/workflow_roles/index.html.erb +4 -2
- data/app/views/hyrax/admin/workflows/index.html.erb +1 -1
- data/app/views/hyrax/base/_form_files.html.erb +7 -7
- data/app/views/hyrax/base/_form_progress.html.erb +10 -5
- data/app/views/hyrax/base/_share_with.html.erb +3 -11
- data/app/views/hyrax/base/_show_actions.html.erb +1 -3
- data/app/views/hyrax/batch_edits/_check_all.html.erb +15 -7
- data/app/views/hyrax/collections/_list_collections.html.erb +1 -1
- data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_default_group.html.erb +7 -2
- data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +1 -2
- data/app/views/hyrax/dashboard/collections/_form.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +6 -6
- data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_show_actions.html.erb +1 -2
- data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +1 -2
- data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +1 -2
- data/app/views/hyrax/dashboard/works/_default_group.html.erb +1 -1
- data/app/views/hyrax/file_sets/_actions.html.erb +1 -1
- data/app/views/hyrax/file_sets/_form.html.erb +3 -3
- data/app/views/hyrax/file_sets/_permission.html.erb +2 -2
- data/app/views/hyrax/file_sets/_permission_form.html.erb +10 -10
- data/app/views/hyrax/file_sets/_show_actions.html.erb +1 -4
- data/app/views/hyrax/file_sets/_single_use_links.html.erb +5 -0
- data/app/views/hyrax/file_sets/_versioning.html.erb +9 -7
- data/app/views/hyrax/file_sets/edit.html.erb +6 -6
- data/app/views/hyrax/file_sets/media_display/_audio.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_image.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_office_document.html.erb +0 -1
- data/app/views/hyrax/file_sets/media_display/_pdf.html.erb +0 -1
- data/app/views/hyrax/file_sets/media_display/_video.html.erb +1 -1
- data/app/views/hyrax/my/collections/_default_group.html.erb +8 -3
- data/app/views/hyrax/my/collections/_list_collections.html.erb +1 -1
- data/app/views/hyrax/my/works/_batch_actions.html.erb +1 -1
- data/app/views/hyrax/my/works/_tabs.html.erb +3 -3
- data/app/views/hyrax/single_use_links_viewer/show.html.erb +1 -1
- data/app/views/hyrax/uploads/_js_templates.html.erb +11 -11
- data/app/views/hyrax/uploads/_js_templates_branding.html.erb +2 -2
- data/app/views/layouts/_head_tag_content.html.erb +1 -1
- data/app/views/layouts/hyrax.html.erb +1 -1
- data/app/views/layouts/hyrax/dashboard.html.erb +1 -1
- data/app/views/records/edit_fields/_license.html.erb +1 -1
- data/app/views/records/edit_fields/_rights_statement.html.erb +2 -1
- data/config/features.rb +4 -0
- data/config/locales/hyrax.de.yml +1 -0
- data/config/locales/hyrax.en.yml +39 -1
- data/config/locales/hyrax.es.yml +1 -0
- data/config/locales/hyrax.fr.yml +1 -0
- data/config/locales/hyrax.it.yml +1 -0
- data/config/locales/hyrax.pt-BR.yml +1 -0
- data/config/locales/hyrax.zh.yml +1 -0
- data/hyrax.gemspec +5 -2
- data/lib/generators/hyrax/templates/mediated_deposit_workflow.json.erb +1 -0
- data/lib/hyrax.rb +7 -1
- data/lib/hyrax/arkivo/create_subscription_job.rb +1 -1
- data/lib/hyrax/redis_event_store.rb +1 -1
- data/lib/hyrax/resource_sync/change_list_writer.rb +2 -2
- data/lib/hyrax/version.rb +1 -1
- data/spec/actors/hyrax/actors/file_set_actor_spec.rb +1 -1
- data/spec/controllers/hyrax/admin/stats_controller_spec.rb +31 -1
- data/spec/controllers/hyrax/collections_controller_spec.rb +2 -2
- data/spec/controllers/hyrax/dashboard/collections_controller_spec.rb +2 -2
- data/spec/controllers/hyrax/generic_works_controller_spec.rb +19 -3
- data/spec/controllers/hyrax/homepage_controller_spec.rb +1 -1
- data/spec/controllers/hyrax/users_controller_spec.rb +58 -0
- data/spec/features/batch_create_spec.rb +1 -1
- data/spec/features/create_work_spec.rb +22 -2
- data/spec/features/dashboard/collection_spec.rb +3 -3
- data/spec/features/homepage_spec.rb +20 -4
- data/spec/javascripts/save_work_spec.js +50 -0
- data/spec/jobs/import_url_job_spec.rb +10 -8
- data/spec/lib/hyrax_spec.rb +9 -0
- data/spec/models/flipflop_spec.rb +8 -0
- data/spec/models/solr_document_spec.rb +2 -2
- data/spec/presenters/hyrax/admin_stats_presenter_spec.rb +73 -0
- data/spec/search_builders/hyrax/my/works_search_builder_spec.rb +0 -2
- data/spec/services/hyrax/graph_exporter_spec.rb +18 -0
- data/spec/services/hyrax/qa_select_service_spec.rb +40 -17
- data/spec/services/hyrax/tolerant_select_service_spec.rb +80 -0
- data/spec/support/fakes/fake_authority.rb +13 -0
- data/spec/support/logging_formatter.rb +1 -1
- data/spec/support/matchers/collection_type_property_matchers.rb +5 -5
- data/spec/views/hyrax/base/_form_progress.html.erb_spec.rb +11 -1
- data/spec/views/hyrax/file_sets/_show_actions.html.erb_spec.rb +0 -1
- data/spec/views/hyrax/file_sets/_single_use_links.html.erb_spec.rb +4 -0
- data/spec/views/hyrax/single_use_links_viewer/show.html.erb_spec.rb +0 -4
- data/template.rb +1 -1
- metadata +24 -11
- data/app/views/kaminari/blacklight_compact/_paginator.html.erb +0 -22
@@ -40,7 +40,7 @@
|
|
40
40
|
<div class="expanded-details">
|
41
41
|
<p>
|
42
42
|
<strong><%= t("hyrax.dashboard.my.collection_list.description") %></strong>
|
43
|
-
<br /><%= collection_presenter.description
|
43
|
+
<br /><%= collection_presenter.description&.first %>
|
44
44
|
</p>
|
45
45
|
<p>
|
46
46
|
<strong><%= t("hyrax.dashboard.my.collection_list.edit_access") %></strong>
|
@@ -3,8 +3,7 @@
|
|
3
3
|
<%= link_to t('hyrax.collection.actions.edit.label'),
|
4
4
|
hyrax.edit_dashboard_collection_path(presenter),
|
5
5
|
title: t('hyrax.collection.actions.edit.desc'),
|
6
|
-
class: 'btn btn-primary'
|
7
|
-
data: { turbolinks: false } %>
|
6
|
+
class: 'btn btn-primary' %>
|
8
7
|
<% end %>
|
9
8
|
|
10
9
|
<% if presenter.collection_type_is_nestable? && presenter.user_can_nest_collection? %>
|
@@ -18,8 +18,7 @@
|
|
18
18
|
<%= link_to t('hyrax.collection.actions.add_existing_works.label'),
|
19
19
|
hyrax.my_works_path(add_works_to_collection: presenter.id, add_works_to_collection_label: presenter.title),
|
20
20
|
title: t('hyrax.collection.actions.add_existing_works.desc'),
|
21
|
-
class: 'btn btn-link side-arrows'
|
22
|
-
data: { turbolinks: false } %>
|
21
|
+
class: 'btn btn-link side-arrows' %>
|
23
22
|
</div>
|
24
23
|
<% end %>
|
25
24
|
</div>
|
@@ -6,7 +6,6 @@
|
|
6
6
|
<% end %>
|
7
7
|
|
8
8
|
<%= menu.nav_link(hyrax.my_works_path,
|
9
|
-
also_active_for: hyrax.dashboard_works_path
|
10
|
-
data: { turbolinks: false }) do %>
|
9
|
+
also_active_for: hyrax.dashboard_works_path) do %>
|
11
10
|
<span class="fa fa-file"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>
|
12
11
|
<% end %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<% if file_set.user_can_perform_any_action? %>
|
2
2
|
<div class="btn-group">
|
3
3
|
|
4
|
-
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= file_set.id %>" aria-haspopup="true">
|
4
|
+
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= file_set.id %>" aria-haspopup="true" aria-expanded="false">
|
5
5
|
<span class="sr-only">Press to </span>
|
6
6
|
<%= t('.header') %>
|
7
7
|
<span class="caret" aria-hidden="true"></span>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<%= simple_form_for [main_app, curation_concern], html: { multipart: true } do |f| %>
|
2
2
|
<fieldset class="required">
|
3
3
|
<span class="control-label">
|
4
|
-
<%= label_tag 'file_set[title][]', '
|
4
|
+
<%= label_tag 'file_set[title][]', t('.title'), class: "string optional" %>
|
5
5
|
</span>
|
6
6
|
<%= text_field_tag 'file_set[title][]', curation_concern.title.first, class: 'form-control', required: true %>
|
7
7
|
</fieldset>
|
@@ -9,10 +9,10 @@
|
|
9
9
|
<div class="row">
|
10
10
|
<div class="col-md-12 form-actions">
|
11
11
|
<%= f.submit(
|
12
|
-
(curation_concern.persisted? ?
|
12
|
+
(curation_concern.persisted? ? t('.save') : t('.attach_to', parent: @parent.human_readable_type)),
|
13
13
|
class: 'btn btn-primary'
|
14
14
|
) %>
|
15
|
-
<%= link_to '
|
15
|
+
<%= link_to t('.cancel'), parent_path(@parent), class: 'btn btn-link' %>
|
16
16
|
</div>
|
17
17
|
</div>
|
18
18
|
<% end %>
|
@@ -7,8 +7,8 @@
|
|
7
7
|
<%= hidden_field_tag('redirect_tab', 'permissions') %>
|
8
8
|
<%= render "permission_form", f: f %>
|
9
9
|
<div id="permissions_submit">
|
10
|
-
<%= button_tag type: 'submit', class: 'btn btn-primary
|
11
|
-
|
10
|
+
<%= button_tag type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" do %>
|
11
|
+
<%= t('.save') %>
|
12
12
|
<% end %>
|
13
13
|
</div>
|
14
14
|
<% end %>
|
@@ -3,11 +3,11 @@
|
|
3
3
|
<% public_perm = true if params[:controller] == 'batch' %>
|
4
4
|
<% registered_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "registered"}.compact.first %>
|
5
5
|
|
6
|
-
<h2 id="permissions_display"><% if params[:controller] == 'batch' %>Bulk <% end %>
|
7
|
-
<small
|
6
|
+
<h2 id="permissions_display"><% if params[:controller] == 'batch' %>Bulk <% end %><%= t('.header') %> <% if params[:controller] == 'batch' %>
|
7
|
+
<small><%= t('.applied_to') %></small><% end %>
|
8
8
|
</h2>
|
9
9
|
|
10
|
-
<div class="alert alert-info hidden" id="save_perm_note"
|
10
|
+
<div class="alert alert-info hidden" id="save_perm_note"><%= t('.save_note_html') %></div>
|
11
11
|
|
12
12
|
<div class="alert alert-warning hidden" role="alert" id="permissions_error">
|
13
13
|
<span id="permissions_error_text"></span>
|
@@ -17,7 +17,7 @@
|
|
17
17
|
|
18
18
|
<!-- Share With -->
|
19
19
|
<div class="row">
|
20
|
-
<h3 class="col-sm-12"
|
20
|
+
<h3 class="col-sm-12"><%= t('.share_with') %> <small><%= t('.optional') %></small>
|
21
21
|
<span id="share_with_tooltip" class="h5">
|
22
22
|
<%= help_text('hyrax/base/share_with') %>
|
23
23
|
</span>
|
@@ -26,7 +26,7 @@
|
|
26
26
|
|
27
27
|
<div class="form-group row">
|
28
28
|
<div id="new-user">
|
29
|
-
<p class="col-sm-12"
|
29
|
+
<p class="col-sm-12"><%= t('.enter', account_label: t('hyrax.account_label')) %></p>
|
30
30
|
<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>
|
31
31
|
<div class="col-sm-5">
|
32
32
|
<label for="new_user_name_skel" class="sr-only"><%= t('hyrax.account_label') %> (without the <%= t('hyrax.directory.suffix') %> part)</label>
|
@@ -51,7 +51,7 @@
|
|
51
51
|
<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>
|
52
52
|
<div class="col-sm-5">
|
53
53
|
<label for="new_group_name_skel" class="sr-only">Group</label>
|
54
|
-
<%= select_tag 'new_group_name_skel', options_for_select([
|
54
|
+
<%= select_tag 'new_group_name_skel', options_for_select([t('.select_group')] + current_user.groups), class: 'form-control' %>
|
55
55
|
</div>
|
56
56
|
<div class="col-sm-4">
|
57
57
|
<label for="new_group_permission_skel" class="sr-only">Access type to grant</label>
|
@@ -67,13 +67,13 @@
|
|
67
67
|
|
68
68
|
<table class="table table-bordered">
|
69
69
|
<tr>
|
70
|
-
<th width="60%"
|
71
|
-
<th width="40%"
|
70
|
+
<th width="60%"><%= t('.table_title_user') %></th>
|
71
|
+
<th width="40%"><%= t('.table_title_access') %></th>
|
72
72
|
</tr>
|
73
73
|
<tr id="file_permissions">
|
74
74
|
<td>
|
75
75
|
<%= label_tag :owner_access, class: "control-label" do %>
|
76
|
-
|
76
|
+
<%= t('.depositor') %> (<span id="file_owner" data-depositor="<%= depositor %>"><%= link_to_profile depositor %></span>)
|
77
77
|
<% end %>
|
78
78
|
</td>
|
79
79
|
<td>
|
@@ -81,7 +81,7 @@
|
|
81
81
|
</td>
|
82
82
|
</tr>
|
83
83
|
<%= f.fields_for :permissions do |permission_fields| %>
|
84
|
-
<%# skip the public,
|
84
|
+
<%# skip the public, registered, and depositor perms as they are displayed first at the top %>
|
85
85
|
<% next if ['public', 'registered', depositor].include? permission_fields.object.agent_name.downcase %>
|
86
86
|
<tr>
|
87
87
|
<td><%= permission_fields.label :agent_name, class: "control-label" do %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<div class="form-actions">
|
2
2
|
<% if Hyrax.config.analytics? %>
|
3
|
-
<%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default'
|
3
|
+
<%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
|
4
4
|
<% end %>
|
5
5
|
|
6
6
|
<% if @presenter.editor? %>
|
@@ -9,9 +9,6 @@
|
|
9
9
|
<%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter],
|
10
10
|
class: 'btn btn-danger', data: { confirm: "Delete this #{@presenter.human_readable_type}?" },
|
11
11
|
method: :delete %>
|
12
|
-
<%= link_to t('hyrax.single_use_links.button'),
|
13
|
-
hyrax.generate_download_single_use_link_path(@presenter),
|
14
|
-
class: 'btn btn-default generate-single-use-link' %>
|
15
12
|
<% end %>
|
16
13
|
|
17
14
|
<%= render 'social_media' %>
|
@@ -1,27 +1,29 @@
|
|
1
1
|
<div id="versioning_display" class="tab-pane">
|
2
|
-
<h2
|
2
|
+
<h2><%= t('.header') %></h2>
|
3
3
|
<%= simple_form_for [main_app, curation_concern], html: { multipart: true } do |f| %>
|
4
4
|
<%= hidden_field_tag('redirect_tab', 'versions') %>
|
5
|
-
<h3
|
5
|
+
<h3><%= t('.upload') %></h3>
|
6
6
|
<%= f.input :files, as: :multifile, wrapper: :vertical_file_input, required: true %>
|
7
7
|
<%= f.button :button, name: "update_versioning", id: "upload_submit", onclick: "confirmation_needed = false;", class: "btn btn-primary" do %>
|
8
|
-
|
9
|
-
<% end %>
|
8
|
+
<%= t('.upload') %>
|
9
|
+
<% end %>
|
10
10
|
<% end %>
|
11
11
|
|
12
12
|
<%= form_for [main_app, curation_concern],
|
13
13
|
html: { class: 'edit_file_set_previous_version' } do |f| %>
|
14
|
-
<h3
|
14
|
+
<h3><%= t('.restore') %></h3>
|
15
15
|
<% @version_list.each do |version| %>
|
16
16
|
<div class="radio">
|
17
17
|
<label class="radio <%= version.current? ? 'disabled' : '' %>">
|
18
18
|
<%= radio_button_tag(:revision, version.label, false, disabled: version.current?, required: 'required') %>
|
19
|
-
<%= version.current? ? '
|
19
|
+
<%= version.current? ? t('.current') : t('.restore_from') %>
|
20
20
|
<%= version.created %> [by <%= version.committer %>]
|
21
21
|
</label>
|
22
22
|
</div>
|
23
23
|
<% end %>
|
24
24
|
<div id="save_version_note" class="alert hide">You must click "Save Revision" to revert a previous version of this file</div>
|
25
|
-
<%= f.button
|
25
|
+
<%= f.button :button, name: "revert_submit", id: "revert_submit", onclick: "confirmation_needed = false;", class: "btn btn-primary", type: 'submit' do %>
|
26
|
+
<%= t('.save') %>
|
27
|
+
<% end %>
|
26
28
|
<% end %>
|
27
29
|
</div> <!-- /row -->
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<% provide :page_title, curation_concern_page_title(curation_concern) %>
|
2
2
|
<% provide :page_header do %>
|
3
|
-
<h1 class="
|
3
|
+
<h1><span class="fa fa-edit"></span><%= t('.header', file_set: curation_concern) %></h1>
|
4
4
|
<% end %>
|
5
5
|
|
6
6
|
<div class="row">
|
@@ -11,19 +11,19 @@
|
|
11
11
|
<div class="panel panel-default tabs">
|
12
12
|
<ul class="nav nav-tabs" role="tablist">
|
13
13
|
<li id="edit_descriptions_link" class="active">
|
14
|
-
<a href="#descriptions_display" data-toggle="tab"><i class="fa fa-tags"></i>
|
14
|
+
<a href="#descriptions_display" data-toggle="tab"><i class="fa fa-tags"></i></span> <%= t('.descriptions') %></a>
|
15
15
|
</li>
|
16
16
|
<li id="edit_versioning_link">
|
17
|
-
<a href="#versioning_display" data-toggle="tab"><i class="fa fa-sitemap"></i>
|
17
|
+
<a href="#versioning_display" data-toggle="tab"><i class="fa fa-sitemap"></i> <%= t('.versions') %></a>
|
18
18
|
</li>
|
19
19
|
<li id="edit_permissions_link">
|
20
|
-
<a href="#permissions_display" data-toggle="tab"><i class="fa fa-key"></i>
|
20
|
+
<a href="#permissions_display" data-toggle="tab"><i class="fa fa-key"></i> <%= t('.permissions') %></a>
|
21
21
|
</li>
|
22
22
|
</ul>
|
23
23
|
<div class="panel-body">
|
24
24
|
<div class="tab-content">
|
25
25
|
<div id="descriptions_display" class="tab-pane active">
|
26
|
-
<h2
|
26
|
+
<h2><%= t('.descriptions') %></h2>
|
27
27
|
<%= render "form" %>
|
28
28
|
</div>
|
29
29
|
<%= render "permission", file_set: curation_concern %>
|
@@ -32,4 +32,4 @@
|
|
32
32
|
</div>
|
33
33
|
</div><!-- /.col-sm-8 -->
|
34
34
|
</div><!-- /.row -->
|
35
|
-
</div>
|
35
|
+
</div>
|
@@ -7,7 +7,7 @@
|
|
7
7
|
role: "presentation" %>
|
8
8
|
<%= link_to t('hyrax.file_set.show.downloadable_content.image_link'),
|
9
9
|
hyrax.download_path(file_set),
|
10
|
-
data: {
|
10
|
+
data: { label: file_set.id },
|
11
11
|
target: :_blank,
|
12
12
|
id: "file_download" %>
|
13
13
|
</div>
|
@@ -2,9 +2,14 @@
|
|
2
2
|
<caption class="sr-only"><%= t("hyrax.dashboard.my.sr.listing") %> <%= application_name %></caption>
|
3
3
|
<thead>
|
4
4
|
<tr>
|
5
|
-
<th class="check-all">
|
6
|
-
<label for="check_all" class="sr-only"
|
7
|
-
|
5
|
+
<th class="check-all text-left">
|
6
|
+
<label for="check_all" class="sr-only">
|
7
|
+
<%= t("hyrax.dashboard.my.sr.check_all_label") %>
|
8
|
+
</label>
|
9
|
+
<label class="centerizer">
|
10
|
+
<input type="checkbox" class="check-all-checkbox" name="check_all" id="check_all" value="yes" />
|
11
|
+
<%= t("hyrax.dashboard.my.action.select") %>
|
12
|
+
</label>
|
8
13
|
</th>
|
9
14
|
<th><%= t("hyrax.dashboard.my.heading.title") %></th>
|
10
15
|
<th><%= t("hyrax.dashboard.my.heading.type") %></th>
|
@@ -42,7 +42,7 @@
|
|
42
42
|
<div class="expanded-details">
|
43
43
|
<p>
|
44
44
|
<strong><%= t("hyrax.dashboard.my.collection_list.description") %></strong>
|
45
|
-
<br /><%= collection_presenter.description
|
45
|
+
<br /><%= collection_presenter.description&.first %>
|
46
46
|
</p>
|
47
47
|
<p>
|
48
48
|
<strong><%= t("hyrax.dashboard.my.collection_list.edit_access") %></strong>
|
@@ -9,6 +9,6 @@
|
|
9
9
|
<%= batch_delete %>
|
10
10
|
<%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
|
11
11
|
class: 'btn btn-primary submits-batches submits-batches-add',
|
12
|
-
data: { toggle: "modal", target: "#collection-list-container"
|
12
|
+
data: { toggle: "modal", target: "#collection-list-container" } %>
|
13
13
|
</div>
|
14
14
|
</div>
|
@@ -1,8 +1,8 @@
|
|
1
|
-
<ul class="nav nav-tabs" id="my_nav" role="navigation">
|
1
|
+
<ul class="nav nav-tabs" id="my_nav" role="navigation">
|
2
2
|
<li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_works_path(locale: nil)) %>>
|
3
|
-
<%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path
|
3
|
+
<%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path %>
|
4
4
|
</li>
|
5
5
|
<li<%= ' class="active"'.html_safe if current_page?(hyrax.my_works_path(locale: nil)) %>>
|
6
|
-
<%= link_to t('hyrax.dashboard.my.your_works'), hyrax.my_works_path
|
6
|
+
<%= link_to t('hyrax.dashboard.my.your_works'), hyrax.my_works_path %>
|
7
7
|
</li>
|
8
8
|
</ul>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<h1 class="lower"><%= @presenter %></h1>
|
3
3
|
<h2 class="non lower">Actions</h2>
|
4
4
|
<p>
|
5
|
-
<%= link_to "Download (can only be used once)", @download_link, target: :_blank
|
5
|
+
<%= link_to "Download (can only be used once)", @download_link, target: :_blank %>
|
6
6
|
</p>
|
7
7
|
<h2> Descriptions:</h2>
|
8
8
|
|
@@ -14,7 +14,7 @@
|
|
14
14
|
<p class="size">Processing...</p>
|
15
15
|
<div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
|
16
16
|
</td>
|
17
|
-
<td>
|
17
|
+
<td class="text-right">
|
18
18
|
{% if (!i && !o.options.autoUpload) { %}
|
19
19
|
<button class="btn btn-primary start" disabled>
|
20
20
|
<i class="glyphicon glyphicon-upload"></i>
|
@@ -22,7 +22,7 @@
|
|
22
22
|
</button>
|
23
23
|
{% } %}
|
24
24
|
{% if (!i) { %}
|
25
|
-
<button class="btn btn-warning cancel">
|
25
|
+
<button class="btn btn-sm btn-warning cancel">
|
26
26
|
<i class="glyphicon glyphicon-ban-circle"></i>
|
27
27
|
<span>Cancel</span>
|
28
28
|
</button>
|
@@ -54,9 +54,9 @@
|
|
54
54
|
<!-- The template to display files available for download -->
|
55
55
|
<script id="batch-template-download" type="text/x-tmpl">
|
56
56
|
{% for (var i=0, file; file=o.files[i]; i++) { %}
|
57
|
-
<tr class="template-download <%= fade_class_if_not_test %>">
|
57
|
+
<tr class="template-download add-batch-work-file-wrapper <%= fade_class_if_not_test %>">
|
58
58
|
<td>
|
59
|
-
<div class="row">
|
59
|
+
<div class="row padding-bottom">
|
60
60
|
<div class="col-sm-6 name">
|
61
61
|
<span>{%=file.name%}</span>
|
62
62
|
<input type="hidden" name="uploaded_files[]" value="{%=file.id%}">
|
@@ -66,7 +66,7 @@
|
|
66
66
|
<div><span class="label label-danger">Error</span> {%=file.error%}</div>
|
67
67
|
{% } %}
|
68
68
|
<span class="size">{%=o.formatFileSize(file.size)%}</span>
|
69
|
-
<button class="btn btn-danger delete pull-right" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
69
|
+
<button class="btn btn-sm btn-danger delete pull-right" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
70
70
|
<i class="glyphicon glyphicon-trash"></i>
|
71
71
|
<span>Delete</span>
|
72
72
|
</button>
|
@@ -76,15 +76,15 @@
|
|
76
76
|
<div class="col-sm-12 form-horizontal">
|
77
77
|
<div class="form-group">
|
78
78
|
<label for="title_{%=file.id%}" class="col-sm-5 control-label">Display label</label>
|
79
|
-
<div class="col-sm-7">
|
79
|
+
<div class="col-sm-7 padding-bottom">
|
80
80
|
<input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
|
81
81
|
</div>
|
82
82
|
<label for="resource_type_{%=file.id%}" class="col-sm-5 control-label">Resource Type</label>
|
83
|
-
<div class="col-sm-7">
|
83
|
+
<div class="col-sm-7 padding-bottom">
|
84
84
|
<select class="form-control resource_type_dropdown" multiple="multiple" size="6" name="resource_type[{%=file.id%}][]" id="resource_type_{%=file.id%}" value="{%=file.name%}">
|
85
85
|
<%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
|
86
86
|
</select>
|
87
|
-
<button class="btn pull-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;">Set all to this Resource Type</button>
|
87
|
+
<button class="btn btn-default pull-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;">Set all to this Resource Type</button>
|
88
88
|
</div>
|
89
89
|
</div>
|
90
90
|
</div>
|
@@ -122,10 +122,10 @@
|
|
122
122
|
<td>
|
123
123
|
<span class="size">{%=o.formatFileSize(file.size)%}</span>
|
124
124
|
</td>
|
125
|
-
<td>
|
126
|
-
<button class="btn btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
125
|
+
<td class="text-right">
|
126
|
+
<button class="btn btn-sm btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
127
127
|
<i class="glyphicon glyphicon-trash"></i>
|
128
|
-
|
128
|
+
Delete
|
129
129
|
</button>
|
130
130
|
</td>
|
131
131
|
</tr>
|
@@ -101,9 +101,9 @@
|
|
101
101
|
</label>
|
102
102
|
</div>
|
103
103
|
|
104
|
-
<div class="col-sm-2">
|
104
|
+
<div class="col-sm-2 text-right">
|
105
105
|
<span class="input-group-btn field-controls">
|
106
|
-
<button class="btn btn-danger delete branding-logo-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
106
|
+
<button class="btn btn-sm btn-danger delete branding-logo-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
107
107
|
<span class="glyphicon glyphicon-remove"></span>
|
108
108
|
<span class="controls-remove-text">Remove</span>
|
109
109
|
<span class="sr-only">
|