hyrax 2.1.0.beta1 → 2.1.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (348) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +9 -49
  3. data/.rubocop_fixme.yml +1 -0
  4. data/.travis.yml +1 -1
  5. data/Gemfile +3 -3
  6. data/README.md +4 -2
  7. data/app/actors/hyrax/actors/file_set_actor.rb +0 -1
  8. data/app/actors/hyrax/actors/interpret_visibility_actor.rb +1 -3
  9. data/app/actors/hyrax/actors/model_actor.rb +4 -0
  10. data/app/assets/javascripts/hyrax.js +1 -1
  11. data/app/assets/javascripts/hyrax/app.js.erb +1 -1
  12. data/app/assets/javascripts/hyrax/authority_select.es6 +15 -7
  13. data/app/assets/javascripts/hyrax/collections.js +188 -9
  14. data/app/assets/javascripts/hyrax/content_blocks.js +13 -1
  15. data/app/assets/javascripts/hyrax/editor.es6 +2 -1
  16. data/app/assets/javascripts/hyrax/proxy_rights.js +2 -2
  17. data/app/assets/javascripts/hyrax/turbolinks_events.js +5 -0
  18. data/app/assets/stylesheets/hyrax/_accessibility.scss +21 -0
  19. data/app/assets/stylesheets/hyrax/_catalog.scss +21 -16
  20. data/app/assets/stylesheets/hyrax/_collections.scss +48 -7
  21. data/app/assets/stylesheets/hyrax/_modal.scss +4 -0
  22. data/app/assets/stylesheets/hyrax/_settings.scss +1 -1
  23. data/app/assets/stylesheets/hyrax/dashboard.scss +0 -1
  24. data/app/controllers/concerns/hyrax/breadcrumbs.rb +3 -1
  25. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +17 -1
  26. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +10 -0
  27. data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb +86 -0
  28. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +14 -11
  29. data/app/controllers/hyrax/admin/collection_types_controller.rb +11 -1
  30. data/app/controllers/hyrax/api/items_controller.rb +2 -6
  31. data/app/controllers/hyrax/batch_edits_controller.rb +6 -0
  32. data/app/controllers/hyrax/batch_uploads_controller.rb +1 -1
  33. data/app/controllers/hyrax/dashboard/collections_controller.rb +4 -7
  34. data/app/controllers/hyrax/dashboard/profiles_controller.rb +2 -0
  35. data/app/controllers/hyrax/dashboard_controller.rb +2 -2
  36. data/app/controllers/hyrax/depositors_controller.rb +19 -0
  37. data/app/controllers/hyrax/downloads_controller.rb +3 -4
  38. data/app/controllers/hyrax/embargoes_controller.rb +2 -0
  39. data/app/controllers/hyrax/file_sets_controller.rb +12 -0
  40. data/app/controllers/hyrax/leases_controller.rb +2 -0
  41. data/app/controllers/hyrax/my/works_controller.rb +9 -0
  42. data/app/controllers/hyrax/my_controller.rb +0 -1
  43. data/app/controllers/hyrax/transfers_controller.rb +1 -3
  44. data/app/controllers/hyrax/users_controller.rb +1 -3
  45. data/app/forms/hyrax/forms/admin/collection_type_form.rb +1 -1
  46. data/app/forms/hyrax/forms/permission_template_form.rb +1 -4
  47. data/app/forms/hyrax/forms/work_form.rb +1 -3
  48. data/app/helpers/hyrax/citations_behaviors/common_behavior.rb +1 -3
  49. data/app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb +1 -5
  50. data/app/helpers/hyrax/collections_helper.rb +7 -4
  51. data/app/helpers/hyrax/file_set_helper.rb +0 -1
  52. data/app/helpers/hyrax/hyrax_helper_behavior.rb +0 -1
  53. data/app/helpers/hyrax/trophy_helper.rb +0 -1
  54. data/app/indexers/hyrax/admin_set_indexer.rb +2 -0
  55. data/app/inputs/multi_value_select_input.rb +1 -3
  56. data/app/jobs/attach_files_to_work_job.rb +5 -1
  57. data/app/jobs/import_url_job.rb +9 -8
  58. data/app/models/admin_set.rb +1 -5
  59. data/app/models/concerns/hyrax/ability.rb +3 -4
  60. data/app/models/concerns/hyrax/collection_behavior.rb +0 -4
  61. data/app/models/concerns/hyrax/collection_nesting.rb +12 -0
  62. data/app/models/concerns/hyrax/suppressible.rb +1 -5
  63. data/app/models/featured_work_list.rb +1 -3
  64. data/app/models/hyrax/collection_type.rb +3 -2
  65. data/app/models/hyrax/permission_template_access.rb +6 -4
  66. data/app/models/proxy_deposit_request.rb +1 -1
  67. data/app/presenters/hyrax/collection_presenter.rb +0 -24
  68. data/app/presenters/hyrax/displays_image.rb +1 -1
  69. data/app/presenters/hyrax/file_set_presenter.rb +1 -1
  70. data/app/presenters/hyrax/menu_presenter.rb +1 -1
  71. data/app/presenters/hyrax/work_show_presenter.rb +15 -10
  72. data/app/search_builders/hyrax/abstract_type_relation.rb +2 -1
  73. data/app/search_builders/hyrax/collection_member_search_builder.rb +1 -1
  74. data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +3 -1
  75. data/app/search_builders/hyrax/parent_collection_search_builder.rb +2 -2
  76. data/app/services/hyrax/admin_set_create_service.rb +1 -3
  77. data/app/services/hyrax/analytics.rb +1 -3
  78. data/app/services/hyrax/collection_member_service.rb +6 -5
  79. data/app/services/hyrax/collection_types/create_service.rb +37 -10
  80. data/app/services/hyrax/collections/permissions_create_service.rb +1 -3
  81. data/app/services/hyrax/collections/permissions_service.rb +6 -4
  82. data/app/views/catalog/_index_header_list_collection.html.erb +1 -1
  83. data/app/views/catalog/_index_header_list_default.html.erb +1 -1
  84. data/app/views/catalog/_index_list_default.html.erb +6 -10
  85. data/app/views/catalog/_search_form.html.erb +10 -11
  86. data/app/views/catalog/_thumbnail_list_collection.html.erb +1 -1
  87. data/app/views/catalog/_thumbnail_list_default.html.erb +1 -1
  88. data/app/views/hyrax/admin/admin_sets/_form.html.erb +1 -1
  89. data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +1 -1
  90. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +1 -1
  91. data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +3 -3
  92. data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +2 -2
  93. data/app/views/hyrax/admin/admin_sets/index.html.erb +1 -1
  94. data/app/views/hyrax/admin/appearances/show.html.erb +4 -4
  95. data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +3 -2
  96. data/app/views/hyrax/admin/collection_types/index.html.erb +2 -2
  97. data/app/views/hyrax/admin/features/index.html.erb +2 -4
  98. data/app/views/hyrax/admin/stats/_date_form.html.erb +3 -3
  99. data/app/views/hyrax/admin/stats/_top_data.html.erb +1 -1
  100. data/app/views/hyrax/admin/stats/show.html.erb +1 -1
  101. data/app/views/hyrax/admin/workflows/index.html.erb +0 -1
  102. data/app/views/hyrax/base/_file_manager_actions.html.erb +2 -2
  103. data/app/views/hyrax/base/_file_manager_member.html.erb +1 -1
  104. data/app/views/hyrax/base/_form_child_work_relationships.html.erb +1 -2
  105. data/app/views/hyrax/base/_form_files.html.erb +3 -3
  106. data/app/views/hyrax/base/_form_member_of_collections.html.erb +1 -2
  107. data/app/views/hyrax/base/_form_progress.html.erb +3 -3
  108. data/app/views/hyrax/base/_form_relationships.html.erb +2 -3
  109. data/app/views/hyrax/base/_form_representative.html.erb +0 -1
  110. data/app/views/hyrax/base/_form_share.html.erb +1 -3
  111. data/app/views/hyrax/base/_form_thumbnail.html.erb +0 -1
  112. data/app/views/hyrax/base/_form_visibility_component.html.erb +6 -6
  113. data/app/views/hyrax/base/_relationships_parent_rows.html.erb +3 -1
  114. data/app/views/hyrax/base/_representative_media.html.erb +1 -1
  115. data/app/views/hyrax/base/_share_with.html.erb +3 -3
  116. data/app/views/hyrax/base/_show_actions.html.erb +14 -1
  117. data/app/views/hyrax/base/_social_media.html.erb +5 -5
  118. data/app/views/hyrax/base/_work_title.erb +3 -1
  119. data/app/views/hyrax/base/_workflow_actions.html.erb +1 -1
  120. data/app/views/hyrax/base/inspect_work.html.erb +1 -1
  121. data/app/views/hyrax/base/show.html.erb +2 -2
  122. data/app/views/hyrax/batch_edits/_check_all.html.erb +2 -2
  123. data/app/views/hyrax/batch_edits/edit.html.erb +47 -44
  124. data/app/views/hyrax/batch_select/_add_button.html.erb +2 -2
  125. data/app/views/hyrax/citations/work.html.erb +3 -3
  126. data/app/views/hyrax/collections/_collection.html.erb +1 -1
  127. data/app/views/hyrax/collections/_default_group.html.erb +1 -1
  128. data/app/views/hyrax/collections/_list_collections.html.erb +2 -2
  129. data/app/views/hyrax/collections/_list_works.html.erb +1 -1
  130. data/app/views/hyrax/collections/_show_descriptions.html.erb +6 -6
  131. data/app/views/hyrax/collections/_show_document_list_row.html.erb +2 -2
  132. data/app/views/hyrax/collections/_show_parent_collections.html.erb +11 -38
  133. data/app/views/hyrax/collections/_sort_and_per_page.html.erb +13 -13
  134. data/app/views/hyrax/collections/_subcollection_list.html.erb +1 -1
  135. data/app/views/hyrax/collections/_view_type_group.html.erb +1 -1
  136. data/app/views/hyrax/collections/show.html.erb +122 -122
  137. data/app/views/hyrax/content_blocks/_form.html.erb +13 -12
  138. data/app/views/hyrax/content_blocks/_modal_content_block.html.erb +15 -0
  139. data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +25 -19
  140. data/app/views/hyrax/dashboard/_sidebar.html.erb +1 -1
  141. data/app/views/hyrax/dashboard/collections/_button_for_remove_selected_from_collection.html.erb +1 -1
  142. data/app/views/hyrax/dashboard/collections/_collection_title.html.erb +16 -16
  143. data/app/views/hyrax/dashboard/collections/_form.html.erb +3 -1
  144. data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +11 -11
  145. data/app/views/hyrax/dashboard/collections/_form_default_group_delt.html.erb +1 -1
  146. data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +2 -2
  147. data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +4 -4
  148. data/app/views/hyrax/dashboard/collections/_form_share.html.erb +51 -44
  149. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +2 -2
  150. data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +4 -4
  151. data/app/views/hyrax/dashboard/collections/_list_works.html.erb +1 -1
  152. data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +10 -5
  153. data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +10 -5
  154. data/app/views/hyrax/dashboard/collections/_show_actions.html.erb +1 -1
  155. data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +2 -2
  156. data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +2 -2
  157. data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +10 -5
  158. data/app/views/hyrax/dashboard/collections/_show_parent_collections.html.erb +11 -34
  159. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +1 -1
  160. data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +23 -17
  161. data/app/views/hyrax/dashboard/collections/show.html.erb +6 -6
  162. data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +0 -4
  163. data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb +16 -14
  164. data/app/views/hyrax/dashboard/profiles/show.html.erb +6 -0
  165. data/app/views/hyrax/dashboard/show_admin.html.erb +19 -3
  166. data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +6 -0
  167. data/app/views/hyrax/dashboard/works/_list_works.html.erb +1 -1
  168. data/app/views/hyrax/depositors/index.html.erb +13 -0
  169. data/app/views/hyrax/embargoes/_list_expired_active_embargoes.html.erb +1 -1
  170. data/app/views/hyrax/embargoes/edit.html.erb +47 -35
  171. data/app/views/hyrax/embargoes/index.html.erb +6 -7
  172. data/app/views/hyrax/file_sets/_actions.html.erb +6 -2
  173. data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +3 -3
  174. data/app/views/hyrax/file_sets/_groups_description.html.erb +0 -1
  175. data/app/views/hyrax/file_sets/_permission_form.html.erb +3 -3
  176. data/app/views/hyrax/file_sets/edit.html.erb +24 -20
  177. data/app/views/hyrax/file_sets/media_display/_audio.html.erb +23 -6
  178. data/app/views/hyrax/file_sets/media_display/_default.html.erb +1 -1
  179. data/app/views/hyrax/file_sets/media_display/_video.html.erb +23 -6
  180. data/app/views/hyrax/leases/_list_expired_active_leases.html.erb +1 -1
  181. data/app/views/hyrax/leases/edit.html.erb +47 -35
  182. data/app/views/hyrax/leases/index.html.erb +6 -6
  183. data/app/views/hyrax/my/_collection_action_menu.html.erb +1 -1
  184. data/app/views/hyrax/my/_facet_limit.html.erb +1 -2
  185. data/app/views/hyrax/my/_facet_pagination.html.erb +6 -6
  186. data/app/views/hyrax/my/_facet_pivot.html.erb +1 -1
  187. data/app/views/hyrax/my/_results_pagination.html.erb +1 -1
  188. data/app/views/hyrax/my/collections/_facets.html.erb +1 -1
  189. data/app/views/hyrax/my/collections/_list_collections.html.erb +5 -5
  190. data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +3 -2
  191. data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +3 -1
  192. data/app/views/hyrax/my/collections/_modal_add_to_collection_permission_deny.html.erb +1 -1
  193. data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +2 -2
  194. data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +1 -2
  195. data/app/views/hyrax/my/collections/_modal_delete_deny.html.erb +1 -1
  196. data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +2 -2
  197. data/app/views/hyrax/my/collections/_tabs.html.erb +2 -2
  198. data/app/views/hyrax/my/collections/index.html.erb +7 -3
  199. data/app/views/hyrax/my/facet.html.erb +1 -1
  200. data/app/views/hyrax/my/index.html.erb +6 -2
  201. data/app/views/hyrax/my/works/_facets.html.erb +1 -1
  202. data/app/views/hyrax/my/works/_list_works.html.erb +1 -1
  203. data/app/views/hyrax/my/works/_tabs.html.erb +2 -2
  204. data/app/views/hyrax/my/works/index.html.erb +6 -2
  205. data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
  206. data/app/views/hyrax/pages/_form.html.erb +12 -12
  207. data/app/views/hyrax/pages/show.html.erb +1 -1
  208. data/app/views/hyrax/single_use_links_viewer/show.html.erb +1 -1
  209. data/app/views/hyrax/stats/file.html.erb +6 -2
  210. data/app/views/hyrax/stats/work.html.erb +6 -2
  211. data/app/views/hyrax/transfers/_received.html.erb +6 -6
  212. data/app/views/hyrax/transfers/_sent.html.erb +2 -2
  213. data/app/views/hyrax/transfers/new.html.erb +0 -1
  214. data/app/views/hyrax/users/_activity_log.html.erb +2 -2
  215. data/app/views/hyrax/users/_profile_tabs.html.erb +1 -1
  216. data/app/views/hyrax/users/_search_form.html.erb +1 -1
  217. data/app/views/hyrax/users/_user.html.erb +0 -1
  218. data/app/views/hyrax/users/index.html.erb +1 -1
  219. data/app/views/kaminari/blacklight_compact/_paginator.html.erb +1 -2
  220. data/app/views/layouts/_head_tag_content.html.erb +2 -2
  221. data/app/views/layouts/error.html.erb +1 -1
  222. data/app/views/layouts/hyrax.html.erb +6 -3
  223. data/app/views/layouts/hyrax/dashboard.html.erb +6 -3
  224. data/app/views/records/show_fields/_based_near.html.erb +0 -1
  225. data/app/views/records/show_fields/_contributor.html.erb +0 -1
  226. data/app/views/records/show_fields/_date_created.html.erb +0 -1
  227. data/app/views/records/show_fields/_description.html.erb +1 -1
  228. data/app/views/records/show_fields/_identifier.html.erb +0 -1
  229. data/app/views/records/show_fields/_language.html.erb +0 -1
  230. data/app/views/records/show_fields/_publisher.html.erb +0 -1
  231. data/app/views/records/show_fields/_related_url.html.erb +0 -1
  232. data/app/views/records/show_fields/_resource_type.html.erb +0 -1
  233. data/app/views/records/show_fields/_subject.html.erb +0 -1
  234. data/app/views/shared/_citations.html.erb +17 -17
  235. data/app/views/shared/_select_work_type_modal.html.erb +2 -2
  236. data/config/locales/hyrax.de.yml +198 -189
  237. data/config/locales/hyrax.en.yml +21 -14
  238. data/config/locales/hyrax.es.yml +9 -0
  239. data/config/locales/hyrax.fr.yml +9 -0
  240. data/config/locales/hyrax.it.yml +9 -0
  241. data/config/locales/hyrax.pt-BR.yml +9 -0
  242. data/config/locales/hyrax.zh.yml +9 -0
  243. data/config/routes.rb +1 -0
  244. data/hyrax.gemspec +7 -18
  245. data/lib/generators/hyrax/models_generator.rb +0 -1
  246. data/lib/generators/hyrax/templates/db/migrate/20180302200051_add_branding_to_collection_type.rb.erb +5 -0
  247. data/lib/generators/hyrax/work/templates/feature_spec.rb.erb +1 -1
  248. data/lib/hyrax/configuration.rb +2 -4
  249. data/lib/hyrax/engine.rb +22 -4
  250. data/lib/hyrax/version.rb +1 -1
  251. data/spec/actors/hyrax/actors/lease_actor_spec.rb +16 -0
  252. data/spec/controllers/hyrax/admin/appearances_controller_spec.rb +1 -1
  253. data/spec/controllers/hyrax/admin/collection_types_controller_spec.rb +2 -0
  254. data/spec/controllers/hyrax/admin/features_controller_spec.rb +1 -1
  255. data/spec/controllers/hyrax/admin/workflow_roles_controller_spec.rb +1 -1
  256. data/spec/controllers/hyrax/admin/workflows_controller_spec.rb +1 -1
  257. data/spec/controllers/hyrax/batch_edits_controller_spec.rb +14 -1
  258. data/spec/controllers/hyrax/batch_uploads_controller_spec.rb +2 -2
  259. data/spec/controllers/hyrax/citations_controller_spec.rb +4 -2
  260. data/spec/controllers/hyrax/collections_controller_spec.rb +32 -4
  261. data/spec/controllers/hyrax/content_blocks_controller_spec.rb +1 -1
  262. data/spec/controllers/hyrax/dashboard/collections_controller_spec.rb +11 -6
  263. data/spec/controllers/hyrax/depositors_controller_spec.rb +11 -0
  264. data/spec/controllers/hyrax/downloads_controller_spec.rb +42 -0
  265. data/spec/controllers/hyrax/embargoes_controller_spec.rb +40 -1
  266. data/spec/controllers/hyrax/file_sets_controller_spec.rb +10 -2
  267. data/spec/controllers/hyrax/generic_works_controller_spec.rb +38 -6
  268. data/spec/controllers/hyrax/leases_controller_spec.rb +11 -0
  269. data/spec/controllers/hyrax/my/collections_controller_spec.rb +1 -1
  270. data/spec/controllers/hyrax/my/works_controller_spec.rb +1 -1
  271. data/spec/controllers/hyrax/pages_controller_spec.rb +1 -1
  272. data/spec/controllers/hyrax/stats_controller_spec.rb +2 -0
  273. data/spec/controllers/hyrax/transfers_controller_spec.rb +1 -1
  274. data/spec/factories/collection_types.rb +10 -1
  275. data/spec/factories/collections.rb +5 -3
  276. data/spec/factories/collections_factory.rb +3 -3
  277. data/spec/factories/file_sets.rb +2 -6
  278. data/spec/factories/generic_works.rb +68 -4
  279. data/spec/factory_tests/collections_factory_spec.rb +2 -1
  280. data/spec/features/batch_create_spec.rb +60 -0
  281. data/spec/features/batch_edit_spec.rb +1 -0
  282. data/spec/features/browse_dashboard_works_spec.rb +1 -0
  283. data/spec/features/collection_multi_membership_spec.rb +9 -6
  284. data/spec/features/collection_spec.rb +1 -1
  285. data/spec/features/collection_type_spec.rb +49 -1
  286. data/spec/features/create_work_admin_spec.rb +2 -2
  287. data/spec/features/create_work_spec.rb +1 -0
  288. data/spec/features/dashboard/all_works.rb +10 -2
  289. data/spec/features/dashboard/collection_spec.rb +38 -17
  290. data/spec/features/dashboard/display_admin_dashboard_spec.rb +29 -0
  291. data/spec/features/dashboard/display_dashboard_spec.rb +1 -1
  292. data/spec/features/edit_content_block_admin_spec.rb +45 -0
  293. data/spec/features/edit_work_spec.rb +40 -2
  294. data/spec/features/ownership_transfer_spec.rb +1 -0
  295. data/spec/features/proxy_spec.rb +2 -2
  296. data/spec/features/search_spec.rb +2 -5
  297. data/spec/features/work_show_spec.rb +14 -4
  298. data/spec/forms/hyrax/forms/admin/collection_type_form_spec.rb +1 -0
  299. data/spec/forms/hyrax/forms/collection_form_spec.rb +1 -1
  300. data/spec/helpers/hyrax/ability_helper_spec.rb +2 -2
  301. data/spec/helpers/hyrax/collections_helper_spec.rb +12 -4
  302. data/spec/javascripts/authority_select_spec.js +1 -1
  303. data/spec/javascripts/settings_spec.js +1 -0
  304. data/spec/jobs/attach_files_to_work_job_spec.rb +13 -0
  305. data/spec/jobs/import_url_job_spec.rb +14 -0
  306. data/spec/models/collection_spec.rb +1 -0
  307. data/spec/models/concerns/hyrax/collection_nesting_spec.rb +16 -0
  308. data/spec/models/hyrax/collection_type_spec.rb +1 -0
  309. data/spec/presenters/hyrax/collection_presenter_spec.rb +1 -100
  310. data/spec/presenters/hyrax/file_set_presenter_spec.rb +17 -2
  311. data/spec/presenters/hyrax/menu_presenter_spec.rb +6 -0
  312. data/spec/presenters/hyrax/work_show_presenter_spec.rb +15 -3
  313. data/spec/search_builders/hyrax/abstract_type_relation_spec.rb +18 -0
  314. data/spec/search_builders/hyrax/dashboard/collections_search_builder_spec.rb +30 -19
  315. data/spec/search_builders/hyrax/parent_collection_search_builder_spec.rb +15 -0
  316. data/spec/services/hyrax/collection_member_service_spec.rb +10 -19
  317. data/spec/services/hyrax/collection_types/create_service_spec.rb +35 -2
  318. data/spec/services/hyrax/collections/collection_member_service_spec.rb +1 -1
  319. data/spec/services/hyrax/qa_select_service_spec.rb +0 -1
  320. data/spec/support/selectors.rb +15 -0
  321. data/spec/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb_spec.rb +2 -0
  322. data/spec/views/hyrax/admin/collection_types/_form_settings.html.erb_spec.rb +1 -0
  323. data/spec/views/hyrax/admin/stats/show.html.erb_spec.rb +9 -0
  324. data/spec/views/hyrax/base/_attributes.html.erb_spec.rb +1 -1
  325. data/spec/views/hyrax/base/_relationships.html.erb_spec.rb +13 -1
  326. data/spec/views/hyrax/base/_show_actions.html.erb_spec.rb +10 -0
  327. data/spec/views/hyrax/base/show.html.erb_spec.rb +8 -0
  328. data/spec/views/hyrax/collections/_show_parent_collections.html.erb_spec.rb +3 -53
  329. data/spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb +22 -0
  330. data/spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb +2 -1
  331. data/spec/views/hyrax/dashboard/collections/_show_actions.html.erb_spec.rb +13 -0
  332. data/spec/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb_spec.rb +26 -8
  333. data/spec/views/hyrax/dashboard/collections/_show_parent_collections.html.erb_spec.rb +7 -43
  334. data/spec/views/hyrax/dashboard/collections/_subcollection_list.html.erb_spec.rb +13 -1
  335. data/spec/views/hyrax/dashboard/collections/show.html.erb_spec.rb +1 -0
  336. data/spec/views/hyrax/dashboard/profiles/_trophy_edit.html.erb_spec.rb +36 -0
  337. data/spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb +0 -38
  338. data/spec/views/hyrax/dashboard/profiles/show.html.erb_spec.rb +37 -0
  339. data/spec/views/hyrax/depositors/index.html.erb_spec.rb +13 -0
  340. data/spec/views/hyrax/file_sets/_actions.html.erb_spec.rb +15 -0
  341. data/spec/views/hyrax/file_sets/media_display/_audio.html.erb_spec.rb +29 -0
  342. data/spec/views/hyrax/file_sets/media_display/_default.html.erb_spec.rb +1 -1
  343. data/spec/views/hyrax/file_sets/media_display/_video.html.erb_spec.rb +29 -0
  344. data/spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb +6 -2
  345. data/tasks/hyrax_dev.rake +1 -3
  346. data/template.rb +1 -1
  347. metadata +49 -41
  348. data/app/assets/javascripts/hyrax/collections_forms.js +0 -108
