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.
Files changed (479) 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/application.rb +1 -1
  11. data/.dassie/config/initializers/riiif.rb +1 -1
  12. data/.dassie/db/schema.rb +5 -5
  13. data/.dassie/package.json +7 -7
  14. data/.engine_cart.yml +2 -39
  15. data/.env +1 -0
  16. data/.regen +2 -1
  17. data/.rubocop.yml +1 -1
  18. data/CONTRIBUTING.md +22 -24
  19. data/Dockerfile +1 -1
  20. data/Rakefile +0 -4
  21. data/app/actors/hyrax/actors/base_actor.rb +1 -1
  22. data/app/actors/hyrax/actors/collections_membership_actor.rb +1 -1
  23. data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +5 -11
  24. data/app/actors/hyrax/actors/embargo_actor.rb +4 -11
  25. data/app/actors/hyrax/actors/file_actor.rb +9 -37
  26. data/app/actors/hyrax/actors/file_set_actor.rb +13 -62
  27. data/app/actors/hyrax/actors/lease_actor.rb +4 -11
  28. data/app/assets/javascripts/hyrax/app.js.erb +2 -2
  29. data/app/assets/javascripts/hyrax/batch.js +2 -2
  30. data/app/assets/javascripts/hyrax/batch_edit.js +4 -4
  31. data/app/assets/javascripts/hyrax/batch_select_all.js +13 -13
  32. data/app/assets/javascripts/hyrax/browse_everything.js +4 -2
  33. data/app/assets/javascripts/hyrax/collection_types.es6 +1 -1
  34. data/app/assets/javascripts/hyrax/collections/editor.es6 +5 -1
  35. data/app/assets/javascripts/hyrax/dashboard_actions.js +5 -5
  36. data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6 +3 -3
  37. data/app/assets/javascripts/hyrax/editor.es6 +3 -3
  38. data/app/assets/javascripts/hyrax/facets.js +6 -4
  39. data/app/assets/javascripts/hyrax/file_manager/member.es6 +1 -1
  40. data/app/assets/javascripts/hyrax/file_manager/save_manager.es6 +2 -2
  41. data/app/assets/javascripts/hyrax/file_manager/sorting.es6 +2 -2
  42. data/app/assets/javascripts/hyrax/file_manager.es6 +2 -17
  43. data/app/assets/javascripts/hyrax/notification.es6 +1 -1
  44. data/app/assets/javascripts/hyrax/permissions/control.es6 +1 -8
  45. data/app/assets/javascripts/hyrax/permissions/registry.es6 +4 -4
  46. data/app/assets/javascripts/hyrax/permissions/user_controls.es6 +3 -1
  47. data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6 +1 -1
  48. data/app/assets/javascripts/hyrax/relationships/control.es6 +2 -2
  49. data/app/assets/javascripts/hyrax/relationships/registry_entry.es6 +1 -1
  50. data/app/assets/javascripts/hyrax/reports-buttons.js +9 -9
  51. data/app/assets/javascripts/hyrax/save_work/required_fields.es6 +1 -1
  52. data/app/assets/javascripts/hyrax/save_work/save_work_control.es6 +6 -6
  53. data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +2 -2
  54. data/app/assets/javascripts/hyrax/single_use_links_manager.js +1 -1
  55. data/app/assets/javascripts/hyrax/skip_to_content.js +1 -1
  56. data/app/assets/javascripts/hyrax/sorting.js +1 -1
  57. data/app/assets/javascripts/hyrax/trophy.js +1 -1
  58. data/app/assets/javascripts/hyrax/uploader.js +3 -3
  59. data/app/assets/javascripts/hyrax.js +1 -19
  60. data/app/assets/stylesheets/_bootstrap-default-overrides.scss +4 -4
  61. data/app/assets/stylesheets/hyrax/_accessibility.scss +1 -1
  62. data/app/assets/stylesheets/hyrax/_badge.scss +7 -0
  63. data/app/assets/stylesheets/hyrax/_batch-edit.scss +8 -8
  64. data/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss +1 -1
  65. data/app/assets/stylesheets/hyrax/_buttons.scss +31 -1
  66. data/app/assets/stylesheets/hyrax/_card.scss +10 -0
  67. data/app/assets/stylesheets/hyrax/_catalog.scss +22 -48
  68. data/app/assets/stylesheets/hyrax/_collection_types.scss +1 -1
  69. data/app/assets/stylesheets/hyrax/_collections.scss +13 -13
  70. data/app/assets/stylesheets/hyrax/_facets.scss +46 -0
  71. data/app/assets/stylesheets/hyrax/_featured.scss +1 -1
  72. data/app/assets/stylesheets/hyrax/_file-listing.scss +3 -3
  73. data/app/assets/stylesheets/hyrax/_file_manager.scss +17 -17
  74. data/app/assets/stylesheets/hyrax/_file_sets.scss +1 -1
  75. data/app/assets/stylesheets/hyrax/_file_upload.scss +4 -4
  76. data/app/assets/stylesheets/hyrax/_fixedsticky.scss +1 -1
  77. data/app/assets/stylesheets/hyrax/_footer.scss +3 -3
  78. data/app/assets/stylesheets/hyrax/_form-progress.scss +9 -9
  79. data/app/assets/stylesheets/hyrax/_form.scss +3 -4
  80. data/app/assets/stylesheets/hyrax/_forms.scss +62 -29
  81. data/app/assets/stylesheets/hyrax/_header.scss +0 -17
  82. data/app/assets/stylesheets/hyrax/_home-page.scss +13 -51
  83. data/app/assets/stylesheets/hyrax/_html.scss +11 -0
  84. data/app/assets/stylesheets/hyrax/_hyrax.scss +16 -14
  85. data/app/assets/stylesheets/hyrax/_nestable.scss +1 -1
  86. data/app/assets/stylesheets/hyrax/_select_work_type.scss +2 -2
  87. data/app/assets/stylesheets/hyrax/_styles.scss +9 -14
  88. data/app/assets/stylesheets/hyrax/_users.scss +2 -2
  89. data/app/assets/stylesheets/hyrax/_variables.scss +20 -1
  90. data/app/assets/stylesheets/hyrax/_work-show.scss +21 -13
  91. data/app/assets/stylesheets/hyrax/blacklight_gallery.scss +75 -2
  92. data/app/assets/stylesheets/hyrax/dashboard.scss +70 -95
  93. data/app/assets/stylesheets/hyrax/sidebar.scss +39 -19
  94. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +9 -0
  95. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +2 -11
  96. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +2 -11
  97. data/app/controllers/concerns/hyrax/manages_embargoes.rb +1 -13
  98. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +4 -9
  99. data/app/controllers/hyrax/batch_edits_controller.rb +1 -1
  100. data/app/controllers/hyrax/dashboard/collections_controller.rb +2 -1
  101. data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +0 -32
  102. data/app/controllers/hyrax/downloads_controller.rb +1 -16
  103. data/app/controllers/hyrax/file_sets_controller.rb +4 -10
  104. data/app/controllers/hyrax/homepage_controller.rb +0 -1
  105. data/app/controllers/hyrax/my_controller.rb +0 -6
  106. data/app/controllers/hyrax/permissions_controller.rb +1 -1
  107. data/app/controllers/hyrax/single_use_links_controller.rb +1 -2
  108. data/app/controllers/hyrax/transfers_controller.rb +2 -0
  109. data/app/controllers/hyrax/workflow_actions_controller.rb +2 -3
  110. data/app/forms/hyrax/forms/collection_form.rb +1 -1
  111. data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +0 -2
  112. data/app/forms/hyrax/forms/file_set_edit_form.rb +1 -1
  113. data/app/forms/hyrax/forms/file_set_form.rb +35 -8
  114. data/app/forms/hyrax/forms/resource_form.rb +32 -36
  115. data/app/helpers/hyrax/embargo_helper.rb +0 -11
  116. data/app/helpers/hyrax/facets_helper.rb +150 -0
  117. data/app/helpers/hyrax/hyrax_helper_behavior.rb +5 -5
  118. data/app/helpers/hyrax/lease_helper.rb +0 -11
  119. data/app/indexers/hyrax/basic_metadata_indexer.rb +3 -9
  120. data/app/indexers/hyrax/pcdm_collection_indexer.rb +0 -1
  121. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +8 -2
  122. data/app/jobs/characterize_job.rb +4 -7
  123. data/app/jobs/content_event_job.rb +1 -1
  124. data/app/jobs/create_derivatives_job.rb +4 -2
  125. data/app/jobs/ingest_local_file_job.rb +5 -13
  126. data/app/jobs/inherit_permissions_job.rb +1 -5
  127. data/app/models/admin_set.rb +0 -8
  128. data/app/models/concerns/hyrax/collection_behavior.rb +2 -3
  129. data/app/models/concerns/hyrax/collection_nesting.rb +1 -10
  130. data/app/models/concerns/hyrax/file_set_behavior.rb +1 -2
  131. data/app/models/concerns/hyrax/in_admin_set.rb +0 -7
  132. data/app/models/concerns/hyrax/user.rb +3 -3
  133. data/app/models/concerns/hyrax/work_behavior.rb +1 -3
  134. data/app/models/content_block.rb +0 -6
  135. data/app/models/hyrax/embargo.rb +1 -1
  136. data/app/models/hyrax/file_metadata.rb +1 -1
  137. data/app/models/hyrax/file_set.rb +3 -3
  138. data/app/models/hyrax/lease.rb +1 -1
  139. data/app/models/hyrax/permission_template.rb +0 -35
  140. data/app/models/proxy_deposit_request.rb +1 -1
  141. data/app/presenters/hyrax/admin/repository_object_presenter.rb +0 -2
  142. data/app/presenters/hyrax/collapsable_section_presenter.rb +2 -2
  143. data/app/presenters/hyrax/collection_presenter.rb +1 -1
  144. data/app/presenters/hyrax/fixity_status_presenter.rb +2 -2
  145. data/app/presenters/hyrax/menu_presenter.rb +1 -1
  146. data/app/presenters/hyrax/permission_badge.rb +8 -9
  147. data/app/presenters/hyrax/version_list_presenter.rb +1 -6
  148. data/app/presenters/hyrax/workflow_presenter.rb +1 -1
  149. data/app/renderers/hyrax/renderers/external_link_attribute_renderer.rb +1 -1
  150. data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +5 -13
  151. data/app/search_builders/hyrax/deposit_search_builder.rb +1 -1
  152. data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +10 -1
  153. data/app/search_builders/hyrax/single_result.rb +1 -1
  154. data/app/search_builders/hyrax/stats/work_status_search_builder.rb +1 -1
  155. data/app/services/hyrax/adapters/nesting_index_adapter.rb +1 -1
  156. data/app/services/hyrax/collection_member_service.rb +1 -2
  157. data/app/services/hyrax/collections/nested_collection_query_service.rb +1 -1
  158. data/app/services/hyrax/collections/search_service.rb +0 -1
  159. data/app/services/hyrax/custom_queries.rb +25 -0
  160. data/app/services/hyrax/edit_permissions_service.rb +3 -21
  161. data/app/services/hyrax/embargo_manager.rb +0 -9
  162. data/app/services/hyrax/file_set_csv_service.rb +1 -1
  163. data/app/services/hyrax/graph_exporter.rb +3 -8
  164. data/app/services/hyrax/iiif_authorization_service.rb +1 -1
  165. data/app/services/hyrax/lease_manager.rb +0 -9
  166. data/app/services/hyrax/listeners/file_metadata_listener.rb +0 -11
  167. data/app/services/hyrax/search_service.rb +1 -81
  168. data/app/services/hyrax/statistics/depositors/summary.rb +1 -3
  169. data/app/services/hyrax/user_stat_importer.rb +0 -2
  170. data/app/services/hyrax/valkyrie_upload.rb +13 -1
  171. data/app/services/hyrax/versioning_service.rb +9 -77
  172. data/app/services/hyrax/visibility_propagator.rb +5 -5
  173. data/app/services/hyrax/work_query_service.rb +1 -1
  174. data/app/services/hyrax/working_directory.rb +2 -0
  175. data/app/views/_controls.html.erb +14 -18
  176. data/app/views/_logo.html.erb +0 -1
  177. data/app/views/_masthead.html.erb +8 -18
  178. data/app/views/_user_util_links.html.erb +16 -18
  179. data/app/views/catalog/_document.html.erb +2 -2
  180. data/app/views/catalog/_document_list.html.erb +1 -1
  181. data/app/views/catalog/_facet_limit.html.erb +1 -1
  182. data/app/views/catalog/_index_gallery_collection_wrapper.html.erb +1 -1
  183. data/app/views/catalog/_index_header_list_collection.html.erb +2 -2
  184. data/app/views/catalog/_index_header_list_default.html.erb +1 -1
  185. data/app/views/catalog/_index_list_default.html.erb +7 -5
  186. data/app/views/catalog/_search_form.html.erb +13 -15
  187. data/app/views/catalog/_thumbnail_list_collection.html.erb +2 -2
  188. data/app/views/catalog/_thumbnail_list_default.html.erb +3 -3
  189. data/app/views/catalog/facet.html.erb +21 -0
  190. data/app/views/catalog/index.html.erb +6 -4
  191. data/app/views/hyrax/admin/admin_sets/_form.html.erb +16 -16
  192. data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +35 -33
  193. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +9 -8
  194. data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +24 -24
  195. data/app/views/hyrax/admin/admin_sets/_form_workflow.erb +5 -5
  196. data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb +3 -3
  197. data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +9 -9
  198. data/app/views/hyrax/admin/admin_sets/index.html.erb +3 -3
  199. data/app/views/hyrax/admin/admin_sets/show.html.erb +4 -4
  200. data/app/views/hyrax/admin/analytics/_date_range_form.html.erb +3 -3
  201. data/app/views/hyrax/admin/analytics/collection_reports/_custom_range.html.erb +3 -3
  202. data/app/views/hyrax/admin/analytics/collection_reports/_monthly_summary.html.erb +3 -3
  203. data/app/views/hyrax/admin/analytics/collection_reports/_summary.html.erb +3 -3
  204. data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb +7 -7
  205. data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb +6 -6
  206. data/app/views/hyrax/admin/analytics/collection_reports/show.html.erb +10 -10
  207. data/app/views/hyrax/admin/analytics/work_reports/_custom_range.html.erb +3 -3
  208. data/app/views/hyrax/admin/analytics/work_reports/_monthly_summary.html.erb +3 -3
  209. data/app/views/hyrax/admin/analytics/work_reports/_summary.html.erb +3 -3
  210. data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb +5 -5
  211. data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb +7 -7
  212. data/app/views/hyrax/admin/analytics/work_reports/_work_counts.html.erb +4 -4
  213. data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb +5 -5
  214. data/app/views/hyrax/admin/analytics/work_reports/index.html.erb +7 -7
  215. data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +10 -10
  216. data/app/views/hyrax/admin/appearances/show.html.erb +2 -2
  217. data/app/views/hyrax/admin/collection_types/_form.html.erb +24 -23
  218. data/app/views/hyrax/admin/collection_types/_form_appearance.html.erb +2 -2
  219. data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +4 -4
  220. data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +9 -9
  221. data/app/views/hyrax/admin/collection_types/index.html.erb +6 -6
  222. data/app/views/hyrax/admin/features/index.html.erb +3 -3
  223. data/app/views/hyrax/admin/stats/_new_users.html.erb +1 -1
  224. data/app/views/hyrax/admin/stats/show.html.erb +4 -6
  225. data/app/views/hyrax/admin/users/index.html.erb +3 -3
  226. data/app/views/hyrax/admin/workflow_roles/index.html.erb +8 -8
  227. data/app/views/hyrax/admin/workflows/index.html.erb +13 -13
  228. data/app/views/hyrax/base/_citations.html.erb +6 -6
  229. data/app/views/hyrax/base/_currently_shared.html.erb +3 -3
  230. data/app/views/hyrax/base/_file_manager_actions.html.erb +5 -3
  231. data/app/views/hyrax/base/_file_manager_member.html.erb +5 -5
  232. data/app/views/hyrax/base/_file_manager_member_resource_options.html.erb +6 -6
  233. data/app/views/hyrax/base/_file_manager_members.html.erb +1 -1
  234. data/app/views/hyrax/base/_file_manager_thumbnail.html.erb +1 -1
  235. data/app/views/hyrax/base/_form_child_work_relationships.html.erb +3 -3
  236. data/app/views/hyrax/base/_form_files.html.erb +9 -9
  237. data/app/views/hyrax/base/_form_member_of_collections.html.erb +3 -3
  238. data/app/views/hyrax/base/_form_metadata.html.erb +1 -1
  239. data/app/views/hyrax/base/_form_permission.html.erb +30 -20
  240. data/app/views/hyrax/base/_form_permission_under_embargo.html.erb +1 -1
  241. data/app/views/hyrax/base/_form_permission_under_lease.html.erb +1 -1
  242. data/app/views/hyrax/base/_form_progress.html.erb +7 -7
  243. data/app/views/hyrax/base/_form_relationships.html.erb +1 -1
  244. data/app/views/hyrax/base/_form_rendering.html.erb +1 -1
  245. data/app/views/hyrax/base/_form_representative.html.erb +1 -1
  246. data/app/views/hyrax/base/_form_share.html.erb +6 -6
  247. data/app/views/hyrax/base/_form_thumbnail.html.erb +1 -1
  248. data/app/views/hyrax/base/_form_visibility_component.html.erb +16 -20
  249. data/app/views/hyrax/base/_guts4form.html.erb +12 -20
  250. data/app/views/hyrax/base/_member.html.erb +1 -1
  251. data/app/views/hyrax/base/_metadata.html.erb +1 -1
  252. data/app/views/hyrax/base/_show_actions.html.erb +9 -9
  253. data/app/views/hyrax/base/_work_button_row.html.erb +16 -15
  254. data/app/views/hyrax/base/_workflow_actions.html.erb +10 -10
  255. data/app/views/hyrax/base/_workflow_actions_widget.erb +1 -1
  256. data/app/views/hyrax/base/file_manager.html.erb +4 -5
  257. data/app/views/hyrax/base/inspect_work.html.erb +1 -1
  258. data/app/views/hyrax/base/show.html.erb +12 -12
  259. data/app/views/hyrax/base/unavailable.html.erb +2 -2
  260. data/app/views/hyrax/batch_edits/_check_all.html.erb +0 -1
  261. data/app/views/hyrax/batch_edits/_delete_selected.html.erb +1 -1
  262. data/app/views/hyrax/batch_edits/edit.html.erb +26 -18
  263. data/app/views/hyrax/collections/_bookmark_control.html.erb +2 -2
  264. data/app/views/hyrax/collections/_list_collections.html.erb +6 -6
  265. data/app/views/hyrax/collections/_list_works.html.erb +3 -1
  266. data/app/views/hyrax/collections/_search_form.html.erb +4 -4
  267. data/app/views/hyrax/collections/_show_document_list_row.html.erb +5 -2
  268. data/app/views/hyrax/collections/_sort_and_per_page.html.erb +3 -3
  269. data/app/views/hyrax/collections/_view_type_group.html.erb +2 -2
  270. data/app/views/hyrax/contact_form/new.html.erb +12 -13
  271. data/app/views/hyrax/content_blocks/_form.html.erb +29 -23
  272. data/app/views/hyrax/content_blocks/templates/agreement.html.erb +3 -3
  273. data/app/views/hyrax/dashboard/_admin_sets.html.erb +22 -28
  274. data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb +2 -2
  275. data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +4 -4
  276. data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb +2 -2
  277. data/app/views/hyrax/dashboard/_repository_growth.html.erb +28 -28
  278. data/app/views/hyrax/dashboard/_resource_type_graph.html.erb +4 -4
  279. data/app/views/hyrax/dashboard/_sidebar.html.erb +3 -3
  280. data/app/views/hyrax/dashboard/_tabs.html.erb +6 -2
  281. data/app/views/hyrax/dashboard/_user_activity.html.erb +22 -19
  282. data/app/views/hyrax/dashboard/_visibility_graph.html.erb +4 -4
  283. data/app/views/hyrax/dashboard/_work_type_graph.html.erb +4 -4
  284. data/app/views/hyrax/dashboard/collections/_batch_edits_actions.html.erb +1 -1
  285. data/app/views/hyrax/dashboard/collections/_bookmark_control.html.erb +2 -2
  286. data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +1 -1
  287. data/app/views/hyrax/dashboard/collections/_form.html.erb +30 -22
  288. data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +19 -19
  289. data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +8 -4
  290. data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +7 -7
  291. data/app/views/hyrax/dashboard/collections/_form_share.html.erb +11 -9
  292. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +34 -31
  293. data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +1 -1
  294. data/app/views/hyrax/dashboard/collections/_list_works.html.erb +3 -1
  295. data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +1 -1
  296. data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +1 -1
  297. data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +1 -1
  298. data/app/views/hyrax/dashboard/collections/_show_descriptions.html.erb +5 -3
  299. data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb +4 -4
  300. data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +12 -10
  301. data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +2 -2
  302. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +4 -4
  303. data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +1 -1
  304. data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +10 -10
  305. data/app/views/hyrax/dashboard/collections/show.html.erb +4 -4
  306. data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +21 -21
  307. data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb +5 -5
  308. data/app/views/hyrax/dashboard/profiles/_zotero.html.erb +2 -2
  309. data/app/views/hyrax/dashboard/profiles/edit.html.erb +2 -2
  310. data/app/views/hyrax/dashboard/profiles/show.html.erb +3 -3
  311. data/app/views/hyrax/dashboard/show_admin.html.erb +36 -34
  312. data/app/views/hyrax/dashboard/show_user.html.erb +16 -16
  313. data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +10 -10
  314. data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +8 -8
  315. data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +3 -1
  316. data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +5 -1
  317. data/app/views/hyrax/dashboard/works/_list_works.html.erb +4 -1
  318. data/app/views/hyrax/depositors/index.html.erb +2 -2
  319. data/app/views/hyrax/embargoes/edit.html.erb +14 -14
  320. data/app/views/hyrax/embargoes/index.html.erb +18 -6
  321. data/app/views/hyrax/file_sets/_actions.html.erb +5 -6
  322. data/app/views/hyrax/file_sets/_descriptions.html.erb +1 -1
  323. data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +1 -1
  324. data/app/views/hyrax/file_sets/_form.html.erb +1 -1
  325. data/app/views/hyrax/file_sets/_permission.html.erb +1 -1
  326. data/app/views/hyrax/file_sets/_permission_form.html.erb +39 -30
  327. data/app/views/hyrax/file_sets/_show_actions.html.erb +2 -2
  328. data/app/views/hyrax/file_sets/_show_details.html.erb +27 -17
  329. data/app/views/hyrax/file_sets/_single_use_link_rows.html.erb +2 -2
  330. data/app/views/hyrax/file_sets/_single_use_links.html.erb +2 -2
  331. data/app/views/hyrax/file_sets/_versioning.html.erb +9 -9
  332. data/app/views/hyrax/file_sets/edit.html.erb +19 -13
  333. data/app/views/hyrax/file_sets/media_display/_image.html.erb +4 -4
  334. data/app/views/hyrax/file_sets/show.html.erb +2 -2
  335. data/app/views/hyrax/homepage/_announcement.html.erb +2 -2
  336. data/app/views/hyrax/homepage/_explore_collections.html.erb +6 -4
  337. data/app/views/hyrax/homepage/_featured_fields.html.erb +1 -1
  338. data/app/views/hyrax/homepage/_featured_works.html.erb +1 -1
  339. data/app/views/hyrax/homepage/_home_content.html.erb +24 -10
  340. data/app/views/hyrax/homepage/_marketing.html.erb +1 -1
  341. data/app/views/hyrax/homepage/_recent_document.html.erb +4 -1
  342. data/app/views/hyrax/homepage/_sortable_featured.html.erb +3 -3
  343. data/app/views/hyrax/homepage/index.html.erb +4 -4
  344. data/app/views/hyrax/leases/edit.html.erb +14 -14
  345. data/app/views/hyrax/leases/index.html.erb +18 -6
  346. data/app/views/hyrax/my/_admin_set_action_menu.html.erb +5 -5
  347. data/app/views/hyrax/my/_collection_action_menu.html.erb +6 -6
  348. data/app/views/hyrax/my/_constraints.html.erb +2 -2
  349. data/app/views/hyrax/my/_document_list.html.erb +1 -1
  350. data/app/views/hyrax/my/_facet_layout.html.erb +1 -2
  351. data/app/views/hyrax/my/_facet_limit.html.erb +4 -4
  352. data/app/views/hyrax/my/_facet_pagination.html.erb +1 -25
  353. data/app/views/hyrax/my/_facet_pivot.html.erb +1 -1
  354. data/app/views/hyrax/my/_facet_selected.html.erb +1 -1
  355. data/app/views/hyrax/my/_search_form.html.erb +7 -8
  356. data/app/views/hyrax/my/_sort_and_per_page.html.erb +10 -12
  357. data/app/views/hyrax/my/_work_action_menu.html.erb +4 -5
  358. data/app/views/hyrax/my/collections/_facets.html.erb +2 -2
  359. data/app/views/hyrax/my/collections/_list_collections.html.erb +1 -1
  360. data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +2 -2
  361. data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +2 -2
  362. data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +5 -5
  363. data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +1 -1
  364. data/app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb +1 -1
  365. data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +1 -1
  366. data/app/views/hyrax/my/collections/_tabs.html.erb +11 -4
  367. data/app/views/hyrax/my/collections/index.html.erb +3 -3
  368. data/app/views/hyrax/my/facet.html.erb +17 -16
  369. data/app/views/hyrax/my/index.html.erb +2 -2
  370. data/app/views/hyrax/my/works/_batch_actions.html.erb +1 -1
  371. data/app/views/hyrax/my/works/_facets.html.erb +2 -2
  372. data/app/views/hyrax/my/works/_list_works.html.erb +6 -7
  373. data/app/views/hyrax/my/works/_tabs.html.erb +6 -6
  374. data/app/views/hyrax/my/works/index.html.erb +20 -18
  375. data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
  376. data/app/views/hyrax/notifications/index.html.erb +4 -4
  377. data/app/views/hyrax/operations/index.html.erb +1 -1
  378. data/app/views/hyrax/operations/show.html.erb +2 -2
  379. data/app/views/hyrax/pages/_form.html.erb +76 -64
  380. data/app/views/hyrax/permissions/confirm.html.erb +4 -4
  381. data/app/views/hyrax/permissions/confirm_access.html.erb +4 -4
  382. data/app/views/hyrax/stats/file.html.erb +1 -1
  383. data/app/views/hyrax/stats/work.html.erb +1 -1
  384. data/app/views/hyrax/transfers/_received.html.erb +4 -4
  385. data/app/views/hyrax/transfers/index.html.erb +8 -8
  386. data/app/views/hyrax/transfers/new.html.erb +1 -1
  387. data/app/views/hyrax/uploads/_js_templates.html.erb +14 -14
  388. data/app/views/hyrax/uploads/_js_templates_branding.html.erb +5 -5
  389. data/app/views/hyrax/uploads/_js_templates_versioning.html.erb +15 -15
  390. data/app/views/hyrax/users/_activity.html.erb +3 -3
  391. data/app/views/hyrax/users/_contributions.html.erb +3 -3
  392. data/app/views/hyrax/users/_left_sidebar.html.erb +1 -1
  393. data/app/views/hyrax/users/_profile_tabs.html.erb +16 -8
  394. data/app/views/hyrax/users/_search_form.html.erb +2 -2
  395. data/app/views/hyrax/users/_user.html.erb +5 -5
  396. data/app/views/hyrax/users/_user_info.html.erb +4 -4
  397. data/app/views/hyrax/users/_vitals.html.erb +3 -3
  398. data/app/views/hyrax/users/show.html.erb +2 -2
  399. data/app/views/layouts/hyrax/dashboard.html.erb +4 -4
  400. data/app/views/layouts/hyrax.html.erb +4 -3
  401. data/app/views/shared/_appearance_styles.html.erb +8 -8
  402. data/app/views/shared/_footer.html.erb +1 -1
  403. data/app/views/shared/_locale_picker.html.erb +5 -8
  404. data/app/views/shared/_nav_safety_modal.html.erb +2 -2
  405. data/app/views/shared/_select_work_type_modal.html.erb +2 -2
  406. data/config/locales/hyrax.de.yml +5 -6
  407. data/config/locales/hyrax.en.yml +4 -7
  408. data/config/locales/hyrax.es.yml +6 -7
  409. data/config/locales/hyrax.fr.yml +8 -9
  410. data/config/locales/hyrax.it.yml +6 -7
  411. data/config/locales/hyrax.pt-BR.yml +6 -7
  412. data/config/locales/hyrax.zh.yml +6 -7
  413. data/docker-compose.yml +2 -1
  414. data/documentation/developing-your-hyrax-based-app.md +2 -2
  415. data/documentation/legacyREADME.md +3 -3
  416. data/hyrax.gemspec +12 -23
  417. data/karma.conf.js +104 -0
  418. data/lib/generators/hyrax/assets_generator.rb +2 -5
  419. data/lib/generators/hyrax/install_generator.rb +9 -33
  420. data/lib/generators/hyrax/templates/catalog_controller.rb +20 -13
  421. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
  422. data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
  423. data/lib/generators/hyrax/templates/hyrax.scss +1 -2
  424. data/lib/generators/hyrax/templates/package.json +7 -8
  425. data/lib/hyrax/active_fedora_dummy_model.rb +0 -13
  426. data/lib/hyrax/configuration.rb +2 -49
  427. data/lib/hyrax/engine.rb +1 -2
  428. data/lib/hyrax/errors.rb +0 -2
  429. data/lib/hyrax/publisher.rb +0 -4
  430. data/lib/hyrax/specs/capybara.rb +5 -3
  431. data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb +0 -6
  432. data/lib/hyrax/specs/shared_specs/indexers.rb +0 -5
  433. data/lib/hyrax/transactions/container.rb +0 -54
  434. data/lib/hyrax/version.rb +1 -1
  435. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
  436. data/lib/wings/valkyrie/persister.rb +2 -1
  437. data/lib/wings/valkyrie/storage.rb +2 -6
  438. data/package.json +11 -0
  439. data/tasks/hyrax_dev.rake +32 -0
  440. data/template.rb +1 -1
  441. data/vendor/assets/javascripts/dataTables.bootstrap4.js +184 -0
  442. data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js +1 -1
  443. data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +2 -2
  444. data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +1 -1
  445. data/vendor/assets/javascripts/handlebars.js +5214 -0
  446. data/vendor/assets/javascripts/jquery-ui.js +19057 -0
  447. data/vendor/assets/javascripts/jquery.dataTables.js +15336 -0
  448. data/vendor/assets/javascripts/morris/morris.min.js +9 -1
  449. data/vendor/assets/javascripts/morris/raphael-min.js +4 -6
  450. data/vendor/assets/javascripts/nestable.js +1 -1
  451. data/vendor/assets/stylesheets/dataTables.bootstrap4.css +307 -0
  452. data/vendor/assets/stylesheets/jquery-ui.css +1315 -0
  453. data/vendor/assets/stylesheets/morris.css +3 -0
  454. metadata +93 -209
  455. data/app/actors/hyrax/actors/initialize_workflow_actor.rb +0 -35
  456. data/app/forms/hyrax/forms/embargo.rb +0 -13
  457. data/app/forms/hyrax/forms/lease.rb +0 -13
  458. data/app/forms/hyrax/forms/pcdm_object_form.rb +0 -46
  459. data/app/forms/hyrax/forms/work_embargo_form.rb +0 -35
  460. data/app/forms/hyrax/forms/work_lease_form.rb +0 -35
  461. data/app/helpers/hyrax/url_helper.rb +0 -13
  462. data/app/jobs/content_depositor_change_event_job.rb +0 -48
  463. data/app/models/concerns/hyrax/with_file_sets.rb +0 -17
  464. data/app/services/hyrax/file_set_file_service.rb +0 -55
  465. data/app/services/hyrax/work_resource_query_service.rb +0 -45
  466. data/config/metadata/file_set_metadata.yaml +0 -130
  467. data/lib/hyrax/transactions/create_work.rb +0 -65
  468. data/lib/hyrax/transactions/destroy_work.rb +0 -28
  469. data/lib/hyrax/transactions/steps/apply_collection_permission_template.rb +0 -34
  470. data/lib/hyrax/transactions/steps/apply_permission_template.rb +0 -32
  471. data/lib/hyrax/transactions/steps/apply_visibility.rb +0 -41
  472. data/lib/hyrax/transactions/steps/destroy_work.rb +0 -27
  473. data/lib/hyrax/transactions/steps/ensure_permission_template.rb +0 -29
  474. data/lib/hyrax/transactions/steps/save_work.rb +0 -38
  475. data/lib/hyrax/transactions/update_work.rb +0 -19
  476. data/lib/wings/services/file_converter_service.rb +0 -19
  477. data/lib/wings/services/file_metadata_builder.rb +0 -94
  478. data/vendor/assets/javascripts/handlebars-v4.0.5.js +0 -4612
  479. data/vendor/assets/stylesheets/morris.js/0.5.1/morris.css +0 -2
