hyrax 3.4.1 → 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 -52
- data/.dassie/.env +1 -1
- 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/forms/collection_resource_form.rb +8 -0
- data/.dassie/app/indexers/collection_resource_indexer.rb +8 -0
- data/.dassie/app/models/collection_resource.rb +35 -0
- data/.dassie/app/models/user.rb +0 -3
- data/.dassie/config/application.rb +1 -1
- data/.dassie/config/initializers/file_services.rb +4 -0
- data/.dassie/config/initializers/hyrax.rb +2 -1
- data/.dassie/config/initializers/riiif.rb +1 -1
- data/.dassie/config/metadata/collection_resource.yaml +23 -0
- data/.dassie/db/schema.rb +5 -5
- data/.dassie/db/seeds.rb +2 -0
- data/.dassie/package.json +7 -7
- data/.dassie/spec/forms/collection_resource_form_spec.rb +13 -0
- data/.dassie/spec/indexers/collection_resource_indexer_spec.rb +14 -0
- data/.dassie/spec/models/collection_resource_spec.rb +13 -0
- data/.engine_cart.yml +2 -39
- data/.env +1 -0
- data/.regen +2 -1
- data/.rubocop.yml +1 -1
- data/.rubocop_fixme.yml +19 -2
- data/CONTAINERS.md +18 -13
- data/CONTRIBUTING.md +22 -24
- data/Dockerfile +2 -2
- data/Rakefile +0 -4
- data/app/actors/hyrax/actors/base_actor.rb +1 -1
- data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +5 -11
- data/app/actors/hyrax/actors/file_actor.rb +9 -37
- data/app/actors/hyrax/actors/file_set_actor.rb +13 -62
- data/app/assets/javascripts/hyrax/app.js.erb +1 -1
- 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/collections_v2.es6 +13 -0
- 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/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 +10 -3
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +4 -9
- data/app/controllers/hyrax/batch_edits_controller.rb +1 -1
- data/app/controllers/hyrax/dashboard/collections_controller.rb +159 -75
- data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +0 -32
- data/app/controllers/hyrax/file_sets_controller.rb +3 -0
- data/app/controllers/hyrax/homepage_controller.rb +0 -1
- data/app/controllers/hyrax/my_controller.rb +0 -6
- data/app/controllers/hyrax/single_use_links_controller.rb +1 -2
- data/app/controllers/hyrax/single_use_links_viewer_controller.rb +1 -1
- data/app/forms/hyrax/forms/pcdm_collection_form.rb +29 -2
- data/app/forms/hyrax/forms/resource_form.rb +15 -1
- data/app/forms/hyrax/forms/widgets/admin_set_visibility.rb +1 -1
- data/app/helpers/hyrax/facets_helper.rb +150 -0
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +5 -5
- data/app/indexers/hyrax/basic_metadata_indexer.rb +3 -9
- data/app/indexers/hyrax/pcdm_collection_indexer.rb +0 -1
- data/app/jobs/characterize_job.rb +3 -2
- data/app/jobs/create_derivatives_job.rb +4 -2
- data/app/jobs/import_url_job.rb +4 -6
- data/app/jobs/ingest_local_file_job.rb +5 -13
- data/app/jobs/inherit_permissions_job.rb +1 -5
- data/app/jobs/valkyrie_ingest_job.rb +15 -77
- data/app/models/concerns/hyrax/collection_behavior.rb +2 -2
- data/app/models/concerns/hyrax/file_set_behavior.rb +1 -1
- data/app/models/concerns/hyrax/in_admin_set.rb +0 -7
- data/app/models/concerns/hyrax/user.rb +14 -3
- data/app/models/concerns/hyrax/work_behavior.rb +1 -2
- data/app/models/content_block.rb +0 -6
- data/app/models/featured_work_list.rb +0 -1
- data/app/models/hyrax/file_metadata.rb +33 -3
- data/app/models/hyrax/file_set.rb +1 -3
- data/app/models/hyrax/group.rb +19 -0
- data/app/models/hyrax/pcdm_collection.rb +0 -1
- data/app/models/hyrax/permission_template.rb +0 -35
- data/app/models/job_io_wrapper.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/member_presenter_factory.rb +2 -4
- data/app/presenters/hyrax/menu_presenter.rb +1 -1
- data/app/presenters/hyrax/permission_badge.rb +7 -7
- data/app/presenters/hyrax/work_show_presenter.rb +3 -3
- 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/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/access_control_list.rb +7 -6
- data/app/services/hyrax/adapters/nesting_index_adapter.rb +4 -4
- data/app/services/hyrax/characterization/valkyrie_characterization_service.rb +3 -5
- data/app/services/hyrax/collection_member_service.rb +1 -2
- data/app/services/hyrax/collections/collection_member_service.rb +3 -5
- data/app/services/hyrax/collections/search_service.rb +0 -1
- data/app/services/hyrax/custom_queries.rb +25 -0
- 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/listeners/member_cleanup_listener.rb +14 -18
- data/app/services/hyrax/multiple_membership_checker.rb +2 -0
- data/app/services/hyrax/search_service.rb +1 -81
- data/app/services/hyrax/statistics/depositors/summary.rb +1 -3
- data/app/services/hyrax/valkyrie_persist_derivatives.rb +50 -0
- data/app/services/hyrax/valkyrie_upload.rb +106 -0
- data/app/services/hyrax/work_query_service.rb +1 -1
- data/app/services/hyrax/workflow/workflow_importer.rb +7 -9
- data/app/services/hyrax/workflow/workflow_schema.rb +3 -5
- data/app/services/hyrax/working_directory.rb +2 -0
- data/app/strategies/hyrax/strategies/yaml_strategy.rb +4 -6
- data/app/uploaders/hyrax/uploaded_file_uploader.rb +4 -4
- data/app/validators/hyrax/collection_membership_validator.rb +16 -15
- 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 +9 -2
- 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 +9 -4
- data/app/views/catalog/facet.html.erb +21 -0
- data/app/views/catalog/index.html.erb +6 -4
- data/app/views/collections/edit_fields/_based_near.html.erb +7 -7
- 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 +6 -6
- 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 +7 -7
- 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 +13 -13
- 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 +6 -6
- 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 +15 -15
- 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 +9 -9
- data/app/views/hyrax/base/_work_button_row.html.erb +16 -15
- 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 +33 -24
- data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +20 -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 +11 -11
- 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_form.html.erb +33 -29
- data/app/views/hyrax/file_sets/_show_actions.html.erb +2 -2
- 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 +17 -11
- 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 +11 -11
- 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 +9 -4
- 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/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/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/chart/hyrax/Chart.yaml +10 -6
- data/chart/hyrax/templates/_helpers.tpl +4 -0
- data/chart/hyrax/templates/cron-embargo.yaml +5 -0
- data/chart/hyrax/templates/cron-lease.yaml +5 -0
- data/chart/hyrax/templates/deployment-worker.yaml +11 -0
- data/chart/hyrax/templates/ingress.yaml +7 -6
- data/chart/hyrax/values.yaml +152 -0
- data/config/features.rb +48 -50
- data/config/initializers/{valkryrie_storage.rb → storage_adapter_initializer.rb} +5 -0
- data/config/locales/hyrax.de.yml +16 -16
- data/config/locales/hyrax.en.yml +4 -4
- data/config/locales/hyrax.es.yml +6 -6
- data/config/locales/hyrax.fr.yml +7 -7
- data/config/locales/hyrax.it.yml +6 -6
- data/config/locales/hyrax.pt-BR.yml +6 -6
- data/config/locales/hyrax.zh.yml +6 -6
- data/docker-compose.yml +3 -1
- data/documentation/developing-your-hyrax-based-app.md +1 -1
- data/documentation/legacyREADME.md +1 -1
- data/hyrax.gemspec +15 -22
- data/karma.conf.js +104 -0
- data/lib/generators/hyrax/assets_generator.rb +2 -5
- data/lib/generators/hyrax/collection_resource/USAGE +20 -0
- data/lib/generators/hyrax/collection_resource/collection_resource_generator.rb +133 -0
- data/lib/generators/hyrax/collection_resource/templates/collection.rb.erb +34 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_form.rb.erb +7 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_form_spec.rb.erb +13 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb +7 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_indexer_spec.rb.erb +13 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_metadata.yaml +22 -0
- data/lib/generators/hyrax/collection_resource/templates/collection_spec.rb.erb +12 -0
- data/lib/generators/hyrax/install_generator.rb +9 -24
- data/lib/generators/hyrax/templates/catalog_controller.rb +20 -13
- data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml +1 -1
- data/lib/generators/hyrax/templates/hyrax.scss +1 -2
- data/lib/generators/hyrax/templates/package.json +7 -8
- data/lib/hyrax/configuration.rb +12 -40
- data/lib/hyrax/engine.rb +1 -2
- data/lib/hyrax/specs/capybara.rb +5 -3
- data/lib/hyrax/specs/shared_specs/hydra_works.rb +0 -1
- data/lib/hyrax/transactions/collection_update.rb +2 -0
- data/lib/hyrax/transactions/container.rb +10 -54
- data/lib/hyrax/transactions/steps/save_collection_banner.rb +59 -0
- data/lib/hyrax/transactions/steps/save_collection_logo.rb +109 -0
- data/lib/hyrax/version.rb +1 -1
- data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
- data/lib/wings/active_fedora_converter/file_metadata_node.rb +48 -0
- data/lib/wings/active_fedora_converter/instance_builder.rb +68 -0
- data/lib/wings/active_fedora_converter.rb +3 -3
- data/lib/wings/services/custom_queries/find_file_metadata.rb +19 -8
- data/lib/wings/valkyrie/persister.rb +2 -1
- data/lib/wings/valkyrie/query_service.rb +4 -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 +126 -156
- data/app/actors/hyrax/actors/initialize_workflow_actor.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/views/catalog/_index_header_list_hyrax_pcdm_collection.html.erb +0 -4
- 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,5 @@
|
|
1
|
-
@import
|
2
|
-
@import
|
1
|
+
@import "morris";
|
2
|
+
@import "bootstrap/variables";
|
3
3
|
$tab-margin: 44px !default;
|
4
4
|
$title-text-color: #4e4a42 !default;
|
5
5
|
$body-background-color: #f0f0f0 !default;
|
@@ -9,7 +9,7 @@ $admin-sidebar-profile-background-color: #505050 !default;
|
|
9
9
|
$admin-sidebar-section-heading-color: #dedede !default;
|
10
10
|
$admin-sidebar-link-color: #ffffff !default;
|
11
11
|
$admin-sidebar-link-hover-color: #000000 !default;
|
12
|
-
$admin-sidebar-link-background-color: #
|
12
|
+
$admin-sidebar-link-background-color: #eeeeee !default;
|
13
13
|
$admin-content-background-color: #f0f0f0 !default;
|
14
14
|
$admin-vertical-padding: 0 !default;
|
15
15
|
$admin-panel-border-color: #dedede !default;
|
@@ -37,11 +37,7 @@ $admin-panel-border-color: #dedede !default;
|
|
37
37
|
|
38
38
|
body.dashboard {
|
39
39
|
background-color: $body-background-color;
|
40
|
-
padding-top:
|
41
|
-
|
42
|
-
@media only screen and (max-width : 767px) {
|
43
|
-
padding-top: 0;
|
44
|
-
}
|
40
|
+
padding-top: 3.5rem;
|
45
41
|
}
|
46
42
|
|
47
43
|
.dashboard {
|
@@ -49,42 +45,6 @@ body.dashboard {
|
|
49
45
|
font-size: 1.1em;
|
50
46
|
}
|
51
47
|
|
52
|
-
.tabs {
|
53
|
-
margin-top: $tab-margin;
|
54
|
-
position: relative;
|
55
|
-
}
|
56
|
-
|
57
|
-
.nav-tabs {
|
58
|
-
border-bottom: 0;
|
59
|
-
margin-bottom: 0;
|
60
|
-
margin-top: -$tab-margin;
|
61
|
-
padding: 0 5px;
|
62
|
-
}
|
63
|
-
|
64
|
-
.nav-tabs > li > a {
|
65
|
-
border-top: 2px solid transparent;
|
66
|
-
}
|
67
|
-
|
68
|
-
.nav-tabs > li.active > a,
|
69
|
-
.nav-tabs > li.active > a:hover {
|
70
|
-
border-top: 2px solid $tab-active-accent-color;
|
71
|
-
}
|
72
|
-
|
73
|
-
/* The #masthead selector below could (and ideally, should) be removed if we can
|
74
|
-
* replace the "navbar-static-top" class with "navbar-fixed-top" for the Admin UI only
|
75
|
-
*/
|
76
|
-
#masthead {
|
77
|
-
border: 0;
|
78
|
-
left: 0;
|
79
|
-
position: fixed;
|
80
|
-
right: 0;
|
81
|
-
top: 0;
|
82
|
-
|
83
|
-
@media only screen and (max-width : 767px) {
|
84
|
-
position: initial;
|
85
|
-
}
|
86
|
-
}
|
87
|
-
|
88
48
|
/* This is needed in Chrome for the admin/admin_sets edit view AND the collection
|
89
49
|
* sharing edit view to render the participants tab
|
90
50
|
* Without this the contents of that tab flow off the right-hand side of the screen
|
@@ -103,30 +63,30 @@ body.dashboard {
|
|
103
63
|
margin-top: 0;
|
104
64
|
|
105
65
|
h1 {
|
106
|
-
font-size: $font-size
|
107
|
-
margin-left: $padding-
|
108
|
-
margin-top: $padding-
|
66
|
+
font-size: $h2-font-size;
|
67
|
+
margin-left: $table-cell-padding-sm;
|
68
|
+
margin-top: $input-btn-padding-y;
|
109
69
|
|
110
70
|
.fa {
|
111
71
|
color: $gray;
|
112
|
-
margin-right: $padding-
|
72
|
+
margin-right: $table-cell-padding-sm;
|
113
73
|
}
|
114
74
|
}
|
115
75
|
|
116
|
-
|
117
76
|
.btn {
|
118
|
-
margin-bottom: $padding-
|
77
|
+
margin-bottom: $input-btn-padding-y;
|
119
78
|
}
|
120
79
|
}
|
121
80
|
|
122
81
|
// the span selector is required because Blacklight is using it.
|
123
|
-
.list-filters-label,
|
82
|
+
.list-filters-label,
|
83
|
+
span.constraints-label {
|
124
84
|
font-weight: bold;
|
125
85
|
margin-right: 2em;
|
126
86
|
}
|
127
87
|
|
128
88
|
.constraints-container {
|
129
|
-
padding: $
|
89
|
+
padding: $card-spacer-y $card-spacer-x;
|
130
90
|
|
131
91
|
.start-over {
|
132
92
|
padding: 4px 6px;
|
@@ -134,21 +94,21 @@ body.dashboard {
|
|
134
94
|
}
|
135
95
|
|
136
96
|
.table {
|
137
|
-
|
138
|
-
|
97
|
+
.date,
|
98
|
+
.action {
|
139
99
|
width: 13ch;
|
140
100
|
}
|
141
101
|
}
|
142
102
|
|
143
103
|
.list-filters {
|
144
|
-
background-color: $
|
104
|
+
background-color: $card-cap-bg;
|
145
105
|
margin-bottom: 20px;
|
146
|
-
padding: $
|
106
|
+
padding: $card-spacer-y $card-spacer-x;
|
147
107
|
|
148
108
|
.btn-group > .facet-values {
|
149
109
|
display: none;
|
150
110
|
}
|
151
|
-
.btn-group.
|
111
|
+
.btn-group.show > .facet-values.show {
|
152
112
|
display: table;
|
153
113
|
}
|
154
114
|
|
@@ -179,7 +139,7 @@ body.dashboard {
|
|
179
139
|
padding: 0;
|
180
140
|
}
|
181
141
|
|
182
|
-
.user-activity .
|
142
|
+
.user-activity .card-body {
|
183
143
|
overflow: scroll;
|
184
144
|
max-height: 20em;
|
185
145
|
}
|
@@ -206,51 +166,66 @@ body.dashboard {
|
|
206
166
|
margin-bottom: 0;
|
207
167
|
}
|
208
168
|
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
float: left;
|
213
|
-
.modal-header,
|
214
|
-
.modal-footer,
|
215
|
-
.modal-body {
|
216
|
-
float: left;
|
217
|
-
width: 100%;
|
218
|
-
}
|
219
|
-
}
|
169
|
+
.card.labels {
|
170
|
+
border-top: 1px solid $card-border-color;
|
171
|
+
margin-bottom: 0;
|
220
172
|
}
|
221
173
|
|
222
|
-
.
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
.panel-heading,
|
228
|
-
.panel-footer,
|
229
|
-
.panel-body,
|
230
|
-
.list-group-item {
|
231
|
-
float: left;
|
232
|
-
width: 100%;
|
233
|
-
}
|
174
|
+
.spacer {
|
175
|
+
margin-bottom: 5px;
|
176
|
+
}
|
177
|
+
}
|
234
178
|
|
235
|
-
|
236
|
-
|
237
|
-
display: block;
|
238
|
-
font-size: 18px;
|
239
|
-
font-weight: 600;
|
240
|
-
line-height: 30px;
|
179
|
+
.dropdown-item {
|
180
|
+
display: list-item;
|
241
181
|
|
242
|
-
|
243
|
-
|
244
|
-
|
182
|
+
> .facet-values {
|
183
|
+
display: table;
|
184
|
+
table-layout: fixed;
|
185
|
+
|
186
|
+
> .facet-label {
|
187
|
+
display: table-cell;
|
188
|
+
hyphens: auto;
|
189
|
+
text-indent: -0.938rem;
|
190
|
+
}
|
191
|
+
|
192
|
+
> .facet-count {
|
193
|
+
display: table-cell;
|
194
|
+
text-align: right;
|
245
195
|
}
|
246
196
|
}
|
197
|
+
}
|
247
198
|
|
248
|
-
|
249
|
-
|
250
|
-
|
199
|
+
ul#visibility_ssi-dropdown-options {
|
200
|
+
table-layout: fixed;
|
201
|
+
|
202
|
+
> li {
|
203
|
+
display: table-row;
|
204
|
+
|
205
|
+
> .facet-label {
|
206
|
+
display: table-cell;
|
207
|
+
hyphens: auto;
|
208
|
+
}
|
209
|
+
|
210
|
+
> .facet-count {
|
211
|
+
display: table-cell;
|
212
|
+
text-align: right;
|
213
|
+
}
|
251
214
|
}
|
215
|
+
}
|
252
216
|
|
253
|
-
|
254
|
-
|
217
|
+
.card.tabs {
|
218
|
+
background-color: transparent;
|
219
|
+
|
220
|
+
> .card-body {
|
221
|
+
background-color: white;
|
255
222
|
}
|
256
223
|
}
|
224
|
+
|
225
|
+
#form_workflows .card-body .radio label span input {
|
226
|
+
margin-right: 0.5rem;
|
227
|
+
}
|
228
|
+
|
229
|
+
div.main-content.maximized.admin-stats {
|
230
|
+
background-color: white;
|
231
|
+
}
|
@@ -18,28 +18,34 @@ $gutter-width: $grid-gutter-width/2;
|
|
18
18
|
// .sidebar is a class on the div
|
19
19
|
.sidebar {
|
20
20
|
background-color: $admin-sidebar-background-color;
|
21
|
-
|
21
|
+
min-height: 100vh;
|
22
|
+
padding-bottom: 2rem;
|
22
23
|
position: absolute;
|
23
|
-
transition: width .1s;
|
24
|
+
transition: width 0.1s;
|
24
25
|
width: $drawer-small;
|
25
26
|
z-index: 1000;
|
26
|
-
min-height: 600px;
|
27
|
-
min-height: 100vh;
|
28
27
|
|
29
28
|
&.maximized {
|
30
|
-
|
29
|
+
width: $drawer-large;
|
30
|
+
|
31
|
+
.h5,
|
32
|
+
.sidebar-action-text,
|
33
|
+
.profile,
|
34
|
+
.collapse-toggle::after {
|
31
35
|
opacity: 1;
|
32
36
|
}
|
33
|
-
width: $drawer-large;
|
34
37
|
|
35
38
|
.sidebar-toggle {
|
36
39
|
transform: rotate(-180deg);
|
37
40
|
}
|
38
41
|
|
39
42
|
.nav-pills > li {
|
43
|
+
width: 100%;
|
44
|
+
|
40
45
|
a {
|
41
46
|
padding-left: 24px;
|
42
47
|
}
|
48
|
+
|
43
49
|
ul > li a {
|
44
50
|
padding-left: 52px;
|
45
51
|
}
|
@@ -61,6 +67,7 @@ $gutter-width: $grid-gutter-width/2;
|
|
61
67
|
width: 18px;
|
62
68
|
z-index: 1001;
|
63
69
|
}
|
70
|
+
|
64
71
|
a {
|
65
72
|
color: $admin-sidebar-link-color;
|
66
73
|
}
|
@@ -72,6 +79,7 @@ $gutter-width: $grid-gutter-width/2;
|
|
72
79
|
.sidebar-action-text {
|
73
80
|
opacity: 0;
|
74
81
|
}
|
82
|
+
|
75
83
|
.h5 {
|
76
84
|
color: $admin-sidebar-section-heading-color;
|
77
85
|
opacity: 0;
|
@@ -102,29 +110,41 @@ $gutter-width: $grid-gutter-width/2;
|
|
102
110
|
.nav {
|
103
111
|
margin-left: 0;
|
104
112
|
margin-right: 0;
|
113
|
+
|
105
114
|
li {
|
106
|
-
overflow: hidden;
|
107
115
|
white-space: nowrap;
|
116
|
+
|
117
|
+
> a:hover, > a:focus {
|
118
|
+
text-decoration: none;
|
119
|
+
background-color: $admin-sidebar-link-background-color;
|
120
|
+
}
|
108
121
|
}
|
122
|
+
|
109
123
|
li .fa {
|
110
|
-
margin-right: $padding-
|
124
|
+
margin-right: $input-btn-padding-x;
|
111
125
|
}
|
112
126
|
}
|
113
127
|
|
114
|
-
.nav-pills > li
|
115
|
-
|
116
|
-
|
128
|
+
.nav-pills > li {
|
129
|
+
> a {
|
130
|
+
border-radius: 0;
|
131
|
+
}
|
117
132
|
|
118
|
-
|
119
|
-
background-color:
|
120
|
-
|
133
|
+
> a.collapse-toggle.nav-link {
|
134
|
+
background-color: unset;
|
135
|
+
|
136
|
+
&:hover {
|
137
|
+
background-color: $admin-sidebar-link-background-color;
|
138
|
+
}
|
121
139
|
}
|
122
|
-
}
|
123
140
|
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
141
|
+
&.active > a,
|
142
|
+
&.active > a:focus,
|
143
|
+
&.active > a:hover {
|
144
|
+
text-decoration: none;
|
145
|
+
background-color: $admin-sidebar-link-background-color;
|
146
|
+
color: $admin-sidebar-link-hover-color;
|
147
|
+
}
|
128
148
|
}
|
129
149
|
|
130
150
|
// submenu items
|
@@ -12,6 +12,10 @@ module Hyrax
|
|
12
12
|
# This is needed as of BL 3.7
|
13
13
|
copy_blacklight_config_from(::CatalogController)
|
14
14
|
|
15
|
+
before_action do
|
16
|
+
blacklight_config.track_search_session = false
|
17
|
+
end
|
18
|
+
|
15
19
|
class_attribute :presenter_class,
|
16
20
|
:form_class,
|
17
21
|
:single_item_search_builder_class,
|
@@ -32,6 +36,11 @@ module Hyrax
|
|
32
36
|
@curation_concern = @collection # we must populate curation_concern
|
33
37
|
presenter
|
34
38
|
query_collection_members
|
39
|
+
|
40
|
+
respond_to do |format|
|
41
|
+
format.html
|
42
|
+
format.json { render json: @curation_concern }
|
43
|
+
end
|
35
44
|
end
|
36
45
|
|
37
46
|
def collection
|
@@ -41,9 +50,7 @@ module Hyrax
|
|
41
50
|
private
|
42
51
|
|
43
52
|
def presenter
|
44
|
-
@presenter ||=
|
45
|
-
presenter_class.new(curation_concern, current_ability)
|
46
|
-
end
|
53
|
+
@presenter ||= presenter_class.new(curation_concern, current_ability)
|
47
54
|
end
|
48
55
|
|
49
56
|
def curation_concern
|
@@ -11,6 +11,10 @@ module Hyrax
|
|
11
11
|
with_themed_layout :decide_layout
|
12
12
|
copy_blacklight_config_from(::CatalogController)
|
13
13
|
|
14
|
+
before_action do
|
15
|
+
blacklight_config.track_search_session = false
|
16
|
+
end
|
17
|
+
|
14
18
|
class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
|
15
19
|
class_attribute :iiif_manifest_builder, instance_accessor: false
|
16
20
|
self.show_presenter = Hyrax::WorkShowPresenter
|
@@ -245,15 +249,6 @@ module Hyrax
|
|
245
249
|
::Hyrax::ContextualPath.new(presenter, parent_presenter).show
|
246
250
|
end
|
247
251
|
|
248
|
-
# @deprecated
|
249
|
-
def curation_concern_from_search_results
|
250
|
-
Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0. " \
|
251
|
-
"Instead, use '#search_result_document'.")
|
252
|
-
search_params = params.deep_dup
|
253
|
-
search_params.delete :page
|
254
|
-
search_result_document(search_params)
|
255
|
-
end
|
256
|
-
|
257
252
|
##
|
258
253
|
# Only returns unsuppressed documents the user has read access to
|
259
254
|
#
|
@@ -54,7 +54,7 @@ module Hyrax
|
|
54
54
|
obj.attributes = work_params(admin_set_id: obj.admin_set_id).except(*visibility_params)
|
55
55
|
obj.date_modified = Time.current.ctime
|
56
56
|
|
57
|
-
InheritPermissionsJob.perform_now(obj
|
57
|
+
InheritPermissionsJob.perform_now(obj)
|
58
58
|
VisibilityCopyJob.perform_now(obj)
|
59
59
|
|
60
60
|
obj.save
|