sufia 4.0.0.beta2 → 4.0.0.beta3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (335) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -0
  3. data/README.md +6 -4
  4. data/SUFIA_VERSION +1 -1
  5. data/app/assets/images/folder.png +0 -0
  6. data/app/assets/javascripts/sufia.js +5 -0
  7. data/app/assets/javascripts/sufia/app.js +1 -0
  8. data/app/assets/javascripts/sufia/batch_select_all.js +1 -2
  9. data/app/assets/javascripts/sufia/dashboard_actions.js +13 -0
  10. data/app/assets/javascripts/sufia/editor.js +1 -1
  11. data/app/assets/javascripts/sufia/ga_events.js +10 -0
  12. data/app/assets/javascripts/sufia/search.js +67 -0
  13. data/app/assets/stylesheets/dashboard.css.scss +15 -1
  14. data/app/assets/stylesheets/sufia.css.scss +12 -0
  15. data/app/controllers/authorities_controller.rb +4 -4
  16. data/app/controllers/batch_controller.rb +4 -4
  17. data/app/controllers/collections_controller.rb +44 -0
  18. data/{lib → app/controllers/concerns}/sufia/batch_edits_controller_behavior.rb +1 -1
  19. data/app/controllers/concerns/sufia/catalog.rb +9 -45
  20. data/{lib → app/controllers/concerns}/sufia/controller.rb +11 -21
  21. data/app/controllers/concerns/sufia/dashboard_controller_behavior.rb +34 -6
  22. data/{lib → app/controllers/concerns}/sufia/downloads_controller_behavior.rb +0 -0
  23. data/app/controllers/concerns/sufia/files_controller/browse_everything.rb +35 -0
  24. data/{lib → app/controllers/concerns}/sufia/files_controller/local_ingest_behavior.rb +19 -7
  25. data/{lib → app/controllers/concerns}/sufia/files_controller/upload_complete_behavior.rb +1 -1
  26. data/app/controllers/concerns/sufia/files_controller_behavior.rb +219 -0
  27. data/app/controllers/concerns/sufia/homepage_controller.rb +41 -0
  28. data/app/controllers/concerns/sufia/users_controller_behavior.rb +3 -2
  29. data/app/controllers/dashboard/collections_controller.rb +19 -0
  30. data/app/controllers/dashboard/files_controller.rb +13 -0
  31. data/app/controllers/dashboard/highlights_controller.rb +20 -0
  32. data/app/controllers/dashboard/lists_controller.rb +13 -0
  33. data/app/controllers/dashboard/shares_controller.rb +19 -0
  34. data/app/controllers/directory_controller.rb +8 -8
  35. data/app/controllers/featured_work_lists_controller.rb +1 -1
  36. data/app/controllers/homepage_controller.rb +4 -0
  37. data/app/controllers/single_use_links_controller.rb +6 -6
  38. data/app/controllers/single_use_links_viewer_controller.rb +6 -6
  39. data/app/controllers/static_controller.rb +4 -3
  40. data/app/helpers/batch_edits_helper.rb +3 -6
  41. data/app/helpers/content_block_helper.rb +7 -2
  42. data/app/helpers/generic_file_helper.rb +33 -39
  43. data/app/helpers/records_helper.rb +4 -0
  44. data/app/helpers/sufia/blacklight_override.rb +11 -0
  45. data/app/helpers/sufia/records_helper_behavior.rb +38 -0
  46. data/app/helpers/sufia/sufia_helper_behavior.rb +109 -0
  47. data/{sufia-models/lib/sufia/models → app/models/concerns/sufia}/solr_document_behavior.rb +6 -1
  48. data/app/models/contact_form.rb +13 -13
  49. data/app/uploaders/tinymce_asset_uploader.rb +2 -2
  50. data/app/views/_controls.html.erb +1 -1
  51. data/app/views/_flash_msg.html.erb +2 -8
  52. data/app/views/_ga.html.erb +4 -0
  53. data/app/views/_user_util_links.html.erb +7 -7
  54. data/app/views/advanced/_advanced_search_facets.html.erb +1 -1
  55. data/app/views/advanced/_advanced_search_fields.html.erb +2 -2
  56. data/app/views/advanced/_advanced_search_form.html.erb +12 -12
  57. data/app/views/batch/_metadata.html.erb +12 -12
  58. data/app/views/batch/_more_metadata.html.erb +1 -2
  59. data/app/views/batch/edit.html.erb +5 -5
  60. data/app/views/batch_edits/_check_all.html.erb +1 -1
  61. data/app/views/batch_edits/_delete_selected.html.erb +2 -3
  62. data/app/views/batch_edits/edit.html.erb +20 -21
  63. data/app/views/catalog/_bookmark_control.html.erb +7 -8
  64. data/app/views/catalog/_constraints_element.html.erb +2 -2
  65. data/app/views/catalog/_delete_partials/_default.html.erb +9 -12
  66. data/app/views/catalog/_document.html.erb +5 -5
  67. data/app/views/catalog/_document_list.html.erb +2 -2
  68. data/app/views/catalog/_edit_partials/_default.html.erb +6 -9
  69. data/app/views/catalog/_edit_partials/_default_details.html.erb +2 -4
  70. data/app/views/catalog/_email_form.html.erb +1 -1
  71. data/app/views/catalog/_facet_limit.html.erb +6 -7
  72. data/app/views/catalog/_facet_selected.html.erb +3 -3
  73. data/app/views/catalog/_folder_control.html.erb +7 -8
  74. data/app/views/catalog/_index_default.html.erb +2 -2
  75. data/app/views/catalog/_index_header_default.html.erb +20 -0
  76. data/app/views/catalog/_index_partials/_default_group.html.erb +1 -1
  77. data/app/views/catalog/_index_partials/_list_files.html.erb +5 -2
  78. data/app/views/catalog/_refworks_form.html.erb +2 -2
  79. data/app/views/catalog/_results_pagination.html.erb +1 -1
  80. data/app/views/catalog/_search_form.html.erb +24 -9
  81. data/app/views/catalog/_show_default.html.erb +2 -2
  82. data/app/views/catalog/_show_partials/_default.html.erb +4 -5
  83. data/app/views/catalog/_show_partials/_default_details.html.erb +5 -5
  84. data/app/views/catalog/_show_partials/_facets.html.erb +7 -7
  85. data/app/views/catalog/_show_tools.html.erb +6 -6
  86. data/app/views/catalog/_sms_form.html.erb +1 -1
  87. data/app/views/catalog/_sort_and_per_page.html.erb +8 -14
  88. data/app/views/catalog/citation.html.erb +1 -1
  89. data/app/views/catalog/email.erb +1 -1
  90. data/app/views/catalog/index.html.erb +16 -27
  91. data/app/views/catalog/recent.js.erb +1 -1
  92. data/app/views/catalog/show.html.erb +2 -2
  93. data/app/views/catalog/sms.erb +1 -1
  94. data/app/views/collections/_action_menu.html.erb +24 -0
  95. data/app/views/collections/_batch_edits_actions.html.erb +3 -0
  96. data/app/views/collections/_button_for_creating_empty_collection.html.erb +3 -0
  97. data/app/views/collections/_dashboard_document_list.html.erb +6 -0
  98. data/app/views/collections/_document_list.html.erb +10 -0
  99. data/app/views/collections/_edit_actions.html.erb +5 -0
  100. data/app/views/collections/_edit_descriptions.html.erb +20 -0
  101. data/app/views/collections/_form.html.erb +24 -0
  102. data/app/views/collections/_form_for_select_collection.html.erb +34 -0
  103. data/app/views/collections/_media_display.html.erb +1 -0
  104. data/app/views/collections/_paginate.html.erb +6 -0
  105. data/app/views/collections/_search_collection_dashboard_form.html.erb +10 -0
  106. data/app/views/collections/_show_actions.html.erb +7 -0
  107. data/app/views/collections/_show_descriptions.html.erb +8 -0
  108. data/app/views/collections/_show_fields.html.erb +0 -0
  109. data/app/views/collections/_single_item_action_fields.html.erb +6 -0
  110. data/app/views/collections/_sort_and_per_page.html.erb +29 -0
  111. data/app/views/collections/_view_type_group.html.erb +13 -0
  112. data/app/views/collections/edit.html.erb +30 -0
  113. data/app/views/collections/show.html.erb +32 -0
  114. data/app/views/contact_form/new.html.erb +13 -13
  115. data/app/views/dashboard/_action_menu.html.erb +29 -0
  116. data/app/views/dashboard/_collection_action_menu.html.erb +15 -0
  117. data/app/views/dashboard/_document_list.html.erb +1 -1
  118. data/app/views/dashboard/_facet_limit.html.erb +2 -2
  119. data/app/views/dashboard/_facet_pagination.html.erb +12 -12
  120. data/app/views/dashboard/_facet_selected.html.erb +2 -2
  121. data/app/views/dashboard/_facets.html.erb +2 -0
  122. data/app/views/dashboard/_index_partials/_default_group.html.erb +9 -2
  123. data/app/views/dashboard/_index_partials/_list_collections.html.erb +45 -0
  124. data/app/views/dashboard/_index_partials/_list_files.html.erb +5 -25
  125. data/app/views/dashboard/_results_pagination.html.erb +1 -1
  126. data/app/views/dashboard/_search_form.html.erb +2 -2
  127. data/app/views/dashboard/_show_partials/_default.html.erb +3 -3
  128. data/app/views/dashboard/_show_partials/_default_details.html.erb +5 -5
  129. data/app/views/dashboard/_show_partials/_facets.html.erb +6 -6
  130. data/app/views/dashboard/_sort_and_per_page.html.erb +24 -8
  131. data/app/views/dashboard/facet.html.erb +3 -3
  132. data/app/views/dashboard/index.html.erb +18 -41
  133. data/app/views/dashboard/lists/index.html.erb +59 -0
  134. data/app/views/generic_files/_breadcrumbs.html.erb +4 -4
  135. data/app/views/generic_files/_descriptions.html.erb +4 -4
  136. data/app/views/generic_files/_field_form.html.erb +5 -5
  137. data/app/views/generic_files/_flot_stats.js.erb +120 -0
  138. data/app/views/generic_files/_media_display.html.erb +14 -4
  139. data/app/views/generic_files/_permission.html.erb +3 -3
  140. data/app/views/generic_files/_permission_form.html.erb +20 -21
  141. data/app/views/generic_files/_show_actions.html.erb +13 -10
  142. data/app/views/generic_files/_show_details.html.erb +16 -9
  143. data/app/views/generic_files/_versioning.html.erb +3 -3
  144. data/app/views/generic_files/edit.html.erb +7 -7
  145. data/app/views/generic_files/edit_fields/_default.html.erb +3 -4
  146. data/app/views/generic_files/edit_fields/_description.html.erb +3 -4
  147. data/app/views/generic_files/edit_fields/_resource_type.html.erb +1 -3
  148. data/app/views/generic_files/edit_fields/_rights.html.erb +3 -5
  149. data/app/views/generic_files/edit_fields/_suffix.html.erb +1 -1
  150. data/app/views/generic_files/show.html.erb +3 -3
  151. data/app/views/generic_files/stats.html.erb +8 -124
  152. data/app/views/generic_files/upload/_alerts.html.erb +2 -4
  153. data/app/views/generic_files/upload/_form.html.erb +1 -1
  154. data/app/views/generic_files/upload/_local_file_import_chooser.html.erb +1 -1
  155. data/app/views/generic_files/upload/_tos_checkbox.html.erb +1 -1
  156. data/app/views/homepage/_featured.html.erb +3 -1
  157. data/app/views/{catalog → homepage}/_featured_researcher.html.erb +0 -0
  158. data/app/views/{catalog → homepage}/_home.html.erb +1 -0
  159. data/app/views/{catalog → homepage}/_home_content.html.erb +4 -4
  160. data/app/views/homepage/_home_header.html.erb +12 -0
  161. data/app/views/homepage/_marketing.html.erb +4 -0
  162. data/app/views/{catalog → homepage}/_recent_document.html.erb +10 -5
  163. data/app/views/homepage/_recents.html.erb +15 -0
  164. data/app/views/homepage/_sortable_featured.html.erb +3 -1
  165. data/app/views/{catalog → homepage}/_tagcloud.html.erb +0 -0
  166. data/app/views/homepage/index.html.erb +1 -0
  167. data/app/views/kaminari/blacklight/_first_page.html.erb +1 -1
  168. data/app/views/kaminari/blacklight/_last_page.html.erb +1 -1
  169. data/app/views/kaminari/blacklight/_next_page.html.erb +1 -1
  170. data/app/views/kaminari/blacklight/_page.html.erb +1 -1
  171. data/app/views/kaminari/blacklight/_prev_page.html.erb +1 -1
  172. data/app/views/layouts/_head_tag_content.html.erb +1 -1
  173. data/app/views/layouts/error.html.erb +2 -2
  174. data/app/views/layouts/homepage.html.erb +4 -4
  175. data/app/views/layouts/sufia-dashboard.html.erb +7 -7
  176. data/app/views/layouts/sufia-one-column.html.erb +4 -4
  177. data/app/views/layouts/sufia-two-column.html.erb +7 -7
  178. data/app/views/mailbox/index.html.erb +2 -2
  179. data/app/views/pages/show.html.erb +1 -0
  180. data/app/views/records/_edit_field.html.erb +18 -0
  181. data/app/views/records/edit_fields/_description.html.erb +10 -0
  182. data/app/views/records/edit_fields/_resource_type.html.erb +7 -0
  183. data/app/views/records/edit_fields/_rights.html.erb +6 -0
  184. data/app/views/records/edit_fields/_suffix.html.erb +9 -0
  185. data/app/views/records/edit_fields/_type.html.erb +13 -0
  186. data/app/views/single_use_links/new_download.html.erb +1 -1
  187. data/app/views/users/_activity.html.erb +1 -1
  188. data/app/views/users/_contributions.html.erb +3 -1
  189. data/app/views/users/_left_sidebar.html.erb +1 -1
  190. data/app/views/users/_notify_link.html.erb +2 -2
  191. data/app/views/users/_profile.html.erb +2 -2
  192. data/app/views/users/_search_form.html.erb +3 -3
  193. data/app/views/users/edit.html.erb +15 -15
  194. data/app/views/users/index.html.erb +3 -3
  195. data/app/views/users/notifications_number.js.erb +1 -1
  196. data/config/locales/sufia.en.yml +13 -2
  197. data/config/routes.rb +56 -20
  198. data/db/seeds.rb +2 -2
  199. data/lib/generators/sufia/sufia_generator.rb +14 -4
  200. data/lib/generators/sufia/templates/catalog_controller.rb +98 -97
  201. data/lib/generators/sufia/templates/sufia_helper.rb +5 -0
  202. data/lib/sufia.rb +4 -0
  203. data/spec/{models/generic_file/actions_spec.rb → actors/generic_file/actor_spec.rb} +2 -2
  204. data/spec/controllers/authorities_controller_spec.rb +7 -7
  205. data/spec/controllers/batch_controller_spec.rb +22 -23
  206. data/spec/controllers/batch_edits_controller_spec.rb +4 -4
  207. data/spec/controllers/catalog_controller_spec.rb +27 -37
  208. data/spec/controllers/collections_controller_spec.rb +179 -0
  209. data/spec/controllers/dashboard/collections_controller_spec.rb +71 -0
  210. data/spec/controllers/dashboard/files_controller_spec.rb +71 -0
  211. data/spec/controllers/dashboard/highlights_controller_spec.rb +66 -0
  212. data/spec/controllers/dashboard/shares_controller_spec.rb +78 -0
  213. data/spec/controllers/dashboard_controller_spec.rb +0 -47
  214. data/spec/controllers/downloads_controller_spec.rb +10 -11
  215. data/spec/controllers/generic_files_controller_spec.rb +147 -118
  216. data/spec/controllers/homepage_controller_spec.rb +57 -0
  217. data/spec/controllers/mailbox_controller_spec.rb +3 -3
  218. data/spec/controllers/single_use_links_viewer_controller_spec.rb +3 -3
  219. data/spec/factories/generic_files.rb +4 -0
  220. data/spec/factories/users.rb +0 -1
  221. data/spec/features/browse_dashboard_files_spec.rb +5 -1
  222. data/spec/features/collection_spec.rb +232 -0
  223. data/spec/features/display_dashboard_spec.rb +1 -0
  224. data/spec/features/notifications_spec.rb +1 -1
  225. data/spec/features/search_spec.rb +22 -0
  226. data/spec/features/single_use_links_spec.rb +2 -2
  227. data/spec/features/users_spec.rb +1 -1
  228. data/spec/fixtures/charter.docx +0 -0
  229. data/spec/helpers/records_helper_spec.rb +61 -0
  230. data/spec/helpers/sufia_helper_spec.rb +40 -2
  231. data/spec/{models → jobs}/active_fedora_pid_based_job_spec.rb +0 -0
  232. data/spec/{models → jobs}/audit_job_spec.rb +0 -2
  233. data/spec/{models → jobs}/batch_update_job_spec.rb +2 -2
  234. data/spec/jobs/characterize_job_spec.rb +25 -0
  235. data/spec/jobs/create_derivatives_job_spec.rb +186 -0
  236. data/spec/{models → jobs}/event_jobs_spec.rb +0 -1
  237. data/spec/jobs/import_url_job_spec.rb +36 -14
  238. data/spec/jobs/ingest_local_file_job_spec.rb +2 -2
  239. data/spec/lib/sufia/analytics_spec.rb +29 -0
  240. data/spec/lib/sufia/upload_complete_behavior_spec.rb +1 -1
  241. data/spec/models/batch_spec.rb +3 -9
  242. data/spec/models/checksum_audit_log_spec.rb +5 -6
  243. data/spec/models/collection_spec.rb +24 -0
  244. data/spec/models/download_spec.rb +21 -0
  245. data/spec/models/featured_work_list_spec.rb +0 -1
  246. data/spec/models/file_content_datastream_spec.rb +8 -14
  247. data/spec/models/file_usage_spec.rb +91 -0
  248. data/spec/models/fits_datastream_spec.rb +1 -1
  249. data/spec/models/generic_file/web_form_spec.rb +2 -2
  250. data/spec/models/generic_file_rdf_datastream_spec.rb +12 -0
  251. data/spec/models/generic_file_spec.rb +150 -168
  252. data/spec/models/local_authority_spec.rb +9 -9
  253. data/spec/models/{pageview.rb → pageview_spec.rb} +0 -0
  254. data/spec/models/single_use_link_spec.rb +32 -35
  255. data/spec/routing/route_spec.rb +19 -3
  256. data/spec/spec_helper.rb +28 -6
  257. data/spec/support/features/session_helpers.rb +5 -6
  258. data/spec/support/lib/generators/test_app_generator.rb +6 -0
  259. data/spec/views/generic_file/edit.html.erb_spec.rb +4 -4
  260. data/spec/views/generic_file/show.html.erb_spec.rb +45 -17
  261. data/spec/views/generic_file/stats.html.erb_spec.rb +26 -7
  262. data/sufia-models/app/actors/sufia/generic_file/actor.rb +98 -0
  263. data/sufia-models/app/models/batch.rb +3 -3
  264. data/sufia-models/app/models/checksum_audit_log.rb +3 -3
  265. data/sufia-models/app/models/collection.rb +41 -0
  266. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file.rb +33 -43
  267. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/accessible_attributes.rb +3 -3
  268. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/audit.rb +12 -18
  269. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/characterization.rb +1 -8
  270. data/sufia-models/app/models/concerns/sufia/generic_file/derivatives.rb +26 -0
  271. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/export.rb +13 -13
  272. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/featured.rb +0 -0
  273. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/metadata.rb +0 -0
  274. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/mime_types.rb +15 -1
  275. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/permissions.rb +5 -1
  276. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/reload_on_save.rb +0 -0
  277. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/trophies.rb +0 -0
  278. data/sufia-models/app/models/concerns/sufia/generic_file/versions.rb +16 -0
  279. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/virus_check.rb +2 -3
  280. data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/web_form.rb +9 -2
  281. data/sufia-models/app/models/concerns/sufia/properties_datastream_behavior.rb +3 -4
  282. data/sufia-models/app/models/concerns/sufia/user.rb +2 -2
  283. data/sufia-models/app/models/datastreams/fits_datastream.rb +137 -136
  284. data/sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb +6 -0
  285. data/sufia-models/app/models/datastreams/paranoid_rights_datastream.rb +3 -3
  286. data/sufia-models/app/models/file_usage.rb +53 -0
  287. data/sufia-models/app/models/follow.rb +2 -4
  288. data/sufia-models/app/models/geo_names_resource.rb +5 -7
  289. data/sufia-models/app/models/local_authority.rb +14 -14
  290. data/sufia-models/app/models/single_use_link.rb +1 -1
  291. data/sufia-models/app/models/sufia/download.rb +9 -0
  292. data/sufia-models/app/models/trophy.rb +1 -1
  293. data/sufia-models/app/services/sufia/{usage_statistics.rb → analytics.rb} +1 -24
  294. data/sufia-models/app/services/sufia/id_service.rb +2 -2
  295. data/sufia-models/lib/generators/sufia/models/install_generator.rb +5 -2
  296. data/sufia-models/lib/generators/sufia/models/templates/config/setup_mail.rb +1 -1
  297. data/sufia-models/lib/generators/sufia/models/templates/config/sufia.rb +5 -3
  298. data/sufia-models/lib/generators/sufia/models/templates/migrations/acts_as_follower_migration.rb +6 -6
  299. data/sufia-models/lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb +2 -3
  300. data/sufia-models/lib/generators/sufia/models/templates/migrations/create_local_authorities.rb +20 -20
  301. data/sufia-models/lib/sufia/ability.rb +1 -1
  302. data/sufia-models/lib/sufia/models/engine.rb +3 -9
  303. data/sufia-models/lib/sufia/models/file_content/versions.rb +3 -3
  304. data/sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb +6 -2
  305. data/sufia-models/lib/sufia/models/jobs/batch_update_job.rb +6 -10
  306. data/sufia-models/lib/sufia/models/jobs/characterize_job.rb +1 -13
  307. data/sufia-models/lib/sufia/models/jobs/create_derivatives_job.rb +14 -0
  308. data/sufia-models/lib/sufia/models/jobs/import_url_job.rb +27 -23
  309. data/sufia-models/lib/tasks/sufia-models_tasks.rake +1 -1
  310. data/sufia-models/sufia-models.gemspec +1 -1
  311. data/sufia.gemspec +7 -2
  312. data/tasks/jetty.rake +4 -4
  313. data/tasks/release.rake +8 -8
  314. data/tasks/sufia-db.rake +4 -4
  315. data/tasks/sufia-dev.rake +11 -5
  316. metadata +226 -95
  317. data/app/helpers/sufia_helper.rb +0 -93
  318. data/app/views/catalog/_bookmark_form.html.erb +0 -8
  319. data/app/views/catalog/_home_header.html.erb +0 -15
  320. data/app/views/catalog/_recents.html.erb +0 -17
  321. data/app/views/dashboard/_index_partials/_thumbnail_display.html.erb +0 -9
  322. data/app/views/layouts/_homepage_sidebar2.html.erb +0 -14
  323. data/lib/sufia/files_controller_behavior.rb +0 -253
  324. data/spec/helpers/generic_file_helper_spec.rb +0 -28
  325. data/spec/lib/sufia/usage_statistics_spec.rb +0 -75
  326. data/spec/models/characterize_job_spec.rb +0 -93
  327. data/spec/models/transcode_audio_job_spec.rb +0 -85
  328. data/spec/models/transcode_video_job_spec.rb +0 -31
  329. data/spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb +0 -22
  330. data/sufia-models/lib/sufia/models/generic_file/actions.rb +0 -50
  331. data/sufia-models/lib/sufia/models/generic_file/derivatives.rb +0 -31
  332. data/sufia-models/lib/sufia/models/generic_file/thumbnail.rb +0 -37
  333. data/sufia-models/lib/sufia/models/generic_file/versions.rb +0 -16
  334. data/sufia-models/lib/sufia/models/jobs/transcode_audio_job.rb +0 -15
  335. data/sufia-models/lib/sufia/models/jobs/transcode_video_job.rb +0 -15