@@ -1,13 +1,14 @@
1
+ <%= render "modal_content_block" %>
1
2
  <div class="panel panel-default tabs">
2
3
  <ul class="nav nav-tabs" role="tablist">
3
4
  <li class="active">
4
- <a href="#announcement_text" role="tab" data-toggle="tab"><%= t(:'hyrax.content_blocks.tabs.announcement_text') %></a>
5
+ <a href="#announcement_text" role="tab" data-toggle="tab" class="show-confirm"><%= t(:'hyrax.content_blocks.tabs.announcement_text') %></a>
5
6
  </li>
6
7
  <li>
7
- <a href="#marketing" role="tab" data-toggle="tab"><%= t(:'hyrax.content_blocks.tabs.marketing_text') %></a>
8
+ <a href="#marketing" role="tab" data-toggle="tab" class="show-confirm"><%= t(:'hyrax.content_blocks.tabs.marketing_text') %></a>
8
9
  </li>
9
10
  <li>
10
- <a href="#researcher" role="tab" data-toggle="tab"><%= t(:'hyrax.content_blocks.tabs.featured_researcher') %></a>
11
+ <a href="#researcher" role="tab" data-toggle="tab" class="show-confirm"><%= t(:'hyrax.content_blocks.tabs.featured_researcher') %></a>
11
12
  </li>
