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.
Files changed (497) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +41 -61
  3. data/.dassie/Gemfile +4 -4
  4. data/.dassie/app/assets/javascripts/application.js +8 -4
  5. data/.dassie/app/assets/stylesheets/application.css +1 -1
  6. data/.dassie/app/assets/stylesheets/hyrax.scss +1 -2
  7. data/.dassie/app/controllers/application_controller.rb +1 -3
  8. data/.dassie/app/controllers/catalog_controller.rb +23 -19
  9. data/.dassie/app/models/user.rb +0 -3
  10. data/.dassie/config/analytics.yml +2 -4
  11. data/.dassie/config/application.rb +1 -1
  12. data/.dassie/config/initializers/riiif.rb +1 -1
  13. data/.dassie/db/schema.rb +5 -5
  14. data/.dassie/package.json +7 -7
  15. data/.engine_cart.yml +2 -39
  16. data/.env +1 -0
  17. data/.github/workflows/main.yml +17 -0
  18. data/.github/workflows/release.yml +17 -0
  19. data/.regen +1 -1
  20. data/.rubocop.yml +1 -1
  21. data/CONTRIBUTING.md +22 -24
  22. data/Dockerfile +1 -1
  23. data/Rakefile +0 -4
  24. data/app/actors/hyrax/actors/base_actor.rb +1 -1
  25. data/app/actors/hyrax/actors/collections_membership_actor.rb +1 -1
  26. data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +5 -11
  27. data/app/actors/hyrax/actors/embargo_actor.rb +4 -11
  28. data/app/actors/hyrax/actors/file_actor.rb +9 -37
  29. data/app/actors/hyrax/actors/file_set_actor.rb +13 -62
  30. data/app/actors/hyrax/actors/lease_actor.rb +4 -11
  31. data/app/assets/javascripts/hyrax/analytics_events.js +38 -88
  32. data/app/assets/javascripts/hyrax/app.js.erb +2 -2
  33. data/app/assets/javascripts/hyrax/batch.js +2 -2
  34. data/app/assets/javascripts/hyrax/batch_edit.js +4 -4
  35. data/app/assets/javascripts/hyrax/batch_select_all.js +13 -13
  36. data/app/assets/javascripts/hyrax/browse_everything.js +4 -2
  37. data/app/assets/javascripts/hyrax/collection_types.es6 +1 -1
  38. data/app/assets/javascripts/hyrax/collections/editor.es6 +5 -1
  39. data/app/assets/javascripts/hyrax/dashboard_actions.js +5 -5
  40. data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6 +3 -3
  41. data/app/assets/javascripts/hyrax/editor.es6 +3 -3
  42. data/app/assets/javascripts/hyrax/facets.js +6 -4
  43. data/app/assets/javascripts/hyrax/file_manager/member.es6 +1 -1
  44. data/app/assets/javascripts/hyrax/file_manager/save_manager.es6 +2 -2
  45. data/app/assets/javascripts/hyrax/file_manager/sorting.es6 +2 -2
  46. data/app/assets/javascripts/hyrax/file_manager.es6 +2 -17
  47. data/app/assets/javascripts/hyrax/notification.es6 +1 -1
  48. data/app/assets/javascripts/hyrax/permissions/control.es6 +1 -8
  49. data/app/assets/javascripts/hyrax/permissions/registry.es6 +4 -4
  50. data/app/assets/javascripts/hyrax/permissions/user_controls.es6 +3 -1
  51. data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6 +1 -1
  52. data/app/assets/javascripts/hyrax/relationships/control.es6 +2 -2
  53. data/app/assets/javascripts/hyrax/relationships/registry_entry.es6 +1 -1
  54. data/app/assets/javascripts/hyrax/reports-buttons.js +9 -9
  55. data/app/assets/javascripts/hyrax/save_work/required_fields.es6 +1 -1
  56. data/app/assets/javascripts/hyrax/save_work/save_work_control.es6 +6 -6
  57. data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +2 -2
  58. data/app/assets/javascripts/hyrax/single_use_links_manager.js +1 -1
  59. data/app/assets/javascripts/hyrax/skip_to_content.js +1 -1
  60. data/app/assets/javascripts/hyrax/sorting.js +1 -1
  61. data/app/assets/javascripts/hyrax/trophy.js +1 -1
  62. data/app/assets/javascripts/hyrax/uploader.js +3 -3
  63. data/app/assets/javascripts/hyrax.js +1 -19
  64. data/app/assets/stylesheets/_bootstrap-default-overrides.scss +4 -4
  65. data/app/assets/stylesheets/hyrax/_accessibility.scss +1 -1
  66. data/app/assets/stylesheets/hyrax/_badge.scss +7 -0
  67. data/app/assets/stylesheets/hyrax/_batch-edit.scss +8 -8
  68. data/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss +1 -1
  69. data/app/assets/stylesheets/hyrax/_buttons.scss +31 -1
  70. data/app/assets/stylesheets/hyrax/_card.scss +10 -0
  71. data/app/assets/stylesheets/hyrax/_catalog.scss +22 -48
  72. data/app/assets/stylesheets/hyrax/_collection_types.scss +1 -1
  73. data/app/assets/stylesheets/hyrax/_collections.scss +13 -13
  74. data/app/assets/stylesheets/hyrax/_facets.scss +46 -0
  75. data/app/assets/stylesheets/hyrax/_featured.scss +1 -1
  76. data/app/assets/stylesheets/hyrax/_file-listing.scss +3 -3
  77. data/app/assets/stylesheets/hyrax/_file_manager.scss +17 -17
  78. data/app/assets/stylesheets/hyrax/_file_sets.scss +1 -1
  79. data/app/assets/stylesheets/hyrax/_file_upload.scss +4 -4
  80. data/app/assets/stylesheets/hyrax/_fixedsticky.scss +1 -1
  81. data/app/assets/stylesheets/hyrax/_footer.scss +3 -3
  82. data/app/assets/stylesheets/hyrax/_form-progress.scss +9 -9
  83. data/app/assets/stylesheets/hyrax/_form.scss +3 -4
  84. data/app/assets/stylesheets/hyrax/_forms.scss +62 -29
  85. data/app/assets/stylesheets/hyrax/_header.scss +0 -17
  86. data/app/assets/stylesheets/hyrax/_home-page.scss +13 -51
  87. data/app/assets/stylesheets/hyrax/_html.scss +11 -0
  88. data/app/assets/stylesheets/hyrax/_hyrax.scss +16 -14
  89. data/app/assets/stylesheets/hyrax/_nestable.scss +1 -1
  90. data/app/assets/stylesheets/hyrax/_select_work_type.scss +2 -2
  91. data/app/assets/stylesheets/hyrax/_styles.scss +9 -14
  92. data/app/assets/stylesheets/hyrax/_users.scss +2 -2
  93. data/app/assets/stylesheets/hyrax/_variables.scss +20 -1
  94. data/app/assets/stylesheets/hyrax/_work-show.scss +21 -13
  95. data/app/assets/stylesheets/hyrax/blacklight_gallery.scss +75 -2
  96. data/app/assets/stylesheets/hyrax/dashboard.scss +70 -95
  97. data/app/assets/stylesheets/hyrax/sidebar.scss +39 -19
  98. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +9 -0
  99. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +2 -11
  100. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +2 -11
  101. data/app/controllers/concerns/hyrax/manages_embargoes.rb +1 -13
  102. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +4 -9
  103. data/app/controllers/hyrax/admin/analytics/collection_reports_controller.rb +2 -2
  104. data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb +1 -1
  105. data/app/controllers/hyrax/admin/strategies_controller.rb +1 -1
  106. data/app/controllers/hyrax/admin/workflows_controller.rb +3 -48
  107. data/app/controllers/hyrax/batch_edits_controller.rb +1 -1
  108. data/app/controllers/hyrax/dashboard/collections_controller.rb +2 -1
  109. data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +0 -32
  110. data/app/controllers/hyrax/downloads_controller.rb +1 -16
  111. data/app/controllers/hyrax/file_sets_controller.rb +4 -10
  112. data/app/controllers/hyrax/homepage_controller.rb +0 -1
  113. data/app/controllers/hyrax/my_controller.rb +0 -6
  114. data/app/controllers/hyrax/permissions_controller.rb +1 -1
  115. data/app/controllers/hyrax/single_use_links_controller.rb +1 -2
  116. data/app/controllers/hyrax/transfers_controller.rb +2 -0
  117. data/app/controllers/hyrax/workflow_actions_controller.rb +2 -3
  118. data/app/forms/hyrax/forms/collection_form.rb +1 -1
  119. data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +0 -2
  120. data/app/forms/hyrax/forms/file_set_edit_form.rb +1 -1
  121. data/app/forms/hyrax/forms/file_set_form.rb +35 -8
  122. data/app/forms/hyrax/forms/resource_form.rb +32 -36
  123. data/app/helpers/hyrax/embargo_helper.rb +0 -11
  124. data/app/helpers/hyrax/facets_helper.rb +150 -0
  125. data/app/helpers/hyrax/hyrax_helper_behavior.rb +5 -5
  126. data/app/helpers/hyrax/lease_helper.rb +0 -11
  127. data/app/indexers/hyrax/basic_metadata_indexer.rb +3 -9
  128. data/app/indexers/hyrax/pcdm_collection_indexer.rb +0 -1
  129. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +8 -2
  130. data/app/jobs/characterize_job.rb +4 -7
  131. data/app/jobs/content_event_job.rb +1 -1
  132. data/app/jobs/create_derivatives_job.rb +4 -2
  133. data/app/jobs/ingest_local_file_job.rb +5 -13
  134. data/app/jobs/inherit_permissions_job.rb +1 -5
  135. data/app/models/admin_set.rb +0 -8
  136. data/app/models/concerns/hyrax/collection_behavior.rb +2 -3
  137. data/app/models/concerns/hyrax/collection_nesting.rb +1 -10
  138. data/app/models/concerns/hyrax/file_set_behavior.rb +1 -2
  139. data/app/models/concerns/hyrax/in_admin_set.rb +0 -7
  140. data/app/models/concerns/hyrax/user.rb +3 -3
  141. data/app/models/concerns/hyrax/work_behavior.rb +1 -3
  142. data/app/models/content_block.rb +0 -6
  143. data/app/models/hyrax/embargo.rb +1 -1
  144. data/app/models/hyrax/file_metadata.rb +1 -1
  145. data/app/models/hyrax/file_set.rb +3 -3
  146. data/app/models/hyrax/lease.rb +1 -1
  147. data/app/models/hyrax/permission_template.rb +0 -35
  148. data/app/models/proxy_deposit_request.rb +1 -1
  149. data/app/presenters/hyrax/admin/repository_object_presenter.rb +0 -2
  150. data/app/presenters/hyrax/collapsable_section_presenter.rb +2 -2
  151. data/app/presenters/hyrax/collection_presenter.rb +1 -1
  152. data/app/presenters/hyrax/fixity_status_presenter.rb +2 -2
  153. data/app/presenters/hyrax/menu_presenter.rb +1 -1
  154. data/app/presenters/hyrax/permission_badge.rb +8 -9
  155. data/app/presenters/hyrax/version_list_presenter.rb +1 -6
  156. data/app/presenters/hyrax/workflow_presenter.rb +1 -1
  157. data/app/renderers/hyrax/renderers/external_link_attribute_renderer.rb +1 -1
  158. data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +5 -13
  159. data/app/search_builders/hyrax/deposit_search_builder.rb +1 -1
  160. data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +10 -1
  161. data/app/search_builders/hyrax/single_result.rb +1 -1
  162. data/app/search_builders/hyrax/stats/work_status_search_builder.rb +1 -1
  163. data/app/services/hyrax/adapters/nesting_index_adapter.rb +1 -1
  164. data/app/services/hyrax/analytics/google.rb +15 -23
  165. data/app/services/hyrax/analytics/matomo.rb +3 -4
  166. data/app/services/hyrax/collection_member_service.rb +1 -2
  167. data/app/services/hyrax/collections/nested_collection_query_service.rb +1 -1
  168. data/app/services/hyrax/collections/search_service.rb +0 -1
  169. data/app/services/hyrax/custom_queries.rb +25 -0
  170. data/app/services/hyrax/edit_permissions_service.rb +3 -21
  171. data/app/services/hyrax/embargo_manager.rb +0 -9
  172. data/app/services/hyrax/file_set_csv_service.rb +1 -1
  173. data/app/services/hyrax/graph_exporter.rb +3 -8
  174. data/app/services/hyrax/iiif_authorization_service.rb +1 -1
  175. data/app/services/hyrax/lease_manager.rb +0 -9
  176. data/app/services/hyrax/listeners/file_metadata_listener.rb +0 -11
  177. data/app/services/hyrax/search_service.rb +1 -81
  178. data/app/services/hyrax/solr_query_service.rb +4 -4
  179. data/app/services/hyrax/statistics/depositors/summary.rb +1 -3
  180. data/app/services/hyrax/user_stat_importer.rb +0 -2
  181. data/app/services/hyrax/valkyrie_upload.rb +13 -1
  182. data/app/services/hyrax/versioning_service.rb +9 -77
  183. data/app/services/hyrax/visibility_propagator.rb +5 -5
  184. data/app/services/hyrax/work_query_service.rb +1 -1
  185. data/app/services/hyrax/workflow/actionable_objects.rb +3 -28
  186. data/app/services/hyrax/workflow/permission_query.rb +2 -23
  187. data/app/services/hyrax/working_directory.rb +2 -0
  188. data/app/views/_controls.html.erb +14 -18
  189. data/app/views/_logo.html.erb +0 -1
  190. data/app/views/_masthead.html.erb +8 -18
  191. data/app/views/_user_util_links.html.erb +16 -18
  192. data/app/views/catalog/_document.html.erb +2 -2
  193. data/app/views/catalog/_document_list.html.erb +1 -1
  194. data/app/views/catalog/_facet_limit.html.erb +1 -1
  195. data/app/views/catalog/_index_gallery_collection_wrapper.html.erb +1 -1
  196. data/app/views/catalog/_index_header_list_collection.html.erb +2 -2
  197. data/app/views/catalog/_index_header_list_default.html.erb +1 -1
  198. data/app/views/catalog/_index_list_default.html.erb +7 -5
  199. data/app/views/catalog/_search_form.html.erb +13 -15
  200. data/app/views/catalog/_thumbnail_list_collection.html.erb +2 -2
  201. data/app/views/catalog/_thumbnail_list_default.html.erb +3 -3
  202. data/app/views/catalog/facet.html.erb +21 -0
  203. data/app/views/catalog/index.html.erb +6 -4
  204. data/app/views/hyrax/admin/admin_sets/_form.html.erb +16 -16
  205. data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +35 -33
  206. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +9 -8
  207. data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +24 -24
  208. data/app/views/hyrax/admin/admin_sets/_form_workflow.erb +5 -5
  209. data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb +3 -3
  210. data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +9 -9
  211. data/app/views/hyrax/admin/admin_sets/index.html.erb +3 -3
  212. data/app/views/hyrax/admin/admin_sets/show.html.erb +4 -4
  213. data/app/views/hyrax/admin/analytics/_date_range_form.html.erb +3 -3
  214. data/app/views/hyrax/admin/analytics/collection_reports/_custom_range.html.erb +3 -3
  215. data/app/views/hyrax/admin/analytics/collection_reports/_monthly_summary.html.erb +3 -3
  216. data/app/views/hyrax/admin/analytics/collection_reports/_summary.html.erb +3 -3
  217. data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb +7 -7
  218. data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb +7 -7
  219. data/app/views/hyrax/admin/analytics/collection_reports/show.html.erb +10 -10
  220. data/app/views/hyrax/admin/analytics/work_reports/_custom_range.html.erb +3 -3
  221. data/app/views/hyrax/admin/analytics/work_reports/_monthly_summary.html.erb +3 -3
  222. data/app/views/hyrax/admin/analytics/work_reports/_summary.html.erb +3 -3
  223. data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb +5 -5
  224. data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb +7 -7
  225. data/app/views/hyrax/admin/analytics/work_reports/_work_counts.html.erb +4 -4
  226. data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb +5 -5
  227. data/app/views/hyrax/admin/analytics/work_reports/index.html.erb +8 -8
  228. data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +10 -10
  229. data/app/views/hyrax/admin/appearances/show.html.erb +2 -2
  230. data/app/views/hyrax/admin/collection_types/_form.html.erb +24 -23
  231. data/app/views/hyrax/admin/collection_types/_form_appearance.html.erb +2 -2
  232. data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +4 -4
  233. data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +9 -9
  234. data/app/views/hyrax/admin/collection_types/index.html.erb +6 -6
  235. data/app/views/hyrax/admin/features/index.html.erb +3 -3
  236. data/app/views/hyrax/admin/stats/_new_users.html.erb +1 -1
  237. data/app/views/hyrax/admin/stats/show.html.erb +4 -6
  238. data/app/views/hyrax/admin/users/index.html.erb +3 -3
  239. data/app/views/hyrax/admin/workflow_roles/index.html.erb +8 -8
  240. data/app/views/hyrax/admin/workflows/index.html.erb +80 -55
  241. data/app/views/hyrax/base/_citations.html.erb +6 -6
  242. data/app/views/hyrax/base/_currently_shared.html.erb +3 -3
  243. data/app/views/hyrax/base/_file_manager_actions.html.erb +5 -3
  244. data/app/views/hyrax/base/_file_manager_member.html.erb +5 -5
  245. data/app/views/hyrax/base/_file_manager_member_resource_options.html.erb +6 -6
  246. data/app/views/hyrax/base/_file_manager_members.html.erb +1 -1
  247. data/app/views/hyrax/base/_file_manager_thumbnail.html.erb +1 -1
  248. data/app/views/hyrax/base/_form_child_work_relationships.html.erb +3 -3
  249. data/app/views/hyrax/base/_form_files.html.erb +9 -9
  250. data/app/views/hyrax/base/_form_member_of_collections.html.erb +3 -3
  251. data/app/views/hyrax/base/_form_metadata.html.erb +1 -1
  252. data/app/views/hyrax/base/_form_permission.html.erb +30 -20
  253. data/app/views/hyrax/base/_form_permission_under_embargo.html.erb +1 -1
  254. data/app/views/hyrax/base/_form_permission_under_lease.html.erb +1 -1
  255. data/app/views/hyrax/base/_form_progress.html.erb +7 -7
  256. data/app/views/hyrax/base/_form_relationships.html.erb +1 -1
  257. data/app/views/hyrax/base/_form_rendering.html.erb +1 -1
  258. data/app/views/hyrax/base/_form_representative.html.erb +1 -1
  259. data/app/views/hyrax/base/_form_share.html.erb +6 -6
  260. data/app/views/hyrax/base/_form_thumbnail.html.erb +1 -1
  261. data/app/views/hyrax/base/_form_visibility_component.html.erb +16 -20
  262. data/app/views/hyrax/base/_guts4form.html.erb +12 -20
  263. data/app/views/hyrax/base/_member.html.erb +1 -1
  264. data/app/views/hyrax/base/_metadata.html.erb +1 -1
  265. data/app/views/hyrax/base/_show_actions.html.erb +10 -10
  266. data/app/views/hyrax/base/_work_button_row.html.erb +17 -16
  267. data/app/views/hyrax/base/_workflow_actions.html.erb +10 -10
  268. data/app/views/hyrax/base/_workflow_actions_widget.erb +1 -1
  269. data/app/views/hyrax/base/file_manager.html.erb +4 -5
  270. data/app/views/hyrax/base/inspect_work.html.erb +1 -1
  271. data/app/views/hyrax/base/show.html.erb +12 -12
  272. data/app/views/hyrax/base/unavailable.html.erb +2 -2
  273. data/app/views/hyrax/batch_edits/_check_all.html.erb +0 -1
  274. data/app/views/hyrax/batch_edits/_delete_selected.html.erb +1 -1
  275. data/app/views/hyrax/batch_edits/edit.html.erb +26 -18
  276. data/app/views/hyrax/collections/_bookmark_control.html.erb +2 -2
  277. data/app/views/hyrax/collections/_list_collections.html.erb +6 -6
  278. data/app/views/hyrax/collections/_list_works.html.erb +3 -1
  279. data/app/views/hyrax/collections/_search_form.html.erb +4 -4
  280. data/app/views/hyrax/collections/_show_document_list_row.html.erb +5 -2
  281. data/app/views/hyrax/collections/_sort_and_per_page.html.erb +3 -3
  282. data/app/views/hyrax/collections/_view_type_group.html.erb +2 -2
  283. data/app/views/hyrax/contact_form/new.html.erb +12 -13
  284. data/app/views/hyrax/content_blocks/_form.html.erb +29 -23
  285. data/app/views/hyrax/content_blocks/templates/agreement.html.erb +3 -3
  286. data/app/views/hyrax/dashboard/_admin_sets.html.erb +22 -28
  287. data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb +2 -2
  288. data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +4 -4
  289. data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb +2 -2
  290. data/app/views/hyrax/dashboard/_repository_growth.html.erb +28 -28
  291. data/app/views/hyrax/dashboard/_resource_type_graph.html.erb +4 -4
  292. data/app/views/hyrax/dashboard/_sidebar.html.erb +3 -3
  293. data/app/views/hyrax/dashboard/_tabs.html.erb +6 -2
  294. data/app/views/hyrax/dashboard/_user_activity.html.erb +22 -19
  295. data/app/views/hyrax/dashboard/_visibility_graph.html.erb +4 -4
  296. data/app/views/hyrax/dashboard/_work_type_graph.html.erb +4 -4
  297. data/app/views/hyrax/dashboard/collections/_batch_edits_actions.html.erb +1 -1
  298. data/app/views/hyrax/dashboard/collections/_bookmark_control.html.erb +2 -2
  299. data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +1 -1
  300. data/app/views/hyrax/dashboard/collections/_form.html.erb +30 -22
  301. data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +19 -19
  302. data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +8 -4
  303. data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +7 -7
  304. data/app/views/hyrax/dashboard/collections/_form_share.html.erb +11 -9
  305. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +34 -31
  306. data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +1 -1
  307. data/app/views/hyrax/dashboard/collections/_list_works.html.erb +3 -1
  308. data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +1 -1
  309. data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +1 -1
  310. data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +1 -1
  311. data/app/views/hyrax/dashboard/collections/_show_descriptions.html.erb +5 -3
  312. data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb +4 -4
  313. data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +12 -10
  314. data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +2 -2
  315. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +4 -4
  316. data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +1 -1
  317. data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +10 -10
  318. data/app/views/hyrax/dashboard/collections/show.html.erb +4 -4
  319. data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +21 -21
  320. data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb +5 -5
  321. data/app/views/hyrax/dashboard/profiles/_zotero.html.erb +2 -2
  322. data/app/views/hyrax/dashboard/profiles/edit.html.erb +2 -2
  323. data/app/views/hyrax/dashboard/profiles/show.html.erb +3 -3
  324. data/app/views/hyrax/dashboard/show_admin.html.erb +36 -34
  325. data/app/views/hyrax/dashboard/show_user.html.erb +16 -16
  326. data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +11 -11
  327. data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +8 -8
  328. data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +3 -1
  329. data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +5 -1
  330. data/app/views/hyrax/dashboard/works/_list_works.html.erb +4 -1
  331. data/app/views/hyrax/depositors/index.html.erb +2 -2
  332. data/app/views/hyrax/embargoes/edit.html.erb +14 -14
  333. data/app/views/hyrax/embargoes/index.html.erb +18 -6
  334. data/app/views/hyrax/file_sets/_actions.html.erb +5 -6
  335. data/app/views/hyrax/file_sets/_descriptions.html.erb +1 -1
  336. data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +1 -1
  337. data/app/views/hyrax/file_sets/_form.html.erb +1 -1
  338. data/app/views/hyrax/file_sets/_permission.html.erb +1 -1
  339. data/app/views/hyrax/file_sets/_permission_form.html.erb +39 -30
  340. data/app/views/hyrax/file_sets/_show_actions.html.erb +3 -3
  341. data/app/views/hyrax/file_sets/_show_details.html.erb +27 -17
  342. data/app/views/hyrax/file_sets/_single_use_link_rows.html.erb +2 -2
  343. data/app/views/hyrax/file_sets/_single_use_links.html.erb +2 -2
  344. data/app/views/hyrax/file_sets/_versioning.html.erb +9 -9
  345. data/app/views/hyrax/file_sets/edit.html.erb +19 -13
  346. data/app/views/hyrax/file_sets/media_display/_image.html.erb +4 -4
  347. data/app/views/hyrax/file_sets/show.html.erb +2 -2
  348. data/app/views/hyrax/homepage/_announcement.html.erb +2 -2
  349. data/app/views/hyrax/homepage/_explore_collections.html.erb +6 -4
  350. data/app/views/hyrax/homepage/_featured_fields.html.erb +1 -1
  351. data/app/views/hyrax/homepage/_featured_works.html.erb +1 -1
  352. data/app/views/hyrax/homepage/_home_content.html.erb +24 -10
  353. data/app/views/hyrax/homepage/_marketing.html.erb +1 -1
  354. data/app/views/hyrax/homepage/_recent_document.html.erb +4 -1
  355. data/app/views/hyrax/homepage/_sortable_featured.html.erb +3 -3
  356. data/app/views/hyrax/homepage/index.html.erb +4 -4
  357. data/app/views/hyrax/leases/edit.html.erb +14 -14
  358. data/app/views/hyrax/leases/index.html.erb +18 -6
  359. data/app/views/hyrax/my/_admin_set_action_menu.html.erb +5 -5
  360. data/app/views/hyrax/my/_collection_action_menu.html.erb +6 -6
  361. data/app/views/hyrax/my/_constraints.html.erb +2 -2
  362. data/app/views/hyrax/my/_document_list.html.erb +1 -1
  363. data/app/views/hyrax/my/_facet_layout.html.erb +1 -2
  364. data/app/views/hyrax/my/_facet_limit.html.erb +4 -4
  365. data/app/views/hyrax/my/_facet_pagination.html.erb +1 -25
  366. data/app/views/hyrax/my/_facet_pivot.html.erb +1 -1
  367. data/app/views/hyrax/my/_facet_selected.html.erb +1 -1
  368. data/app/views/hyrax/my/_search_form.html.erb +7 -8
  369. data/app/views/hyrax/my/_sort_and_per_page.html.erb +10 -12
  370. data/app/views/hyrax/my/_work_action_menu.html.erb +4 -5
  371. data/app/views/hyrax/my/collections/_facets.html.erb +2 -2
  372. data/app/views/hyrax/my/collections/_list_collections.html.erb +1 -1
  373. data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +2 -2
  374. data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +2 -2
  375. data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +5 -5
  376. data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +1 -1
  377. data/app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb +1 -1
  378. data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +1 -1
  379. data/app/views/hyrax/my/collections/_tabs.html.erb +11 -4
  380. data/app/views/hyrax/my/collections/index.html.erb +3 -3
  381. data/app/views/hyrax/my/facet.html.erb +17 -16
  382. data/app/views/hyrax/my/index.html.erb +2 -2
  383. data/app/views/hyrax/my/works/_batch_actions.html.erb +1 -1
  384. data/app/views/hyrax/my/works/_facets.html.erb +2 -2
  385. data/app/views/hyrax/my/works/_list_works.html.erb +6 -7
  386. data/app/views/hyrax/my/works/_tabs.html.erb +6 -6
  387. data/app/views/hyrax/my/works/index.html.erb +20 -18
  388. data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
  389. data/app/views/hyrax/notifications/index.html.erb +4 -4
  390. data/app/views/hyrax/operations/index.html.erb +1 -1
  391. data/app/views/hyrax/operations/show.html.erb +2 -2
  392. data/app/views/hyrax/pages/_form.html.erb +76 -64
  393. data/app/views/hyrax/permissions/confirm.html.erb +4 -4
  394. data/app/views/hyrax/permissions/confirm_access.html.erb +4 -4
  395. data/app/views/hyrax/stats/file.html.erb +1 -1
  396. data/app/views/hyrax/stats/work.html.erb +1 -1
  397. data/app/views/hyrax/transfers/_received.html.erb +4 -4
  398. data/app/views/hyrax/transfers/index.html.erb +8 -8
  399. data/app/views/hyrax/transfers/new.html.erb +1 -1
  400. data/app/views/hyrax/uploads/_js_templates.html.erb +14 -14
  401. data/app/views/hyrax/uploads/_js_templates_branding.html.erb +5 -5
  402. data/app/views/hyrax/uploads/_js_templates_versioning.html.erb +15 -15
  403. data/app/views/hyrax/users/_activity.html.erb +3 -3
  404. data/app/views/hyrax/users/_contributions.html.erb +3 -3
  405. data/app/views/hyrax/users/_left_sidebar.html.erb +1 -1
  406. data/app/views/hyrax/users/_profile_tabs.html.erb +16 -8
  407. data/app/views/hyrax/users/_search_form.html.erb +2 -2
  408. data/app/views/hyrax/users/_user.html.erb +5 -5
  409. data/app/views/hyrax/users/_user_info.html.erb +4 -4
  410. data/app/views/hyrax/users/_vitals.html.erb +3 -3
  411. data/app/views/hyrax/users/show.html.erb +2 -2
  412. data/app/views/layouts/_head_tag_content.html.erb +2 -5
  413. data/app/views/layouts/hyrax/dashboard.html.erb +4 -4
  414. data/app/views/layouts/hyrax.html.erb +4 -3
  415. data/app/views/shared/_appearance_styles.html.erb +8 -8
  416. data/app/views/shared/_footer.html.erb +1 -1
  417. data/app/views/shared/_locale_picker.html.erb +5 -8
  418. data/app/views/shared/_nav_safety_modal.html.erb +2 -2
  419. data/app/views/shared/_select_work_type_modal.html.erb +2 -2
  420. data/config/locales/hyrax.de.yml +5 -6
  421. data/config/locales/hyrax.en.yml +4 -15
  422. data/config/locales/hyrax.es.yml +6 -7
  423. data/config/locales/hyrax.fr.yml +8 -9
  424. data/config/locales/hyrax.it.yml +6 -7
  425. data/config/locales/hyrax.pt-BR.yml +6 -7
  426. data/config/locales/hyrax.zh.yml +6 -7
  427. data/docker-compose.yml +2 -1
  428. data/documentation/developing-your-hyrax-based-app.md +2 -2
  429. data/documentation/legacyREADME.md +3 -3
  430. data/hyrax.gemspec +13 -24
  431. data/karma.conf.js +104 -0
  432. data/lib/generators/hyrax/assets_generator.rb +2 -5
  433. data/lib/generators/hyrax/install_generator.rb +9 -33
  434. data/lib/generators/hyrax/templates/catalog_controller.rb +20 -13
  435. data/lib/generators/hyrax/templates/config/analytics.yml +0 -3
  436. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
  437. data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
  438. data/lib/generators/hyrax/templates/hyrax.scss +1 -2
  439. data/lib/generators/hyrax/templates/package.json +7 -8
  440. data/lib/hyrax/active_fedora_dummy_model.rb +0 -13
  441. data/lib/hyrax/configuration.rb +2 -49
  442. data/lib/hyrax/engine.rb +1 -2
  443. data/lib/hyrax/errors.rb +0 -2
  444. data/lib/hyrax/publisher.rb +0 -4
  445. data/lib/hyrax/specs/capybara.rb +5 -3
  446. data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb +0 -6
  447. data/lib/hyrax/specs/shared_specs/indexers.rb +0 -5
  448. data/lib/hyrax/transactions/container.rb +0 -54
  449. data/lib/hyrax/version.rb +1 -1
  450. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
  451. data/lib/wings/valkyrie/persister.rb +2 -1
  452. data/lib/wings/valkyrie/storage.rb +2 -6
  453. data/package.json +11 -0
  454. data/tasks/hyrax_dev.rake +32 -0
  455. data/template.rb +1 -1
  456. data/vendor/assets/javascripts/dataTables.bootstrap4.js +184 -0
  457. data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js +1 -1
  458. data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +2 -2
  459. data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +1 -1
  460. data/vendor/assets/javascripts/handlebars.js +5214 -0
  461. data/vendor/assets/javascripts/jquery-ui.js +19057 -0
  462. data/vendor/assets/javascripts/jquery.dataTables.js +15336 -0
  463. data/vendor/assets/javascripts/morris/morris.min.js +9 -1
  464. data/vendor/assets/javascripts/morris/raphael-min.js +4 -6
  465. data/vendor/assets/javascripts/nestable.js +1 -1
  466. data/vendor/assets/stylesheets/dataTables.bootstrap4.css +307 -0
  467. data/vendor/assets/stylesheets/jquery-ui.css +1315 -0
  468. data/vendor/assets/stylesheets/morris.css +3 -0
  469. metadata +95 -218
  470. data/app/actors/hyrax/actors/initialize_workflow_actor.rb +0 -35
  471. data/app/forms/hyrax/forms/embargo.rb +0 -13
  472. data/app/forms/hyrax/forms/lease.rb +0 -13
  473. data/app/forms/hyrax/forms/pcdm_object_form.rb +0 -46
  474. data/app/forms/hyrax/forms/work_embargo_form.rb +0 -35
  475. data/app/forms/hyrax/forms/work_lease_form.rb +0 -35
  476. data/app/helpers/hyrax/url_helper.rb +0 -13
  477. data/app/jobs/content_depositor_change_event_job.rb +0 -48
  478. data/app/models/concerns/hyrax/with_file_sets.rb +0 -17
  479. data/app/services/hyrax/analytics/ga4.rb +0 -204
  480. data/app/services/hyrax/file_set_file_service.rb +0 -55
  481. data/app/services/hyrax/work_resource_query_service.rb +0 -45
  482. data/app/views/hyrax/admin/workflows/_tabs.html.erb +0 -9
  483. data/app/views/shared/_ga4.html.erb +0 -10
  484. data/config/metadata/file_set_metadata.yaml +0 -130
  485. data/lib/hyrax/transactions/create_work.rb +0 -65
  486. data/lib/hyrax/transactions/destroy_work.rb +0 -28
  487. data/lib/hyrax/transactions/steps/apply_collection_permission_template.rb +0 -34
  488. data/lib/hyrax/transactions/steps/apply_permission_template.rb +0 -32
  489. data/lib/hyrax/transactions/steps/apply_visibility.rb +0 -41
  490. data/lib/hyrax/transactions/steps/destroy_work.rb +0 -27
  491. data/lib/hyrax/transactions/steps/ensure_permission_template.rb +0 -29
  492. data/lib/hyrax/transactions/steps/save_work.rb +0 -38
  493. data/lib/hyrax/transactions/update_work.rb +0 -19
  494. data/lib/wings/services/file_converter_service.rb +0 -19
  495. data/lib/wings/services/file_metadata_builder.rb +0 -94
  496. data/vendor/assets/javascripts/handlebars-v4.0.5.js +0 -4612
  497. 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="panel panel-default">
