hyrax 3.5.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/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/.regen +2 -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/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/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/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/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/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 +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 +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 +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 +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 +10 -10
- 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 +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 +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/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 -7
- 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 +12 -23
- 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/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 +93 -209
- 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/file_set_file_service.rb +0 -55
- data/app/services/hyrax/work_resource_query_service.rb +0 -45
- data/config/metadata/file_set_metadata.yaml +0 -130
- data/lib/hyrax/transactions/create_work.rb +0 -65
- data/lib/hyrax/transactions/destroy_work.rb +0 -28
- data/lib/hyrax/transactions/steps/apply_collection_permission_template.rb +0 -34
- data/lib/hyrax/transactions/steps/apply_permission_template.rb +0 -32
- data/lib/hyrax/transactions/steps/apply_visibility.rb +0 -41
- data/lib/hyrax/transactions/steps/destroy_work.rb +0 -27
- data/lib/hyrax/transactions/steps/ensure_permission_template.rb +0 -29
- data/lib/hyrax/transactions/steps/save_work.rb +0 -38
- data/lib/hyrax/transactions/update_work.rb +0 -19
- data/lib/wings/services/file_converter_service.rb +0 -19
- data/lib/wings/services/file_metadata_builder.rb +0 -94
- data/vendor/assets/javascripts/handlebars-v4.0.5.js +0 -4612
- data/vendor/assets/stylesheets/morris.js/0.5.1/morris.css +0 -2
@@ -1,7 +1,7 @@
|
|
1
1
|
<!-- The template to display files available for upload -->
|
2
2
|
<script id="template-upload" type="text/x-tmpl">
|
3
3
|
{% for (var i=0, file; file=o.files[i]; i++) { %}
|
4
|
-
<tr class="template-upload fade">
|
4
|
+
<tr class="template-upload fade show">
|
5
5
|
<td>
|
6
6
|
<span class="preview"></span>
|
7
7
|
</td>
|
@@ -46,13 +46,13 @@
|
|
46
46
|
<input type="hidden" name="banner_files[]" value="{%=file.id%}">
|
47
47
|
</span>
|
48
48
|
{% if (file.error) { %}
|
49
|
-
<span><span class="
|
49
|
+
<span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
|
50
50
|
{% } %}
|
51
51
|
</div>
|
52
52
|
|
53
53
|
<div class="col-sm-2">
|
54
54
|
<button class="btn btn-link remove branding-banner-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}" onclick=$("#banner").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
55
|
-
<span class="
|
55
|
+
<span class="fa fa-times"></span>
|
56
56
|
<span class="controls-remove-text"><%= t('.remove') %></span>
|
57
57
|
<span class="sr-only">
|
58
58
|
<%= t('.previous') %>
|
@@ -88,7 +88,7 @@
|
|
88
88
|
</span>
|
89
89
|
|
90
90
|
{% if (file.error) { %}
|
91
|
-
<span><span class="
|
91
|
+
<span><span class="badge badge-danger">Error</span> {%=file.error%}</span>
|
92
92
|
{% } %}
|
93
93
|
</div>
|
94
94
|
|
@@ -104,7 +104,7 @@
|
|
104
104
|
<div class="col-sm-2 text-right">
|
105
105
|
<span class="input-group-btn field-controls">
|
106
106
|
<button class="btn btn-sm btn-danger delete branding-logo-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
107
|
-
<span class="
|
107
|
+
<span class="fa fa-times"></span>
|
108
108
|
<span class="controls-remove-text">Remove</span>
|
109
109
|
<span class="sr-only">
|
110
110
|
<%= t('.previous') %>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<!-- The template to display files available for upload -->
|
2
|
-
<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
|
2
|
+
<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
|
3
3
|
<script id="versioning-template-upload" type="text/x-tmpl">
|
4
4
|
{% for (var i=0, file; file=o.files[i]; i++) { %}
|
5
5
|
<tr class="template-upload <%= fade_class_if_not_test %>">
|
@@ -12,24 +12,24 @@
|
|
12
12
|
</td>
|
13
13
|
<td>
|
14
14
|
<p class="size">Processing...</p>
|
15
|
-
<div class="progress
|
15
|
+
<div class="progress"
|
16
16
|
role="progressbar"
|
17
17
|
aria-valuemin="0"
|
18
18
|
aria-valuemax="100"
|
19
19
|
aria-valuenow="0">
|
20
|
-
<div class="progress-bar progress-bar-success" style="width:0%;"></div>
|
20
|
+
<div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
|
21
21
|
</div>
|
22
22
|
</td>
|
23
23
|
<td class="text-right">
|
24
24
|
{% if (!i && !o.options.autoUpload) { %}
|
25
25
|
<button class="btn btn-primary start" disabled>
|
26
|
-
<span class="
|
26
|
+
<span class="fa fa-upload"></span>
|
27
27
|
<span><%= t('.start') %></span>
|
28
28
|
</button>
|
29
29
|
{% } %}
|
30
30
|
{% if (!i) { %}
|
31
31
|
<button class="btn btn-sm btn-warning cancel">
|
32
|
-
<span class="
|
32
|
+
<span class="fa fa-ban"></span>
|
33
33
|
<span><%= t('helpers.action.cancel') %></span>
|
34
34
|
</button>
|
35
35
|
{% } %}
|
@@ -69,26 +69,26 @@
|
|
69
69
|
</div>
|
70
70
|
<div class="col-sm-6">
|
71
71
|
{% if (file.error) { %}
|
72
|
-
<div><span class="
|
72
|
+
<div><span class="badge badge-danger">Error</span> {%=file.error%}</div>
|
73
73
|
{% } %}
|
74
74
|
<span class="size">{%=o.formatFileSize(file.size)%}</span>
|
75
|
-
<button class="btn btn-sm btn-danger delete
|
75
|
+
<button class="btn btn-sm btn-danger delete float-right"
|
76
76
|
data-type="{%=file.deleteType%}"
|
77
77
|
data-url="{%=file.deleteUrl%}"
|
78
78
|
{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
79
|
-
<span class="
|
79
|
+
<span class="fa fa-trash"></span>
|
80
80
|
<span><%= t('helpers.action.delete') %></span>
|
81
81
|
</button>
|
82
82
|
</div>
|
83
83
|
</div>
|
84
84
|
<div class="row">
|
85
|
-
<div class="col-sm-12
|
86
|
-
<div class="form-group">
|
87
|
-
<label for="title_{%=file.id%}" class="col-sm-5
|
85
|
+
<div class="col-sm-12">
|
86
|
+
<div class="form-group row">
|
87
|
+
<label for="title_{%=file.id%}" class="col-sm-5 col-form-label"><%= t('.display_label') %></label>
|
88
88
|
<div class="col-sm-7 padding-bottom">
|
89
89
|
<input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
|
90
90
|
</div>
|
91
|
-
<label for="resource_type_{%=file.id%}" class="col-sm-5
|
91
|
+
<label for="resource_type_{%=file.id%}" class="col-sm-5 col-form-label">Resource Type</label>
|
92
92
|
<div class="col-sm-7 padding-bottom">
|
93
93
|
<select class="form-control resource_type_dropdown"
|
94
94
|
multiple="multiple"
|
@@ -98,7 +98,7 @@
|
|
98
98
|
value="{%=file.name%}">
|
99
99
|
<%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
|
100
100
|
</select>
|
101
|
-
<button class="btn btn-
|
101
|
+
<button class="btn btn-secondary float-right resource_type_button"
|
102
102
|
onClick="setAllResourceTypesVersioning({%= file.id %}); return false;">
|
103
103
|
<%= t('.set_all_to_this_resource_type') %>
|
104
104
|
</button>
|
@@ -125,7 +125,7 @@
|
|
125
125
|
<input type="hidden" name="files_files[]" value="{%=file.id%}">
|
126
126
|
</span>
|
127
127
|
{% if (file.error) { %}
|
128
|
-
<span><span class="
|
128
|
+
<span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
|
129
129
|
{% } %}
|
130
130
|
</div>
|
131
131
|
|
@@ -134,7 +134,7 @@
|
|
134
134
|
data-type="{%=file.deleteType%}"
|
135
135
|
data-url="{%=file.deleteUrl%}"
|
136
136
|
onclick=$("#files").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
|
137
|
-
<span class="
|
137
|
+
<span class="fa fa-times"></span>
|
138
138
|
<span class="controls-remove-text"><%= t('.remove') %></span>
|
139
139
|
<span class="sr-only">
|
140
140
|
<%= t('.previous') %>
|
@@ -1,3 +1,3 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
1
|
+
<div class="tab-pane" id="activity_log">
|
2
|
+
<%= render 'hyrax/users/activity_log', events: presenter.events %>
|
3
|
+
</div>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<div class="tab-pane active" id="contributions">
|
1
|
+
<div class="tab-pane show active" id="contributions">
|
2
2
|
<% if presenter.trophies.count > 0 %>
|
3
3
|
<table>
|
4
4
|
<% presenter.trophies.each do |t| %>
|
@@ -11,8 +11,8 @@
|
|
11
11
|
<td>
|
12
12
|
<%= link_to t.to_s, [main_app, t] %>
|
13
13
|
<% if presenter.current_user? %>
|
14
|
-
<%= display_trophy_link current_user, t.id, class: '
|
15
|
-
<span class='trophy-on
|
14
|
+
<%= display_trophy_link current_user, t.id, class: 'fa fa-star', data: { removerow: true } do %>
|
15
|
+
<span class='trophy-on fa fa-times'></span>
|
16
16
|
<% end %>
|
17
17
|
<% end %>
|
18
18
|
</td>
|
@@ -1,4 +1,4 @@
|
|
1
1
|
<%= render 'hyrax/users/user', user: @user %>
|
2
2
|
|
3
3
|
<br />
|
4
|
-
<a class="btn btn-primary" href="<%= hyrax.users_path %>"><i class="
|
4
|
+
<a class="btn btn-primary" href="<%= hyrax.users_path %>"><i class="fa fa-globe" aria-hidden="true"></i><%= t('.view_users') %></a>
|
@@ -1,9 +1,17 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
1
|
+
<ul class="nav nav-tabs" id="myTab">
|
2
|
+
<li class="nav-item">
|
3
|
+
<a class="nav-link active" href="#contributions">
|
4
|
+
<span class="fa fa-star"></span> <%= I18n.t('hyrax.user_profile.tab_highlighted') %>
|
5
|
+
</a>
|
6
|
+
</li>
|
7
|
+
<li class="nav-item">
|
8
|
+
<a class="nav-link" href="#activity_log">
|
9
|
+
<span class="fa fa-calendar"></span> <%= I18n.t('hyrax.user_profile.tab_activity') %>
|
10
|
+
</a>
|
11
|
+
</li>
|
12
|
+
</ul>
|
5
13
|
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
14
|
+
<div class="tab-content card-body">
|
15
|
+
<%= render 'contributions', presenter: presenter %>
|
16
|
+
<%= render 'activity', presenter: presenter %>
|
17
|
+
</div> <!-- /tab-content -->
|
@@ -4,9 +4,9 @@
|
|
4
4
|
<label class="sr-only" for="user_search"><%= t('.search_users') %></label>
|
5
5
|
<%= text_field_tag :uq, params[:uq], class: "q", placeholder: t('.search_users'), size: '30', type: "search", id: "user_search" %>
|
6
6
|
<%= hidden_field_tag :sort, params[:sort], id: 'user_sort' %>
|
7
|
-
<%=
|
7
|
+
<%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:uq, :sort, :qt, :page, :utf8)) %>
|
8
8
|
<button type="submit" class="btn btn-primary" id="user_submit">
|
9
|
-
<span class="
|
9
|
+
<span class="fa fa-search"></span><%= t('.go') %>
|
10
10
|
</button>
|
11
11
|
<% end %>
|
12
12
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<div class="
|
2
|
-
<div class="
|
1
|
+
<div class="card panel-user">
|
2
|
+
<div class="card-header">
|
3
3
|
<%= image_tag user.avatar.url(:thumb), width: 100 if user.avatar.present? %>
|
4
4
|
<h3>
|
5
5
|
<%= user.name %>
|
@@ -14,10 +14,10 @@
|
|
14
14
|
</div>
|
15
15
|
</div>
|
16
16
|
|
17
|
-
<div class="
|
17
|
+
<div class="card-footer clearfix">
|
18
18
|
<% if can? :edit, user %>
|
19
|
-
<%= link_to hyrax.edit_dashboard_profile_path(user), class: "btn btn-
|
20
|
-
<span class="
|
19
|
+
<%= link_to hyrax.edit_dashboard_profile_path(user), class: "btn btn-secondary float-right" do %>
|
20
|
+
<span class="fa fa-edit"></span> <%= t("hyrax.edit_profile") %>
|
21
21
|
<% end %>
|
22
22
|
<% end %>
|
23
23
|
</div>
|
@@ -34,12 +34,12 @@
|
|
34
34
|
<dd><%= mail_to user.email %></dd>
|
35
35
|
|
36
36
|
<% if user.chat_id %>
|
37
|
-
<dt><span class="
|
37
|
+
<dt><span class="fa fa-bullhorn" aria-hidden="true"></span> Chat ID</dt>
|
38
38
|
<dd><%= user.chat_id %></dd>
|
39
39
|
<% end %>
|
40
40
|
|
41
41
|
<% if user.website %>
|
42
|
-
<dt><span class="
|
42
|
+
<dt><span class="fa fa-globe" aria-hidden="true"></span> Website(s)</dt>
|
43
43
|
<dd><%= iconify_auto_link(user.website) %></dd>
|
44
44
|
<% end %>
|
45
45
|
|
@@ -64,7 +64,7 @@
|
|
64
64
|
<% end %>
|
65
65
|
|
66
66
|
<% if user.address %>
|
67
|
-
<dt><span class="
|
67
|
+
<dt><span class="fa fa-map-marker" aria-hidden="true"></span> Address</dt>
|
68
68
|
<dd><%= user.address %></dd>
|
69
69
|
<% end %>
|
70
70
|
|
@@ -74,7 +74,7 @@
|
|
74
74
|
<% end %>
|
75
75
|
|
76
76
|
<% if user.telephone %>
|
77
|
-
<dt><span class="
|
77
|
+
<dt><span class="fa fa-phone" aria-hidden="true"></span> Telephone</dt>
|
78
78
|
<dd><%= link_to_telephone(user) %></dd>
|
79
79
|
<% end %>
|
80
80
|
|
@@ -1,15 +1,15 @@
|
|
1
1
|
<div class="list-group-item">
|
2
|
-
<span class="
|
2
|
+
<span class="fa fa-clock-o" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
|
3
3
|
</div>
|
4
4
|
|
5
5
|
<div class="list-group-item">
|
6
6
|
<span class="badge"><%= number_of_collections(user) %></span>
|
7
|
-
<span class="
|
7
|
+
<span class="fa fa-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
|
8
8
|
</div>
|
9
9
|
|
10
10
|
<div class="list-group-item">
|
11
11
|
<span class="badge"><%= number_of_works(user) %></span>
|
12
|
-
<span class="
|
12
|
+
<span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
|
13
13
|
|
14
14
|
<ul class="views-downloads-dashboard list-unstyled">
|
15
15
|
<li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
|
@@ -9,18 +9,18 @@
|
|
9
9
|
<div class="skip-to-content">
|
10
10
|
<%= link_to "Skip to Content", "#skip-to-content" %>
|
11
11
|
</div>
|
12
|
-
<%= render '/masthead' %>
|
12
|
+
<%= render '/masthead', placement_class: 'fixed-top' %>
|
13
13
|
<%= content_for(:navbar) %>
|
14
14
|
<div id="content-wrapper" role="main">
|
15
15
|
<div class="sidebar maximized">
|
16
16
|
<%= render 'hyrax/dashboard/sidebar' %>
|
17
17
|
</div>
|
18
|
-
<div class="main-content maximized">
|
18
|
+
<div class="main-content maximized<%= " admin-stats" if request.fullpath.include? '/admin/stats' %>">
|
19
19
|
<%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
|
20
20
|
<%= render '/flash_msg' %>
|
21
21
|
<% if content_for?(:page_header) %>
|
22
22
|
<div class="row">
|
23
|
-
<div class="col-
|
23
|
+
<div class="col-12 main-header">
|
24
24
|
<%= yield(:page_header) %>
|
25
25
|
</div>
|
26
26
|
</div>
|
@@ -33,6 +33,6 @@
|
|
33
33
|
</div>
|
34
34
|
|
35
35
|
</div><!-- /#content-wrapper -->
|
36
|
-
<%= render 'shared/
|
36
|
+
<%= render 'shared/modal' %>
|
37
37
|
</body>
|
38
38
|
</html>
|
@@ -9,15 +9,16 @@
|
|
9
9
|
<div class="skip-to-content">
|
10
10
|
<%= link_to "Skip to Content", "#skip-to-content" %>
|
11
11
|
</div>
|
12
|
-
<%= render '/masthead' %>
|
12
|
+
<%= render '/masthead', placement_class: nil %>
|
13
13
|
<%= content_for(:navbar) %>
|
14
14
|
<%= content_for(:precontainer_content) %>
|
15
15
|
<div id="content-wrapper" class="container" role="main">
|
16
|
+
<%= content_for(:container_header) %>
|
16
17
|
<%= render '/flash_msg' %>
|
17
18
|
<%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
|
18
19
|
<% if content_for?(:page_header) %>
|
19
20
|
<div class="row">
|
20
|
-
<div class="col-
|
21
|
+
<div class="col-12 main-header">
|
21
22
|
<%= yield(:page_header) %>
|
22
23
|
</div>
|
23
24
|
</div>
|
@@ -28,6 +29,6 @@
|
|
28
29
|
<%= content_for?(:content) ? yield(:content) : yield %>
|
29
30
|
</div><!-- /#content-wrapper -->
|
30
31
|
<%= render 'shared/footer' %>
|
31
|
-
<%= render 'shared/
|
32
|
+
<%= render 'shared/modal' %>
|
32
33
|
</body>
|
33
34
|
</html>
|
@@ -2,17 +2,17 @@
|
|
2
2
|
<style>
|
3
3
|
<% appearance = Hyrax::Forms::Admin::Appearance.new %>
|
4
4
|
a { color: <%= appearance.link_color %>; }
|
5
|
-
.navbar-
|
5
|
+
.navbar-dark.bg-dark .navbar-link { color: <%= appearance.footer_link_color %>; }
|
6
6
|
|
7
|
-
.navbar-
|
7
|
+
.navbar-dark.bg-dark { background-color: <%= appearance.header_background_color %> !important; }
|
8
8
|
|
9
|
-
.navbar-
|
10
|
-
.navbar-
|
11
|
-
.navbar-
|
9
|
+
.navbar-dark.bg-dark .navbar-nav > .open > a,
|
10
|
+
.navbar-dark.bg-dark .navbar-nav > .open > a:hover,
|
11
|
+
.navbar-dark.bg-dark .navbar-nav > .open > a:focus { background-color: <%= appearance.header_background_color %>; }
|
12
12
|
|
13
|
-
.navbar-
|
14
|
-
.navbar-
|
15
|
-
.navbar-
|
13
|
+
.navbar-dark.bg-dark .navbar-nav > li > a,
|
14
|
+
.navbar-dark.bg-dark .navbar-text,
|
15
|
+
.navbar-dark.bg-dark .navbar-brand { color: <%= appearance.header_text_color %>; }
|
16
16
|
|
17
17
|
.btn-primary {
|
18
18
|
background-color: <%= appearance.primary_button_background_color %>;
|
@@ -2,15 +2,12 @@
|
|
2
2
|
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="language-dropdown-menu">
|
3
3
|
<span class="sr-only"><%= t('hyrax.toolbar.language_switch') %></span>
|
4
4
|
<span title="<%= t('hyrax.toolbar.language_switch') %>"><%= available_translations[I18n.locale.to_s] %></span>
|
5
|
-
<b class="caret"></b>
|
6
5
|
</a>
|
7
|
-
<
|
8
|
-
<
|
9
|
-
<
|
6
|
+
<div id="language-dropdown-menu" class="dropdown-menu" role="menu">
|
7
|
+
<div role="presentation" class="dropdown-header"><%= t('hyrax.toolbar.language_switch') %></div>
|
8
|
+
<div role="presentation" class="dropdown-divider"></div>
|
10
9
|
<% available_translations.each do |language, label| %>
|
11
|
-
|
12
|
-
<%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', tabindex: '-1', data: { locale: language } %>
|
13
|
-
</li>
|
10
|
+
<%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', lang: language, tabindex: '-1', data: { locale: language } %>
|
14
11
|
<% end %>
|
15
|
-
</
|
12
|
+
</div>
|
16
13
|
</li>
|
@@ -5,8 +5,8 @@
|
|
5
5
|
<%= t(:'hyrax.nav_safety.change_tab_message') %>
|
6
6
|
</div>
|
7
7
|
<div class="modal-footer">
|
8
|
-
<button type="button" class="btn btn-
|
9
|
-
<button type="button" class="btn btn-
|
8
|
+
<button type="button" class="btn btn-secondary" id="nav-safety-acknowledge" data-dismiss="modal">Cancel</button>
|
9
|
+
<button type="button" class="btn btn-secondary" id="nav-safety-dismiss" data-dismiss="modal">OK</button>
|
10
10
|
</div>
|
11
11
|
</div>
|
12
12
|
</div>
|
@@ -3,8 +3,8 @@
|
|
3
3
|
<div class="modal-dialog" role="document">
|
4
4
|
<form class="modal-content new-work-select">
|
5
5
|
<div class="modal-header">
|
6
|
-
<button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">×</span></button>
|
7
6
|
<h2 class="modal-title" id="select-worktype-label"><%= t('hyrax.dashboard.heading_actions.select_type_of_work') %></h2>
|
7
|
+
<button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">×</span></button>
|
8
8
|
</div>
|
9
9
|
<div class="modal-body">
|
10
10
|
<% create_work_presenter.each do |row_presenter| %>
|
@@ -25,7 +25,7 @@
|
|
25
25
|
<% end %>
|
26
26
|
</div>
|
27
27
|
<div class="modal-footer">
|
28
|
-
<button type="button" class="btn btn-
|
28
|
+
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('hyrax.dashboard.heading_actions.close') %></button>
|
29
29
|
<input type="submit" class="btn btn-primary" value="<%= t('hyrax.dashboard.heading_actions.create_work') %>" />
|
30
30
|
</div>
|
31
31
|
</form>
|
data/config/locales/hyrax.de.yml
CHANGED
@@ -557,7 +557,7 @@ de:
|
|
557
557
|
actions: Aktion
|
558
558
|
title: Sammlungstitel
|
559
559
|
form_permission:
|
560
|
-
visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </
|
560
|
+
visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </ Small>
|
561
561
|
form_permission_under_embargo:
|
562
562
|
help_html: "<strong>Diese Arbeit ist unter Embargo.</strong> Hier können Sie die Einstellungen des Embargos ändern, oder Sie können den %{edit_link} besuchen, um ihn zu deaktivieren."
|
563
563
|
legend_html: Sichtbarkeit <small>Wer sollte in der Lage sein, diesen Inhalt anzusehen oder herunterzuladen?</small>
|
@@ -596,7 +596,6 @@ de:
|
|
596
596
|
legend_html: Miniaturansicht
|
597
597
|
form_visibility_component:
|
598
598
|
visibility: Sichtbarkeit
|
599
|
-
subtitle_html: <small>Wer sollte diesen Inhalt anzeigen oder herunterladen können?</small>
|
600
599
|
inspect_work:
|
601
600
|
back_to: Zurück zu
|
602
601
|
entity_id: Mandanten-ID
|
@@ -1087,14 +1086,14 @@ de:
|
|
1087
1086
|
no_transfers: Sie haben keine Arbeit übertragen
|
1088
1087
|
profiles:
|
1089
1088
|
edit_primary:
|
1090
|
-
change_picture: <i class = "
|
1089
|
+
change_picture: <i class = "fa fa-camera"> </ i> Bild ändern
|
1091
1090
|
delete_picture: Bild löschen
|
1092
1091
|
delete_picture_data_content: Wenn Sie Ihr Bild vollständig entfernen möchten, aktivieren Sie das Kontrollkästchen und speichern Sie Ihr Profil.
|
1093
1092
|
delete_picture_data_original_title: Bild löschen
|
1094
1093
|
facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </ i> Facebook-Handle
|
1095
1094
|
google_handle: <i class = "fa-fa-google-plus"> </ i> Google+ Handle
|
1096
1095
|
help_change_picture_type: JPG, GIF oder PNG (weniger als 2 MB)
|
1097
|
-
save_profile: <i class = "
|
1096
|
+
save_profile: <i class = "fa fa-floppy-o"> </ i> Profil speichern
|
1098
1097
|
twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </ i> Twitter-Handle
|
1099
1098
|
proxy_activity: Vertreter-Aktivität
|
1100
1099
|
proxy_add_deny: Sie können sich nicht selbst zum Stellvertreter machen
|
@@ -1484,7 +1483,7 @@ de:
|
|
1484
1483
|
read: Lesen/Download
|
1485
1484
|
search:
|
1486
1485
|
button:
|
1487
|
-
html: <span class="
|
1486
|
+
html: <span class="fa fa-search"></span> Suchen
|
1488
1487
|
text: Suche
|
1489
1488
|
form:
|
1490
1489
|
option:
|
@@ -1830,7 +1829,7 @@ de:
|
|
1830
1829
|
find_child_work: Suche nach einer Arbeit ...
|
1831
1830
|
member_of_collection_ids: Wählen Sie eine Sammlung ...
|
1832
1831
|
required:
|
1833
|
-
html: <span class="
|
1832
|
+
html: <span class="badge badge-info required-tag">erforderlich</span>
|
1834
1833
|
total_view:
|
1835
1834
|
one: Diese Arbeit hat 1 Gesamtansicht
|
1836
1835
|
other: Dieses Werk hat insgesamt %{count} Aufrufe
|
data/config/locales/hyrax.en.yml
CHANGED
@@ -588,7 +588,6 @@ en:
|
|
588
588
|
legend_html: Thumbnail
|
589
589
|
form_visibility_component:
|
590
590
|
visibility: Visibility
|
591
|
-
subtitle_html: <small>Who should be able to view or download this content?</small>
|
592
591
|
inspect_work:
|
593
592
|
back_to: Back to
|
594
593
|
entity_id: Entity ID
|
@@ -1078,14 +1077,14 @@ en:
|
|
1078
1077
|
no_transfers: You haven't transferred any work
|
1079
1078
|
profiles:
|
1080
1079
|
edit_primary:
|
1081
|
-
change_picture: <i class="
|
1080
|
+
change_picture: <i class="fa fa-camera"></i> Change picture
|
1082
1081
|
delete_picture: Delete picture
|
1083
1082
|
delete_picture_data_content: If you would like to remove your picture entirely, check the box and save your profile.
|
1084
1083
|
delete_picture_data_original_title: Delete Picture
|
1085
1084
|
facebook_handle: <i class="fa fa-facebook" aria-hidden="true"></i> Facebook Handle
|
1086
1085
|
google_handle: <i class="fa fa-google-plus"></i> Google+ Handle
|
1087
1086
|
help_change_picture_type: JPG, GIF, or PNG (less than 2MB)
|
1088
|
-
save_profile: <i class="
|
1087
|
+
save_profile: <i class="fa fa-floppy-o"></i> Save Profile
|
1089
1088
|
twitter_handle: <i class="fa fa-twitter" aria-hidden="true"></i> Twitter Handle
|
1090
1089
|
proxy_activity: Proxy Activity
|
1091
1090
|
proxy_add_deny: You cannot make yourself a proxy
|
@@ -1474,7 +1473,7 @@ en:
|
|
1474
1473
|
read_only: The repository is in read-only mode for maintenance. No submissions or edits can be made at this time.
|
1475
1474
|
search:
|
1476
1475
|
button:
|
1477
|
-
html: <span class="
|
1476
|
+
html: <span class="fa fa-search" aria-hidden="true"></span> Go
|
1478
1477
|
text: Search
|
1479
1478
|
form:
|
1480
1479
|
option:
|
@@ -1688,8 +1687,6 @@ en:
|
|
1688
1687
|
note_html: Keep to myself with option to share.
|
1689
1688
|
text: Private
|
1690
1689
|
restricted_title_attr: Change the visibility of this resource
|
1691
|
-
unknown:
|
1692
|
-
text: Unknown
|
1693
1690
|
work_button_row:
|
1694
1691
|
attach_child: Attach Child
|
1695
1692
|
workflow:
|
@@ -1821,7 +1818,7 @@ en:
|
|
1821
1818
|
find_child_work: Search for a work…
|
1822
1819
|
member_of_collection_ids: Select a collection…
|
1823
1820
|
required:
|
1824
|
-
html: <span class="
|
1821
|
+
html: <span class="badge badge-info required-tag">required</span>
|
1825
1822
|
total_view:
|
1826
1823
|
one: This work has 1 total view
|
1827
1824
|
other: This work has %{count} total views
|
data/config/locales/hyrax.es.yml
CHANGED
@@ -601,7 +601,6 @@ es:
|
|
601
601
|
legend_html: Miniatura
|
602
602
|
form_visibility_component:
|
603
603
|
visibility: La visibilidad
|
604
|
-
subtitle_html: <small>¿Quién debería poder ver o descargar este contenido?</small>
|
605
604
|
inspect_work:
|
606
605
|
back_to: De regreso
|
607
606
|
entity_id: ID de entidad
|
@@ -1092,14 +1091,14 @@ es:
|
|
1092
1091
|
no_transfers: No ha transferido ningún trabajo
|
1093
1092
|
profiles:
|
1094
1093
|
edit_primary:
|
1095
|
-
change_picture: <i class = "
|
1094
|
+
change_picture: <i class = "fa fa-camera"> </i> Cambiar imagen
|
1096
1095
|
delete_picture: Eliminar foto
|
1097
1096
|
delete_picture_data_content: Si desea eliminar su imagen por completo, marque la casilla y guarde su perfil.
|
1098
1097
|
delete_picture_data_original_title: Eliminar imagen
|
1099
1098
|
facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </i> Asa de Facebook
|
1100
1099
|
google_handle: <i class = "fa fa-google-plus"> </i> Manija de Google+
|
1101
1100
|
help_change_picture_type: JPG, GIF o PNG (menos de 2 MB)
|
1102
|
-
save_profile: <i class = "
|
1101
|
+
save_profile: <i class = "fa fa-floppy-o"> </i> Guardar perfil
|
1103
1102
|
twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </i> Twitter Handle
|
1104
1103
|
proxy_activity: Actividad de Proxy
|
1105
1104
|
proxy_add_deny: No puedes hacerte un proxy
|
@@ -1457,7 +1456,7 @@ es:
|
|
1457
1456
|
changes_required:
|
1458
1457
|
message: |-
|
1459
1458
|
%{title} (%{link}) requiere cambios adicionales antes de la aprobación.
|
1460
|
-
|
1459
|
+
'%{comment}'
|
1461
1460
|
subject: Su depósito requiere cambios
|
1462
1461
|
deposited:
|
1463
1462
|
message: "%{title} (%{link}) fue aprobado por %{user}. %{comment}"
|
@@ -1491,7 +1490,7 @@ es:
|
|
1491
1490
|
read: Ver descarga
|
1492
1491
|
search:
|
1493
1492
|
button:
|
1494
|
-
html: <span class="
|
1493
|
+
html: <span class="fa fa-search"></span> Ir
|
1495
1494
|
text: Buscar
|
1496
1495
|
form:
|
1497
1496
|
option:
|
@@ -1837,7 +1836,7 @@ es:
|
|
1837
1836
|
find_child_work: Busque un trabajo ...
|
1838
1837
|
member_of_collection_ids: Seleccione una colección ...
|
1839
1838
|
required:
|
1840
|
-
html: <span class="
|
1839
|
+
html: <span class="badge badge-info required-tag">obligatorio</span>
|
1841
1840
|
total_view:
|
1842
1841
|
one: Este trabajo tiene 1 vista total
|
1843
|
-
other: Este trabajo tiene un total de %{count} visualizaciones
|
1842
|
+
other: Este trabajo tiene un total de %{count} visualizaciones
|