12
13
  </ul>
13
14
  <div class="tab-content">
@@ -16,13 +17,13 @@
16
17
  <%= simple_form_for ContentBlock.for(:announcement), url: hyrax.content_block_path(ContentBlock.for(:announcement)) do |f| %>
17
18
  <div class="panel-body">
18
19
  <div class="field form-group">
19
- <%= f.label :announcement %><br>
20
+ <%= f.label :announcement %><br />
20
21
  <%= f.text_area :announcement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
21
22
  </div>
22
23
  </div>
23
24
  <div class="panel-footer">
24
- <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
25
- <%= f.button :submit, class: 'btn btn-primary pull-right'%>
25
+ <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
26
+ <%= f.button :submit, class: 'btn btn-primary pull-right' %>
26
27
  </div>
27
28
  <% end %>
28
29
  </div>
@@ -32,13 +33,13 @@
32
33
  <%= simple_form_for ContentBlock.for(:marketing), url: hyrax.content_block_path(ContentBlock.for(:marketing)) do |f| %>
33
34
  <div class="panel-body">
34
35
  <div class="field form-group">
35
- <%= f.label :marketing %><br>
36
+ <%= f.label :marketing %><br />
36
37
  <%= f.text_area :marketing, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
37
38
  </div>
38
39
  </div>