12
- <% if Hyrax.config.analytics? && Hyrax.config.analytics_provider != 'ga4' %>
11
+ <div class="card">
12
+ <% if Hyrax.config.analytics? %>
13
13
  <% if current_user.ability.admin? %>
14
- <div class="panel-heading"><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>
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="panel-heading"><%= t('.access_to') %> <b><%= @works_count %> <%= t('.works') %></b>.</div>
16
+ <div class="card-header"><%= t('.access_to') %> <b><%= @works_count %> <%= t('.works') %></b>.</div>
17
17
  <% end %>
18
- <div class="panel-body">
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-default nav-link" type="button" href="#summary" data-toggle="pill">
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-default nav-link" type="button" href="#monthly" data-toggle="pill">
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-default nav-link" type="button" href="#custom-range" data-toggle="pill">
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 pull-right" %>
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="panel panel-default">
15
- <div class="panel-heading">
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-default pull-right" %>
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="panel-body">
23
+ <div class="card-body">
24
24
  <div class="row">
25
- <div class="col-xs-12 col-md-5">
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-xs-12 col-md-5">
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-default nav-link" type="button" href="#summary" data-toggle="pill">
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-default nav-link" type="button" href="#monthly" data-toggle="pill">
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-default nav-link" type="button" href="#custom-range" data-toggle="pill">
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="panel panel-default">
6
- <div class="panel-body">
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="panel panel-default tabs" id="collection-types-controls">
2
+ <div class="card tabs" id="collection-types-controls">
3
3
  <ul class="nav nav-tabs" role="tablist">