@@ -1,28 +1,26 @@
1
- <ul id="user_utility_links" class="nav navbar-nav navbar-right">
1
+ <ul id="user_utility_links" class="navbar-nav navbar-dark">
2
2
  <%= render 'shared/locale_picker' if available_translations.size > 1 %>
3
3
  <% if user_signed_in? %>
4
- <li>
4
+ <li class="nav-item">
5
5
  <%= render_notifications(user: current_user) %>
6
6
  </li>
7
- <li class="dropdown">
8
- <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false, controls: 'user-util-links' } do %>
7
+ <li class="nav-item dropdown">
8
+ <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
9
9
  <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
10
- <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
10
+ <span><%= current_user.name %></span>
11
11
  <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
12
- <span class="fa fa-user" aria-hidden="true"></span>
13
- <span class="caret"></span>
14
- <% end %>
15
- <ul id="user-util-links" class="dropdown-menu dropdown-menu-right" role="menu">
16
- <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li>
17
-
18
- <li class="divider"></li>
19
- <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
20
- </ul>
21
- </li><!-- /.btn-group -->
12
+ </a>
13
+ <div class="dropdown-menu" aria-labelledby="navbarDropdown">
14
+ <%= link_to "My Profile", hyrax.dashboard_profile_path(current_user), class: 'dropdown-item' %>
15
+ <%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path, class: "dropdown-item" %>
16
+ <div class="dropdown-divider"></div>
17
+ <%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path, class: "dropdown-item" %>
18
+ </div>
19
+ </li>
22
20
  <% else %>
