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
@@ -0,0 +1,29 @@
1
+ <div class="btn-group">
2
+ <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">Select an action <span class="caret"></span>
3
+ </button>
4
+ <ul class="dropdown-menu dropdown-menu-right">
5
+ <li>
6
+ <%= link_to raw('<i class="glyphicon glyphicon-link over"></i> Single-Use Link to File'), '#',
7
+ class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{noid}" %>
8
+ </li>
9
+ <li>
10
+ <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(noid),
11
+ class: 'itemicon itemedit', title: 'Edit File' %>
12
+ </li>
13
+ <li>
14
+ <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(noid),
15
+ class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
16
+ </li>
17
+ <li>
18
+ <%= link_to raw('<i class="glyphicon glyphicon-trash"></i> Delete File'), sufia.generic_file_path(noid),
19
+ class: 'itemicon itemtrash', title: 'Delete File', method: :delete, data: {
20
+ confirm: "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation" } %>
21
+ </li>
22
+ <li>
23
+ <%= display_trophy_link(@user, noid) do |text| %>
24
+ <i class='glyphicon glyphicon-star'></i> <%= text %>
25
+ <% end %>
26
+ </li>
27
+ </ul>
28
+ </div>
29
+
@@ -0,0 +1,15 @@
1
+ <div class="btn-group">
2
+ <button class="btn btn-small" href="#"><i class="icon-wrench"></i> Select an action</button>
3
+ <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down"></span></button>
4
+ <ul class="dropdown-menu">
5
+ <li>
6
+ <%= link_to raw('<i class="icon-pencil"></i> Edit Collection'), collections.edit_collection_path(noid),
7
+ class: 'itemicon itemedit', title: 'Edit Collection' %>
8
+ </li>
9
+ <li>
10
+ <%= link_to raw('<i class="icon-trash"></i> Delete Collection'), collections.collection_path(noid),
11
+ class: 'itemicon itemtrash', title: 'Delete Collection', method: :delete, data: {
12
+ confirm: "Deleting a collection from #{t('sufia.product_name')} is permanent. Click OK to delete this collection from #{t('sufia.product_name')}, or Cancel to cancel this operation" } %>
13
+ </li>
14
+ </ul>
15
+ </div>
@@ -1,4 +1,4 @@
1
1
  <% # container for all documents in index view -%>
2
2
  <div id="documents" class="clear">
3
- <%= render :partial => 'dashboard/_index_partials/default_group', :locals => {:docs => @response.docs.map { |x| SolrDocument.new(x) }, :facet_value => nil} %>
3
+ <%= render partial: 'dashboard/_index_partials/default_group', locals: {docs: @response.docs.map { |x| SolrDocument.new(x) }, facet_value: nil} %>
4
4
  </div>
@@ -1,4 +1,4 @@
1
- <% paginator = Blacklight::Solr::FacetPaginator.new(display_facet.items,
1
+ <% paginator = Blacklight::Solr::FacetPaginator.new(display_facet.items,
2
2
  limit: facet_limit_for(solr_field)) %>
3
3
  <ul class="slide-list">
4
4
  <% paginator.items.each do |item| -%>
@@ -12,6 +12,6 @@
12
12
  <% end %>
13
13
 
14
14
  <% if(paginator.has_next?) %>
15
- <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»', sufia.url_for(params.merge(:id => solr_field, :action=>"facet", :path_only=>true)), :class => "more_facets_link" %></li>
15
+ <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»', sufia.url_for(params.merge(id: solr_field, action: "facet", path_only: true)), class: "more_facets_link" %></li>
16
16
  <% end %>
17
17
  </ul> <!-- /slide-list -->
@@ -1,25 +1,25 @@
1
1
  <!-- This was copied from https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/_facet_pagination.html.erb
2
- It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord
2
+ It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord
3
3
  -->
4
4
  <div class="prev_next_links btn-group pull-left">
5
- <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), :route_set=>sufia, :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
5
+ <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), route_set: sufia, params: params, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn' do %>
6
6
  <span class="disabled btn"><%= raw(t('views.pagination.previous')) %></span>
7
7
  <% end %>
8
- <%= link_to_next_page @pagination, raw(t('views.pagination.next')), :route_set=>sufia, :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
9
-
8
+ <%= link_to_next_page @pagination, raw(t('views.pagination.next')), route_set: sufia, params: params, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn' do %>
9
+
10
10
  <span class="disabled btn"><%= raw(t('views.pagination.next')) %></span>
11
11
  <% end %>
12
-
12
+
13
13
  </div>
14
-
14
+
15
15
  <div class="sort_options btn-group pull-right">