4
- <li class="active">
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="panel panel-default labels">
25
- <div class="panel-body">
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="panel panel-default labels">
33
- <div class="panel-body">
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="panel panel-default labels">
41
- <div class="panel-body">
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="panel panel-default labels collection-types-edit-participants-tab">
50
- <div class="panel-body">
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="panel panel-default labels">
57
- <div class="panel-body">
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="panel-footer">
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'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection_type" %>
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>
@@ -1,5 +1,5 @@
1
- <div class="panel panel-default">
2
- <div class="panel-body">
1
+ <div class="card">
2
+ <div class="card-body">
3
3
  <%= f.input :badge_color, required: false, input_html: { type: 'color' } %>
4
4
  </div>
5
5
  </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-xs-4 control-label"><%= t('.add_group') %>:</label>
14
+ <label class="col-md-2 col-4 col-form-label"><%= t('.add_group') %>:</label>
15
15
 
16
- <div class="col-md-10 col-xs-8 form-group">
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-xs-4 control-label"><%= t('.add_user') %>:</label>
41
+ <label class="col-md-2 col-4 col-form-label"><%= t('.add_user') %>:</label>
42
42
 
43
- <div class="col-md-10 col-xs-8 form-group">
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="checkbox">
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="panel panel-default">
8
- <div class="panel-heading adam">
9
- <span class="panel-heading-message">
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="panel-body">
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-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
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-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
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="panel">
7
- <div class="panel-body">
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="<%= @feature_set.status(feature) -%>"><%= @feature_set.status(feature) -%></span>
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 %></div>
4
+ Total: <%= @presenter.recent_users.count %>
5
5
  <%- else %>