@@ -3,27 +3,24 @@
3
3
  <%- stylesheet_links << "../plugin_assets/hydra-head/javascripts/date-picker/css/datepicker" %>
4
4
  <%- stylesheet_links << "../plugin_assets/hydra-head/javascripts/fancybox/jquery.fancybox-1.3.1.css" %>
5
5
  <%- stylesheet_links << ["../plugin_assets/hydra-head/javascripts/select_to_ui_slider/css/ui.slider.extras.css"] %>
6
- <%- stylesheet_links << ["slider", {:plugin=>"hydra-head"}] %>
7
-
8
-
6
+ <%- stylesheet_links << ["slider", { plugin: "hydra-head" }] %>
9
7
 
10
8
  <div class="document_viewer" id="cover_container">
11
9
  <div id="delete_dialog">
12
10
  <div id="delete_dialog_container">
13
-
14
-
15
- <div>
11
+
12
+ <div>
16
13
  <span>Permanently delete <%= @document['id'] %> and its assets from the repository?</span><br/>
17
14
  <div id="deletable_assets"></div>
18
15
  </div>
19
-
16
+
20
17
  <div>
21
- <%= button_to("Delete", {:action => :destroy, :controller => :assets, :id => @document['id'] }, :confirm => 'Are you sure?', :method => :delete )%>
22
- <%= button_to("Withdraw", :action=>"withdraw", :controller => :assets, :id => @document['id'] ) %>
23
- <%= button_to("Cancel", :action=>:edit, :controller => :catalog, :id => @document['id'] ) %>
24
-
18
+ <%= button_to("Delete", { action: :destroy, controller: :assets, id: @document['id'] }, confirm: 'Are you sure?', method: :delete )%>
19
+ <%= button_to("Withdraw", action: "withdraw", controller: :assets, id: @document['id'] ) %>
20
+ <%= button_to("Cancel", action: :edit, controller: :catalog, id: @document['id'] ) %>
21
+
25
22
  </div>