16
16
  <% if @pagination.sort == 'index' -%>
17
- <span class="active az btn"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'),
18
- Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('count', params).symbolize_keys.merge(:only_path=>true)),
19
- :class => "sort_change numeric btn") %>
17
+ <span class="active az btn"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'),
18
+ Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('count', params).symbolize_keys.merge(only_path: true)),
19
+ class: "sort_change numeric btn") %>
20
20
  <% elsif @pagination.sort == 'count' -%>
21
21
  <%= link_to(t('blacklight.search.facets.sort.index'),
22
- Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('index', params).symbolize_keys.merge(:only_path=>true)),
23
- :class => "sort_change az btn") %><span class="active numeric btn"><%= t('blacklight.search.facets.sort.count') %></span>
24
- <% end -%>
22
+ Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('index', params).symbolize_keys.merge(only_path: true)),
23
+ class: "sort_change az btn") %><span class="active numeric btn"><%= t('blacklight.search.facets.sort.count') %></span>
24
+ <% end -%>
25
25
  </div>
@@ -2,9 +2,9 @@
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" => "dashboard", :action=> "index"] %>
5
+ <% link_options = remove_facet_params(k, selected_facet, params).merge(action: :index) %>
6
6
  <div class="alert alert-warning">
7
- <%= link_to 'X', sufia.url_for(link_options), {:class=>'close', :'data-dismiss' => "alert" } %>
7
+ <%= link_to 'X', sufia.url_for(link_options), {class: 'close', :'data-dismiss' => "alert" } %>
8
8
  <i class="glyphicon glyphicon-ok"></i> <strong><%= selected_facet %></strong>
9
9
  </div>
10
10
  <% end %>
@@ -1,5 +1,7 @@
1
1
  <% # main container for facets/limits menu -%>
2
2
  <div>
3
+ <%= render partial: 'collections/button_for_creating_empty_collection', locals: {label: 'Create Collection'} %>
4
+ <div class="row">&nbsp;</div>
3
5
  <h2>Browse By</h2>
4
6
  <ul class="nav nav-list" id="facets">
5
7
  <%= render_facet_partials %>
@@ -3,7 +3,7 @@
3
3
  <% unless params[:display_type] == 'list' %>
4
4
  <thead>
5
5
  <tr>
6
- <th class="sm"><%= render :partial => 'batch_edits/check_all' %></th>
6
+ <th class="sm"><%= render partial: 'batch_edits/check_all' %></th>
7
7
  <th>&nbsp;</th>
8
8
  <th class="center">Title</th>
9
9
  <th class="sorts-dash"><i id="desc_metadata__date_uploaded_dtsi" class="<%=params[:sort]== "desc_metadata__date_uploaded_dtsi desc" ? 'caret' : params[:sort]== "desc_metadata__date_uploaded_dtsi asc" ? 'caret up' : ''%>"></i>Date Uploaded</th>
@@ -14,7 +14,14 @@
14
14
  <% end %>
15
15
  <tbody>
16
16
  <% docs.each_with_index do |document,counter| %>
17
- <%= render :partial => 'dashboard/_index_partials/list_files', :locals => {:document => document, :counter => counter} %>
17
+ <% case document.hydra_model %>
18
+ <% when "GenericFile" %>
19
+ <%= render partial: 'dashboard/_index_partials/list_files', locals: {document: document, counter: counter} %>
20
+ <% when "Collection" %>
21
+ <%= render partial: 'dashboard/_index_partials/list_collections', locals: {document: document, counter: counter} %>
22
+ <% else %>
23
+ <tr><td colspan='6'><%= document.hydra_model %> : <%= document.id %></td></tr>
24
+ <% end %>
18
25
  <% end %>
19
26
  </tbody>
20
27
  </table>