39
40
  <div class="panel-footer">
40
- <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
41
- <%= f.button :submit, class: 'btn btn-primary pull-right'%>
41
+ <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
42
+ <%= f.button :submit, class: 'btn btn-primary pull-right' %>
42
43
  </div>
43
44
  <% end %>
44
45
  </div>
@@ -48,13 +49,13 @@
48
49
  <%= simple_form_for ContentBlock.for(:researcher), url: hyrax.content_block_path(ContentBlock.for(:researcher)) do |f| %>
49
50
  <div class="panel-body">
50
51
  <div class="field form-group">
51
- <%= f.label :researcher %><br>
52
+ <%= f.label :researcher %><br />
52
53
  <%= f.text_area :researcher, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
53
54
  </div>
54
55
  </div>
55
56
  <div class="panel-footer">
56
- <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
57
- <%= f.button :submit, class: 'btn btn-primary pull-right'%>
57
+ <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
58
+ <%= f.button :submit, class: 'btn btn-primary pull-right' %>
58
59
  </div>
59
60
  <% end %>
60
61
  </div>
@@ -0,0 +1,15 @@
1
+ <div class="modal fade" id="change-tab-content-block" tabindex="-1" role="dialog">
2
+ <div class="modal-dialog" role="document">
3
+ <div class="modal-content">
4
+ <div class="delete-collection-form">
5
+ <div class="modal-body">
6
+ <%= t(:'hyrax.content_blocks.change_tab_message') %>
7
+ </div>
8
+ <div class="modal-footer">
9
+ <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
10
+ <%= link_to 'OK', hyrax.edit_content_blocks_path, class: 'btn btn-default', id: "change-tab-btn" %>
11
+ </div>
12
+ </div>
13
+ </div>
14
+ </div>
15
+ </div>
@@ -1,24 +1,30 @@
1
1
  <div class="clearfix proxy-rights">