23
- <li>
24
- <%= link_to main_app.new_user_session_path do %>
25
- <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
21
+ <li class="nav-item">
22
+ <%= link_to main_app.new_user_session_path, class: 'nav-link' do %>
23
+ <span class="fa fa-sign-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
26
24
  <% end %>
27
25
  </li>
28
26
  <% end %>
@@ -1,5 +1,5 @@
1
- <li id="document_<%= document.to_param %>" class="document <%= render_document_class document %>" itemscope itemtype="<%= document.itemtype %>">
2
- <div class="row search-result-wrapper">
1
+ <li id="document_<%= document.to_param %>" class="pb-3 document <%= render_document_class document %>" itemscope itemtype="<%= document.itemtype %>">
2
+ <div class="search-result-wrapper row">
3
3
  <%= render_document_partials document, blacklight_config.view_config(document_index_view_type).partials, document_counter: document_counter %>
4
4
  </div>
5
5
  </li>
@@ -1,6 +1,6 @@
1
1
  <%# container for all documents in index view -%>
2
2
  <div id="search-results">
3
- <ul class="list-unstyled catalog" start="<%= document_counter_with_offset(0) %>">
3
+ <ul class="list-unstyled catalog mt-4" start="<%= document_counter_with_offset(0) %>">
4
4
  <%= render documents, as: :document %>