26
-
23
+
27
24
  </div>
28
25
  </div>
29
26
  </div>
@@ -1,18 +1,18 @@
1
1
  <% # container for a single doc -%>
2
2
  <div class="document <%= render_document_class document %>">
3
-
3
+
4
4
  <% # header bar for doc items in index view -%>
5
5
  <div class="documentHeader">
6
-
6
+
7
7
  <% # bookmark/folder functions for items/docs -%>
8
8
  <%= render_index_doc_actions document %>
9
-
9
+
10
10
  <% # main title container for doc partial view -%>
11
11
  <div class="yui-u">
12
- <h3 class="index_title"><%= document_counter + 1 + @response.params[:start].to_i %>. <%= link_to_document document, :label=>document_show_link_field, :counter => (document_counter + 1 + @response.params[:start].to_i) %></h3>
12
+ <h3 class="index_title"><%= document_counter + 1 + @response.params[:start].to_i %>. <%= link_to_document document, label: document_show_link_field, counter: (document_counter + 1 + @response.params[:start].tol_i) %></h3>
13
13
  </div>
14
14
  </div>
15
-
15
+
16
16
  <% # main container for doc partial view -%>
17
17
  <%= render_document_partial document, :index %>
18
18
 
@@ -1,2 +1,2 @@
1
- <% # container for all documents in index view -%>
2
- <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => @response.docs.map { |x| SolrDocument.new(x) }, :facet_name => nil, :facet_value => nil} %>
1
+ <%# container for all documents in index view -%>
2
+ <%= render partial: 'catalog/_index_partials/default_group', locals: { docs: @response.docs.map { |x| SolrDocument.new(x) }, facet_name: nil, facet_value: nil } %>
@@ -5,8 +5,6 @@
5
5
  <%- stylesheet_links << ["../plugin_assets/hydra-head/javascripts/select_to_ui_slider/css/ui.slider.extras.css"] %>