2
- <div class="row">
3
- <div class="col-xs-6 proxy-search">
4
- <h4><%= t("hyrax.dashboard.authorize_proxies") %></h4>
5
- <label class="sr-only" for="user"><%= t("hyrax.dashboard.proxy_user") %></label>
6
- <%= hidden_field_tag :user, nil, data: { grantor: current_user.to_param } %>
2
+ <div class="row">
3
+ <div class="col-xs-12">
4
+ <p><%= t('hyrax.dashboard.proxy_help') %></p>
5
+ </div>
7
6
  </div>
7
+ <div class="row">
8
+ <div class="col-xs-6 proxy-search">
9
+ <h4><%= t("hyrax.dashboard.authorize_proxies") %></h4>
10
+ <label class="sr-only" for="user"><%= t("hyrax.dashboard.proxy_user") %></label>
11
+ <%= hidden_field_tag :user, nil, data: { grantor: current_user.to_param } %>
12
+ <%= hidden_field_tag :delete_button_label, nil, data: { label: I18n.t('hyrax.dashboard.proxy_delete') } %>
13
+ </div>
8
14
 
9
- <div class="col-xs-6">
10
- <h4><%= t("hyrax.dashboard.current_proxies") %></h4>
11
- <table class="table table-condensed table-striped" id="authorizedProxies">
12
- <tbody>
13
- <% user.can_receive_deposits_from.each do |depositor| %>
14
- <tr><td class="depositor-name"><%= depositor.name %></td>
15
- <td><%= link_to(hyrax.user_depositor_path(user, depositor), method: :delete, class: "remove-proxy-button") do %>
16
- <span class="sr-only"><%= I18n.t('hyrax.dashboard.proxy_delete') %></span>
17
- <i class="glyphicon glyphicon-remove"></i><% end %>
18
- </td></tr>
19
- <% end %>
20
- </tbody>
21
- </table>
15
+ <div class="col-xs-6">
16
+ <h4><%= t("hyrax.dashboard.current_proxies") %></h4>
17
+ <table class="table table-condensed table-striped" id="authorizedProxies">
18
+ <tbody>
19
+ <% user.can_receive_deposits_from.each do |depositor| %>
20
+ <tr><td class="depositor-name"><%= depositor.name %></td>
21
+ <td><%= link_to(I18n.t('hyrax.dashboard.proxy_delete'), hyrax.user_depositor_path(user, depositor),
22
+ method: :delete,
23
+ class: "remove-proxy-button btn btn-danger") %>
24
+ </td></tr>
25
+ <% end %>
26
+ </tbody>
27
+ </table>
28
+ </div>
22
29
  </div>
