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
@@ -8,31 +8,31 @@
|
|
8
8
|
<div class="col-sm-12">
|
9
9
|
<div class="work-reports">
|
10
10
|
|
11
|
-
<div class="
|
12
|
-
<% if Hyrax.config.analytics?
|
11
|
+
<div class="card">
|
12
|
+
<% if Hyrax.config.analytics? %>
|
13
13
|
<% if current_user.ability.admin? %>
|
14
|
-
<div class="
|
14
|
+
<div class="card-header"><b><%= @works_count %> <%= t('.works') %></b> <%= t('.repo_summary') %> <b><%= @pageviews.all if @pageviews %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all if @downloads %> <%= t('.downloads') %></b>.</div>
|
15
15
|
<% else %>
|
16
|
-
<div class="
|
16
|
+
<div class="card-header"><%= t('.access_to') %> <b><%= @works_count %> <%= t('.works') %></b>.</div>
|
17
17
|
<% end %>
|
18
|
-
<div class="
|
18
|
+
<div class="card-body">
|
19
19
|
<% if current_user.ability.admin? %>
|
20
20
|
<div class="row text-center">
|
21
21
|
<div class="nav nav-pills btn-group" role="group">
|
22
22
|
<% if params[:start_date] %>
|
23
|
-
<a button id='summary-btn' class="btn btn-
|
23
|
+
<a button id='summary-btn' class="btn btn-secondary nav-link" type="button" href="#summary" data-toggle="pill">
|
24
24
|
<% else %>
|
25
25
|
<a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
|
26
26
|
<% end %>
|
27
27
|
<%= t('.summary') %>
|
28
28
|
</a>
|
29
|
-
<a button id='monthly-btn' class="btn btn-
|
29
|
+
<a button id='monthly-btn' class="btn btn-secondary nav-link" type="button" href="#monthly" data-toggle="pill">
|
30
30
|
<%= t('.monthly') %>
|
31
31
|
</a>
|
32
32
|
<% if params[:start_date] %>
|
33
33
|
<a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
|
34
34
|
<% else %>
|
35
|
-
<a button id='range-btn' class="btn btn-
|
35
|
+
<a button id='range-btn' class="btn btn-secondary nav-link" type="button" href="#custom-range" data-toggle="pill">
|
36
36
|
<% end %>
|
37
37
|
<%= t('.custom_range') %>
|
38
38
|
</a>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
<% provide :page_header do %>
|
4
4
|
<h1><span class="fa fa-bar-chart" aria-hidden="true"></span> <%= t('.title') %>
|
5
|
-
<%= link_to "#{t('.return_to_btn')}", admin_analytics_work_reports_path, class: "btn btn-primary
|
5
|
+
<%= link_to "#{t('.return_to_btn')}", admin_analytics_work_reports_path, class: "btn btn-primary float-right" %>
|
6
6
|
</h1>
|
7
7
|
<br>
|
8
8
|
<% end %>
|
@@ -11,23 +11,23 @@
|
|
11
11
|
<div class="col-sm-12">
|
12
12
|
<div class="work-reports">
|
13
13
|
|
14
|
-
<div class="
|
15
|
-
<div class="
|
14
|
+
<div class="card">
|
15
|
+
<div class="card-header">
|
16
16
|
<div class="col-sm-10">
|
17
17
|
<h3><%= @document %></h3>
|
18
18
|
</div>
|
19
19
|
<div class="col-sm-2">
|
20
|
-
<%= link_to "#{t('.view_work_btn')}", [main_app, @document], class: "btn btn-
|
20
|
+
<%= link_to "#{t('.view_work_btn')}", [main_app, @document], class: "btn btn-secondary float-right" %>
|
21
21
|
</div>
|
22
22
|
</div>
|
23
|
-
<div class="
|
23
|
+
<div class="card-body">
|
24
24
|
<div class="row">
|
25
|
-
<div class="col-
|
25
|
+
<div class="col-12 col-md-5">
|
26
26
|
<p><%= t('.deposited_by') %> <b><%= @document.depositor %></b> on <b><%= @document.date_uploaded.strftime("%Y-%m-%d") %></b></p>
|
27
27
|
<p><%= t('.work_type') %> <b><%= @document.human_readable_type %></b></p>
|
28
28
|
<p><%= t('.resource_type') %> <b><%= @document.resource_type.join(", ") %></b></p>
|
29
29
|
</div>
|
30
|
-
<div class="col-
|
30
|
+
<div class="col-12 col-md-5">
|
31
31
|
<p><%= t('.status') %> <b><%= @document.workflow_state %></b></p>
|
32
32
|
<p><%= t('.visibility') %> <b><%= @document.visibility %></b></p>
|
33
33
|
</div>
|
@@ -38,19 +38,19 @@
|
|
38
38
|
<div class="row text-center">
|
39
39
|
<div class="nav nav-pills btn-group" role="group">
|
40
40
|
<% if params[:start_date] %>
|
41
|
-
<a button id='summary-btn' class="btn btn-
|
41
|
+
<a button id='summary-btn' class="btn btn-secondary nav-link" type="button" href="#summary" data-toggle="pill">
|
42
42
|
<% else %>
|
43
43
|
<a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
|
44
44
|
<% end %>
|
45
45
|
<%= t('.summary') %>
|
46
46
|
</a>
|
47
|
-
<a button id='monthly-btn' class="btn btn-
|
47
|
+
<a button id='monthly-btn' class="btn btn-secondary nav-link" type="button" href="#monthly" data-toggle="pill">
|
48
48
|
<%= t('.monthly') %>
|
49
49
|
</a>
|
50
50
|
<% if params[:start_date] %>
|
51
51
|
<a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
|
52
52
|
<% else %>
|
53
|
-
<a button id='range-btn' class="btn btn-
|
53
|
+
<a button id='range-btn' class="btn btn-secondary nav-link" type="button" href="#custom-range" data-toggle="pill">
|
54
54
|
<% end %>
|
55
55
|
<%= t('.custom_range') %>
|
56
56
|
</a>
|
@@ -2,8 +2,8 @@
|
|
2
2
|
<h1><span class="fa fa-paint-brush" aria-hidden="true"></span> <%= t('.header') %></h1>
|
3
3
|
<% end %>
|
4
4
|
|
5
|
-
<div class="
|
6
|
-
<div class="
|
5
|
+
<div class="card">
|
6
|
+
<div class="card-body">
|
7
7
|
<%= simple_form_for @form, url: admin_appearance_path do |f| %>
|
8
8
|
<%= f.input :header_background_color, required: false, input_html: { type: 'color' } %>
|
9
9
|
<%= f.input :header_text_color, required: false, input_html: { type: 'color' } %>
|
@@ -1,18 +1,18 @@
|
|
1
1
|
<%= render "shared/nav_safety_modal" %>
|
2
|
-
<div class="
|
2
|
+
<div class="card tabs" id="collection-types-controls">
|
3
3
|
<ul class="nav nav-tabs" role="tablist">
|
4
|
-
<li class="
|
5
|
-
<a href="#metadata" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.metadata') %></a>
|
4
|
+
<li class="nav-item">
|
5
|
+
<a href="#metadata" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.metadata') %></a>
|
6
6
|
</li>
|
7
7
|
<% if @form.persisted? %>
|
8
|
-
<li>
|
9
|
-
<a href="#settings" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.settings') %></a>
|
8
|
+
<li class="nav-item">
|
9
|
+
<a href="#settings" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.settings') %></a>
|
10
10
|
</li>
|
11
|
-
<li>
|
12
|
-
<a href="#participants" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.participants') %></a>
|
11
|
+
<li class="nav-item">
|
12
|
+
<a href="#participants" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.participants') %></a>
|
13
13
|
</li>
|
14
|
-
<li>
|
15
|
-
<a href="#appearance" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.appearance') %></a>
|
14
|
+
<li class="nav-item">
|
15
|
+
<a href="#appearance" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.appearance') %></a>
|
16
16
|
</li>
|
17
17
|
<% end %>
|
18
18
|
</ul>
|
@@ -20,25 +20,25 @@
|
|
20
20
|
<%= simple_form_for @form, url: form_url, as: :collection_type, html: {class: 'nav-safety'} do |f| %>
|
21
21
|
<div class="tab-content">
|
22
22
|
<% if @collection_type.admin_set? %>
|
23
|
-
<div id="metadata" class="tab-pane active">
|
24
|
-
<div class="
|
25
|
-
<div class="
|
23
|
+
<div id="metadata" class="tab-pane show active">
|
24
|
+
<div class="card labels">
|
25
|
+
<div class="card-body">
|
26
26
|
<%= render 'form_metadata_admin_set', f: f %>
|
27
27
|
</div>
|
28
28
|
</div>
|
29
29
|
</div>
|
30
30
|
<% else %>
|
31
|
-
<div id="metadata" class="tab-pane active">
|
32
|
-
<div class="
|
33
|
-
<div class="
|
31
|
+
<div id="metadata" class="tab-pane show active">
|
32
|
+
<div class="card labels">
|
33
|
+
<div class="card-body">
|
34
34
|
<%= render 'form_metadata', f: f %>
|
35
35
|
</div>
|
36
36
|
</div>
|
37
37
|
</div>
|
38
38
|
<% end %>
|
39
39
|
<div id="settings" class="tab-pane">
|
40
|
-
<div class="
|
41
|
-
<div class="
|
40
|
+
<div class="card labels">
|
41
|
+
<div class="card-body">
|
42
42
|
<%= render 'form_settings', f: f %>
|
43
43
|
</div>
|
44
44
|
</div>
|
@@ -46,24 +46,25 @@
|
|
46
46
|
<% # end of form %>
|
47
47
|
<% # TODO: The participants partial can't sit inside the other form, moved down here temporarily %>
|
48
48
|
<div id="participants" class="tab-pane">
|
49
|
-
<div class="
|
50
|
-
<div class="
|
49
|
+
<div class="card labels collection-types-edit-participants-tab">
|
50
|
+
<div class="card-body">
|
51
51
|
<%= render 'form_participants' %>
|
52
52
|
</div>
|
53
53
|
</div>
|
54
54
|
</div>
|
55
55
|
<div id="appearance" class="tab-pane">
|
56
|
-
<div class="
|
57
|
-
<div class="
|
56
|
+
<div class="card labels">
|
57
|
+
<div class="card-body">
|
58
58
|
<%= render 'form_appearance', f: f %>
|
59
59
|
</div>
|
60
60
|
</div>
|
61
61
|
</div>
|
62
|
-
<div class="
|
62
|
+
<div class="card-footer">
|
63
63
|
<% if params[:action] == "new" %>
|
64
64
|
<%= f.submit t(:'hyrax.admin.collection_types.new.submit'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection_type" %>
|
65
65
|
<% else %>
|
66
|
-
<%= f.submit t(:'hyrax.admin.collection_types.edit.submit'),
|
66
|
+
<%= f.submit t(:'hyrax.admin.collection_types.edit.submit'),
|
67
|
+
class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection_type", form: 'edit_collection_type' %>
|
67
68
|
<% end %>
|
68
69
|
<%= link_to t(:'helpers.action.cancel'), hyrax.admin_collection_types_path, class: 'btn btn-link' %>
|
69
70
|
</div>
|
@@ -11,9 +11,9 @@
|
|
11
11
|
html: { id: 'group-participants-form' },
|
12
12
|
as: :collection_type_participant do |f| %>
|
13
13
|
<div class="form-inline add-participants-form">
|
14
|
-
<label class="col-md-2 col-
|
14
|
+
<label class="col-md-2 col-4 col-form-label"><%= t('.add_group') %>:</label>
|
15
15
|
|
16
|
-
<div class="col-md-10 col-
|
16
|
+
<div class="col-md-10 col-8 form-group">
|
17
17
|
<%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
|
18
18
|
<%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::GROUP_TYPE %>
|
19
19
|
<%= f.text_field :agent_id,
|
@@ -38,9 +38,9 @@
|
|
38
38
|
html: { id: 'user-participants-form' },
|
39
39
|
as: :collection_type_participant do |f| %>
|
40
40
|
<div class="form-inline add-participants-form">
|
41
|
-
<label class="col-md-2 col-
|
41
|
+
<label class="col-md-2 col-4 col-form-label"><%= t('.add_user') %>:</label>
|
42
42
|
|
43
|
-
<div class="col-md-10 col-
|
43
|
+
<div class="col-md-10 col-8 form-group">
|
44
44
|
<%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
|
45
45
|
<%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::USER_TYPE %>
|
46
46
|
<%= f.text_field :agent_id,
|
@@ -12,25 +12,25 @@
|
|
12
12
|
<div class="collection-type-share-applies-to">
|
13
13
|
<div id="sharable-applies-to-new-works-setting-checkbox-container"
|
14
14
|
class="form-group boolean optional collection_type_share_applies_to_new_works <%= 'disabled' if f.object.share_options_disabled? %>">
|
15
|
-
<div class="
|
15
|
+
<div class="form-check">
|
16
16
|
<input value="0"
|
17
17
|
name="collection_type[share_applies_to_new_works]"
|
18
18
|
type="hidden"
|
19
19
|
<%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %> />
|
20
|
+
<input id="collection_type_share_applies_to_new_works" <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %>
|
21
|
+
class="form-check-input boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
|
22
|
+
value="1"
|
23
|
+
<%= "checked=\"checked\"".html_safe if f.object.share_applies_to_new_works %>"
|
24
|
+
name="collection_type[share_applies_to_new_works]"
|
25
|
+
type="checkbox" />
|
20
26
|
<label id="sharable-applies-to-new-works-setting-label"
|
21
|
-
class="boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
|
27
|
+
class="form-check-label boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
|
22
28
|
for="collection_type_share_applies_to_new_works">
|
23
|
-
<input id="collection_type_share_applies_to_new_works" <%= "disabled=\"disabled\"".html_safe if f.object.share_options_disabled? %>
|
24
|
-
class="boolean optional <%= 'disabled' if f.object.share_options_disabled? %>"
|
25
|
-
value="1"
|
26
|
-
<%= "checked=\"checked\"".html_safe if f.object.share_applies_to_new_works %>"
|
27
|
-
name="collection_type[share_applies_to_new_works]"
|
28
|
-
type="checkbox" />
|
29
29
|
APPLY TO NEW WORKS
|
30
30
|
</label>
|
31
31
|
</div>
|
32
|
-
<p class="help-block"><%= t('simple_form.hints.collection_type.share_applies_to_new_works') %></p>
|
33
32
|
</div>
|
33
|
+
<p class="form-text"><%= t('simple_form.hints.collection_type.share_applies_to_new_works') %></p>
|
34
34
|
</div>
|
35
35
|
<p><%= f.input :allow_multiple_membership, as: :boolean, disabled: f.object.all_settings_disabled? %></p>
|
36
36
|
<p><%= f.input :require_membership, as: :boolean, disabled: true %></p>
|
@@ -4,16 +4,16 @@
|
|
4
4
|
<h1><span class="fa fa-folder-open" aria-hidden="true"></span> <%= t('.header') %></h1>
|
5
5
|
<% end %>
|
6
6
|
|
7
|
-
<div class="
|
8
|
-
<div class="
|
9
|
-
<span class="
|
7
|
+
<div class="card">
|
8
|
+
<div class="card-header adam">
|
9
|
+
<span class="card-header-message">
|
10
10
|
<strong><%= pluralize(@collection_types.size, 'collection type') %> </strong> in this repository
|
11
11
|
</span>
|
12
12
|
<%= link_to hyrax.new_admin_collection_type_path, class: 'btn btn-primary' do %>
|
13
13
|
<%= t('.create_new_button') %>
|
14
14
|
<% end %>
|
15
15
|
</div>
|
16
|
-
<div class="
|
16
|
+
<div class="card-body">
|
17
17
|
<p><%= t('.description') %></p>
|
18
18
|
|
19
19
|
<p><a class="collapse-header" data-toggle="collapse" href="#collapseAbout" aria-expanded="false" aria-controls="collapseAbout" data-expand-text="<%= t('helpers.action.more')%>" data-collapse-text="<%= t('helpers.action.less')%>"><%= t('.more_toggle_header_html') %></a></p>
|
@@ -62,7 +62,7 @@
|
|
62
62
|
<%= t('.modal.can_delete_body_html') %>
|
63
63
|
</div>
|
64
64
|
<div class="modal-footer">
|
65
|
-
<button type="button" class="btn btn-
|
65
|
+
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
|
66
66
|
<button type="button" class="btn btn-danger confirm-delete-collection-type"><%= t('helpers.action.delete') %></button>
|
67
67
|
</div>
|
68
68
|
</div>
|
@@ -78,7 +78,7 @@
|
|
78
78
|
<%= t('.modal.cannot_delete_body_html') %>
|
79
79
|
</div>
|
80
80
|
<div class="modal-footer">
|
81
|
-
<button type="button" class="btn btn-
|
81
|
+
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
|
82
82
|
<%= link_to t('.modal.view_collections'), hyrax.my_collections_path, class: 'btn btn-primary view-collections-of-this-type', data_dismiss: 'modal' %>
|
83
83
|
</div>
|
84
84
|
</div>
|
@@ -3,8 +3,8 @@
|
|
3
3
|
<% end %>
|
4
4
|
<div class="flip row">
|
5
5
|
<div class="col-md-12">
|
6
|
-
<div class="
|
7
|
-
<div class="
|
6
|
+
<div class="card">
|
7
|
+
<div class="card-body">
|
8
8
|
<div class="table-responsive">
|
9
9
|
<table class="table table-striped">
|
10
10
|
<thead>
|
@@ -30,7 +30,7 @@
|
|
30
30
|
<% features.each do |feature| %>
|
31
31
|
<tr data-feature="<%= feature.name.dasherize.parameterize %>">
|
32
32
|
<td class="status">
|
33
|
-
<span class="
|
33
|
+
<span class="badge badge-<%= @feature_set.status(feature) -%>"><%= @feature_set.status(feature) -%></span>
|
34
34
|
</td>
|
35
35
|
<td class="name"><%= feature.name.humanize -%></td>
|
36
36
|
<td class="description"><%= feature.description -%></td>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<h3>Newest Users (<%= @presenter.date_filter_string %>)</h3>
|
2
2
|
<h4>
|
3
3
|
<%- if !@presenter.start_date.blank? %>
|
4
|
-
Total: <%= @presenter.recent_users.count
|
4
|
+
Total: <%= @presenter.recent_users.count %>
|
5
5
|
<%- else %>
|
6
6
|
<%= @presenter.recent_users.count %> most recent users:
|
7
7
|
<%- end %>
|
@@ -2,12 +2,12 @@
|
|
2
2
|
<h1><span class="fa fa-user" aria-hidden="true"></span> <%= t('hyrax.admin.users.index.title') %></h1>
|
3
3
|
<% end %>
|
4
4
|
|
5
|
-
<div class="
|
6
|
-
<div class="
|
5
|
+
<div class="card users-listing">
|
6
|
+
<div class="card-header">
|
7
7
|
<%= t('hyrax.admin.users.index.describe_users_html', count: @presenter.user_count) %>
|
8
8
|
</div>
|
9
9
|
|
10
|
-
<div class="
|
10
|
+
<div class="card-body">
|
11
11
|
<div class="table-responsive">
|
12
12
|
<table class="table table-striped datatable">
|
13
13
|
<thead>
|
@@ -4,11 +4,11 @@
|
|
4
4
|
|
5
5
|
<div class="row">
|
6
6
|
<div class="col-md-12">
|
7
|
-
<div class="
|
8
|
-
<div class="
|
9
|
-
<h2 class="
|
7
|
+
<div class="card">
|
8
|
+
<div class="card-header">
|
9
|
+
<h2 class="card-title h2"><%= t('.new_role') %></h2>
|
10
10
|
</div>
|
11
|
-
<div class="
|
11
|
+
<div class="card-body">
|
12
12
|
<%= simple_form_for Hyrax::Forms::WorkflowResponsibilityForm.new, url: hyrax.admin_workflow_roles_path do |f| %>
|
13
13
|
<%= f.input :user_id, as: :select, collection: f.object.user_options %>
|
14
14
|
<%= f.input :workflow_role_id, as: :select, collection: f.object.workflow_role_options %>
|
@@ -21,11 +21,11 @@
|
|
21
21
|
|
22
22
|
<div class="row">
|
23
23
|
<div class="col-md-12">
|
24
|
-
<div class="
|
25
|
-
<div class="
|
26
|
-
<h2 class="
|
24
|
+
<div class="card">
|
25
|
+
<div class="card-header">
|
26
|
+
<h2 class="card-title h2"><%= t('.current_roles') %></h3>
|
27
27
|
</div>
|
28
|
-
<div class="
|
28
|
+
<div class="card-body">
|
29
29
|
<table class="table table-striped datatable">
|
30
30
|
<thead>
|
31
31
|
<th><%= t('.header.name') %></th>
|
@@ -1,66 +1,91 @@
|
|
1
1
|
<% provide :page_header do %>
|
2
|
-
<h1><span class="
|
2
|
+
<h1><span class="fa fa-check-circle"></span> <%= t('.header') %></h1>
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<div class="row">
|
6
6
|
<div class="col-md-12">
|
7
|
-
<div class="
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
7
|
+
<div class="card tabs">
|
8
|
+
<ul class="nav nav-tabs" role="tablist">
|
9
|
+
<li class="nav-item">
|
10
|
+
<a class="nav-link active" href="#under-review" role="tab" data-toggle="tab"><%= t('.tabs.under_review') %></a>
|
11
|
+
</li>
|
12
|
+
<li class="nav-item">
|
13
|
+
<a class="nav-link" href="#published" role="tab" data-toggle="tab"><%= t('.tabs.published') %></a>
|
14
|
+
</li>
|
15
|
+
</ul>
|
16
|
+
<div class="tab-content">
|
17
|
+
<div id="under-review" class="tab-pane show active">
|
18
|
+
<div class="card labels">
|
19
|
+
<div class="card-body">
|
20
|
+
<div class="table-responsive">
|
21
|
+
<table class="table table-sm table-striped datatable">
|
22
|
+
<thead>
|
23
|
+
<tr>
|
24
|
+
<th width="40%">Work</th>
|
25
|
+
<th width="20%">Depositor</th>
|
26
|
+
<th width="20%">Submission Date</th>
|
27
|
+
<th width="20%">Status</th>
|
28
|
+
</tr>
|
29
|
+
</thead>
|
30
|
+
<tbody>
|
31
|
+
<% @status_list.each do |document| %>
|
32
|
+
<tr>
|
33
|
+
<td>
|
34
|
+
<%= link_to document, [main_app, document] %>
|
35
|
+
</td>
|
36
|
+
<td>
|
37
|
+
<%= safe_join(document.creator, tag(:br)) %>
|
38
|
+
</td>
|
39
|
+
<td>
|
40
|
+
<%= document.date_modified %>
|
41
|
+
</td>
|
42
|
+
<td>
|
43
|
+
<span class="state state-pending"><%= document.workflow_state %></span>
|
44
|
+
</td>
|
45
|
+
</tr>
|
46
|
+
<% end %>
|
47
|
+
</tbody>
|
48
|
+
</table>
|
49
|
+
</div>
|
50
|
+
</div>
|
51
|
+
</div>
|
52
|
+
</div>
|
53
|
+
<div id="published" class="tab-pane">
|
54
|
+
<div class="card labels">
|
55
|
+
<div class="card-body">
|
56
|
+
<div class="table-responsive">
|
57
|
+
<table class="table table-sm table-striped datatable">
|
58
|
+
<thead>
|
59
|
+
<tr>
|
60
|
+
<th width="40%">Work</th>
|
61
|
+
<th width="20%">Depositor</th>
|
62
|
+
<th width="20%">Submission Date</th>
|
63
|
+
<th width="20%">Status</th>
|
64
|
+
</tr>
|
65
|
+
</thead>
|
66
|
+
<tbody>
|
67
|
+
<% @published_list.each do |document| %>
|
68
|
+
<tr>
|
69
|
+
<td>
|
70
|
+
<%= link_to document, [main_app, document] %>
|
71
|
+
</td>
|
72
|
+
<td>
|
73
|
+
<%= safe_join(document.creator, tag(:br)) %>
|
74
|
+
</td>
|
75
|
+
<td>
|
76
|
+
<%= document.date_modified %>
|
77
|
+
</td>
|
78
|
+
<td>
|
79
|
+
<span class="state state-pending"><%= document.workflow_state %></span>
|
80
|
+
</td>
|
81
|
+
</tr>
|
82
|
+
<% end %>
|
83
|
+
</tbody>
|
84
|
+
</table>
|
85
|
+
</div>
|
31
86
|
</div>
|
32
87
|
</div>
|
33
88
|
</div>
|
34
|
-
<h2 class="sr-only"><%= t('.works_listing') %></h2>
|
35
|
-
<table class="table table-sm table-striped works-list">
|
36
|
-
<thead>
|
37
|
-
<tr>
|
38
|
-
<th width="40%"><%= t(".heading.work") %></th>
|
39
|
-
<th width="20%"><%= t(".heading.depositor") %></th>
|
40
|
-
<th width="20%"><%= t(".heading.submission_date") %></th>
|
41
|
-
<th width="20%"><%= t(".heading.status") %></th>
|
42
|
-
</tr>
|
43
|
-
</thead>
|
44
|
-
<tbody>
|
45
|
-
<% @response.docs.each do |document| %>
|
46
|
-
<tr>
|
47
|
-
<td>
|
48
|
-
<%= link_to document, [main_app, document] %>
|
49
|
-
</td>
|
50
|
-
<td>
|
51
|
-
<%= safe_join(document.creator, tag(:br)) %>
|
52
|
-
</td>
|
53
|
-
<td>
|
54
|
-
<%= document.date_modified %>
|
55
|
-
</td>
|
56
|
-
<td>
|
57
|
-
<span class="state state-pending"><%= document.workflow_state %></span>
|
58
|
-
</td>
|
59
|
-
</tr>
|
60
|
-
<% end %>
|
61
|
-
</tbody>
|
62
|
-
</table>
|
63
|
-
<%= render 'hyrax/my/results_pagination' %>
|
64
89
|
</div>
|
65
90
|
</div>
|
66
91
|
</div>
|
@@ -1,15 +1,15 @@
|
|
1
1
|
<div class="citations">
|
2
2
|
<% if Hyrax.config.citations? %>
|
3
|
-
<%= link_to t(".citations"), hyrax.citations_work_path(presenter), id: 'citations', class: 'btn btn-
|
3
|
+
<%= link_to t(".citations"), hyrax.citations_work_path(presenter), id: 'citations', class: 'btn btn-secondary btn-sm mr-2' %>
|
4
4
|
<% end %>
|
5
5
|
<div class="btn-group">
|
6
|
-
<button type="button" class="btn btn-
|
7
|
-
<%= t('.header') %>
|
6
|
+
<button type="button" class="btn btn-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
7
|
+
<%= t('.header') %>
|
8
8
|
</button>
|
9
9
|
<ul class="dropdown-menu">
|
10
|
-
<li><%= link_to t('.endnote'), polymorphic_path([main_app, presenter], format: 'endnote') %></li>
|
11
|
-
<li><%= link_to t('.zotero'), hyrax.zotero_path, id: 'zoteroLink', name: 'zotero' %></li>
|
12
|
-
<li><%= link_to t('.mendeley'), hyrax.mendeley_path, id: 'mendeleyLink', name: 'mendeley' %></li>
|
10
|
+
<li class="dropdown-item"><%= link_to t('.endnote'), polymorphic_path([main_app, presenter], format: 'endnote') %></li>
|
11
|
+
<li class="dropdown-item"><%= link_to t('.zotero'), hyrax.zotero_path, id: 'zoteroLink', name: 'zotero' %></li>
|
12
|
+
<li class="dropdown-item"><%= link_to t('.mendeley'), hyrax.mendeley_path, id: 'mendeleyLink', name: 'mendeley' %></li>
|
13
13
|
</ul>
|
14
14
|
</div>
|
15
15
|
</div>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<% permission_service = Hyrax::EditPermissionsService.build_service_object_from(form: f, ability: current_ability) %>
|
2
2
|
|
3
|
-
<h2><%= t('.currently_sharing') %></h2>
|
3
|
+
<h2 class="h3 mt-4"><%= t('.currently_sharing') %></h2>
|
4
4
|
|
5
5
|
<table class="table table-bordered">
|
6
6
|
<tr>
|
@@ -9,7 +9,7 @@
|
|
9
9
|
</tr>
|
10
10
|
<tr id="file_permissions">
|
11
11
|
<td>
|
12
|
-
<%= label_tag :owner_access, class: "
|
12
|
+
<%= label_tag :owner_access, class: "col-form-label" do %>
|
13
13
|
Depositor (<span id="file_owner" data-depositor="<%= permission_service.depositor %>"><%= link_to_profile permission_service.depositor %></span>)
|
14
14
|
<% end %>
|
15
15
|
</td>
|
@@ -23,7 +23,7 @@
|
|
23
23
|
<% permission_service.with_applicable_permission(permission_hash: permission_fields.object.to_hash) do |permission| %>
|
24
24
|
<tr>
|
25
25
|
<td>
|
26
|
-
<%= permission_fields.label :agent_name, class: "
|
26
|
+
<%= permission_fields.label :agent_name, class: "col-form-label" do %>
|
27
27
|
<%= user_display_name_and_key(permission.name) %>
|
28
28
|
<%= permission.granted_by_html_hint %>
|
29
29
|
<% end %>
|