hyrax 3.6.0 → 4.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +41 -61
- data/.dassie/Gemfile +4 -4
- data/.dassie/app/assets/javascripts/application.js +8 -4
- data/.dassie/app/assets/stylesheets/application.css +1 -1
- data/.dassie/app/assets/stylesheets/hyrax.scss +1 -2
- data/.dassie/app/controllers/application_controller.rb +1 -3
- data/.dassie/app/controllers/catalog_controller.rb +23 -19
- data/.dassie/app/models/user.rb +0 -3
- data/.dassie/config/analytics.yml +2 -4
- data/.dassie/config/application.rb +1 -1
- data/.dassie/config/initializers/riiif.rb +1 -1
- data/.dassie/db/schema.rb +5 -5
- data/.dassie/package.json +7 -7
- data/.engine_cart.yml +2 -39
- data/.env +1 -0
- data/.github/workflows/main.yml +17 -0
- data/.github/workflows/release.yml +17 -0
- data/.regen +1 -1
- data/.rubocop.yml +1 -1
- data/CONTRIBUTING.md +22 -24
- data/Dockerfile +1 -1
- data/Rakefile +0 -4
- data/app/actors/hyrax/actors/base_actor.rb +1 -1
- data/app/actors/hyrax/actors/collections_membership_actor.rb +1 -1
- data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +5 -11
- data/app/actors/hyrax/actors/embargo_actor.rb +4 -11
- data/app/actors/hyrax/actors/file_actor.rb +9 -37
- data/app/actors/hyrax/actors/file_set_actor.rb +13 -62
- data/app/actors/hyrax/actors/lease_actor.rb +4 -11
- data/app/assets/javascripts/hyrax/analytics_events.js +38 -88
- data/app/assets/javascripts/hyrax/app.js.erb +2 -2
- data/app/assets/javascripts/hyrax/batch.js +2 -2
- data/app/assets/javascripts/hyrax/batch_edit.js +4 -4
- data/app/assets/javascripts/hyrax/batch_select_all.js +13 -13
- data/app/assets/javascripts/hyrax/browse_everything.js +4 -2
- data/app/assets/javascripts/hyrax/collection_types.es6 +1 -1
- data/app/assets/javascripts/hyrax/collections/editor.es6 +5 -1
- data/app/assets/javascripts/hyrax/dashboard_actions.js +5 -5
- data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6 +3 -3
- data/app/assets/javascripts/hyrax/editor.es6 +3 -3
- data/app/assets/javascripts/hyrax/facets.js +6 -4
- data/app/assets/javascripts/hyrax/file_manager/member.es6 +1 -1
- data/app/assets/javascripts/hyrax/file_manager/save_manager.es6 +2 -2
- data/app/assets/javascripts/hyrax/file_manager/sorting.es6 +2 -2
- data/app/assets/javascripts/hyrax/file_manager.es6 +2 -17
- data/app/assets/javascripts/hyrax/notification.es6 +1 -1
- data/app/assets/javascripts/hyrax/permissions/control.es6 +1 -8
- data/app/assets/javascripts/hyrax/permissions/registry.es6 +4 -4
- data/app/assets/javascripts/hyrax/permissions/user_controls.es6 +3 -1
- data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6 +1 -1
- data/app/assets/javascripts/hyrax/relationships/control.es6 +2 -2
- data/app/assets/javascripts/hyrax/relationships/registry_entry.es6 +1 -1
- data/app/assets/javascripts/hyrax/reports-buttons.js +9 -9
- data/app/assets/javascripts/hyrax/save_work/required_fields.es6 +1 -1
- data/app/assets/javascripts/hyrax/save_work/save_work_control.es6 +6 -6
- data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +2 -2
- data/app/assets/javascripts/hyrax/single_use_links_manager.js +1 -1
- data/app/assets/javascripts/hyrax/skip_to_content.js +1 -1
- data/app/assets/javascripts/hyrax/sorting.js +1 -1
- data/app/assets/javascripts/hyrax/trophy.js +1 -1
- data/app/assets/javascripts/hyrax/uploader.js +3 -3
- data/app/assets/javascripts/hyrax.js +1 -19
- data/app/assets/stylesheets/_bootstrap-default-overrides.scss +4 -4
- data/app/assets/stylesheets/hyrax/_accessibility.scss +1 -1
- data/app/assets/stylesheets/hyrax/_badge.scss +7 -0
- data/app/assets/stylesheets/hyrax/_batch-edit.scss +8 -8
- data/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss +1 -1
- data/app/assets/stylesheets/hyrax/_buttons.scss +31 -1
- data/app/assets/stylesheets/hyrax/_card.scss +10 -0
- data/app/assets/stylesheets/hyrax/_catalog.scss +22 -48
- data/app/assets/stylesheets/hyrax/_collection_types.scss +1 -1
- data/app/assets/stylesheets/hyrax/_collections.scss +13 -13
- data/app/assets/stylesheets/hyrax/_facets.scss +46 -0
- data/app/assets/stylesheets/hyrax/_featured.scss +1 -1
- data/app/assets/stylesheets/hyrax/_file-listing.scss +3 -3
- data/app/assets/stylesheets/hyrax/_file_manager.scss +17 -17
- data/app/assets/stylesheets/hyrax/_file_sets.scss +1 -1
- data/app/assets/stylesheets/hyrax/_file_upload.scss +4 -4
- data/app/assets/stylesheets/hyrax/_fixedsticky.scss +1 -1
- data/app/assets/stylesheets/hyrax/_footer.scss +3 -3
- data/app/assets/stylesheets/hyrax/_form-progress.scss +9 -9
- data/app/assets/stylesheets/hyrax/_form.scss +3 -4
- data/app/assets/stylesheets/hyrax/_forms.scss +62 -29
- data/app/assets/stylesheets/hyrax/_header.scss +0 -17
- data/app/assets/stylesheets/hyrax/_home-page.scss +13 -51
- data/app/assets/stylesheets/hyrax/_html.scss +11 -0
- data/app/assets/stylesheets/hyrax/_hyrax.scss +16 -14
- data/app/assets/stylesheets/hyrax/_nestable.scss +1 -1
- data/app/assets/stylesheets/hyrax/_select_work_type.scss +2 -2
- data/app/assets/stylesheets/hyrax/_styles.scss +9 -14
- data/app/assets/stylesheets/hyrax/_users.scss +2 -2
- data/app/assets/stylesheets/hyrax/_variables.scss +20 -1
- data/app/assets/stylesheets/hyrax/_work-show.scss +21 -13
- data/app/assets/stylesheets/hyrax/blacklight_gallery.scss +75 -2
- data/app/assets/stylesheets/hyrax/dashboard.scss +70 -95
- data/app/assets/stylesheets/hyrax/sidebar.scss +39 -19
- data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +9 -0
- data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +2 -11
- data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +2 -11
- data/app/controllers/concerns/hyrax/manages_embargoes.rb +1 -13
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +4 -9
- data/app/controllers/hyrax/admin/analytics/collection_reports_controller.rb +2 -2
- data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb +1 -1
- data/app/controllers/hyrax/admin/strategies_controller.rb +1 -1
- data/app/controllers/hyrax/admin/workflows_controller.rb +3 -48
- data/app/controllers/hyrax/batch_edits_controller.rb +1 -1
- data/app/controllers/hyrax/dashboard/collections_controller.rb +2 -1
- data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +0 -32
- data/app/controllers/hyrax/downloads_controller.rb +1 -16
- data/app/controllers/hyrax/file_sets_controller.rb +4 -10
- data/app/controllers/hyrax/homepage_controller.rb +0 -1
- data/app/controllers/hyrax/my_controller.rb +0 -6
- data/app/controllers/hyrax/permissions_controller.rb +1 -1
- data/app/controllers/hyrax/single_use_links_controller.rb +1 -2
- data/app/controllers/hyrax/transfers_controller.rb +2 -0
- data/app/controllers/hyrax/workflow_actions_controller.rb +2 -3
- data/app/forms/hyrax/forms/collection_form.rb +1 -1
- data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +0 -2
- data/app/forms/hyrax/forms/file_set_edit_form.rb +1 -1
- data/app/forms/hyrax/forms/file_set_form.rb +35 -8
- data/app/forms/hyrax/forms/resource_form.rb +32 -36
- data/app/helpers/hyrax/embargo_helper.rb +0 -11
- data/app/helpers/hyrax/facets_helper.rb +150 -0
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +5 -5
- data/app/helpers/hyrax/lease_helper.rb +0 -11
- data/app/indexers/hyrax/basic_metadata_indexer.rb +3 -9
- data/app/indexers/hyrax/pcdm_collection_indexer.rb +0 -1
- data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +8 -2
- data/app/jobs/characterize_job.rb +4 -7
- data/app/jobs/content_event_job.rb +1 -1
- data/app/jobs/create_derivatives_job.rb +4 -2
- data/app/jobs/ingest_local_file_job.rb +5 -13
- data/app/jobs/inherit_permissions_job.rb +1 -5
- data/app/models/admin_set.rb +0 -8
- data/app/models/concerns/hyrax/collection_behavior.rb +2 -3
- data/app/models/concerns/hyrax/collection_nesting.rb +1 -10
- data/app/models/concerns/hyrax/file_set_behavior.rb +1 -2
- data/app/models/concerns/hyrax/in_admin_set.rb +0 -7
- data/app/models/concerns/hyrax/user.rb +3 -3
- data/app/models/concerns/hyrax/work_behavior.rb +1 -3
- data/app/models/content_block.rb +0 -6
- data/app/models/hyrax/embargo.rb +1 -1
- data/app/models/hyrax/file_metadata.rb +1 -1
- data/app/models/hyrax/file_set.rb +3 -3
- data/app/models/hyrax/lease.rb +1 -1
- data/app/models/hyrax/permission_template.rb +0 -35
- data/app/models/proxy_deposit_request.rb +1 -1
- data/app/presenters/hyrax/admin/repository_object_presenter.rb +0 -2
- data/app/presenters/hyrax/collapsable_section_presenter.rb +2 -2
- data/app/presenters/hyrax/collection_presenter.rb +1 -1
- data/app/presenters/hyrax/fixity_status_presenter.rb +2 -2
- data/app/presenters/hyrax/menu_presenter.rb +1 -1
- data/app/presenters/hyrax/permission_badge.rb +8 -9
- data/app/presenters/hyrax/version_list_presenter.rb +1 -6
- data/app/presenters/hyrax/workflow_presenter.rb +1 -1
- data/app/renderers/hyrax/renderers/external_link_attribute_renderer.rb +1 -1
- data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +5 -13
- data/app/search_builders/hyrax/deposit_search_builder.rb +1 -1
- data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +10 -1
- data/app/search_builders/hyrax/single_result.rb +1 -1
- data/app/search_builders/hyrax/stats/work_status_search_builder.rb +1 -1
- data/app/services/hyrax/adapters/nesting_index_adapter.rb +1 -1
- data/app/services/hyrax/analytics/google.rb +15 -23
- data/app/services/hyrax/analytics/matomo.rb +3 -4
- data/app/services/hyrax/collection_member_service.rb +1 -2
- data/app/services/hyrax/collections/nested_collection_query_service.rb +1 -1
- data/app/services/hyrax/collections/search_service.rb +0 -1
- data/app/services/hyrax/custom_queries.rb +25 -0
- data/app/services/hyrax/edit_permissions_service.rb +3 -21
- data/app/services/hyrax/embargo_manager.rb +0 -9
- data/app/services/hyrax/file_set_csv_service.rb +1 -1
- data/app/services/hyrax/graph_exporter.rb +3 -8
- data/app/services/hyrax/iiif_authorization_service.rb +1 -1
- data/app/services/hyrax/lease_manager.rb +0 -9
- data/app/services/hyrax/listeners/file_metadata_listener.rb +0 -11
- data/app/services/hyrax/search_service.rb +1 -81
- data/app/services/hyrax/solr_query_service.rb +4 -4
- data/app/services/hyrax/statistics/depositors/summary.rb +1 -3
- data/app/services/hyrax/user_stat_importer.rb +0 -2
- data/app/services/hyrax/valkyrie_upload.rb +13 -1
- data/app/services/hyrax/versioning_service.rb +9 -77
- data/app/services/hyrax/visibility_propagator.rb +5 -5
- data/app/services/hyrax/work_query_service.rb +1 -1
- data/app/services/hyrax/workflow/actionable_objects.rb +3 -28
- data/app/services/hyrax/workflow/permission_query.rb +2 -23
- data/app/services/hyrax/working_directory.rb +2 -0
- data/app/views/_controls.html.erb +14 -18
- data/app/views/_logo.html.erb +0 -1
- data/app/views/_masthead.html.erb +8 -18
- data/app/views/_user_util_links.html.erb +16 -18
- data/app/views/catalog/_document.html.erb +2 -2
- data/app/views/catalog/_document_list.html.erb +1 -1
- data/app/views/catalog/_facet_limit.html.erb +1 -1
- data/app/views/catalog/_index_gallery_collection_wrapper.html.erb +1 -1
- data/app/views/catalog/_index_header_list_collection.html.erb +2 -2
- data/app/views/catalog/_index_header_list_default.html.erb +1 -1
- data/app/views/catalog/_index_list_default.html.erb +7 -5
- data/app/views/catalog/_search_form.html.erb +13 -15
- data/app/views/catalog/_thumbnail_list_collection.html.erb +2 -2
- data/app/views/catalog/_thumbnail_list_default.html.erb +3 -3
- data/app/views/catalog/facet.html.erb +21 -0
- data/app/views/catalog/index.html.erb +6 -4
- data/app/views/hyrax/admin/admin_sets/_form.html.erb +16 -16
- data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +35 -33
- data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +9 -8
- data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +24 -24
- data/app/views/hyrax/admin/admin_sets/_form_workflow.erb +5 -5
- data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb +3 -3
- data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +9 -9
- data/app/views/hyrax/admin/admin_sets/index.html.erb +3 -3
- data/app/views/hyrax/admin/admin_sets/show.html.erb +4 -4
- data/app/views/hyrax/admin/analytics/_date_range_form.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_custom_range.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_monthly_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb +7 -7
- data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb +7 -7
- data/app/views/hyrax/admin/analytics/collection_reports/show.html.erb +10 -10
- data/app/views/hyrax/admin/analytics/work_reports/_custom_range.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/work_reports/_monthly_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/work_reports/_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb +5 -5
- data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb +7 -7
- data/app/views/hyrax/admin/analytics/work_reports/_work_counts.html.erb +4 -4
- data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb +5 -5
- data/app/views/hyrax/admin/analytics/work_reports/index.html.erb +8 -8
- data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +10 -10
- data/app/views/hyrax/admin/appearances/show.html.erb +2 -2
- data/app/views/hyrax/admin/collection_types/_form.html.erb +24 -23
- data/app/views/hyrax/admin/collection_types/_form_appearance.html.erb +2 -2
- data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +4 -4
- data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +9 -9
- data/app/views/hyrax/admin/collection_types/index.html.erb +6 -6
- data/app/views/hyrax/admin/features/index.html.erb +3 -3
- data/app/views/hyrax/admin/stats/_new_users.html.erb +1 -1
- data/app/views/hyrax/admin/stats/show.html.erb +4 -6
- data/app/views/hyrax/admin/users/index.html.erb +3 -3
- data/app/views/hyrax/admin/workflow_roles/index.html.erb +8 -8
- data/app/views/hyrax/admin/workflows/index.html.erb +80 -55
- data/app/views/hyrax/base/_citations.html.erb +6 -6
- data/app/views/hyrax/base/_currently_shared.html.erb +3 -3
- data/app/views/hyrax/base/_file_manager_actions.html.erb +5 -3
- data/app/views/hyrax/base/_file_manager_member.html.erb +5 -5
- data/app/views/hyrax/base/_file_manager_member_resource_options.html.erb +6 -6
- data/app/views/hyrax/base/_file_manager_members.html.erb +1 -1
- data/app/views/hyrax/base/_file_manager_thumbnail.html.erb +1 -1
- data/app/views/hyrax/base/_form_child_work_relationships.html.erb +3 -3
- data/app/views/hyrax/base/_form_files.html.erb +9 -9
- data/app/views/hyrax/base/_form_member_of_collections.html.erb +3 -3
- data/app/views/hyrax/base/_form_metadata.html.erb +1 -1
- data/app/views/hyrax/base/_form_permission.html.erb +30 -20
- data/app/views/hyrax/base/_form_permission_under_embargo.html.erb +1 -1
- data/app/views/hyrax/base/_form_permission_under_lease.html.erb +1 -1
- data/app/views/hyrax/base/_form_progress.html.erb +7 -7
- data/app/views/hyrax/base/_form_relationships.html.erb +1 -1
- data/app/views/hyrax/base/_form_rendering.html.erb +1 -1
- data/app/views/hyrax/base/_form_representative.html.erb +1 -1
- data/app/views/hyrax/base/_form_share.html.erb +6 -6
- data/app/views/hyrax/base/_form_thumbnail.html.erb +1 -1
- data/app/views/hyrax/base/_form_visibility_component.html.erb +16 -20
- data/app/views/hyrax/base/_guts4form.html.erb +12 -20
- data/app/views/hyrax/base/_member.html.erb +1 -1
- data/app/views/hyrax/base/_metadata.html.erb +1 -1
- data/app/views/hyrax/base/_show_actions.html.erb +10 -10
- data/app/views/hyrax/base/_work_button_row.html.erb +17 -16
- data/app/views/hyrax/base/_workflow_actions.html.erb +10 -10
- data/app/views/hyrax/base/_workflow_actions_widget.erb +1 -1
- data/app/views/hyrax/base/file_manager.html.erb +4 -5
- data/app/views/hyrax/base/inspect_work.html.erb +1 -1
- data/app/views/hyrax/base/show.html.erb +12 -12
- data/app/views/hyrax/base/unavailable.html.erb +2 -2
- data/app/views/hyrax/batch_edits/_check_all.html.erb +0 -1
- data/app/views/hyrax/batch_edits/_delete_selected.html.erb +1 -1
- data/app/views/hyrax/batch_edits/edit.html.erb +26 -18
- data/app/views/hyrax/collections/_bookmark_control.html.erb +2 -2
- data/app/views/hyrax/collections/_list_collections.html.erb +6 -6
- data/app/views/hyrax/collections/_list_works.html.erb +3 -1
- data/app/views/hyrax/collections/_search_form.html.erb +4 -4
- data/app/views/hyrax/collections/_show_document_list_row.html.erb +5 -2
- data/app/views/hyrax/collections/_sort_and_per_page.html.erb +3 -3
- data/app/views/hyrax/collections/_view_type_group.html.erb +2 -2
- data/app/views/hyrax/contact_form/new.html.erb +12 -13
- data/app/views/hyrax/content_blocks/_form.html.erb +29 -23
- data/app/views/hyrax/content_blocks/templates/agreement.html.erb +3 -3
- data/app/views/hyrax/dashboard/_admin_sets.html.erb +22 -28
- data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb +2 -2
- data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +4 -4
- data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb +2 -2
- data/app/views/hyrax/dashboard/_repository_growth.html.erb +28 -28
- data/app/views/hyrax/dashboard/_resource_type_graph.html.erb +4 -4
- data/app/views/hyrax/dashboard/_sidebar.html.erb +3 -3
- data/app/views/hyrax/dashboard/_tabs.html.erb +6 -2
- data/app/views/hyrax/dashboard/_user_activity.html.erb +22 -19
- data/app/views/hyrax/dashboard/_visibility_graph.html.erb +4 -4
- data/app/views/hyrax/dashboard/_work_type_graph.html.erb +4 -4
- data/app/views/hyrax/dashboard/collections/_batch_edits_actions.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_bookmark_control.html.erb +2 -2
- data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_form.html.erb +30 -22
- data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +19 -19
- data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +8 -4
- data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +7 -7
- data/app/views/hyrax/dashboard/collections/_form_share.html.erb +11 -9
- data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +34 -31
- data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_list_works.html.erb +3 -1
- data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_show_descriptions.html.erb +5 -3
- data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb +4 -4
- data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +12 -10
- data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +2 -2
- data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +4 -4
- data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +10 -10
- data/app/views/hyrax/dashboard/collections/show.html.erb +4 -4
- data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +21 -21
- data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb +5 -5
- data/app/views/hyrax/dashboard/profiles/_zotero.html.erb +2 -2
- data/app/views/hyrax/dashboard/profiles/edit.html.erb +2 -2
- data/app/views/hyrax/dashboard/profiles/show.html.erb +3 -3
- data/app/views/hyrax/dashboard/show_admin.html.erb +36 -34
- data/app/views/hyrax/dashboard/show_user.html.erb +16 -16
- data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +11 -11
- data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +8 -8
- data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +3 -1
- data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +5 -1
- data/app/views/hyrax/dashboard/works/_list_works.html.erb +4 -1
- data/app/views/hyrax/depositors/index.html.erb +2 -2
- data/app/views/hyrax/embargoes/edit.html.erb +14 -14
- data/app/views/hyrax/embargoes/index.html.erb +18 -6
- data/app/views/hyrax/file_sets/_actions.html.erb +5 -6
- data/app/views/hyrax/file_sets/_descriptions.html.erb +1 -1
- data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +1 -1
- data/app/views/hyrax/file_sets/_form.html.erb +1 -1
- data/app/views/hyrax/file_sets/_permission.html.erb +1 -1
- data/app/views/hyrax/file_sets/_permission_form.html.erb +39 -30
- data/app/views/hyrax/file_sets/_show_actions.html.erb +3 -3
- data/app/views/hyrax/file_sets/_show_details.html.erb +27 -17
- data/app/views/hyrax/file_sets/_single_use_link_rows.html.erb +2 -2
- data/app/views/hyrax/file_sets/_single_use_links.html.erb +2 -2
- data/app/views/hyrax/file_sets/_versioning.html.erb +9 -9
- data/app/views/hyrax/file_sets/edit.html.erb +19 -13
- data/app/views/hyrax/file_sets/media_display/_image.html.erb +4 -4
- data/app/views/hyrax/file_sets/show.html.erb +2 -2
- data/app/views/hyrax/homepage/_announcement.html.erb +2 -2
- data/app/views/hyrax/homepage/_explore_collections.html.erb +6 -4
- data/app/views/hyrax/homepage/_featured_fields.html.erb +1 -1
- data/app/views/hyrax/homepage/_featured_works.html.erb +1 -1
- data/app/views/hyrax/homepage/_home_content.html.erb +24 -10
- data/app/views/hyrax/homepage/_marketing.html.erb +1 -1
- data/app/views/hyrax/homepage/_recent_document.html.erb +4 -1
- data/app/views/hyrax/homepage/_sortable_featured.html.erb +3 -3
- data/app/views/hyrax/homepage/index.html.erb +4 -4
- data/app/views/hyrax/leases/edit.html.erb +14 -14
- data/app/views/hyrax/leases/index.html.erb +18 -6
- data/app/views/hyrax/my/_admin_set_action_menu.html.erb +5 -5
- data/app/views/hyrax/my/_collection_action_menu.html.erb +6 -6
- data/app/views/hyrax/my/_constraints.html.erb +2 -2
- data/app/views/hyrax/my/_document_list.html.erb +1 -1
- data/app/views/hyrax/my/_facet_layout.html.erb +1 -2
- data/app/views/hyrax/my/_facet_limit.html.erb +4 -4
- data/app/views/hyrax/my/_facet_pagination.html.erb +1 -25
- data/app/views/hyrax/my/_facet_pivot.html.erb +1 -1
- data/app/views/hyrax/my/_facet_selected.html.erb +1 -1
- data/app/views/hyrax/my/_search_form.html.erb +7 -8
- data/app/views/hyrax/my/_sort_and_per_page.html.erb +10 -12
- data/app/views/hyrax/my/_work_action_menu.html.erb +4 -5
- data/app/views/hyrax/my/collections/_facets.html.erb +2 -2
- data/app/views/hyrax/my/collections/_list_collections.html.erb +1 -1
- data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +2 -2
- data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +2 -2
- data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +5 -5
- data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +1 -1
- data/app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb +1 -1
- data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +1 -1
- data/app/views/hyrax/my/collections/_tabs.html.erb +11 -4
- data/app/views/hyrax/my/collections/index.html.erb +3 -3
- data/app/views/hyrax/my/facet.html.erb +17 -16
- data/app/views/hyrax/my/index.html.erb +2 -2
- data/app/views/hyrax/my/works/_batch_actions.html.erb +1 -1
- data/app/views/hyrax/my/works/_facets.html.erb +2 -2
- data/app/views/hyrax/my/works/_list_works.html.erb +6 -7
- data/app/views/hyrax/my/works/_tabs.html.erb +6 -6
- data/app/views/hyrax/my/works/index.html.erb +20 -18
- data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
- data/app/views/hyrax/notifications/index.html.erb +4 -4
- data/app/views/hyrax/operations/index.html.erb +1 -1
- data/app/views/hyrax/operations/show.html.erb +2 -2
- data/app/views/hyrax/pages/_form.html.erb +76 -64
- data/app/views/hyrax/permissions/confirm.html.erb +4 -4
- data/app/views/hyrax/permissions/confirm_access.html.erb +4 -4
- data/app/views/hyrax/stats/file.html.erb +1 -1
- data/app/views/hyrax/stats/work.html.erb +1 -1
- data/app/views/hyrax/transfers/_received.html.erb +4 -4
- data/app/views/hyrax/transfers/index.html.erb +8 -8
- data/app/views/hyrax/transfers/new.html.erb +1 -1
- data/app/views/hyrax/uploads/_js_templates.html.erb +14 -14
- data/app/views/hyrax/uploads/_js_templates_branding.html.erb +5 -5
- data/app/views/hyrax/uploads/_js_templates_versioning.html.erb +15 -15
- data/app/views/hyrax/users/_activity.html.erb +3 -3
- data/app/views/hyrax/users/_contributions.html.erb +3 -3
- data/app/views/hyrax/users/_left_sidebar.html.erb +1 -1
- data/app/views/hyrax/users/_profile_tabs.html.erb +16 -8
- data/app/views/hyrax/users/_search_form.html.erb +2 -2
- data/app/views/hyrax/users/_user.html.erb +5 -5
- data/app/views/hyrax/users/_user_info.html.erb +4 -4
- data/app/views/hyrax/users/_vitals.html.erb +3 -3
- data/app/views/hyrax/users/show.html.erb +2 -2
- data/app/views/layouts/_head_tag_content.html.erb +2 -5
- data/app/views/layouts/hyrax/dashboard.html.erb +4 -4
- data/app/views/layouts/hyrax.html.erb +4 -3
- data/app/views/shared/_appearance_styles.html.erb +8 -8
- data/app/views/shared/_footer.html.erb +1 -1
- data/app/views/shared/_locale_picker.html.erb +5 -8
- data/app/views/shared/_nav_safety_modal.html.erb +2 -2
- data/app/views/shared/_select_work_type_modal.html.erb +2 -2
- data/config/locales/hyrax.de.yml +5 -6
- data/config/locales/hyrax.en.yml +4 -15
- data/config/locales/hyrax.es.yml +6 -7
- data/config/locales/hyrax.fr.yml +8 -9
- data/config/locales/hyrax.it.yml +6 -7
- data/config/locales/hyrax.pt-BR.yml +6 -7
- data/config/locales/hyrax.zh.yml +6 -7
- data/docker-compose.yml +2 -1
- data/documentation/developing-your-hyrax-based-app.md +2 -2
- data/documentation/legacyREADME.md +3 -3
- data/hyrax.gemspec +13 -24
- data/karma.conf.js +104 -0
- data/lib/generators/hyrax/assets_generator.rb +2 -5
- data/lib/generators/hyrax/install_generator.rb +9 -33
- data/lib/generators/hyrax/templates/catalog_controller.rb +20 -13
- data/lib/generators/hyrax/templates/config/analytics.yml +0 -3
- data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
- data/lib/generators/hyrax/templates/hyrax.scss +1 -2
- data/lib/generators/hyrax/templates/package.json +7 -8
- data/lib/hyrax/active_fedora_dummy_model.rb +0 -13
- data/lib/hyrax/configuration.rb +2 -49
- data/lib/hyrax/engine.rb +1 -2
- data/lib/hyrax/errors.rb +0 -2
- data/lib/hyrax/publisher.rb +0 -4
- data/lib/hyrax/specs/capybara.rb +5 -3
- data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb +0 -6
- data/lib/hyrax/specs/shared_specs/indexers.rb +0 -5
- data/lib/hyrax/transactions/container.rb +0 -54
- data/lib/hyrax/version.rb +1 -1
- data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
- data/lib/wings/valkyrie/persister.rb +2 -1
- data/lib/wings/valkyrie/storage.rb +2 -6
- data/package.json +11 -0
- data/tasks/hyrax_dev.rake +32 -0
- data/template.rb +1 -1
- data/vendor/assets/javascripts/dataTables.bootstrap4.js +184 -0
- data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js +1 -1
- data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +2 -2
- data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +1 -1
- data/vendor/assets/javascripts/handlebars.js +5214 -0
- data/vendor/assets/javascripts/jquery-ui.js +19057 -0
- data/vendor/assets/javascripts/jquery.dataTables.js +15336 -0
- data/vendor/assets/javascripts/morris/morris.min.js +9 -1
- data/vendor/assets/javascripts/morris/raphael-min.js +4 -6
- data/vendor/assets/javascripts/nestable.js +1 -1
- data/vendor/assets/stylesheets/dataTables.bootstrap4.css +307 -0
- data/vendor/assets/stylesheets/jquery-ui.css +1315 -0
- data/vendor/assets/stylesheets/morris.css +3 -0
- metadata +95 -218
- data/app/actors/hyrax/actors/initialize_workflow_actor.rb +0 -35
- data/app/forms/hyrax/forms/embargo.rb +0 -13
- data/app/forms/hyrax/forms/lease.rb +0 -13
- data/app/forms/hyrax/forms/pcdm_object_form.rb +0 -46
- data/app/forms/hyrax/forms/work_embargo_form.rb +0 -35
- data/app/forms/hyrax/forms/work_lease_form.rb +0 -35
- data/app/helpers/hyrax/url_helper.rb +0 -13
- data/app/jobs/content_depositor_change_event_job.rb +0 -48
- data/app/models/concerns/hyrax/with_file_sets.rb +0 -17
- data/app/services/hyrax/analytics/ga4.rb +0 -204
- data/app/services/hyrax/file_set_file_service.rb +0 -55
- data/app/services/hyrax/work_resource_query_service.rb +0 -45
- data/app/views/hyrax/admin/workflows/_tabs.html.erb +0 -9
- data/app/views/shared/_ga4.html.erb +0 -10
- data/config/metadata/file_set_metadata.yaml +0 -130
- data/lib/hyrax/transactions/create_work.rb +0 -65
- data/lib/hyrax/transactions/destroy_work.rb +0 -28
- data/lib/hyrax/transactions/steps/apply_collection_permission_template.rb +0 -34
- data/lib/hyrax/transactions/steps/apply_permission_template.rb +0 -32
- data/lib/hyrax/transactions/steps/apply_visibility.rb +0 -41
- data/lib/hyrax/transactions/steps/destroy_work.rb +0 -27
- data/lib/hyrax/transactions/steps/ensure_permission_template.rb +0 -29
- data/lib/hyrax/transactions/steps/save_work.rb +0 -38
- data/lib/hyrax/transactions/update_work.rb +0 -19
- data/lib/wings/services/file_converter_service.rb +0 -19
- data/lib/wings/services/file_metadata_builder.rb +0 -94
- data/vendor/assets/javascripts/handlebars-v4.0.5.js +0 -4612
- data/vendor/assets/stylesheets/morris.js/0.5.1/morris.css +0 -2
@@ -1,5 +1,7 @@
|
|
1
|
-
<div class="actions
|
2
|
-
|
3
|
-
|
1
|
+
<div class="actions card">
|
2
|
+
<div class="d-flex">
|
3
|
+
<%= button_tag t('.save'), class: "btn btn-primary disabled mr-2", data: { action: "save-actions" } %>
|
4
|
+
<%= button_tag t('.sort_alphabetically'), class: "btn btn-primary ", data: { action: "alpha-sort-action" } %>
|
5
|
+
</div>
|
4
6
|
</div>
|
5
7
|
<%= render "file_manager_resource_form" %>
|
@@ -1,13 +1,13 @@
|
|
1
1
|
<li data-reorder-id='<%= node.id %>'>
|
2
|
-
<div class="
|
2
|
+
<div class="card">
|
3
3
|
<%= simple_form_for [main_app, node], remote: true, html: {'data-type': 'json'} do |f| %>
|
4
|
-
<div class="
|
4
|
+
<div class="card-header">
|
5
5
|
<div class="order-title">
|
6
6
|
<%= f.input :title, as: :string, input_html: { name: "#{f.object.model_name.singular}[title][]", class: "title" }, value: node.to_s, label: false, hint: false %>
|
7
7
|
</div>
|
8
|
-
<div class="file-set-link
|
8
|
+
<div class="file-set-link float-right">
|
9
9
|
<%= link_to contextual_path(node, @presenter), title: "Edit file" do %>
|
10
|
-
<span class="
|
10
|
+
<span class="fa fa-pencil" aria-hidden="true"></span>
|
11
11
|
<% end %>
|
12
12
|
</div>
|
13
13
|
<% if node.respond_to?(:label) %>
|
@@ -16,7 +16,7 @@
|
|
16
16
|
</div>
|
17
17
|
<% end %>
|
18
18
|
</div>
|
19
|
-
<div class="
|
19
|
+
<div class="card-body">
|
20
20
|
<div class="text-center thumbnail">
|
21
21
|
<%= render "file_manager_thumbnail", node: node %>
|
22
22
|
</div>
|
@@ -1,10 +1,10 @@
|
|
1
1
|
<div class="form-group radio_buttons member_resource_options">
|
2
|
-
<span class="
|
3
|
-
<%= radio_button_tag "thumbnail_id", node.id, @form.thumbnail_id == node.id, id: "thumbnail_id_#{node.id}", class: "radio_buttons" %>
|
4
|
-
<%= label_tag "thumbnail_id_#{node.id}", t('.thumbnail') %>
|
2
|
+
<span class="form-check">
|
3
|
+
<%= radio_button_tag "thumbnail_id", node.id, @form.thumbnail_id == node.id, id: "thumbnail_id_#{node.id}", class: "form-check-input radio_buttons" %>
|
4
|
+
<%= label_tag "thumbnail_id_#{node.id}", t('.thumbnail'), class: 'form-check-label' %>
|
5
5
|
</span>
|
6
|
-
<span class="
|
7
|
-
<%= radio_button_tag "representative_id", node.id, @form.representative_id == node.id, id: "representative_id_#{node.id}", class: "radio_buttons" %>
|
8
|
-
<%= label_tag "representative_id_#{node.id}", t('.representative_media') %>
|
6
|
+
<span class="form-check">
|
7
|
+
<%= radio_button_tag "representative_id", node.id, @form.representative_id == node.id, id: "representative_id_#{node.id}", class: "form-check-input radio_buttons" %>
|
8
|
+
<%= label_tag "representative_id_#{node.id}", t('.representative_media'), class: 'form-check-label' %>
|
9
9
|
</span>
|
10
10
|
</div>
|
@@ -1 +1 @@
|
|
1
|
-
<%=
|
1
|
+
<%= document_presenter(node)&.thumbnail&.thumbnail_tag({ class: 'thumbnail-inner mw-100' }, {}) %>
|
@@ -20,10 +20,10 @@ HTML Properties:
|
|
20
20
|
'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/find_works',
|
21
21
|
'exclude-work': f.object.model.id.to_s # exclude this item from the result set.
|
22
22
|
} %>
|
23
|
-
<a href="#" onclick="return false;" class="btn btn-
|
23
|
+
<a href="#" onclick="return false;" class="btn btn-secondary ml-2" data-behavior="add-relationship"><%= t('.add') %></a>
|
24
24
|
</div>
|
25
|
-
<div class="message has-warning
|
26
|
-
<div
|
25
|
+
<div class="message has-warning"></div>
|
26
|
+
<div class="my-4">
|
27
27
|
<%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular.to_sym], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
|
28
28
|
</div>
|
29
29
|
<table class="table table-striped">
|
@@ -11,18 +11,18 @@
|
|
11
11
|
<!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
|
12
12
|
<div class="fileupload-buttonbar">
|
13
13
|
<div class="row">
|
14
|
-
<div class="col-
|
14
|
+
<div class="col-12">
|
15
15
|
<div class="fileinput-button" id="add-files">
|
16
16
|
<input id="addfiles" type="file" style="display:none;" name="files[]" multiple />
|
17
17
|
<button type="button" class="btn btn-success" onclick="document.getElementById('addfiles').click();">
|
18
|
-
<span class="
|
18
|
+
<span class="fa fa-plus"></span>
|
19
19
|
<span><%= t(".add_files") %></span>
|
20
20
|
</button>
|
21
21
|
</div>
|
22
22
|
<div class="fileinput-button">
|
23
23
|
<input id="addfolder" type="file" style="display:none;" name="files[]" multiple directory webkitdirectory />
|
24
24
|
<button type="button" class="btn btn-success" onclick="document.getElementById('addfolder').click();">
|
25
|
-
<span class="
|
25
|
+
<span class="fa fa-plus"></span>
|
26
26
|
<span><%= t(".add_folder") %></span>
|
27
27
|
</button>
|
28
28
|
</div>
|
@@ -30,12 +30,12 @@
|
|
30
30
|
<%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
|
31
31
|
'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
|
32
32
|
'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 %>
|
33
|
-
<span class="
|
33
|
+
<span class="fa fa-plus"></span>
|
34
34
|
<%= t('hyrax.upload.browse_everything.browse_files_button') %>
|
35
35
|
<% end %>
|
36
36
|
<% end %>
|
37
|
-
<button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel
|
38
|
-
<span class="
|
37
|
+
<button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel">
|
38
|
+
<span class="fa fa-ban"></span>
|
39
39
|
<span><%= t('.cancel_upload') %></span>
|
40
40
|
</button>
|
41
41
|
<!-- The global file processing state -->
|
@@ -43,12 +43,12 @@
|
|
43
43
|
</div>
|
44
44
|
</div>
|
45
45
|
<div class="row">
|
46
|
-
<div class="col-
|
46
|
+
<div class="col-12">
|
47
47
|
<!-- The global progress state -->
|
48
48
|
<div class="fileupload-progress fade">
|
49
49
|
<!-- The global progress bar -->
|
50
|
-
<div class="progress
|
51
|
-
<div class="progress-bar progress-bar-success" style="width:0%;"></div>
|
50
|
+
<div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
|
51
|
+
<div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
|
52
52
|
</div>
|
53
53
|
<!-- The extended global progress state -->
|
54
54
|
<div class="progress-extended"> </div>
|
@@ -9,11 +9,11 @@ HTML Properties:
|
|
9
9
|
table:
|
10
10
|
[data-behavior="child-relationships"] : allows the javascript to be initialized
|
11
11
|
data-param-key : the parameter key value for this model type %>
|
12
|
-
<h2><%= t("hyrax.works.form.in_collections") %></h2>
|
12
|
+
<h2 class="h3 mt-4"><%= t("hyrax.works.form.in_collections") %></h2>
|
13
13
|
|
14
14
|
<div class="form-group" data-behavior="collection-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= member_of_collections_json(f.object) %>">
|
15
15
|
|
16
|
-
<div class="form-inline">
|
16
|
+
<div class="form-inline mb-3">
|
17
17
|
<%= f.label :member_of_collection_ids %>
|
18
18
|
<%= f.input_field :member_of_collection_ids,
|
19
19
|
prompt: :translate,
|
@@ -21,7 +21,7 @@ HTML Properties:
|
|
21
21
|
autocomplete: 'collection',
|
22
22
|
'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/collections?access=deposit'
|
23
23
|
} %>
|
24
|
-
<a href="#" onclick="return false;" class="btn btn-
|
24
|
+
<a href="#" onclick="return false;" class="btn btn-secondary ml-2" data-behavior="add-relationship"><%= t('.add') %></a>
|
25
25
|
</div>
|
26
26
|
|
27
27
|
<table class="table table-striped">
|
@@ -6,7 +6,7 @@
|
|
6
6
|
<% if f.object.display_additional_fields? %>
|
7
7
|
<%= link_to t('hyrax.works.form.additional_fields'),
|
8
8
|
'#extended-terms',
|
9
|
-
class: 'btn btn-
|
9
|
+
class: 'btn btn-secondary additional-fields',
|
10
10
|
data: { toggle: 'collapse' },
|
11
11
|
role: "button",
|
12
12
|
'aria-expanded'=> "false",
|
@@ -10,26 +10,36 @@
|
|
10
10
|
</legend>
|
11
11
|
|
12
12
|
<div class="form-group">
|
13
|
-
<
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
</
|
25
|
-
<
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
13
|
+
<div class="form-check">
|
14
|
+
<label class="form-check-label">
|
15
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, class: 'form-check-input' %>
|
16
|
+
<%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) %>
|
17
|
+
</label>
|
18
|
+
</div>
|
19
|
+
<div class="form-check">
|
20
|
+
<label class="form-check-label">
|
21
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED, class: 'form-check-input' %>
|
22
|
+
<%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED) %>
|
23
|
+
</label>
|
24
|
+
</div>
|
25
|
+
<div class="form-check">
|
26
|
+
<label class="form-check-label">
|
27
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, class: 'form-check-input' %>
|
28
|
+
<%= render "form_permission_embargo", f: f %>
|
29
|
+
</label>
|
30
|
+
</div>
|
31
|
+
<div class="form-check">
|
32
|
+
<label class="form-check-label">
|
33
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE, class: 'form-check-input' %>
|
34
|
+
<%= render "form_permission_lease", f: f %>
|
35
|
+
</label>
|
36
|
+
</div>
|
37
|
+
<div class="form-check">
|
38
|
+
<label class="form-check-label">
|
39
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, class: 'form-check-input' %>
|
40
|
+
<%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE) %>
|
41
|
+
</label>
|
42
|
+
</div>
|
33
43
|
</div>
|
34
44
|
</fieldset>
|
35
45
|
<% end %>
|
@@ -1,6 +1,6 @@
|
|
1
|
-
<aside id="form-progress" class="form-progress
|
2
|
-
<div class="
|
3
|
-
<h3 class="
|
1
|
+
<aside id="form-progress" class="form-progress card">
|
2
|
+
<div class="card-header">
|
3
|
+
<h3 class="card-title"><%= t("hyrax.works.progress.header") %></h3>
|
4
4
|
</div>
|
5
5
|
<div class="list-group">
|
6
6
|
<div class="list-group-item">
|
@@ -19,7 +19,7 @@
|
|
19
19
|
</div>
|
20
20
|
|
21
21
|
<div class="set-access-controls list-group-item">
|
22
|
-
<%= render 'form_visibility_component', f: f
|
22
|
+
<%= render 'form_visibility_component', f: f %>
|
23
23
|
</div>
|
24
24
|
<% if Flipflop.proxy_deposit? && current_user.can_make_deposits_for.any? %>
|
25
25
|
<div class="list-group-item">
|
@@ -31,7 +31,7 @@
|
|
31
31
|
<%= render "form_progress_#{section}", f: f %>
|
32
32
|
<% end %>
|
33
33
|
</div>
|
34
|
-
<div class="
|
34
|
+
<div class="card-footer text-center">
|
35
35
|
<% if ::Flipflop.show_deposit_agreement? %>
|
36
36
|
<% if ::Flipflop.active_deposit_agreement_acceptance? %>
|
37
37
|
<label>
|
@@ -56,9 +56,9 @@
|
|
56
56
|
</div>
|
57
57
|
|
58
58
|
<%# Provide immediate feedback after the form is submitted while the subsequent page is loading %>
|
59
|
-
<div class="
|
59
|
+
<div class="card-footer save-progress" hidden>
|
60
60
|
<div class="progress">
|
61
|
-
<div class="progress-bar progress-bar-striped progress-bar-complete
|
61
|
+
<div class="progress-bar progress-bar-striped progress-bar-complete progress-bar-animated">
|
62
62
|
<span id="form-feedback" aria-live="assertive"><%= t(".saving_your_work") %></span>
|
63
63
|
</div>
|
64
64
|
</div>
|
@@ -9,6 +9,6 @@
|
|
9
9
|
<%= render 'form_member_of_collections', f: f %>
|
10
10
|
|
11
11
|
<% if f.object.persisted? %>
|
12
|
-
<h2><%= t("hyrax.works.form.in_this_work") %></h2>
|
12
|
+
<h2 class="h3 mt-4"><%= t("hyrax.works.form.in_this_work") %></h2>
|
13
13
|
<%= render 'form_child_work_relationships', f: f %>
|
14
14
|
<% end %>
|
@@ -5,7 +5,7 @@
|
|
5
5
|
<%= t("hyrax.base.form_rendering.legend_html") %>
|
6
6
|
</legend>
|
7
7
|
<div class="form-group">
|
8
|
-
<span class="
|
8
|
+
<span class="form-text"><%= t("hyrax.base.form_rendering.help_html") %></span>
|
9
9
|
<%= f.select :rendering_ids,
|
10
10
|
form_file_set_select_for(parent: f.object),
|
11
11
|
{ include_blank: true },
|
@@ -5,7 +5,7 @@
|
|
5
5
|
<%= t("hyrax.base.form_representative.legend_html") %>
|
6
6
|
</legend>
|
7
7
|
<div class="form-group">
|
8
|
-
<span class="
|
8
|
+
<span class="form-text"><%= t("hyrax.base.form_representative.help_html") %></span>
|
9
9
|
<%= f.select :representative_id, form_file_set_select_for(parent: @form), {}, { class: 'form-control' } %>
|
10
10
|
</div>
|
11
11
|
</fieldset>
|
@@ -1,11 +1,11 @@
|
|
1
1
|
<p><%= t('.directions') %></p>
|
2
|
-
<h2><%= t('.add_sharing') %></h2>
|
2
|
+
<h2 class="h3 mt-4"><%= t('.add_sharing') %></h2>
|
3
3
|
|
4
4
|
<% depositor = f.object.depositor %>
|
5
5
|
|
6
|
-
<div class="alert alert-info
|
6
|
+
<div class="alert alert-info" id="save_perm_note"><%= t('.permissions_save_note_html') %></div>
|
7
7
|
|
8
|
-
<div class="alert alert-warning
|
8
|
+
<div class="alert alert-warning" role="alert" id="permissions_error">
|
9
9
|
<span id="permissions_error_text"></span>
|
10
10
|
</div>
|
11
11
|
|
@@ -22,7 +22,7 @@
|
|
22
22
|
<label for="new_group_permission_skel" class="sr-only"><%= t(".access_type_to_grant") %></label>
|
23
23
|
<%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
|
24
24
|
|
25
|
-
<button class="btn btn-
|
25
|
+
<button class="btn btn-secondary ml-2" id="add_new_group_skel">
|
26
26
|
<span><%= t(".add_this_group_html") %></span>
|
27
27
|
</button>
|
28
28
|
<br /><span id="directory_group_result"></span>
|
@@ -38,7 +38,7 @@
|
|
38
38
|
<%= text_field_tag 'new_user_name_skel', nil %>
|
39
39
|
<label for="new_user_permission_skel" class="sr-only"><%= t('.access_type_to_grant') %></label>
|
40
40
|
<%= select_tag 'new_user_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
|
41
|
-
<button class="btn btn-
|
41
|
+
<button class="btn btn-secondary ml-2" id="add_new_user_skel">
|
42
42
|
<span>Add<span class="sr-only"> this <%= t('hyrax.account_label') %></span></span>
|
43
43
|
</button>
|
44
44
|
<br /> <span id="directory_user_result"></span>
|
@@ -49,7 +49,7 @@
|
|
49
49
|
|
50
50
|
<script type="text/x-tmpl" id="tmpl-work-grant">
|
51
51
|
<tr>
|
52
|
-
<td><label class="
|
52
|
+
<td><label class="col-form-label">{%= o.name %}</label></td>
|
53
53
|
<td><div class="col-sm-10">{%= o.accessLabel %}<button class="btn close">×</button></div></td>
|
54
54
|
</tr>
|
55
55
|
</script>
|
@@ -5,7 +5,7 @@
|
|
5
5
|
<%= t("hyrax.base.form_thumbnail.legend_html") %>
|
6
6
|
</legend>
|
7
7
|
<div class="form-group">
|
8
|
-
<span class="
|
8
|
+
<span class="form-text"><%= t("hyrax.base.form_thumbnail.help_html") %></span>
|
9
9
|
<%= f.select :thumbnail_id, form_file_set_select_for(parent: @form), {}, { class: 'form-control' } %>
|
10
10
|
</div>
|
11
11
|
</fieldset>
|
@@ -4,15 +4,11 @@
|
|
4
4
|
<%= render 'form_permission_under_lease', f: f %>
|
5
5
|
<% else %>
|
6
6
|
<fieldset>
|
7
|
-
|
8
|
-
<legend class="legend-save-work"><%= t('.visibility') %></legend>
|
9
|
-
<% else %>
|
10
|
-
<legend><%= t('.visibility') %><%= raw(t('.subtitle_html')) %></legend>
|
11
|
-
<% end %>
|
7
|
+
<legend class="legend-save-work"><%= t('.visibility') %></legend>
|
12
8
|
<ul class="visibility">
|
13
|
-
<li class="
|
14
|
-
<label>
|
15
|
-
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, data: { 'target': '#collapsePublic' } %>
|
9
|
+
<li class="form-check">
|
10
|
+
<label class="form-check-label">
|
11
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, class: 'form-check-input', data: { 'target': '#collapsePublic' } %>
|
16
12
|
<%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) %>
|
17
13
|
<br />
|
18
14
|
<%= t('hyrax.visibility.open.note_html', type: f.object.human_readable_type) %>
|
@@ -21,17 +17,17 @@
|
|
21
17
|
</div>
|
22
18
|
</label>
|
23
19
|
</li>
|
24
|
-
<li class="
|
25
|
-
<label>
|
26
|
-
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>
|
20
|
+
<li class="form-check">
|
21
|
+
<label class="form-check-label">
|
22
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED, class: 'form-check-input' %>
|
27
23
|
<%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED) %>
|
28
24
|
<br />
|
29
25
|
<%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
|
30
26
|
</label>
|
31
27
|
</li>
|
32
|
-
<li class="
|
33
|
-
<label>
|
34
|
-
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, data: { 'target': '#collapseEmbargo' } %>
|
28
|
+
<li class="form-check">
|
29
|
+
<label class="form-check-label">
|
30
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, class: 'form-check-input', data: { 'target': '#collapseEmbargo' } %>
|
35
31
|
<%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO) %>
|
36
32
|
<br />
|
37
33
|
<%= t('hyrax.visibility.embargo.note_html') %>
|
@@ -45,9 +41,9 @@
|
|
45
41
|
</div>
|
46
42
|
</label>
|
47
43
|
</li>
|
48
|
-
<li class="
|
49
|
-
<label>
|
50
|
-
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE, data: { 'target': '#collapseLease' } %>
|
44
|
+
<li class="form-check">
|
45
|
+
<label class="form-check-label">
|
46
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE, class: 'form-check-input', data: { 'target': '#collapseLease' } %>
|
51
47
|
<%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE) %>
|
52
48
|
<br />
|
53
49
|
<%= t('hyrax.visibility.lease.note_html') %>
|
@@ -61,9 +57,9 @@
|
|
61
57
|
</div>
|
62
58
|
</label>
|
63
59
|
</li>
|
64
|
-
<li class="
|
65
|
-
<label>
|
66
|
-
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>
|
60
|
+
<li class="form-check">
|
61
|
+
<label class="form-check-label">
|
62
|
+
<%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, class: 'form-check-input' %>
|
67
63
|
<%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE) %>
|
68
64
|
<br />
|
69
65
|
<%= t('hyrax.visibility.restricted.note_html') %>
|
@@ -1,36 +1,28 @@
|
|
1
1
|
<% # we will yield to content_for for each tab, e.g. :files_tab %>
|
2
2
|
<div class="row">
|
3
|
-
<div class="col-
|
4
|
-
<div class="
|
3
|
+
<div class="col-12 col-sm-8">
|
4
|
+
<div class="tabs" role="main">
|
5
5
|
<!-- Nav tabs -->
|
6
6
|
<ul class="nav nav-tabs" role="tablist">
|
7
7
|
<% (tabs - ['share']).each_with_index do | tab, i | %>
|
8
|
-
|
9
|
-
<
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
<a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
|
14
|
-
<%= form_tab_label_for(form: f.object, tab: tab) %>
|
15
|
-
</a>
|
16
|
-
</li>
|
8
|
+
<li role="presentation" class="nav-item">
|
9
|
+
<a class="nav-link <% if i == 0 %>active<% end %>" href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
|
10
|
+
<%= form_tab_label_for(form: f.object, tab: tab) %>
|
11
|
+
</a>
|
12
|
+
</li>
|
17
13
|
<% end %>
|
18
14
|
|
19
|
-
<li role="presentation" id="tab-share" class="
|
20
|
-
<a href="#share" aria-controls="share" role="tab" data-toggle="tab">
|
15
|
+
<li role="presentation" id="tab-share" class="nav-item">
|
16
|
+
<a class="nav-link" href="#share" aria-controls="share" role="tab" data-toggle="tab">
|
21
17
|
<%= form_tab_label_for(form: f.object, tab: 'share') %>
|
22
18
|
</a>
|
23
19
|
</li>
|
24
20
|
</ul>
|
25
21
|
|
26
22
|
<!-- Tab panes -->
|
27
|
-
<div class="tab-content">
|
23
|
+
<div class="tab-content card">
|
28
24
|
<% (tabs - ['share']).each_with_index do | tab, i | %>
|
29
|
-
<% if i == 0 %>
|
30
|
-
<div role="tabpanel" class="tab-pane active" id="<%= tab %>">
|
31
|
-
<% else %>
|
32
|
-
<div role="tabpanel" class="tab-pane" id="<%= tab %>">
|
33
|
-
<% end %>
|
25
|
+
<div role="tabpanel" class="tab-pane <% if i == 0 %>show active<% end %>" id="<%= tab %>">
|
34
26
|
<div class="form-tab-content">
|
35
27
|
<% # metadata_tab is sometimes provided %>
|
36
28
|
<%= yield "#{tab}_tab".to_sym if content_for? "#{tab}_tab".to_sym %>
|
@@ -48,7 +40,7 @@
|
|
48
40
|
</div>
|
49
41
|
</div>
|
50
42
|
|
51
|
-
<div id="savewidget" class="col-
|
43
|
+
<div id="savewidget" class="col-12 col-sm-4 fixedsticky" role="complementary">
|
52
44
|
<%= render 'form_progress', f: f %>
|
53
45
|
</div>
|
54
46
|
</div>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<tr class="<%= dom_class(member) %> attributes">
|
2
2
|
<td class="thumbnail">
|
3
|
-
<%=
|
3
|
+
<%= document_presenter(member).thumbnail.thumbnail_tag(alt: 'file details') %>
|
4
4
|
</td>
|
5
5
|
<td class="attribute attribute-filename ensure-wrapped"><%= link_to(member.link_name, contextual_path(member, @presenter)) %></td>
|
6
6
|
<td class="attribute attribute-date_uploaded"><%= member.try(:date_uploaded) %></td>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<dl class="work-show <%= dom_class(presenter) %>" <%= presenter.microdata_type_to_html %>>
|
1
|
+
<dl class="work-show pt-3 <%= dom_class(presenter) %>" <%= presenter.microdata_type_to_html %>>
|
2
2
|
<%= render 'attribute_rows', presenter: presenter %>
|
3
3
|
<%= presenter.attribute_to_html(:embargo_release_date, render_as: :date, html_dl: true) %>
|
4
4
|
<%= presenter.attribute_to_html(:lease_expiration_date, render_as: :date, html_dl: true) %>
|
@@ -4,39 +4,39 @@
|
|
4
4
|
<% if presenter.show_deposit_for?(collections: @user_collections) %>
|
5
5
|
<input type="checkbox" style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
|
6
6
|
<%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
|
7
|
-
class: 'btn btn-
|
7
|
+
class: 'btn btn-secondary submits-batches submits-batches-add',
|
8
8
|
data: { toggle: "modal", target: "#collection-list-container" } %>
|
9
9
|
<% end %>
|
10
10
|
<% if presenter.work_featurable? %>
|
11
11
|
<%= link_to t('.feature'), hyrax.featured_work_path(presenter, format: :json),
|
12
12
|
data: { behavior: 'feature' },
|
13
|
-
class: presenter.display_feature_link? ? 'btn btn-
|
13
|
+
class: presenter.display_feature_link? ? 'btn btn-secondary' : 'btn btn-secondary collapse' %>
|
14
14
|
|
15
15
|
<%= link_to t('.unfeature'), hyrax.featured_work_path(presenter, format: :json),
|
16
16
|
data: { behavior: 'unfeature' },
|
17
|
-
class: presenter.display_unfeature_link? ? 'btn btn-
|
17
|
+
class: presenter.display_unfeature_link? ? 'btn btn-secondary' : 'btn btn-secondary collapse' %>
|
18
18
|
<% end %>
|
19
19
|
<% end %>
|
20
|
-
<% if Hyrax.config.analytics?
|
20
|
+
<% if Hyrax.config.analytics? %>
|
21
21
|
<% # turbolinks needs to be turned off or the page will use the cache and the %>
|
22
22
|
<% # analytics graph will not show unless the page is refreshed. %>
|
23
|
-
<%= link_to t('.analytics'), presenter.stats_path, id: 'stats', class: 'btn btn-
|
23
|
+
<%= link_to t('.analytics'), presenter.stats_path, id: 'stats', class: 'btn btn-secondary', data: { turbolinks: false } %>
|
24
24
|
<% end %>
|
25
25
|
</div>
|
26
26
|
|
27
27
|
<div class="col-sm-6 text-right">
|
28
28
|
<% if presenter.editor? && !workflow_restriction?(presenter) %>
|
29
|
-
<%= link_to t('.edit'), edit_polymorphic_path([main_app, presenter]), class: 'btn btn-
|
29
|
+
<%= link_to t('.edit'), edit_polymorphic_path([main_app, presenter]), class: 'btn btn-secondary' %>
|
30
30
|
<% if presenter.member_count > 1 %>
|
31
|
-
<%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-
|
31
|
+
<%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-secondary' %>
|
32
32
|
<% end %>
|
33
33
|
<% if presenter.valid_child_concerns.length > 0 %>
|
34
34
|
<div class="btn-group">
|
35
|
-
<button type="button" class="btn btn-
|
36
|
-
<%= t('.attach_child') %>
|
35
|
+
<button type="button" class="btn btn-secondary dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
36
|
+
<%= t('.attach_child') %>
|
37
37
|
<ul class="dropdown-menu">
|
38
38
|
<% presenter.valid_child_concerns.each do |concern| %>
|
39
|
-
<li>
|
39
|
+
<li class="dropdown-item">
|
40
40
|
<%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
|
41
41
|
</li>
|
42
42
|
<% end %>
|