23
30
  </div>
24
- </div>
@@ -11,7 +11,7 @@
11
11
  </div>
12
12
  </div>
13
13
  </li>
14
-
14
+
15
15
  <%= render 'hyrax/dashboard/sidebar/activity', menu: menu %>
16
16
  <%= render 'hyrax/dashboard/sidebar/repository_content', menu: menu %>
17
17
  <%= render 'hyrax/dashboard/sidebar/tasks', menu: menu %>
@@ -1,5 +1,5 @@
1
1
  <%# button for removing a batch from a collection %>
2
- <%# collection -- collection to be updated %>
2
+ <%# collection -- collection to be updated %>
3
3
  <%# label -- button label %>
4
4
  <%= form_for collection, url: hyrax.dashboard_collection_path(collection.id), method: :put do |f| %>
5
5
  <%= f.hidden_field :members, :value => "remove" %>
@@ -6,20 +6,20 @@
6
6
  data-colls-hash="<%= presenter.available_parent_collections(scope: controller) %>"
7
7
  data-post-url="<%= hyrax.dashboard_create_nest_collection_within_path(id) %>"
8
8
  data-post-delete-url="<%= hyrax.dashboard_collection_path(id) %>">
9
- <% presenter.title.each_with_index do |title, index| %>
10
- <% if index == 0 %>
11
- <div class="collection-title-row-content">
12
- <h3 class="collection-title"><%= title %></h3>
13
- <%= presenter.permission_badge %>
14
- <span class="label label-success">
15
- <%= presenter.collection_type_badge %>
16
- </span>
17
- </div>
18
- <div class="collection-title-row-content">
19
- <%= render 'show_actions', presenter: presenter %>
20
- </div>
21
- <% else %>
22
- <h3><%= title %></h3>
23
- <% end %>
24
- <% end %>
9
+
10
+ <div class="collection-title-row-content">
11
+ <h3 class="collection-title">
12
+ <% # List multiple titles %>
13
+ <% presenter.title.each_with_index do |title, index| %>
14
+ <span><%= title %></span>
15
+ <% end %>
16
+ </h3>
17
+ <%= presenter.permission_badge %>
18
+ <span class="label label-success">
19
+ <%= presenter.collection_type_badge %>
20
+ </span>
21
+ </div>
22
+ <div class="collection-title-row-content">
23
+ <%= render 'show_actions', presenter: presenter %>
24
+ </div>
25
25
  </section>
@@ -4,9 +4,11 @@
4
4
  <a href="#description" role="tab" data-toggle="tab"><%= t('.tabs.description') %></a>
5
5
  </li>
6
6
  <% if @form.persisted? %>
7
+ <% if @collection.brandable? %>
7
8
  <li>
8
9
  <a href="#branding" role="tab" data-toggle="tab"><%= t('.tabs.branding') %></a>
9
10
  </li>
11
+ <% end %>
10
12
  <% if @collection.discoverable? %>
11
13
  <li>
12
14
  <a href="#discovery" role="tab" data-toggle="tab"><%= t('.tabs.discovery') %></a>
@@ -60,7 +62,7 @@
60
62
  <% end %>
61
63
  <% if params[:batch_document_ids].present? %>
62
64
  <% params[:batch_document_ids].each do |batch_item| %>
63
- <input type="hidden" name="batch_document_ids[]" value="<%= batch_item %>"/>
65
+ <input type="hidden" name="batch_document_ids[]" value="<%= batch_item %>" />
64
66
  <% end %>
65
67
  <% end %>
66
68
  </div>
@@ -6,7 +6,7 @@
6
6
 
7
7
  <div id="fileupload">
8
8
  <!-- Redirect browsers with JavaScript disabled to the origin page -->
9
- <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"></noscript>
9
+ <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
10
10
  <!-- The table listing the files available for upload/download -->
11
11
 
12
12
  <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
@@ -16,7 +16,7 @@
16
16
  <span class="btn btn-success fileinput-button">