5
5
  </ul>
6
6
  </div>
@@ -5,7 +5,7 @@
5
5
  <% unless paginator.last_page? || params[:action] == "facet" %>
6
6
  <li class="more_facets_link">
7
7
  <%= link_to t("more_#{field_name}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: facet_field_label(facet_field.field).pluralize),
8
- search_facet_path(id: facet_field.key), class: "more_facets_link" %>
8
+ search_facet_path(id: facet_field.key), class: "more_facets_link", data: { blacklight_modal: 'trigger' } %>
9
9
  </li>
10
10
  <% end %>
11
11
  </ul>
@@ -1,4 +1,4 @@
1
- <div class="document col-xs-6 col-md-3">
1
+ <div class="document col-6 col-md-3">
2
2
  <div class="thumbnail">
3
3
  <%= collection_thumbnail(document, {}, counter: document_counter_with_offset(document_counter)) %>
4
4
  <div class="caption">
@@ -1,4 +1,4 @@
1
- <div class="search-results-title-row">
2
- <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
1
+ <div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
2
+ <h3 class="search-result-title mb-0 pr-3"><%= link_to document.title_or_label, [hyrax, document] %></h3>
3
3
  <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
4
4
  </div>
@@ -1,5 +1,5 @@
1
1
  <% model = document.hydra_model %>
2
- <div class="search-results-title-row">
2
+ <div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
3
3
  <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
4
4
  <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
5
5
  <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
@@ -1,11 +1,13 @@
1
- <div class="col-md-6">
1
+ <div class="col-md-9 col-lg-6">
2
2
  <div class="metadata">
3
- <dl class="dl-horizontal">
3
+ <dl>
4
4
  <% doc_presenter = index_presenter(document) %>
5
5
  <% index_fields(document).each do |field_name, field| -%>
6
6
  <% if should_render_index_field? document, field %>
7
- <dt data-solr-field-name="<%= field_name %>"><%= render_index_field_label document, field: field_name %></dt>
8
- <dd><%= doc_presenter.field_value field %></dd>
7
+ <div class="row">
8
+ <dt class="col-5 text-right" data-solr-field-name="<%= field_name %>"><%= render_index_field_label document, field: field_name %></dt>
9
+ <dd class="col-7"><%= doc_presenter.field_value field %></dd>
10
+ </div>
9
11
  <% end %>
10
12
  <% end %>
11
13
  </dl>
@@ -13,7 +15,7 @@
13
15
  </div>
14
16
  <% if document.collection? %>
15
17
  <% collection_presenter = Hyrax::CollectionPresenter.new(document, current_ability) %>
16
- <div class="col-md-4">
18
+ <div class="col-md-12 col-lg-3">
17
19
  <div class="collection-counts-wrapper">
18
20
  <div class="collection-counts-item">
19
21
  <span><%= collection_presenter.total_viewable_collections %></span>Collections
@@ -1,43 +1,41 @@
1
- <%= form_tag search_form_action, method: :get, class: "form-horizontal search-form", id: "search-form-header", role: "search" do %>
2
- <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
1
+ <%= form_tag search_form_action, method: :get, class: "search-form", id: "search-form-header", role: "search" do %>
2
+ <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
3
3
  <%= hidden_field_tag :search_field, 'all_fields' %>
4
- <div class="form-group">
4
+ <div class="form-group row">
5
5
 
6
- <label class="control-label col-sm-3" for="search-field-header">
6
+ <label class="col-sm-3 mb-0" for="search-field-header">
7
7
  <%= t("hyrax.search.form.q.label", application_name: application_name) %>
8
8
  </label>
9
9
 
10
- <div class="input-group">
10
+ <div class="input-group col-sm-9">
11
11
  <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
12
12
 
13
- <div class="input-group-btn">
13
+ <div class="input-group-append">
14
14
  <button type="submit" class="btn btn-primary" id="search-submit-header">
15
15
  <%= t('hyrax.search.button.html') %>
16
16
  </button>
17
17
  <% if current_user %>
18
- <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
18
+ <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
19
19
 
20
20
  <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
21
21
  <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
22
- <span class="caret"></span>
23
22
  </button>
24
23
 
25
- <ul class="dropdown-menu pull-right">
26
- <li>
24
+ <ul class="dropdown-menu dropdown-menu-right">
25
+ <li class="dropdown-item">
27
26
  <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
28
27
  data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
29
28
  </li>
30
- <li>
29
+ <li class="dropdown-item">
31
30
  <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
32
31
  data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
33
32
  </li>
34
- <li>
33
+ <li class="dropdown-item">
35
34
  <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
36
35
  data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
37
36
  </li>
38
- <% end %>
39
-
40
- </ul>
37
+ </ul>
38
+ <% end %>
41
39
  </div><!-- /.input-group-btn -->
42
40
  </div><!-- /.input-group -->
43
41
 
@@ -1,4 +1,4 @@
1
- <div class="col-md-2">
2
- <%= render_thumbnail_tag document, {}, suppress_link: true %>
1
+ <div class="col-md-3">
2
+ <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, { suppress_link: true }) %>
3
3
  </div>