6
6
  <%- stylesheet_links << ["../plugin_assets/hydra-head/stylesheets/slider.css"] %>
7
7
 
8
-
9
-
10
8
  <% @fedora_object = ActiveFedora::Base.load_instance(params[:id])
11
9
  @datastreams = @fedora_object.datastreams
12
10
  %>
@@ -34,11 +32,11 @@
34
32
  <dt>datastreams:</dt>
35
33
  <dd>
36
34
  <ul>
37
- <% @datastreams.keys.sort!.each do |dsid| %>
38
- <li><a href="#<%=dsid%>" class="inline"><%=dsid%></a>
39
- <div style='display:none'>
40
- <div id='<%=dsid%>'>
41
- <h1><%=dsid%></h1>
35
+ <% @datastreams.keys.sort.each do |dsid| %>
36
+ <li><a href="#<%= dsid %>" class="inline"><%= dsid %></a>
37
+ <div style='display: none'>
38
+ <div id='<%= dsid %>'>
39
+ <h1><%= dsid %></h1>
42
40
  <dl>
43
41
  <%= ("<dt>label:</dt><dd>" + @datastreams[dsid].dsLabel + "</dd>").html_safe unless @datastreams[dsid].dsLabel.blank? %>
44
42
  <%= ("<dt>last modified:</dt><dd>" + @datastreams[dsid].lastModifiedDate + "</dd>").html_safe unless @datastreams[dsid].lastModifiedDate.blank? %>