17
17
  <span class="glyphicon glyphicon-plus"></span>
18
18
  <span>Choose File</span>
19
- <input type="file" name="files[]" single>
19
+ <input type="file" name="files[]" single />
20
20
  </span>
21
21
  </div> <!-- end col-xs-4 -->
22
22
 
@@ -40,12 +40,12 @@
40
40
  <div class="col-sm-3">
41
41
  <span class="name">
42
42
  <span><%= f.object.banner_info[:file] %></span>
43
- <input type="hidden" name="banner_unchanged" value="true">
43
+ <input type="hidden" name="banner_unchanged" value="true" />
44
44
  </span>
45
45
  </div>
46
46
 
47
47
  <div class="col-sm-2">
48
- <button class="btn btn-danger delete branding-banner-remove" data-type="DELETE" data-url="/" onclick=$("#banner").remove(); >
48
+ <button class="btn btn-danger delete branding-banner-remove" data-type="DELETE" data-url="/" onclick=$("#banner").remove();>
49
49
  <span class="glyphicon glyphicon-remove"></span>
50
50
  <span class="controls-remove-text">Remove</span>
51
51
  <span class="sr-only">
@@ -57,7 +57,7 @@
57
57
  </div> <!-- row branding-banner-row -->
58
58
 
59
59
  <% if f.object.banner_info[:relative_path] %>
60
- <div class="banner-image" >
60
+ <div class="banner-image">
61
61
  <i><%= image_tag(f.object.banner_info[:relative_path],
62
62
  size: "800x100",
63
63
  alt: "Unable to display banner: #{f.object.banner_info[:file]}") %></i>
@@ -83,7 +83,7 @@
83
83
 
84
84
  <div id="fileuploadlogo">
85
85
  <!-- Redirect browsers with JavaScript disabled to the origin page -->
86
- <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"></noscript>
86
+ <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
87
87
  <!-- The table listing the files available for upload/download -->
88
88
 
89
89
  <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
@@ -93,7 +93,7 @@
93
93
  <span class="btn btn-success fileinput-button">
94
94
  <span class="glyphicon glyphicon-plus"></span>
95
95
  <span>Choose File</span>
96
- <input type="file" name="files[]" single>
96
+ <input type="file" name="files[]" single />
97
97
  </span>
98
98
  </div> <!-- end col-xs-4 -->
99
99
 
@@ -117,21 +117,21 @@
117
117
  <div class="col-sm-3">
118
118
  <span class="name">
119
119
  <span><%= linfo[:file] %></span>
120
- <input type="hidden" name="logo_files[]" value="<%= linfo[:full_path] %>">
120
+ <input type="hidden" name="logo_files[]" value="<%= linfo[:full_path] %>" />
121
121
  </span>
122
122
  </div>
123
123
 
124
124
  <div class="col-sm-4 branding-logo-input">
125
125
  <label for="linkurl_<%= i %>">Link URL:
126
- <input id="linkurl_<%= i %>" class="branding-logo-input" type="text" name="linkurl[]" value="<%= linfo[:linkurl] %>"></input>
126
+ <input id="linkurl_<%= i %>" class="branding-logo-input" type="text" name="linkurl[]" value="<%= linfo[:linkurl] %>" /><input />
127
127
  </label>
128
128
  <label for="alttext_<%= i %>">Alt Text:
129
- <input id="alttext_<%= i %>" class="branding-logo-input" type="text" name="alttext[]" value="<%= linfo[:alttext] %>"></input>
129
+ <input id="alttext_<%= i %>" class="branding-logo-input" type="text" name="alttext[]" value="<%= linfo[:alttext] %>" /><input />
130
130
  </label>
131
131
  </div>
132
132
 
133
133
  <div class="col-sm-2">
134
- <button class="btn btn-danger delete branding-logo-remove" data-type="DELETE" data-url="/" onclick=$("#logorow_<%= i %>").remove(); >
134
+ <button class="btn btn-danger delete branding-logo-remove" data-type="DELETE" data-url="/" onclick=$("#logorow_<%= i %>").remove();>
135
135
  <span class="glyphicon glyphicon-remove"></span>
136
136
  <span class="controls-remove-text">Remove</span>
137
137
  <span class="sr-only">
@@ -7,7 +7,7 @@
7
7
  <tr>
8
8
  <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
9
9
  <th><%= t("hyrax.dashboard.my.heading.title") %></th>
10
- <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%= params[:sort] == "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort] == "#{CatalogController.uploaded_field} asc" ? 'caret up' : ''%>"></i><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
10
+ <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%= params[:sort] == "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort] == "#{CatalogController.uploaded_field} asc" ? 'caret up' : '' %>"></i><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
11
11
  <th><%= t("hyrax.dashboard.my.heading.visibility") %></th>
12
12
  <th><%= t("hyrax.dashboard.my.heading.action") %></th>
13
13
  </tr>
@@ -5,13 +5,13 @@
5
5
 
6
6
  <div class="form-group">
7
7
  <label class="radio">
8
- <input type="radio" id="visibility_open" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if @collection.open_access? %> checked="true"<% end %>/><strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
8
+ <input type="radio" id="visibility_open" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if @collection.open_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
9
9
  </label>
10
10
  <label class="radio">
11
11
  <input type="radio" id="visibility_registered" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if @collection.authenticated_only_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
12
12
  </label>
13
13
  <label class="radio">
14
- <input type="radio" id="visibility_restricted" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE%>" <% if @collection.private_access? %> checked="true"<% end %>/><strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
14
+ <input type="radio" id="visibility_restricted" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>" <% if @collection.private_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
15
15
  </label>
16
16
  </div>
17
17
 
@@ -1,4 +1,4 @@
1
- <div role="dialog" class="modal collection-list-modal fade" id="collection-list-container" tabindex="-1" aria-labelledby="col_add_title" >
1
+ <div role="dialog" class="modal collection-list-modal fade" id="collection-list-container" tabindex="-1" aria-labelledby="col_add_title">
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content">
4
4
  <div class="modal-header">
@@ -7,13 +7,13 @@
7
7
  </div>
8
8
  <div class="modal-body">
9
9
  <% if user_collections.blank? %>