4
4
 
@@ -1,10 +1,10 @@
1
1
  <% model = document.hydra_model %>
2
- <div class="col-md-2">
2
+ <div class="col-md-3">
3
3
  <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
4
- <%= render_thumbnail_tag document, {}, suppress_link: true %>
4
+ <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, suppress_link: true) %>
5
5
  <% else %>
6
6
  <div class="list-thumbnail">
7
- <%= render_thumbnail_tag document %>
7
+ <%= document_presenter(document)&.thumbnail&.thumbnail_tag %>
8
8
  </div>
9
9
  <% end %>
10
10
  </div>
@@ -0,0 +1,21 @@
1
+ <%# Blacklight 7.24.0 %>
2
+ <%# Override app/views/catalog/facet.html.erb %>
3
+
4
+ <%= render Blacklight::System::ModalComponent.new do |component| %>
5
+ <%# Removed component prefix that duplicates the facet pagination view %>
6
+
7
+ <% component.title { facet_field_label(@facet.key) } %>
8
+
9
+ <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
10
+
11
+ <div class="facet-extended-list">
12
+ <%= render_facet_limit(@display_facet, layout: false) %>
13
+ </div>
14
+
15
+ <%# Removed component footer and placed the facet pagination partial within a `container` div %>
16
+ <div class="container">
17
+ <div class="facet-pagination bottom row justify-content-between">
18
+ <%= render :partial=>'facet_pagination' %>
19
+ </div>
20
+ </div>
21
+ <% end %>
@@ -1,7 +1,9 @@
1
- <div id="content" class="col-md-9 col-md-push-3 col-sm-8 col-sm-push-4">
1
+ <div class="row mt-4">
2
+ <div id="content" class="order-sm-1 order-md-2 col-md-9 col-sm-12">
2
3
  <%= render 'search_results' %>