@@ -52,7 +50,6 @@
52
50
  </dd>
53
51
  </dl>
54
52
 
55
- <%= render :partial => "hydra/permissions/index", :locals => {:document => document, :asset_id=>params[:id]}%>
53
+ <%= render partial: "hydra/permissions/index", locals: { document: document, asset_id: params[:id] }%>
56
54
 
57
55
  </div>
58
-
@@ -1,11 +1,9 @@
1
-
2
-
3
1
  <%# this should imitate the stuff in catalog/_show_partials/_default_details -%>
4
- <%= form_tag hydra_update_url_for(:action=>"update", :controller=>"hydra/assets"), :id=>"document_metadata" "accept-charset"=>"utf-8" do %>
2
+ <%= form_tag hydra_update_url_for(action: "update", controller: "hydra/assets"), id: "document_metadata" "accept-charset" => "utf-8" do %>
5
3
 
6
4
  <div id="multipleEdit">
7
5
  <dl class="defList fl-theme-mist">
8
- <%= editable_metadata_field(@document_fedora, "descMetadata", :title, :label => "Title:") %>
6
+ <%= editable_metadata_field(@document_fedora, "descMetadata", :title, label: "Title:") %>
9
7
  </dl>
10
8
  </div>
11
9
  </div>
@@ -1,5 +1,5 @@
1
1
  <h1>Email This</h1>
2
- <%= form_tag url_for(:controller => "catalog", :action => "email"), :id => 'email_form', :method => :post do %>
2
+ <%= form_tag url_for(controller: "catalog", action: "email"), id: 'email_form', method: :post do %>
3
3
  <%= label_tag(:to, "Email:") %><br/>
4
4
  <%= text_field_tag :to %><br/>
5
5
  <%= label_tag(:message, "Message:") %><br/>