@@ -0,0 +1,45 @@
1
+
2
+ <!-- scholarsphere over ride -->
3
+ <!-- the sub on ':' is b.c. jQuery has trouble with '.' or ':'
4
+ on element ids -->
5
+ <% noid = document.noid %>
6
+ <tr id="document_<%= noid %>" class="<%= cycle("","zebra") %>">
7
+ <td width="6%"></td>
8
+ <td width="1%">
9
+ </td>
10
+ <td width="37%">
11
+ <a href="" title="Click for more details"><i id="expand_<%= noid.gsub(":", "_") %>" class="glyphicon-plus icon-large fleft"></i></a>&nbsp;
12
+ <%= link_to image_tag("/assets/folder.png", width: 36), collections.collection_path(noid) %>
13
+ <span class=center><%= link_to document.title_or_label, collections.collection_path(noid), id: "src_copy_link#{noid}" %> <br /></span>
14
+ </td>
15
+ <td width="17%"><%= document.date_uploaded %> </td>
16
+ <td width="5%" align="center">
17
+ <% if document.registered? %>
18
+ <span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a>
19
+ <% elsif document.public? %>
20
+ <span class="label label-success" title="Open Access">Open Access</span></a>
21
+ <% else %>
22
+ <span class="label label-important" title="Private">Private</span></a>
23
+ <% end %>
24
+
25
+ </td>
26
+ <td width="23%" class="center">
27
+ <%= render partial:'collection_action_menu', locals:{noid:noid} %>
28
+ </td>
29
+ </tr>
30
+ <tr id="detail_<%= noid.gsub(":", "_") %>"> <!-- collection detail"> -->
31
+ <td colspan="6">
32
+ <dl class="expanded-details row">
33
+ <dt class="col-xs-3 col-lg-2">Description:</dt>
34
+ <dd class="col-xs-9 col-lg-4"><%= document.description%></dd>
35
+ <dt class="col-xs-3 col-lg-2">Edit Access:</dt>
36
+ <dd class="col-xs-9 col-lg-10">
37
+ <% if document.edit_groups.present? %>
38
+ Groups: <%= document.edit_groups.join(', ') %>
39
+ <br/>
40
+ <% end %>
41
+ Users: <%= document.edit_people.join(', ') %>
42
+ </dd>
43
+ </dl>
44
+ </td>
45
+ </tr>
@@ -12,9 +12,11 @@
12
12
  </td>
13
13
  <td width="41%">
14
14
  <a href="#" title="Click for more details"><i id="expand_<%= noid %>" class="glyphicon glyphicon-plus"></i></a>&nbsp;
15
- <%= render :partial => 'dashboard/_index_partials/thumbnail_display', :locals => {:document => document} %>
15
+ <%= link_to sufia.generic_file_path(document) do %>
16
+ <%= render_thumbnail_tag document %>
17
+ <% end %>
16
18
  <span class=center>
17
- <%= link_to document.title_or_label, sufia.generic_file_path(noid), :id => "src_copy_link#{noid}", :class => "#{'document-title' if document.title_or_label == document.label}" %><br/>
19
+ <%= link_to document.title_or_label, sufia.generic_file_path(noid), id: "src_copy_link#{noid}", class: "#{'document-title' if document.title_or_label == document.label}" %><br/>
18
20
  </span>
19
21
  </td>
20
22
  <td width="17%"><%= document.date_uploaded %> </td>
@@ -30,29 +32,7 @@
30
32
  </a>
31
33
  </td>
32
34
  <td width="23%">
33
- <div class="btn-group">
34
- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">Select an action <span class="caret"></span>
35
- </button>
36
- <ul class="dropdown-menu dropdown-menu-right">
37
- <li>
38
- <%= link_to raw('<i class="glyphicon glyphicon-link over"></i> Single-Use Link to File'), '#', :class => "copypaste itemicon itemcode", :title => "Single-Use Link to File", :id => "copy_link_#{noid}" %>
39
- </li>
40
- <li>
41
- <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(noid), :class => 'itemicon itemedit', :title => 'Edit File' %>
42
- </li>
43
- <li>
44
- <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(noid), :class => 'itemicon itemdownload', :title => 'Download File', :target => '_new' %>
45
- </li>
46
- <li>
47
- <%= link_to raw('<i class="glyphicon glyphicon-trash"></i> Delete File'), sufia.generic_file_path(noid), :class => 'itemicon itemtrash', :title => 'Delete File', :method => :delete, :data => {:confirm => "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation"} %>
48
- </li>
49
- <li>
50
- <%= display_trophy_link(@user, noid) do |text| %>
51
- <i class='glyphicon glyphicon-star'></i> <%= text %>
52
- <% end %>
53
- </li>
54
- </ul>
55
- </div>
35
+ <%= render partial: 'action_menu', locals: { noid: noid, gf: gf } %>
56
36
  </td>
57
37
  </tr>
58
38
  <tr id="detail_<%= noid %>"> <!-- document detail"> -->
@@ -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,10 +1,10 @@
1
1
  <div class="col-xs-12 col-md-6">
2
- <%= form_tag sufia.dashboard_index_path, :method => :get, :role => "search" do %>
2
+ <%= form_tag search_action_url, method: :get, role: "search" do %>
3
3
  <label for="dashboard_search" class="sr-only">Search My Dashboard</label>
4
4
  <%= hidden_field_tag :search_field, 'all_fields' %>
5
5
  <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
6
6
  <div class="input-group">