10
- <em> <%= t("hyrax.collection.select_form.no_collections") %></em><br><br><br><br>
10
+ <em> <%= t("hyrax.collection.select_form.no_collections") %></em><br /><br /><br /><br />
11
11
  <% else %>
12
12
  <div class="collection-list">
13
13
  <fieldset>
14
14
  <legend><%= t("hyrax.collection.select_form.select_heading") %></legend>
15
15
  <ul>
16
- <% user_collections.sort { |c1,c2| c2[CatalogController.uploaded_field] <=> c1[CatalogController.uploaded_field] }.each_with_index do |collection,index| %>
16
+ <% user_collections.sort { |c1,c2| c2[CatalogController.uploaded_field] <=> c1[CatalogController.uploaded_field] }.each_with_index do |collection,index| %>
17
17
  <li>
18
18
  <% selected = (collection.id == @add_works_to_collection) || (@add_works_to_collection.blank? && index == 0) %>
19
19
  <%= radio_button_tag(:id, collection.id, selected, class: "collection-selector") %>
@@ -26,7 +26,7 @@
26
26
  <% end %> <!-- else -->
27
27
  </div>
28
28
  <div class="modal-footer">
29
- <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("hyrax.collection.select_form.close")%></button>
29
+ <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("hyrax.collection.select_form.close") %></button>
30
30
  <% if user_collections.blank? %>
31
31
  <%= render 'hyrax/dashboard/collections/button_create_collection', label: t("hyrax.collection.select_form.create") %>
32
32
 
@@ -1,3 +1,5 @@
1
+ <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
2
+
1
3
  <div id="participants" class="tab-pane">
2
4
  <div class="panel panel-default labels edit-sharing-tab">
3
5
  <div class="panel-body">
@@ -6,64 +8,69 @@
6
8
  <p><%= t('.note') %></p>
7
9
  <h3><%= t('.add_sharing') %></h3>
8
10
 
9
- <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
11
+ <!-- Add group form -->
12
+ <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
13
+ <%= simple_form_for @form.permission_template,
14
+ url: [hyrax, :dashboard, @form, :permission_template],
15
+ html: { id: 'group-participants-form' } do |f| %>
16
+ <div class="clearfix spacer">
17
+ <%= f.fields_for 'access_grants_attributes',
18
+ f.object.access_grants.build(agent_type: 'group'),
19
+ index: 0 do |builder| %>
20
+
21
+ <div class="form-inline add-sharing-form">
22
+ <label class="col-md-2 col-xs-4 control-label"><%= t('.add_group') %>:</label>
23
+ <div class="col-md-10 col-xs-8 form-group">
24
+ <%= builder.hidden_field :agent_type %>
25
+ <%= builder.text_field :agent_id,
26
+ placeholder: "Search for a group...",
27
+ class: 'form-control search-input' %>
28
+ as
29
+ <%= builder.select :access,
30
+ access_options,
31
+ { prompt: "Select a role..." },
32
+ class: 'form-control' %>
33
+
34
+ <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button' %>
35
+ </div>
36
+ </div>
37
+ <% end %>
38
+ </div>
39
+ <% end %>
40
+ </div>
41
+
42
+ <!-- Add user form -->
43
+ <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
44
+ <%= simple_form_for @form.permission_template,
45
+ url: [hyrax, :dashboard, @form, :permission_template],
46
+ html: { id: 'user-participants-form' } do |f| %>
47
+ <div class="clearfix spacer">
10
48
 
11
- <%= simple_form_for @form.permission_template,
12
- url: [hyrax, :dashboard, @form, :permission_template],
13
- html: { id: 'group-participants-form' } do |f| %>
14
- <div class="clearfix spacer">
15
- <%= f.fields_for 'access_grants_attributes',
16
- f.object.access_grants.build(agent_type: 'group'),
17
- index: 0 do |builder| %>
49
+ <%= f.fields_for 'access_grants_attributes',
50
+ f.object.access_grants.build(agent_type: 'user'),
51
+ index: 0 do |builder| %>
18
52
 
19
- <div class="form-inline add-sharing-form">
20
- <label class="col-md-2 col-xs-4 control-label"><%= t('.add_group') %>:</label>
53
+ <div class="form-inline add-users">
54
+ <label class="col-md-2 col-xs-4 control-label"><%= t('.add_user') %>:</label>
21
55
  <div class="col-md-10 col-xs-8 form-group">
22
56
  <%= builder.hidden_field :agent_type %>
23
57
  <%= builder.text_field :agent_id,
24
- placeholder: "Search for a group...",
25
- class: 'form-control search-input' %>
58
+ placeholder: "Search for a user..." %>
26
59
  as
27
60
  <%= builder.select :access,
28
61
  access_options,
29
62
  { prompt: "Select a role..." },
30
63
  class: 'form-control' %>
31
64
 
32
- <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
65
+ <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button' %>
33
66
  </div>
34
67
  </div>
35
- <% end %>
36
- </div>
37
- <% end %>
38
-
39
- <%= simple_form_for @form.permission_template,
40
- url: [hyrax, :dashboard, @form, :permission_template],
41
- html: { id: 'user-participants-form' } do |f| %>
42
- <div class="clearfix spacer">
43
-
44
- <%= f.fields_for 'access_grants_attributes',
45
- f.object.access_grants.build(agent_type: 'user'),
46
- index: 0 do |builder| %>
47
-
48
- <div class="form-inline add-users">
49
- <label class="col-md-2 col-xs-4 control-label"><%= t('.add_user') %>:</label>
50
- <div class="col-md-10 col-xs-8 form-group">
51
- <%= builder.hidden_field :agent_type %>
52
- <%= builder.text_field :agent_id,
53
- placeholder: "Search for a user..." %>
54
- as
55
- <%= builder.select :access,
56
- access_options,
57
- { prompt: "Select a role..." },
58
- class: 'form-control' %>
59
-
60
- <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
61
- </div>
68
+ <% end %>
62
69
  </div>
63
- <% end %>
64
- </div>
65
- <% end %>
66
- <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note')%></p>
70
+ <% end %>
71
+ </div>
72
+
73
+ <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note') %></p>
67
74
  </section>
68
75
 
69
76
  <section class="section-collection-sharing">