@@ -1,18 +1,17 @@
1
1
  <ul class="facet-values list-unstyled">
2
- <% paginator = facet_paginator(facet_field, display_facet)
3
- %>
2
+ <% paginator = facet_paginator(facet_field, display_facet) %>
4
3
  <% paginator.items.each do |item| -%>
5
4
  <li>
6
- <% if facet_in_params?( solr_field, item.value ) %>
7
- <%= render_selected_facet_value(solr_field, item) %>
8
- <% else %>
9
- <%= render_facet_value(solr_field, item) %>
5
+ <% if facet_in_params?(solr_field, item.value) %>
6
+ <%= render_selected_facet_value(solr_field, item) %>
7
+ <% else %>
8
+ <%= render_facet_value(solr_field, item) %>
10
9
  <% end -%>
11
10
  </li>
12
11
  <% end %>
13
12
 
14
13
  <% if paginator.has_next? and params[:action] != "facet" %>
15
- <li class="more_facets_link"><%= link_to('more '+ facet_field.label.pluralize + '»', params.merge(:id => solr_field, :action=>"facet", :page => nil), :class => "more_facets_link") %></li>
14
+ <li class="more_facets_link"><%= link_to('more '+ facet_field.label.pluralize + '»', params.merge(id: solr_field, action: "facet", page: nil), class: "more_facets_link") %></li>
16
15
  <% end %>
17
16
 
18
17
  </ul>
@@ -2,10 +2,10 @@
2
2
  <% if params[:f] %>
3
3
  <% params[:f].each do |k,v| %>
4
4
  <% v.each do |selected_facet| %>
5
- <% link_options = remove_facet_params(k, selected_facet, params).merge!Hash["controller" => "catalog", :action=> "index"] %>
5
+ <% link_options = remove_facet_params(k, selected_facet, params).merge!({ controller: "catalog", action: "index" }) %>
6
6
  <div class="alert alert-warning">
7
- <%= link_to 'X', url_for(link_options), {:class=>'close', :'data-dismiss' => "alert" } %>
8
- <i class="icon-ok icon-large"></i> <strong><%= facet_display_value(k, selected_facet) %></strong>
7
+ <%= link_to 'X', url_for(link_options), {class: 'close', :'data-dismiss' => "alert" } %>
8
+ <i class="icon-ok icon-large"></i> <strong><%= facet_display_value(k, selected_facet) %></strong>
9
9
  </div>
10
10
  <% end %>
11
11
  <% end %>
@@ -1,12 +1,11 @@
1
- <%-
1
+ <%-
2
2
  # pass in local :document with a SolrDocument
3
- method = (item_in_folder?(document.id) ? "delete" : "put")
4
- label = (item_in_folder?(document.id) ? "Unselect" : "Select")
5
- cssClass = (item_in_folder?(document.id) ? "deleteFolder" : "addFolder")
3
+ method = item_in_folder?(document.id) ? "delete" : "put"
4
+ label = item_in_folder?(document.id) ? "Unselect" : "Select"
5
+ cssClass = item_in_folder?(document.id) ? "deleteFolder" : "addFolder"
6
6
  -%>
7
7
 
8
- <%= form_tag( folder_path(document), :method => method, :class=> "folder_toggle #{cssClass}", "data-doc-id" => document.id, :title=>h(document[document_show_link_field])) do -%>
9
- <%= hidden_field(:bookmark, :title, :value => document[document_show_link_field]) %>
10
- <%= submit_tag(label, :class=>"folder_submit", :id => "folder_submit_#{document.id}") %>
8
+ <%= form_tag(folder_path(document), method: method, class: "folder_toggle #{cssClass}", "data-doc-id" => document.id, title: h(document[document_show_link_field])) do -%>
9
+ <%= hidden_field(:bookmark, :title, value: document[document_show_link_field]) %>
10
+ <%= submit_tag(label, class: "folder_submit", id: "folder_submit_#{document.id}") %>
11
11
  <% end %>
12
-
@@ -3,8 +3,8 @@
3
3
 
4
4
  <% index_fields.each do |solr_fname, field| -%>
5
5
  <% if document.has? solr_fname %>
6
- <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_label :field => solr_fname %></dt>
7
- <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_value :document => document, :field => solr_fname %></dd>
6
+ <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_label field: solr_fname %></dt>
7
+ <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_value document: document, field: solr_fname %></dd>
8
8
  <% end -%>
9
9
  <% end -%>
10
10
 
@@ -0,0 +1,20 @@
1
+
2
+ <% # header bar for doc items in index view -%>
3
+ <div class="documentHeader row">
4
+
5
+ <%# main title container for doc partial view
6
+ How many bootstrap columns need to be reserved
7
+ for bookmarks control depends on size.
8
+ -%>
9
+ <h5 class="index_title col-sm-9 col-lg-10">
10
+ <% counter = document_counter_with_offset(document_counter) %>
11
+ <span class="document-counter">
12
+ <%= t('blacklight.search.documents.counter', counter: counter) if counter %>
13
+ </span>
14
+ <%= link_to_document document, label: document_show_link_field(document), counter: counter %>
15
+ </h5>
16
+
17
+ <% # bookmark functions for items/docs -%>
18
+ <%= render_index_doc_actions document, wrapping_class: "index-document-functions col-sm-3 col-lg-2" %>
19
+ </div>
20
+
@@ -1,7 +1,7 @@
1
1
  <div id="search-results">
2
2
  <ol class="catalog" start="<%=1+((@response.current_page-1)*@response.limit_value)%>">
3
3
  <% docs.each_with_index do |document,counter| %>
4
- <%= render :partial => 'catalog/_index_partials/list_files', :locals => {:document => document, :counter => counter} %>
4
+ <%= render partial: 'catalog/_index_partials/list_files', locals: {document: document, counter: counter} %>
5
5
  <% end %>
6
6
  </ol>
7
7
  </div>
@@ -1,11 +1,14 @@
1
1
  <li>
2
2
  <h2>
3
3
  <%= link_to document.title_or_label, sufia.generic_file_path(document.noid) %>
4
- <small>[<%= link_to 'Download', sufia.download_path(document.noid), :target => '_new' %>]</small>
4
+ <small>[<%= link_to 'Download', sufia.download_path(document.noid), target: '_new' %>]</small>
5
5
  </h2>
6
6
  <table class="table">
7
7
  <tr>