3
- </div>
4
+ </div>
4
5
 
5
- <div id="sidebar" class="col-md-3 col-md-pull-9 col-sm-4 col-sm-pull-8">
6
- <%= render 'search_sidebar' %>
6
+ <div id="sidebar" class="order-sm-2 order-md-1 col-md-3 col-sm-12">
7
+ <%= render 'search_sidebar' %>
8
+ </div>
7
9
  </div>
@@ -1,26 +1,26 @@
1
1
  <%= render 'shared/nav_safety_modal' %>
2
- <div class="panel panel-default tabs" id="admin-set-controls">
2
+ <div class="tabs mt-4" id="admin-set-controls">
3
3
  <ul class="nav nav-tabs" role="tablist">
4
- <li class="active">
5
- <a href="#description" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.description') %></a>
4
+ <li class="nav-item">
5
+ <a href="#description" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm"><%= t('.tabs.description') %></a>
6
6
  </li>
7
7
  <% if @form.persisted? %>
8
- <li>
9
- <a href="#participants" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.participants') %></a>
8
+ <li class="nav-item">
9
+ <a href="#participants" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('.tabs.participants') %></a>
10
10
  </li>
11
- <li>
12
- <a href="#visibility" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.visibility') %></a>
11
+ <li class="nav-item">
12
+ <a href="#visibility" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('.tabs.visibility') %></a>
13
13
  </li>