7
- <%= text_field_tag :q, params[:q], :class => "q form-control", :placeholder => "Search My Dashboard", :id => "dashboard_search" %>
7
+ <%= text_field_tag :q, params[:q], class: "q form-control", placeholder: "Search My Dashboard", id: "dashboard_search" %>
8
8
  <span class="input-group-btn">
9
9
  <button type="submit" class="btn btn-default" id="dashboard_submit"><i class="glyphicon glyphicon-search"></i> Go</button>
10
10
  </span><!-- / .input-group-btn -->
@@ -2,7 +2,7 @@
2
2
  <div class="document_viewer" id="cover_container">
3
3
  <dl class="defList">
4
4
  <dt>ID: </dt>
5
- <dd><%= render_document_show_field_value(:document=>document, :field=>"id") %></dd>
5
+ <dd><%= render_document_show_field_value(document: document, field: "id") %></dd>
6
6
  <dt>Download:</dt>
7
7
  <dd id="downloads">
8
8
  <ul>
@@ -10,11 +10,11 @@
10
10
  </ul>
11
11
  </dd>
12
12
  <dt>Copyright: </dt>
13
- <dd><%= render_document_show_field_value(:document=>document, :field=>"rights_t") %></dd>
13
+ <dd><%= render_document_show_field_value(document: document, field: "rights_t") %></dd>
14
14
  </dl>
15
15
  </div>
16
16
  <div class="<%= params[:action]%>_details">
17
- <%= render :partial => "#{params[:controller]}/_#{params[:action]}_partials/default_details", :locals => {:document => document}%>
17
+ <%= render partial: "#{params[:controller]}/_#{params[:action]}_partials/default_details", locals: {document: document}%>
18
18
  </div>
19
19
 
20
20
  <%= 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>
@@ -16,11 +16,11 @@
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>
@@ -34,8 +34,8 @@
34
34
  <% if facet_in_params? solr_fname, item.value %>
35
35
  <li>
36
36
  <span class="selected"><%= h(item.value) %> (<%= format_num facet_count_for_value %>)</span>
37
- <% link_options = remove_facet_params(solr_fname, item.value, params).merge!Hash["controller" =>"catalog", :action=> "index"] %>
38
- [<%= link_to 'remove', url_for(link_options), :class=>'remove' %>]
37
+ <% link_options = remove_facet_params(solr_fname, item.value, params).merge!({ controller: "catalog", action: "index" }) %>
38
+ [<%= link_to 'remove', url_for(link_options), class: 'remove' %>]
39
39
  </li>
40
40
  <% else %>
41
41
  <%- if item_counter > Blacklight.config[:facet_more_num]-1 -%>
@@ -43,7 +43,7 @@
43
43
  <%- else -%>
44
44
  <li>
45
45
  <%- end -%>
46
- <% link_options = add_facet_params(solr_fname, item.value).merge!Hash["controller" =>"catalog", :action=> "index"] %>
46
+ <% link_options = add_facet_params(solr_fname, item.value).merge!({ controller: "catalog", action: "index" }) %>
47
47
  <%= link_to h(item.value), url_for(link_options) %> (<%= format_num facet_count_for_value %>)
48
48
  </li>
49
49
  <% end -%>
@@ -1,18 +1,34 @@
1
1
  <div class="batch-info">
2
- <% session[:batch_edit_state] = "on" %>
3
- <%=batch_delete%> <%=batch_edit_continue("Edit Selected") %>
2
+ <div>
3
+ <%= render partial: 'collections/form_for_select_collection', locals: {user_collections: @user_collections} %>
4
+ </div>
5
+
6
+ <div class="batch-toggle">
7
+ <% session[:batch_edit_state] = "on" %>
8
+ <%= batch_edit_continue "Edit Selected" %>
9
+ <%= batch_delete %>
10
+ <%= form_tag sufia.dashboard_index_path do %>
11
+ <%= hidden_field_tag :type, nil, value: "Add to Collection" %>
12
+ <div>
13
+ </div>
14
+ <% end %>
15
+ <%= button_tag "Add to Collection", class: 'btn btn-primary submits-batches submits-batches-add',
16
+ data: { toggle: "modal", target: "#collection-list-container" } %>
17
+ </div>
18
+ <div class="sort-toggle">
4
19
  <% unless @response.response['numFound'] < 2 %>
5
- <%= form_tag sufia.dashboard_index_path, :method=>:get, :class=>'per_page form-inline' do %>
20
+ <%= form_tag sufia.dashboard_index_path, method: :get, class: 'per_page form-inline' do %>
6
21
  <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
7
22
  <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