8
- <td rowspan="6" class="span20"> <%= render :partial => 'dashboard/_index_partials/thumbnail_display', :locals => {:document=>document, :height=>200, :width=>150} %>
8
+ <td rowspan="6" class="span20">
9
+ <%= link_to sufia.generic_file_path(document) do %>
10
+ <%= render_thumbnail_tag document, { width: 150 } %>
11
+ <% end %>
9
12
  </td>
10
13
  <th><h4>Title:</h4></th>
11
14
  <td><%= document.title %></td>
@@ -1,7 +1,7 @@
1
- <%= form_tag "http://www.refworks.com/express/expressimport.asp?vendor=#{application_name}&filter=MARC%20Format&encoding=65001", :name => "refworks", :target => "_blank" do %>
1
+ <%= form_tag "http://www.refworks.com/express/expressimport.asp?vendor=#{application_name}&filter=MARC%20Format&encoding=65001", name: "refworks", target: "_blank" do %>
2
2
 
3
3
  <%= hidden_field_tag "ImportData", render_refworks_texts(documents) %>
4
- <%= submit_tag "Export to Refworks", :class => 'submit'%>
4
+ <%= submit_tag "Export to Refworks", class: 'submit'%>
5
5
  <%= link_to_function "Export to Refworks", "document.refworks.submit();" %>
6
6
  <% end %>
7
7
 
@@ -1,6 +1,6 @@
1
1
  <% if @response.total_pages > 1 %>
2
2
  <div class="pager">
3
- <%= paginate @response, :outer_window => 2, :theme => 'blacklight', :route_set=> sufia %>
3
+ <%= paginate @response, outer_window: 2, theme: 'blacklight', route_set: sufia %>
4
4
  <div class="clearfix"></div>
5
5
  </div><!-- /pager -->
6
6
  <% end %>
@@ -1,15 +1,30 @@
1
1
  <%# only display the q parameter if the controller is not the dashboard. If they are in the dashboard controller, then the search is of the dashboard. %>
2
- <% q = params[:controller] == 'dashboard' ? nil : params[:q] %>
3
- <%= form_tag catalog_index_path, :method => :get, :id => "search-form-header", :class => "col-xs-12", :role => "search" do %>
4
- <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
5
- <div class="input-group">
6
- <label class="sr-only" for="search-field-header"><%= t('sufia.search.form.q.label') %></label>
7
- <%= text_field_tag :q, q, :class => "q form-control", :id => "search-field-header", :placeholder => t('sufia.search.form.q.placeholder') %>
8
- <span class="input-group-btn">
9
- <button type="submit" class="btn btn-default" id="search-submit-header">
2
+ <%= form_tag catalog_index_path, method: :get, id: "search-form-header", class: "col-xs-12", role: "search" do %>
3
+ <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8, :owner)) %>
4
+ <%= hidden_field_tag 'owner', params[:owner] %>
5
+
6
+ <div class="row">
7
+ <div class="col-lg-10">
8
+ <div class="input-group">
9
+ <% q = params[:controller].match(/^dashboard/) ? nil : params[:q] %>
10
+ <%= text_field_tag :q, q, class: "q form-control", id: "search-field-header", placeholder: t('sufia.search.form.q.placeholder') %>
11
+ <%# if this label goes before the search field, it'll mess up the rounded corners %>
12
+ <label class="sr-only" for="search-field-header"><%= t('sufia.search.form.q.label') %></label>
13
+
14
+ <div class="input-group-btn">
15
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span data-search-element="label"><%= t('sufia.search.form.option.all.label_long') %></span> <span class="caret"></span></button>
16
+ <ul class="dropdown-menu pull-right">
17
+ <li><a href="#" data-search-option="all" data-search-label="<%= t('sufia.search.form.option.all.label_short') %>"><%= t('sufia.search.form.option.all.label_long') %></a></li>
18
+ <li><a href="#" data-search-option="mine" data-search-label="<%= t('sufia.search.form.option.mine.label_short') %>"><%= t('sufia.search.form.option.mine.label_long') %></a></li>
19
+ </ul>
20
+ </div>
21
+ </div>
22
+ </div>
23
+ <div class="col-lg-2">
24
+ <button type="submit" class="btn btn-primary" id="search-submit-header">
10
25
  <i class="glyphicon glyphicon-search"></i> Go
11
26
  </button>
12
- </span>
27
+ </div>
13
28
  </div>
14
29
  <% end %>
15
30
 
@@ -2,8 +2,8 @@
2
2
  <dl class="defList">
3
3
  <% document_show_fields.each do |solr_fname, field| -%>
4
4
  <% if document.has? solr_fname %>
5
- <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_label :field => solr_fname %></dt>
6
- <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_value :document => document, :field => solr_fname %></dd>
5
+ <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_label field: solr_fname %></dt>
6
+ <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_value document: document, field: solr_fname %></dd>
7
7
  <% end -%>
8
8
  <% end -%>
9
9
  </dl>
@@ -1,10 +1,9 @@
1
1
  <%# default partial to display solr document fields in catalog show view -%>
2
2
 
3
-
4
3
  <div class="document_viewer" id="cover_container">
5
4
  <dl class="defList">
6
5
  <dt>ID: </dt>
7
- <dd><%= render_document_show_field_value(:document=>document, :field=>"id") %></dd>
6
+ <dd><%= render_document_show_field_value(document: document, field: "id") %></dd>
8
7
  <dt>Download:</dt>
9
8
  <dd id="downloads">
10
9
  <ul>
@@ -12,11 +11,11 @@
12
11
  </ul>
13
12
  </dd>
14
13
  <dt>Copyright: </dt>
15
- <dd><%= render_document_show_field_value(:document=>document, :field=>"rights_t") %></dd>
14
+ <dd><%= render_document_show_field_value(document: document, field: "rights_t") %></dd>
16
15
  </dl>
17
16
  </div>
18
- <div class="<%= params[:action]%>_details">
19
- <%= render :partial => "#{params[:controller]}/_#{params[:action]}_partials/default_details", :locals => {:document => document}%>
17
+ <div class="<%= params[:action] %>_details">
18
+ <%= render partial: "#{params[:controller]}/_#{params[:action]}_partials/default_details", locals: { document: document } %>
20
19
  </div>
21
20
 
22
21
  <%= async_load_tag(hydra_asset_downloads_path(params[:id]), 'downloads') %>
@@ -2,14 +2,14 @@
2
2
  <div>