14
- <li>
15
- <a href="#workflow" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.workflow') %></a>
14
+ <li class="nav-item">
15
+ <a href="#workflow" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('.tabs.workflow') %></a>
16
16
  </li>
17
17
  <% end %>
18
18
  </ul>
19
- <div class="tab-content">
20
- <div id="description" class="tab-pane active">
21
- <div class="panel panel-default labels">
19
+ <div class="tab-content card">
20
+ <div id="description" class="tab-pane show active">
21
+ <div class="labels">
22
22
  <%= simple_form_for @form, url: [hyrax, :admin, @form], html: { class: 'nav-safety' } do |f| %>
23
- <div class="panel-body">
23
+ <div class="card-body">
24
24
  <%= render 'form_metadata', f: f %>
25
25
 
26
26
  <% if f.object.persisted? && f.object.member_ids.present? %>
@@ -31,10 +31,10 @@
31
31
 
32
32
  </div>
33
33
 
34
- <div class="panel-footer">
34
+ <div class="card-footer d-flex justify-content-end">
35
35
  <% cancel_path = f.object.persisted? ? hyrax.admin_admin_set_path(f.object) : hyrax.dashboard_collections_path %>
36
- <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default pull-right' %>
37
- <%= f.button :submit, class: 'btn btn-primary pull-right' %>
36
+ <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
37
+ <%= link_to t('.cancel'), cancel_path, class: 'btn btn-light' %>
38
38
  </div>
39
39
  <% end %>
40
40
  </div>
@@ -1,33 +1,35 @@
1
- <h3><%= t(".#{access}.title") %></h3>
2
- <p><%= t(".#{access}.help") %></p>
3
- <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
4
- <table class="table table-striped share-status">
5
- <thead>
6
- <tr>
7
- <th><%= t(".#{access}.agent_name") %></th>
8
- <th><%= t(".#{access}.type") %></th>
9
- <th><%= t(".#{access}.action") %></th>
10
- </tr>
11
- </thead>
12
- <tbody>
13
- <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
14
- <tr>
15
- <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
16
- <td><%= g.agent_type.titleize %></td>
17
- <td>
18
- <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
19
- <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
20
- <% else %>
21
- <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
22
- <% end %>
23
- </td>
24
- </tr>
25
- <% end %>
26
- </tbody>
27
- </table>
28
- <% else %>
29
- <p><em><%= t(".#{access}.empty") %></em></p>
30
- <% end %>
31
- <%= button_tag t('.allow_all_registered'),
32
- class: 'btn btn-info',
33
- data: { behavior: 'add-registered-users' } if access == 'depositors' %>
1
+ <div class="mb-4">
2
+ <h3 class="h4"><%= t(".#{access}.title") %></h3>
3
+ <p><%= t(".#{access}.help") %></p>
4
+ <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
5
+ <table class="table table-striped share-status">
6
+ <thead>
7
+ <tr>
8
+ <th><%= t(".#{access}.agent_name") %></th>
9
+ <th><%= t(".#{access}.type") %></th>
10
+ <th><%= t(".#{access}.action") %></th>
11
+ </tr>
12
+ </thead>
13
+ <tbody>
14
+ <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
15
+ <tr>
16
+ <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
17
+ <td><%= g.agent_type.titleize %></td>
18
+ <td>
19
+ <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
20
+ <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
21
+ <% else %>
22
+ <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
23
+ <% end %>
24
+ </td>
25
+ </tr>
26
+ <% end %>
27
+ </tbody>
28
+ </table>
29
+ <% else %>
30
+ <p><em><%= t(".#{access}.empty") %></em></p>
31
+ <% end %>
32
+ <%= button_tag t('.allow_all_registered'),
33
+ class: 'btn btn-primary ',
34
+ data: { behavior: 'add-registered-users' } if access == 'depositors' %>
35
+ </div>
@@ -1,8 +1,8 @@
1
1
  <div id="participants" class="tab-pane">
2
- <div class="panel panel-default labels edit-sharing-tab">
3
- <div class="panel-body">
2
+ <div class="card labels edit-sharing-tab">
3
+ <div class="card-body">
4
4
  <section class="section-add-sharing clearfix">
5
- <h3><%= t('.add_participants') %></h3>
5
+ <h2 class="h3"><%= t('.add_participants') %></h2>
6
6
  <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
7
7
  <div class="sharing-row-form">
8
8
  <%= simple_form_for collection_permission_template_form_for(form: @form),
@@ -27,7 +27,7 @@
27
27
  class: 'form-control' %>
28
28
  </div>
29
29
  <% end %>
30
- <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
30
+ <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
31
31
 
32
32
  <% end %>
33
33
  </div>
@@ -54,20 +54,21 @@
54
54
  class: 'form-control' %>
55
55
  </div>
56
56
  <% end %>
57
- <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
57
+ <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
58
58
  <% end %>
59
59
  </div>
60
60
 
61
- <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note') %></p>
61
+ <p class="form-text"><%= t('hyrax.admin.admin_sets.form.note') %></p>
62
62
  </section>
63
63
 
64
+ <h2 class="h3"><%= t(".current_participants") %></h2>
64
65
  <fieldset class="admin-set-participants section-collection-sharing">
65
- <legend><%= t(".current_participants") %></legend>
66
+
66
67
  <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
67
68
  <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
68
69
  <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
69
70
  </fieldset>
70
71
 
71
- </div><!-- /.panel-body -->
72
+ </div><!-- /.card-body -->
72
73
  </div>
73
74
  </div>
@@ -3,47 +3,47 @@
3
3
  <%= simple_form_for collection_permission_template_form_for(form: @form),
4
4
  url: [hyrax, :admin, @form, :permission_template],
5
5
  html: { class: 'nav-safety' } do |f| %>
6
- <div class="panel-body">
6
+ <div class="card-body">
7
7
  <p><%= t('.page_description') %></p>
8
8
  <h3><%= t('.release.title') %></h3>
9
9
  <p><%= t('.release.description') %></p>
10
- <div id="release-no-delay" class="radio">
11
- <label>
12
- <%= f.radio_button :release_period, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY %>
10
+ <div id="release-no-delay" class="form-check">
11
+ <label class="form-check-label">
12
+ <%= f.radio_button :release_period, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY, class: 'form-check-input' %>
13
13
  <%= t('.release.no_delay') %>
14
14
  </label>
15
15
  </div>
16
- <div id="release-varies" class="radio">
17
- <label>
18
- <%= f.radio_button :release_period, '', checked: f.object.release_period.blank? || !f.object.release_varies.blank? %>
16
+ <div id="release-varies" class="form-check">
17
+ <label class="form-check-label">
18
+ <%= f.radio_button :release_period, '', checked: f.object.release_period.blank? || !f.object.release_varies.blank?, class: 'form-check-input' %>
19
19
  <%= t('.release.varies.description') %>