8
23
  &nbsp;&nbsp;&nbsp;
9
- <%= label_tag(:per_page) do %>
10
- Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => "Number of results to display per page") %> per page
24
+ <%= label_tag :per_page do %>
25
+ Show <%= select_tag :per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])),
26
+ title: "Number of results to display per page" %> per page
11
27
  <% end %>
12
- <%= render_hash_as_hidden_fields(params_for_search().except(:per_page, :sort, :utf8)) %>
28
+ <%= render_hash_as_hidden_fields params_for_search().except(:per_page, :sort, :utf8) %>
13
29
  &nbsp;&nbsp;&nbsp;
14
30
  <button class="btn btn-primary" id="dashboard_sort_submit"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
31
+ <% end %>
15
32
  <% end unless sort_fields.empty? %>
16
-
17
- <% end %>
33
+ </div>
18
34
  </div>
@@ -1,8 +1,8 @@
1
1
  <!-- This was copied from https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/facet.html.erb
2
- It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord
2
+ It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord
3
3
  -->
4
4
  <div class="facet_pagination top">
5
- <%= render :partial=>'facet_pagination' %>
5
+ <%= render partial: 'facet_pagination' %>
6
6
  </div>
7
7
 
8
8
  <div class="modal-header">
@@ -18,6 +18,6 @@
18
18
  <div class="modal-footer">
19
19
 
20
20
  <div class="facet_pagination bottom">
21
- <%= render :partial=>'facet_pagination' %>
21
+ <%= render partial: 'facet_pagination' %>
22
22
  </div>
23
23
  </div>
@@ -1,44 +1,21 @@
1
1
  <% content_for :head do %>
2
- <%= auto_discovery_link_tag(:rss, sufia.url_for(params.merge(:format => 'rss')), :title => "RSS for results") %>
3
- <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(:format => 'atom')), :title => "Atom for results") %>
2
+ <%= auto_discovery_link_tag(:rss, sufia.url_for(params.merge(format: 'rss')), title: "RSS for results") %>
3
+ <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(format: 'atom')), title: "Atom for results") %>
4
4
  <% end %>
5
5
 
6
- <% content_for :local_js do %>
7
-
8
- initialize_audio();
9
-
10
- // hide or show the batch update buttons on page startup
11
- window.batch_part_on_other_page = <%= @batch_part_on_other_page %>;
12
- window.batch_size_on_other_page = <%= @batch_size_on_other_page %>;
13
- window.result_set_size = <%= @result_set_size %>;
14
- window.document_list_count = <%= @document_list.count %>;
15
- toggleButtons(<%= !@empty_batch %>);
16
-
17
- // initialize hydra batch edit and set up select all button toggle after checkboxes have been created
18
- $('#documents').batchEdit({afterCheckboxUpdate: setup_buttontoggle});
19
-
20
- <% end %>
21
-
22
- <% @page_title = application_name + " Dashboard" %>
23
-
24
- <% if params.has_key?("q") %>
25
- <div class="alert alert-info"><i class="glyphicon glyphicon-search icon-large"></i> You searched for:
26
- <strong><%= params[:q] %></strong></div>
27
- <% end %>
28
-
29
- <%= render :partial => 'did_you_mean' %>
30
- <%= render :partial => 'facet_selected' %>
31
-
32
- <%= render 'constraints', :localized_params => params %>
33
-
34
- <%= render 'sort_and_per_page' %>
35
-
36
- <%= render :partial => 'dashboard/document_list' %>
37
- <% content_for :sidebar do %>
38
- <%= render :partial => 'facets' %>
39
- <% end %>
40
-
41
- <%= render 'results_pagination' %>
42
- <% if @events.present? %>
43
- <%= render :partial => 'users/activity_log', :locals => {:events => @events} %>
44
- <% end %>
6
+ <ul class="nav nav-tabs">
7
+ <li class="<%= "active" if @selected_tab == :files %>">
8
+ <%= link_to "Files", sufia.dashboard_files_path %>
9
+ </li>
10
+ <li class="<%= "active" if @selected_tab == :collections %>">
11
+ <%= link_to "Collections", sufia.dashboard_collections_path %>
12
+ </li>
13
+ <li class="<%= "active" if @selected_tab == :highlighted %>">
14
+ <%= link_to "Highlighted", sufia.dashboard_highlights_path %>
15
+ </li>
16
+ <li class="<%= "active" if @selected_tab == :shared %>">
17
+ <%= link_to "Shared with Me", sufia.dashboard_shares_path %>
18
+ </li>
19
+ </ul>
20
+
21
+ Totally awesome new dashboard goes here!<br/>