3
3
  <dl class="defList">
4
4
  <dt>Date: </dt>
5
- <dd><%= render_document_show_field_value(:document=>document, :field=>"date_t") %></dd>
5
+ <dd><%= render_document_show_field_value(document: document, field: "date_t") %></dd>
6
6
  <dt>Title: </dt>
7
- <dd><%= render_document_show_field_value(:document=>document, :field=>"title_t") %></dd>
7
+ <dd><%= render_document_show_field_value(document: document, field: "title_t") %></dd>
8
8
  <dt>Document Type: </dt>
9
- <dd><%= render_document_show_field_value(:document=>document, :field=>"medium_t") %></dd>
9
+ <dd><%= render_document_show_field_value(document: document, field: "medium_t") %></dd>
10
10
  <dt>Location: </dt>
11
- <dd><%= render_document_show_field_value(:document=>document, :field=>"location_t") %></dd>
11
+ <dd><%= render_document_show_field_value(document: document, field: "location_t") %></dd>
12
12
  <dt>Date: </dt>
13
- <dd><%= render_document_show_field_value(:document=>document, :field=>"date_t") %></dd>
13
+ <dd><%= render_document_show_field_value(document: document, field: "date_t") %></dd>
14
14
  </dl>
15
15
  </div>
@@ -1,11 +1,11 @@
1
1
  <% facets_display_heading ||= "" %>
2
- <% # main container for facets/limits menu -%>
2
+ <%# main container for facets/limits menu -%>
3
3
  <div id="facets">
4
- <h2><%=h facets_display_heading %></h2>
4
+ <h2><%= h(facets_display_heading) %></h2>
5
5
  <% facet_field_names.each do |solr_fname| %>
6
6
  <div>
7
7
  <% display_facet = @response.facets.detect {|f| f.name == solr_fname} -%>
8
- <%#- raise solr_fname.inspect unless display_facet -%>
8
+ <%# raise solr_fname.inspect unless display_facet -%>
9
9
  <% if display_facet && display_facet.items.length > 0 %>
10
10
  <h3 class="facet_selected"><%= facet_field_labels[solr_fname] -%></h3>
11
11
  <ul>
@@ -16,16 +16,16 @@
16
16
  <% if facet_in_params? solr_fname, item.value %>
17
17
  <li>
18
18
  <span class="selected"><%= h(item.value) %> (<%= format_num facet_count_for_value %>)</span>
19
- <% link_options = remove_facet_params(solr_fname, item.value, params).merge!Hash["controller" => "catalog", :action=> "index"] %>
20
- [<%= link_to 'remove', url_for(link_options), :class=>'remove' %>]
19
+ <% link_options = remove_facet_params(solr_fname, item.value, params).merge!({ controller: "catalog", action: "index" }) %>
20
+ [<%= link_to 'remove', url_for(link_options), class: 'remove' %>]
21
21
  </li>
22
22
  <% else %>
23
- <%- if item_counter > Blacklight.config[:facet_more_num]-1 -%>
23
+ <%- if item_counter > Blacklight.config[:facet_more_num] - 1 -%>
24
24
  <li class="more">
25
25
  <%- else -%>
26
26
  <li>
27
27
  <%- end -%>
28
- <% link_options = add_facet_params(solr_fname, item.value).merge!Hash["controller" => "catalog", :action=> "index"] %>
28
+ <% link_options = add_facet_params(solr_fname, item.value).merge!({ controller: "catalog", action: "index" }) %>
29
29
  <%= link_to h(item.value), url_for(link_options) %> (<%= format_num facet_count_for_value %>)
30
30
  </li>
31
31
  <% end -%>
@@ -10,36 +10,36 @@
10
10
 
11
11
  <% if (@document.respond_to?(:export_as_mla_citation_txt) || @document.respond_to?(:export_as_apa_citation_txt)) %>
12
12
  <li class="cite">
13
- <%= link_to "Cite This", citation_catalog_path(:id => @document), {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink'} %>
13
+ <%= link_to "Cite This", citation_catalog_path(id: @document), {id: 'citeLink', name: 'citation', class: 'lightboxLink'} %>
14
14
  </li>
15
15
  <% end %>
16
16
 
17
17
  <% if @document.export_formats.keys.include?( :refworks_marc_txt ) %>
18
18
  <li class="refworks">
19
- <%= link_to "Export to RefWorks", refworks_export_url(:id => @document) %>
19
+ <%= link_to "Export to RefWorks", refworks_export_url(id: @document) %>
20
20
  </li>
21
21
  <% end %>
22
22
 
23
23
  <% if @document.export_formats.keys.include?( :endnote ) %>
24
24
  <li class="endnote">
25
- <%= link_to "Export to EndNote", catalog_path(@document, :format => 'endnote') %>
25
+ <%= link_to "Export to EndNote", catalog_path(@document, format: 'endnote') %>
26
26
  </li>
27
27
  <% end %>
28
28
 
29
29
  <% if @document.respond_to?( :to_email_text ) %>
30
30
  <li class="email">
31
- <%= link_to "Email This", email_catalog_path(:id => @document), {:id => 'emailLink', :name => 'email', :class => 'lightboxLink'} %>
31
+ <%= link_to "Email This", email_catalog_path(id: @document), {id: 'emailLink', name: 'email', class: 'lightboxLink'} %>
32
32
  </li>
33
33
  <%- end -%>
34
34
  <%- if @document.respond_to?( :to_sms_text ) -%>
35
35
  <li class="sms">
36
- <%= link_to "SMS This", sms_catalog_path(:id => @document), {:id => 'smsLink', :name => 'sms', :class => 'lightboxLink'} %>
36
+ <%= link_to "SMS This", sms_catalog_path(id: @document), {id: 'smsLink', name: 'sms', class: 'lightboxLink'} %>
37
37
  </li>
38
38
  <%- end -%>
39
39
 
40
40
  <% if @document.respond_to?(:to_marc) %>
41
41
  <li class="librarian_view">
42
- <%= link_to "Librarian View", librarian_view_catalog_path(@document), {:id => 'librarianLink', :name => 'librarian_view', :class => 'lightboxLink'} %>
42
+ <%= link_to "Librarian View", librarian_view_catalog_path(@document), {id: 'librarianLink', name: 'librarian_view', class: 'lightboxLink'} %>
43
43
  </li>
44
44
  <% end %>
45
45