20
20
  </label>
21
21
  <ul>
22
- <li class="radio form-inline">
23
- <label>
24
- <%= f.radio_button :release_varies, '' %>
22
+ <li class="form-check form-check-inline">
23
+ <label class="form-check-label">
24
+ <%= f.radio_button :release_varies, '', class: 'form-check-input' %>
25
25
  <%= t('.release.varies.any') %>
26
26
  </label>
27
27
  </li>
28
- <li class="radio form-inline">
29
- <label>
30
- <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE %>
28
+ <li class="form-check form-check-inline">
29
+ <label class="form-check-label">
30
+ <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, class: 'form-check-input' %>
31
31
  <%= t('.release.varies.between') %>
32
32
  </label>
33
33
  <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control', placeholder: 'mm/dd/yyyy' %>
34
34
  </li>
35
- <li class="radio form-inline">
36
- <label>
37
- <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO %>
35
+ <li class="form-check form-check-inline">
36
+ <label class="form-check-label">
37
+ <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO, class: 'form-check-input' %>
38
38
  <%= t('.release.varies.period') %>
39
39
  <%= f.collection_select :release_embargo, f.object.embargo_options, :first, :last, prompt: t('.release.varies.embargo.select') %>
40
40
  </label>
41
41
  </li>
42
42
  </ul>
43
43
  </div>
44
- <div id="release-fixed" class="radio form-inline">
45
- <label>
46
- <%= f.radio_button :release_period, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED %>
44
+ <div id="release-fixed" class="form-check form-check-inline mb-4">
45
+ <label class="form-check-label">
46
+ <%= f.radio_button :release_period, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, class: 'form-check-input' %>
47
47
  <%= t('.release.fixed') %>
48
48
  </label>
49
49
  <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control', placeholder: 'mm/dd/yyyy' %>
@@ -51,14 +51,14 @@
51
51
  <h3><%= t('.visibility.title') %></h3>
52
52
  <p><%= t('.visibility.description') %></p>
53
53
  <%# List each option in a <div class='radio'> tag %>
54
- <%= f.collection_radio_buttons :visibility, f.object.visibility_options, :first, :last, item_wrapper_tag: :div, item_wrapper_class: 'radio' do |b| %>
54
+ <%= f.collection_radio_buttons :visibility, f.object.visibility_options, :first, :last, item_wrapper_tag: :div, item_wrapper_class: 'form-check' do |b| %>
55
55
  <%# NOTE: Bug in simple_form causes nested labels: https://github.com/plataformatec/simple_form/issues/1190 This block is a workaround. %>
56
- <% b.radio_button + b.text %>
56
+ <% b.label(class: 'form-check-label') { b.radio_button(class: 'form-check-input') + b.text } %>
57
57
  <% end %>
58
58
  </div>
59
- <div class="panel-footer">
60
- <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
61
- <%= f.button :submit, class: 'btn btn-primary pull-right' %>
59
+ <div class="card-footer d-flex justify-content-end">
60
+ <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
61
+ <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
62
62
  </div>
63
63
  <% end %>
64
64
  </div>
@@ -4,19 +4,19 @@
4
4
  url: [hyrax, :admin, @form, :permission_template],
5
5
  html: { id: 'form_workflows', class: 'nav-safety' } do |f| %>
6
6
  <% if f.object.available_workflows.any? %>
7
- <div class="panel-body">
7
+ <div class="card-body">
8
8
  <p><%= t('.page_description') %></p>
9
9
  <%= f.collection_radio_buttons :workflow_id, f.object.available_workflows, :id, :label, item_wrapper_tag: :div, item_wrapper_class: "radio" do |b| %>
10
10
  <span><%= b.radio_button + b.object.label %></span>
11
11
  <p><%= b.object.description %></p>
12
12
  <% end %>
13
13
  </div>
14
- <div class="panel-footer">
15
- <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
16
- <%= f.button :submit, class: 'btn btn-primary pull-right'%>
14
+ <div class="card-footer d-flex justify-content-end">
15
+ <%= f.button :submit, class: 'btn btn-primary text-white mr-2'%>
16
+ <%= link_to t('.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light'%>
17
17
  </div>
18
18
  <% else %>
19
- <div class="panel-body">
19
+ <div class="card-body">
20
20
  <p><%= t('.no_workflows') %></p>
21
21
  </div>
22
22
  <% end %>
@@ -1,12 +1,12 @@
1
1
 
2
- <div class="panel-heading">
2
+ <div class="card-header">
3
3
  <div class="row">
4
4
  <div class="col-sm-8">
5
- <h2 class="panel-title display-page"><%= presenter.to_s %></h2>
5
+ <h2 class="card-title display-page"><%= presenter.to_s %></h2>
6
6
  </div>
7
7
  <% if can? :edit, presenter.solr_document %>
8
8
  <div class="col-sm-4">
9
- <div class="pull-right">
9
+ <div class="float-right">
10
10
  <%= link_to edit_admin_admin_set_path(presenter), class: 'btn btn-primary' do %>
11
11
  <span class="fa fa-edit" aria-hidden="true"></span> <%= t(:'helpers.action.edit') %>
12
12
  <% end %>
@@ -3,18 +3,18 @@
3
3
  <tr id="document_<%= id %>">
4
4
  <td>&nbsp;
5
5
  <% if current_user and document.depositor != current_user.user_key %>
6
- <i class="glyphicon glyphicon-share-alt" />
6
+ <i class="fa fa-share" />
7
7
  <% end %>
8
8
  </td>
9
9
  <td>
10
10
  <div class="media">
11
11
  <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
12
- <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
12
+ <%= document_presenter(document)&.thumbnail&.thumbnail_tag({ class: "d-none d-md-block file_listing_thumbnail" }, { suppress_link: true }) %>
13
13
  <% end %>
14
14
  <div class="media-body">
15
15
  <p class="media-heading">
16
16
  <strong><%= link_to document.title_or_label, [main_app, document], id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %></strong>
17
- <a href="#" class="small" title="Click for more details"><span id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></span></a>
17
+ <a href="#" class="small" title="Click for more details"><span id="expand_<%= id %>" class="fa fa-chevron-right"></span></a>
18
18
  </p>
19
19
  <%= render_collection_links(document) %>
20
20
  </div>
@@ -34,12 +34,12 @@
34
34
  <tr id="detail_<%= id %>"> <!-- document detail"> -->
35
35
  <td colspan="6">
36
36
  <dl class="expanded-details row">
37
- <dt class="col-xs-3 col-lg-2">Creator:</dt>
38
- <dd class="col-xs-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
39
- <dt class="col-xs-3 col-lg-2">Depositor:</dt>
40
- <dd class="col-xs-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
41
- <dt class="col-xs-3 col-lg-2">Edit Access:</dt>
42
- <dd class="col-xs-9 col-lg-10">
37
+ <dt class="col-3 col-lg-2">Creator:</dt>
38
+ <dd class="col-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
39
+ <dt class="col-3 col-lg-2">Depositor:</dt>
40
+ <dd class="col-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
41
+ <dt class="col-3 col-lg-2">Edit Access:</dt>
42
+ <dd class="col-9 col-lg-10">
43
43
  <% if document.edit_groups.present? %>
44
44
  Groups: <%= document.edit_groups.join(', ') %>
45
45
  <br />