6
6
  <%= @presenter.recent_users.count %> most recent users:
7
7
  <%- end %>
@@ -1,7 +1,5 @@
1
- <div class="row">
2
- <div class="col-sm-12">
3
- <%= render "stats_by_date" %>
4
- <hr />
5
- <%= render "top_data" %>
6
- </div>
1
+ <div class="col-sm-12">
2
+ <%= render "stats_by_date" %>
3
+ <hr />
4
+ <%= render "top_data" %>
7
5
  </div>
@@ -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="panel panel-default users-listing">
6
- <div class="panel-heading">
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="panel-body">
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="panel panel-default">
8
- <div class="panel-heading">
9
- <h2 class="panel-title h2"><%= t('.new_role') %></h2>
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="panel-body">
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="panel panel-default">
25
- <div class="panel-heading">
26
- <h2 class="panel-title h2"><%= t('.current_roles') %></h3>
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="panel-body">
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="glyphicon glyphicon-ok-circle"></span> <%= t('.header') %></h1>
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="panel panel-default tabs">
8
- <%= render 'tabs' %>
9
- <div class="panel-heading">
10
- <span class="count-display">
11
- <% if @response.viewing_under_review? %>
12
- <%= I18n.t('hyrax.admin.workflows.index.works_under_review', total_count: @response.total_count).html_safe %>
13
- <% else %>
14
- <%= I18n.t('hyrax.admin.workflows.index.works_published', total_count: @response.total_count).html_safe %>
15
- <% end %>
16
- </span>
17
- </div>
18
- <div class="panel-body">
19
- <div class="row">
20
- <div class="col-sm-12">
21
- <div class="sort-toggle mt-2">
22
- <%= form_tag hyrax.admin_workflows_path, method: :get, class: 'per_page' do %>
23
- <fieldset class="col-12">
24
- <legend class="sr-only"><%= t('hyrax.dashboard.my.sr.results_per_page') %></legend>
25
- <%= label_tag :per_page do %>
26
- Show <%= select_tag :per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page.map(&:to_s), h(params[:per_page])), title: "entries" %> per page
27
- <% end %>
28
- <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort, :utf8)) %>
29
- </fieldset>
30
- <% end %>
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-default' %>
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-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
7
- <%= t('.header') %> <span class="caret"></span>
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: "control-label" do %>
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: "control-label" do %>
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 %>