blacklight-spotlight 0.4.1 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (367) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +22 -8
  3. data/Rakefile +40 -39
  4. data/app/assets/javascripts/spotlight/blacklight_configuration.js +16 -0
  5. data/app/assets/javascripts/spotlight/blocks/resources_block.js +3 -1
  6. data/app/assets/stylesheets/spotlight/_blacklight_configuration.scss +2 -2
  7. data/app/assets/stylesheets/spotlight/_blacklight_overrides.scss +24 -0
  8. data/app/assets/stylesheets/spotlight/_header.scss +150 -47
  9. data/app/assets/stylesheets/spotlight/_pages.scss +62 -11
  10. data/app/assets/stylesheets/spotlight/_report_a_problem.scss +1 -0
  11. data/app/assets/stylesheets/spotlight/_spotlight.scss +1 -0
  12. data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +28 -21
  13. data/app/controllers/spotlight/about_pages_controller.rb +25 -14
  14. data/app/controllers/spotlight/appearances_controller.rb +34 -30
  15. data/app/controllers/spotlight/application_controller.rb +2 -1
  16. data/app/controllers/spotlight/attachments_controller.rb +9 -7
  17. data/app/controllers/spotlight/browse_controller.rb +13 -9
  18. data/app/controllers/spotlight/catalog_controller.rb +179 -161
  19. data/app/controllers/spotlight/concerns/application_controller.rb +22 -20
  20. data/app/controllers/spotlight/concerns/catalog_search_context.rb +44 -0
  21. data/app/controllers/spotlight/confirmations_controller.rb +5 -2
  22. data/app/controllers/spotlight/contact_forms_controller.rb +13 -7
  23. data/app/controllers/spotlight/contacts_controller.rb +13 -4
  24. data/app/controllers/spotlight/custom_fields_controller.rb +48 -40
  25. data/app/controllers/spotlight/dashboards_controller.rb +17 -8
  26. data/app/controllers/spotlight/default_controller.rb +3 -1
  27. data/app/controllers/spotlight/exhibits_controller.rb +69 -62
  28. data/app/controllers/spotlight/feature_pages_controller.rb +21 -11
  29. data/app/controllers/spotlight/home_pages_controller.rb +6 -5
  30. data/app/controllers/spotlight/lock_controller.rb +3 -1
  31. data/app/controllers/spotlight/metadata_configurations_controller.rb +49 -0
  32. data/app/controllers/spotlight/pages_controller.rb +28 -18
  33. data/app/controllers/spotlight/resources/upload_controller.rb +53 -46
  34. data/app/controllers/spotlight/resources_controller.rb +9 -5
  35. data/app/controllers/spotlight/roles_controller.rb +26 -22
  36. data/app/controllers/spotlight/search_configurations_controller.rb +66 -0
  37. data/app/controllers/spotlight/searches_controller.rb +91 -82
  38. data/app/controllers/spotlight/solr_controller.rb +20 -13
  39. data/app/controllers/spotlight/tags_controller.rb +5 -3
  40. data/app/controllers/spotlight/versions_controller.rb +15 -12
  41. data/app/controllers/spotlight/view_configurations_controller.rb +17 -0
  42. data/app/helpers/spotlight/application_helper.rb +44 -32
  43. data/app/helpers/spotlight/browse_helper.rb +13 -1
  44. data/app/helpers/spotlight/crud_link_helpers.rb +22 -14
  45. data/app/helpers/spotlight/jcrop_helper.rb +4 -2
  46. data/app/helpers/spotlight/main_app_helpers.rb +45 -41
  47. data/app/helpers/spotlight/navbar_helper.rb +6 -0
  48. data/app/helpers/spotlight/pages_helper.rb +23 -15
  49. data/app/helpers/spotlight/roles_helper.rb +10 -4
  50. data/app/helpers/spotlight/search_configurations_helper.rb +22 -0
  51. data/app/helpers/spotlight/title_helper.rb +16 -13
  52. data/app/jobs/spotlight/add_uploads_from_csv.rb +13 -9
  53. data/app/jobs/spotlight/reindex_job.rb +9 -9
  54. data/app/jobs/spotlight/rename_sidecar_field_job.rb +3 -0
  55. data/app/mailers/spotlight/confirmation_mailer.rb +2 -0
  56. data/app/mailers/spotlight/indexing_complete_mailer.rb +4 -2
  57. data/app/models/ability.rb +3 -0
  58. data/app/models/concerns/spotlight/ar_light.rb +49 -25
  59. data/app/models/concerns/spotlight/blacklight_configuration_defaults.rb +25 -10
  60. data/app/models/concerns/spotlight/exhibit_analytics.rb +28 -0
  61. data/app/models/concerns/spotlight/image_derivatives.rb +25 -26
  62. data/app/models/concerns/spotlight/resources/open_graph.rb +23 -19
  63. data/app/models/concerns/spotlight/resources/web.rb +25 -24
  64. data/app/models/concerns/spotlight/solr_document.rb +40 -34
  65. data/app/models/concerns/spotlight/solr_document/active_model_concern.rb +29 -40
  66. data/app/models/concerns/spotlight/solr_document/atomic_updates.rb +22 -18
  67. data/app/models/concerns/spotlight/solr_document/finder.rb +23 -18
  68. data/app/models/concerns/spotlight/solr_document/spotlight_images.rb +43 -39
  69. data/app/models/concerns/spotlight/solr_document/uploaded_resource.rb +41 -29
  70. data/app/models/concerns/spotlight/user.rb +25 -19
  71. data/app/models/sir_trevor_rails/blocks/browse_block.rb +36 -30
  72. data/app/models/sir_trevor_rails/blocks/featured_pages_block.rb +24 -18
  73. data/app/models/sir_trevor_rails/blocks/oembed_block.rb +8 -4
  74. data/app/models/sir_trevor_rails/blocks/search_results_block.rb +29 -23
  75. data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb +43 -42
  76. data/app/models/sir_trevor_rails/blocks/solr_documents_carousel_block.rb +16 -12
  77. data/app/models/sir_trevor_rails/blocks/solr_documents_embed_block.rb +7 -3
  78. data/app/models/sir_trevor_rails/blocks/solr_documents_features_block.rb +7 -3
  79. data/app/models/sir_trevor_rails/blocks/solr_documents_grid_block.rb +7 -3
  80. data/app/models/sir_trevor_rails/blocks/textable.rb +18 -18
  81. data/app/models/spotlight/ability.rb +32 -33
  82. data/app/models/spotlight/about_page.rb +3 -1
  83. data/app/models/spotlight/analytics/ga.rb +46 -27
  84. data/app/models/spotlight/attachment.rb +3 -1
  85. data/app/models/spotlight/blacklight_configuration.rb +146 -68
  86. data/app/models/spotlight/contact.rb +35 -30
  87. data/app/models/spotlight/contact_email.rb +6 -3
  88. data/app/models/spotlight/contact_form.rb +4 -3
  89. data/app/models/spotlight/custom_field.rb +41 -33
  90. data/app/models/spotlight/exhibit.rb +104 -130
  91. data/app/models/spotlight/feature_page.rb +9 -7
  92. data/app/models/spotlight/featured_image.rb +10 -10
  93. data/app/models/spotlight/field_metadata.rb +46 -0
  94. data/app/models/spotlight/home_page.rb +8 -5
  95. data/app/models/spotlight/lock.rb +4 -3
  96. data/app/models/spotlight/main_navigation.rb +9 -3
  97. data/app/models/spotlight/masthead.rb +17 -16
  98. data/app/models/spotlight/page.rb +16 -16
  99. data/app/models/spotlight/resource.rb +69 -22
  100. data/app/models/spotlight/resources/csv_upload.rb +8 -4
  101. data/app/models/spotlight/resources/upload.rb +68 -57
  102. data/app/models/spotlight/role.rb +30 -34
  103. data/app/models/spotlight/search.rb +74 -63
  104. data/app/models/spotlight/solr_document_sidecar.rb +17 -15
  105. data/app/serializers/spotlight/exhibit_export_serializer.rb +65 -29
  106. data/app/serializers/spotlight/page_representer.rb +10 -6
  107. data/app/uploaders/spotlight/attachment_uploader.rb +4 -6
  108. data/app/uploaders/spotlight/avatar_uploader.rb +4 -3
  109. data/app/uploaders/spotlight/featured_image_uploader.rb +15 -14
  110. data/app/uploaders/spotlight/item_uploader.rb +3 -1
  111. data/app/uploaders/spotlight/masthead_uploader.rb +4 -2
  112. data/app/views/catalog/_search_form.html.erb +24 -0
  113. data/app/views/shared/_browse_navbar.html.erb +1 -1
  114. data/app/views/shared/_exhibit_navbar.html.erb +1 -1
  115. data/app/views/spotlight/appearances/edit.html.erb +13 -45
  116. data/app/views/spotlight/catalog/_edit_default.html.erb +1 -1
  117. data/app/views/spotlight/custom_fields/_form.html.erb +1 -1
  118. data/app/views/spotlight/exhibits/edit.html.erb +4 -4
  119. data/app/views/spotlight/home_pages/_empty.html.erb +1 -3
  120. data/app/views/spotlight/home_pages/_page_options.html.erb +1 -1
  121. data/app/views/spotlight/{blacklight_configurations → metadata_configurations}/_metadata_field.html.erb +0 -0
  122. data/app/views/spotlight/{blacklight_configurations/edit_metadata_fields.html.erb → metadata_configurations/edit.html.erb} +1 -1
  123. data/app/views/spotlight/pages/show.html.erb +2 -2
  124. data/app/views/spotlight/search_configurations/_default_per_page.html.erb +5 -0
  125. data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb +7 -0
  126. data/app/views/spotlight/search_configurations/_facets.html.erb +38 -0
  127. data/app/views/spotlight/search_configurations/_search_fields.html.erb +58 -0
  128. data/app/views/spotlight/search_configurations/_sort.html.erb +53 -0
  129. data/app/views/spotlight/search_configurations/edit.html.erb +46 -0
  130. data/app/views/spotlight/searches/_search.html.erb +1 -1
  131. data/app/views/spotlight/shared/_admin_sidebar.html.erb +0 -2
  132. data/app/views/spotlight/shared/_curation_sidebar.html.erb +2 -3
  133. data/app/views/spotlight/shared/_report_a_problem.html.erb +2 -2
  134. data/app/views/spotlight/sir_trevor/blocks/_oembed_block.html.erb +5 -1
  135. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb +7 -5
  136. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb +2 -2
  137. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb +7 -5
  138. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb +2 -2
  139. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb +14 -9
  140. data/config/locales/spotlight.en.yml +94 -49
  141. data/config/routes.rb +11 -20
  142. data/db/migrate/20150410180014_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +15 -0
  143. data/db/migrate/20150410180015_add_missing_taggable_index.acts_as_taggable_on_engine.rb +10 -0
  144. data/db/migrate/20150410180016_change_collation_for_tag_names.acts_as_taggable_on_engine.rb +10 -0
  145. data/db/migrate/20150713160101_change_spotlight_searches_to_published.rb +5 -0
  146. data/db/migrate/20151016092343_remove_searchable_from_exhibit.rb +20 -0
  147. data/lib/blacklight/spotlight.rb +1 -1
  148. data/lib/generators/spotlight/install_generator.rb +27 -25
  149. data/lib/generators/spotlight/templates/catalog_controller.rb +7 -5
  150. data/lib/generators/spotlight/templates/jetty.rake +8 -2
  151. data/lib/generators/spotlight/templates/spotlight_helper.rb +3 -1
  152. data/lib/spotlight.rb +4 -2
  153. data/lib/spotlight/base.rb +21 -14
  154. data/lib/spotlight/catalog.rb +10 -9
  155. data/lib/spotlight/catalog/access_controls_enforcement.rb +30 -15
  156. data/lib/spotlight/config.rb +4 -2
  157. data/lib/spotlight/controller.rb +12 -11
  158. data/lib/spotlight/engine.rb +30 -22
  159. data/lib/spotlight/rails/routes.rb +7 -4
  160. data/lib/spotlight/version.rb +2 -1
  161. data/lib/tasks/spotlight_tasks.rake +56 -50
  162. data/spec/controllers/application_controller_spec.rb +13 -13
  163. data/spec/controllers/spotlight/about_pages_controller_spec.rb +63 -59
  164. data/spec/controllers/spotlight/appearances_controller_spec.rb +29 -24
  165. data/spec/controllers/spotlight/application_controller_spec.rb +3 -3
  166. data/spec/controllers/spotlight/attachments_controller_spec.rb +10 -10
  167. data/spec/controllers/spotlight/browse_controller_spec.rb +23 -25
  168. data/spec/controllers/spotlight/catalog_controller_spec.rb +82 -87
  169. data/spec/controllers/spotlight/confirmations_controller_spec.rb +13 -11
  170. data/spec/controllers/spotlight/contact_forms_controller_spec.rb +17 -12
  171. data/spec/controllers/spotlight/contacts_controller_spec.rb +36 -36
  172. data/spec/controllers/spotlight/custom_fields_controller_spec.rb +26 -26
  173. data/spec/controllers/spotlight/dashboards_controller_spec.rb +14 -14
  174. data/spec/controllers/spotlight/exhibits_controller_spec.rb +59 -54
  175. data/spec/controllers/spotlight/feature_pages_controller_spec.rb +59 -59
  176. data/spec/controllers/spotlight/home_pages_controller_spec.rb +28 -29
  177. data/spec/controllers/spotlight/metadata_configurations_controller_spec.rb +84 -0
  178. data/spec/controllers/spotlight/resources/upload_controller_spec.rb +42 -33
  179. data/spec/controllers/spotlight/resources_controller_spec.rb +25 -29
  180. data/spec/controllers/spotlight/roles_controller_spec.rb +37 -19
  181. data/spec/controllers/spotlight/search_configurations_controller_spec.rb +125 -0
  182. data/spec/controllers/spotlight/searches_controller_spec.rb +84 -63
  183. data/spec/controllers/spotlight/solr_controller_spec.rb +13 -14
  184. data/spec/controllers/spotlight/tags_controller_spec.rb +16 -16
  185. data/spec/controllers/spotlight/versions_controller_spec.rb +15 -18
  186. data/spec/controllers/spotlight/view_configurations_controller_spec.rb +31 -0
  187. data/spec/factories/contacts.rb +1 -3
  188. data/spec/factories/custom_fields.rb +2 -4
  189. data/spec/factories/exhibits.rb +4 -2
  190. data/spec/factories/pages.rb +8 -11
  191. data/spec/factories/resources.rb +4 -4
  192. data/spec/factories/searches.rb +10 -13
  193. data/spec/factories/tags.rb +0 -3
  194. data/spec/factories/users.rb +2 -4
  195. data/spec/features/about_page_spec.rb +19 -19
  196. data/spec/features/add_contacts_spec.rb +34 -34
  197. data/spec/features/add_custom_field_metadata_spec.rb +24 -26
  198. data/spec/features/add_item_bookmarklet_spec.rb +12 -12
  199. data/spec/features/browse_category_admin_spec.rb +39 -39
  200. data/spec/features/catalog_spec.rb +9 -10
  201. data/spec/features/confirm_email_spec.rb +10 -10
  202. data/spec/features/create_exhibit_spec.rb +18 -15
  203. data/spec/features/create_page_spec.rb +8 -8
  204. data/spec/features/curator_items.rb +3 -3
  205. data/spec/features/dashboard_spec.rb +15 -16
  206. data/spec/features/edit_contact_spec.rb +8 -10
  207. data/spec/features/edit_search_fields_spec.rb +79 -0
  208. data/spec/features/exhibits/add_tags_spec.rb +15 -16
  209. data/spec/features/exhibits/administration_spec.rb +25 -25
  210. data/spec/features/exhibits/custom_metadata_fields_spec.rb +41 -43
  211. data/spec/features/exhibits/edit_metadata_fields_spec.rb +19 -19
  212. data/spec/features/feature_page_spec.rb +49 -48
  213. data/spec/features/home_page_spec.rb +38 -38
  214. data/spec/features/import_exhibit_spec.rb +23 -20
  215. data/spec/features/item_admin_spec.rb +28 -29
  216. data/spec/features/javascript/about_page_admin_spec.rb +9 -9
  217. data/spec/features/javascript/block_controls_spec.rb +16 -18
  218. data/spec/features/javascript/blocks/featured_browse_categories_block_spec.rb +11 -12
  219. data/spec/features/javascript/blocks/featured_pages_block_spec.rb +12 -13
  220. data/spec/features/javascript/blocks/search_result_block_spec.rb +17 -17
  221. data/spec/features/javascript/blocks/solr_documents_block_spec.rb +67 -65
  222. data/spec/features/javascript/edit_in_place_spec.rb +30 -56
  223. data/spec/features/javascript/feature_page_admin_spec.rb +73 -59
  224. data/spec/features/javascript/home_page_edit_spec.rb +6 -6
  225. data/spec/features/javascript/metadata_admin_spec.rb +15 -15
  226. data/spec/features/javascript/multi_image_select_spec.rb +17 -18
  227. data/spec/features/javascript/preview_block_spec.rb +11 -12
  228. data/spec/features/javascript/rule_block_spec.rb +7 -7
  229. data/spec/features/javascript/search_config_admin_spec.rb +144 -0
  230. data/spec/features/javascript/search_context_spec.rb +41 -42
  231. data/spec/features/main_navigation_spec.rb +22 -22
  232. data/spec/features/metadata_admin_spec.rb +8 -8
  233. data/spec/features/multiple_exhibits_spec.rb +15 -17
  234. data/spec/features/report_a_problem_spec.rb +23 -17
  235. data/spec/features/site_masthead_spec.rb +46 -46
  236. data/spec/features/slideshow_spec.rb +8 -9
  237. data/spec/features/tags_admin_spec.rb +11 -11
  238. data/spec/features/upload_non_repository_item_spec.rb +32 -32
  239. data/spec/features/user_admin_spec.rb +7 -7
  240. data/spec/helpers/spotlight/application_helper_spec.rb +63 -56
  241. data/spec/helpers/spotlight/browse_helper_spec.rb +6 -6
  242. data/spec/helpers/spotlight/crud_link_helpers_spec.rb +58 -52
  243. data/spec/helpers/spotlight/main_app_helpers_spec.rb +44 -24
  244. data/spec/helpers/spotlight/navbar_helper_spec.rb +4 -4
  245. data/spec/helpers/spotlight/pages_helper_spec.rb +56 -37
  246. data/spec/helpers/spotlight/roles_helper_spec.rb +3 -3
  247. data/spec/helpers/spotlight/search_configurations_helper_spec.rb +24 -0
  248. data/spec/helpers/spotlight/title_helper_spec.rb +33 -35
  249. data/spec/jobs/spotlight/reindex_job_spec.rb +6 -6
  250. data/spec/jobs/spotlight/rename_sidecar_field_job_spec.rb +7 -7
  251. data/spec/lib/spotlight/catalog/access_controls_enforcement_spec.rb +41 -26
  252. data/spec/lib/spotlight/controller_spec.rb +10 -10
  253. data/spec/lib/spotlight/routes_spec.rb +4 -4
  254. data/spec/mailers/spotlight/indexing_complete_mailer_spec.rb +13 -13
  255. data/spec/models/sir_trevor_rails/blocks/solr_documents_block_spec.rb +8 -8
  256. data/spec/models/{spotlight/sir_trevor_blocks → sir_trevor_rails/blocks}/textable_spec.rb +7 -8
  257. data/spec/models/solr_document_spec.rb +49 -50
  258. data/spec/models/spotlight/ability_spec.rb +17 -20
  259. data/spec/models/spotlight/about_page_spec.rb +6 -6
  260. data/spec/models/spotlight/analytics/ga_spec.rb +2 -2
  261. data/spec/models/spotlight/blacklight_configuration_spec.rb +196 -133
  262. data/spec/models/spotlight/contact_email_spec.rb +28 -24
  263. data/spec/models/spotlight/contact_spec.rb +6 -7
  264. data/spec/models/spotlight/custom_field_spec.rb +51 -52
  265. data/spec/models/spotlight/exhibit_spec.rb +102 -60
  266. data/spec/models/spotlight/feature_page_spec.rb +32 -32
  267. data/spec/models/spotlight/featured_image_spec.rb +5 -5
  268. data/spec/models/spotlight/field_metadata_spec.rb +78 -0
  269. data/spec/models/spotlight/home_page_spec.rb +11 -20
  270. data/spec/models/spotlight/{spotlight_image_derivatives_spec.rb → image_derivatives_spec.rb} +2 -2
  271. data/spec/models/spotlight/main_navigation_spec.rb +7 -9
  272. data/spec/models/spotlight/masthead_spec.rb +6 -6
  273. data/spec/models/spotlight/page_spec.rb +26 -29
  274. data/spec/models/spotlight/resource_spec.rb +56 -26
  275. data/spec/models/spotlight/resources/open_graph_spec.rb +16 -18
  276. data/spec/models/spotlight/resources/upload_spec.rb +32 -35
  277. data/spec/models/spotlight/resources/web_spec.rb +9 -11
  278. data/spec/models/spotlight/role_spec.rb +20 -20
  279. data/spec/models/spotlight/search_spec.rb +32 -15
  280. data/spec/models/spotlight/solr_document/atomic_updates_spec.rb +34 -0
  281. data/spec/models/spotlight/{solr_document_images_spec.rb → solr_document/spotlight_images_spec.rb} +18 -10
  282. data/spec/models/spotlight/solr_document/uploaded_resource_spec.rb +52 -0
  283. data/spec/models/spotlight/solr_document_sidecar_spec.rb +3 -4
  284. data/spec/routing/spotlight/exhibit_catalog_spec.rb +5 -5
  285. data/spec/routing/spotlight/pages_routing_spec.rb +24 -25
  286. data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb +88 -68
  287. data/spec/spec_helper.rb +13 -22
  288. data/spec/support/features/test_features_helpers.rb +50 -46
  289. data/spec/support/views/test_view_helpers.rb +1 -1
  290. data/spec/test_app_templates/Gemfile.extra +0 -1
  291. data/spec/test_app_templates/carrierwave.rb +2 -2
  292. data/spec/test_app_templates/catalog_controller.rb +42 -42
  293. data/spec/test_app_templates/lib/generators/test_app_generator.rb +20 -11
  294. data/spec/test_app_templates/spotlight_test.rake +3 -3
  295. data/spec/uploaders/spotlight/item_uploader_spec.rb +68 -0
  296. data/spec/views/_user_util_links.html.erb_spec.rb +14 -14
  297. data/spec/views/shared/_analytics.html.erb_spec.rb +4 -6
  298. data/spec/views/shared/_exhibit_masthead.html.erb_spec.rb +19 -20
  299. data/spec/views/shared/_exhibit_navbar.html.erb_spec.rb +129 -131
  300. data/spec/views/shared/_footer.html.erb_spec.rb +6 -7
  301. data/spec/views/shared/_header_navbar.html.erb_spec.rb +5 -5
  302. data/spec/views/spotlight/about_pages/_empty.html.erb_spec.rb +4 -4
  303. data/spec/views/spotlight/about_pages/_sidebar.html.erb_spec.rb +9 -11
  304. data/spec/views/spotlight/about_pages/index.html.erb_spec.rb +31 -28
  305. data/spec/views/spotlight/browse/_search.html.erb_spec.rb +6 -6
  306. data/spec/views/spotlight/browse/_sort_and_per_page.html.erb_spec.rb +10 -12
  307. data/spec/views/spotlight/browse/index.html.erb_spec.rb +6 -6
  308. data/spec/views/spotlight/browse/show.html.erb_spec.rb +19 -20
  309. data/spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb +7 -7
  310. data/spec/views/spotlight/catalog/admin.html.erb_spec.rb +7 -7
  311. data/spec/views/spotlight/catalog/edit.html.erb_spec.rb +3 -6
  312. data/spec/views/spotlight/catalog/new.html.erb_spec.rb +8 -10
  313. data/spec/views/spotlight/contacts/edit.html.erb_spec.rb +8 -8
  314. data/spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb +22 -22
  315. data/spec/views/spotlight/exhibits/edit.html.erb_spec.rb +7 -8
  316. data/spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb +5 -5
  317. data/spec/views/spotlight/feature_pages/_sidebar.html.erb_spec.rb +24 -26
  318. data/spec/views/spotlight/home_pages/_empty.html.erb_spec.rb +13 -9
  319. data/spec/views/spotlight/home_pages/_sidebar.html.erb_spec.rb +6 -6
  320. data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +26 -0
  321. data/spec/views/spotlight/metadata_configurations/edit.html.erb_spec.rb +22 -0
  322. data/spec/views/spotlight/pages/edit.html.erb_spec.rb +16 -16
  323. data/spec/views/spotlight/pages/index.html.erb_spec.rb +19 -17
  324. data/spec/views/spotlight/pages/new.html.erb_spec.rb +6 -6
  325. data/spec/views/spotlight/pages/show.html.erb_spec.rb +27 -28
  326. data/spec/views/spotlight/roles/index.html.erb_spec.rb +6 -6
  327. data/spec/views/spotlight/search_configurations/_search_fields.html.erb_spec.rb +54 -0
  328. data/spec/views/spotlight/search_configurations/_sort.html.erb_spec.rb +28 -0
  329. data/spec/views/spotlight/searches/_search.html.erb_spec.rb +20 -10
  330. data/spec/views/spotlight/searches/edit.html.erb_spec.rb +12 -11
  331. data/spec/views/spotlight/searches/index.html.erb_spec.rb +12 -7
  332. data/spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb +7 -8
  333. data/spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb +4 -4
  334. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb +38 -0
  335. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb +7 -8
  336. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +18 -13
  337. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb +14 -12
  338. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb +11 -12
  339. data/spec/views/spotlight/tags/index.html.erb_spec.rb +9 -9
  340. metadata +167 -83
  341. data/app/controllers/spotlight/blacklight_configurations_controller.rb +0 -101
  342. data/app/controllers/spotlight/resources/csv_controller.rb +0 -23
  343. data/app/forms/spotlight/appearance.rb +0 -86
  344. data/app/helpers/spotlight/attachments_helper.rb +0 -4
  345. data/app/helpers/spotlight/blacklight_configurations_helper.rb +0 -15
  346. data/app/jobs/spotlight/set_default_thumbnail_job.rb +0 -16
  347. data/app/models/spotlight/resources/csv.rb +0 -80
  348. data/app/uploaders/spotlight/csv_uploader.rb +0 -15
  349. data/app/views/spotlight/blacklight_configurations/edit_facet_fields.html.erb +0 -47
  350. data/app/views/spotlight/blacklight_configurations/edit_sort_fields.html.erb +0 -65
  351. data/app/views/spotlight/resources/csv/_form.html.erb +0 -17
  352. data/app/views/spotlight/resources/csv/new.html.erb +0 -3
  353. data/spec/controllers/spotlight/blacklight_configurations_controller_spec.rb +0 -167
  354. data/spec/features/edit_sort_fields_spec.rb +0 -42
  355. data/spec/features/exhibits/edit_facet_fields_spec.rb +0 -37
  356. data/spec/features/javascript/facet_admin_spec.rb +0 -36
  357. data/spec/features/search_facets_admin_spec.rb +0 -19
  358. data/spec/features/update_appearance_spec.rb +0 -58
  359. data/spec/helpers/spotlight/blacklight_configurations_helper_spec.rb +0 -12
  360. data/spec/models/spotlight/appearance_spec.rb +0 -33
  361. data/spec/models/spotlight/resources/csv_spec.rb +0 -101
  362. data/spec/models/spotlight/solr_document_atomic_updates_spec.rb +0 -29
  363. data/spec/models/spotlight/solr_document_uploaded_resource_spec.rb +0 -45
  364. data/spec/uploaders/item_uploader_spec.rb +0 -62
  365. data/spec/views/spotlight/blacklight_configuration/_metadata_field.html.erb_spec.rb +0 -27
  366. data/spec/views/spotlight/blacklight_configuration/edit_metadata_fields.html.erb_spec.rb +0 -23
  367. data/spec/views/spotlight/blacklight_configuration/edit_sort_fields.html.erb_spec.rb +0 -19
@@ -26,7 +26,7 @@
26
26
  <% unless field.configured_to_display? %>
27
27
  <p class="bg-warning help-block">
28
28
  <%= t(:'.blank_field_warning_html',
29
- link: link_to(t(:'spotlight.curation.sidebar.metadata'), spotlight.exhibit_edit_metadata_path(current_exhibit))) %>
29
+ link: link_to(t(:'spotlight.curation.sidebar.metadata'), spotlight.edit_exhibit_metadata_configuration_path(current_exhibit))) %>
30
30
  </p>
31
31
  <% end %>
32
32
  </div>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <div class="form-actions">
12
12
  <div class="primary-actions">
13
- <%= link_to t(:"cancel"), exhibit_edit_metadata_path(current_exhibit), class: "btn btn-link" %>
13
+ <%= link_to t(:"cancel"), edit_exhibit_metadata_configuration_path(current_exhibit), class: "btn btn-link" %>
14
14
  <%= f.submit nil, class: 'btn btn-primary' %>
15
15
  </div>
16
16
  </div>
@@ -4,21 +4,21 @@
4
4
  <div role="tabpanel">
5
5
  <ul class="nav nav-tabs" role="tablist">
6
6
  <li role="presentation" class="active">
7
- <a href="#basic" area-controls="basic" role="tab" data-toggle="tab"><%= t(:'.basic_settings.heading') %></a>
7
+ <a href="#basic" aria-controls="basic" role="tab" data-toggle="tab"><%= t(:'.basic_settings.heading') %></a>
8
8
  </li>
9
9
  <% if can? :import, current_exhibit %>
10
10
  <li role="presentation">
11
- <a href="#import" area-controls="import" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.import.heading') %></a>
11
+ <a href="#import" aria-controls="import" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.import.heading') %></a>
12
12
  </li>
13
13
  <% end %>
14
14
  <% if can? :export, current_exhibit %>
15
15
  <li role="presentation">
16
- <a href="#export" area-controls="export" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.export.heading') %></a>
16
+ <a href="#export" aria-controls="export" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.export.heading') %></a>
17
17
  </li>
18
18
  <% end %>
19
19
  <% if can? :destroy, current_exhibit %>
20
20
  <li role="presentation">
21
- <a href="#delete" area-controls="delete" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.delete.heading') %></a>
21
+ <a href="#delete" aria-controls="delete" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.delete.heading') %></a>
22
22
  </li>
23
23
  <% end %>
24
24
  </ul>
@@ -11,9 +11,7 @@
11
11
  <ol>
12
12
  <% if can? :update, current_exhibit %>
13
13
  <li>Visit the <%= link_to "Administrative Dashboard Settings", edit_exhibit_path(current_exhibit) %> page to configure the exhibit title and subtitle.</li>
14
- <% end %>
15
14
 
16
- <% if can? :update, current_exhibit.appearance %>
17
15
  <li>Next, go to the <%= link_to "Administration > Appearance", edit_exhibit_appearance_path(current_exhibit) %> page to add a site masthead image and configure other appearance options.</li>
18
16
  <% end %>
19
17
 
@@ -26,7 +24,7 @@
26
24
  <% end %>
27
25
 
28
26
  <% if can? :update, current_exhibit.blacklight_configuration %>
29
- <li>Use the other Curation pages, such as <%= link_to "Curation > Metadata", exhibit_edit_metadata_path(current_exhibit) %> and <%= link_to "Curation > Search Facets", exhibit_edit_facets_path(current_exhibit) %>, to customize the way various features are presented to exhibit visitors.</li>
27
+ <li>Use the other Curation pages, such as <%= link_to "Curation > Metadata", edit_exhibit_metadata_configuration_path(current_exhibit) %> and <%= link_to "Curation > Search", edit_exhibit_search_configuration_path(current_exhibit) %>, to customize the way various features are presented to exhibit visitors.</li>
30
28
  <% end %>
31
29
 
32
30
  <li>Visit the Spotlight <%= link_to "documentation pages", "https://github.com/sul-dlss/spotlight/wiki" %> to learn how to add and edit feature pages, about pages, custom browse categories, and more.</li>
@@ -1,2 +1,2 @@
1
1
  <%= f.check_box :display_title %>
2
- <%= f.check_box :display_sidebar?, disabled: !current_exhibit.searchable? %>
2
+ <%= f.check_box :display_sidebar? %>
@@ -1,7 +1,7 @@
1
1
  <%= render 'spotlight/shared/curation_sidebar' %>
2
2
  <div id="content" class="col-md-9">
3
3
  <%= curation_page_title %>
4
- <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_blacklight_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
4
+ <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_metadata_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
5
5
  <h3><%= t(:'.order_header') %></h3>
6
6
 
7
7
  <p class="instructions"><%= t :'.instructions' %></p>
@@ -3,7 +3,7 @@
3
3
  <%= render 'sidebar' if @page.display_sidebar? %>
4
4
 
5
5
  <%= cache_unless current_user, @page do %>
6
- <div class="<%= 'col-md-9' if @page.display_sidebar? %>">
6
+ <div class="<%= @page.display_sidebar? ? 'col-md-9' : 'col-md-12' %>">
7
7
  <div class="clearfix">
8
8
  <%= render 'edit_page_link' if can? :edit, @page %>
9
9
  <% if @page.should_display_title? %>
@@ -13,7 +13,7 @@
13
13
  <% end %>
14
14
  </div>
15
15
  <div>
16
- <% if @page.has_content? %>
16
+ <% if @page.content? %>
17
17
  <%= render @page.content %>
18
18
  <% else %>
19
19
  <%= render 'empty' %>
@@ -0,0 +1,5 @@
1
+ <%= f.form_group :default_per_page, label: { text: t(:'.default_per_page')} do %>
2
+ <% @blacklight_configuration.default_blacklight_config.per_page.each do |key| %>
3
+ <%= f.radio_button :default_per_page, key, label: key.to_s %>
4
+ <% end %>
5
+ <% end %>
@@ -0,0 +1,7 @@
1
+ <%= f.form_group :document_index_view_types, label: {text: t(:'.document_index_view_types')} do %>
2
+ <%= f.fields_for :document_index_view_types, @blacklight_configuration.document_index_view_types_selected_hash do |vt| %>
3
+ <% @blacklight_configuration.default_blacklight_config.view.select { |_k, v| v.if != false }.keys.each do |key| %>
4
+ <%= vt.check_box key %>
5
+ <% end %>
6
+ <% end %>
7
+ <% end %>
@@ -0,0 +1,38 @@
1
+ <p class="instructions"><%=t(:'.help') %></p>
2
+ <div class="panel-group dd facet_fields" id="nested-fields" data-behavior="nestable" data-max-depth="1">
3
+ <ol class="dd-list">
4
+ <%= f.fields_for :facet_fields do |idxf| %>
5
+ <% @blacklight_configuration.blacklight_config.facet_fields.each do |key, config| %>
6
+ <% metadata = @field_metadata.field(key) %>
7
+ <li class="dd-item" data-id="<%= key.parameterize %>">
8
+ <div class="dd-handle dd3-handle"><%= t :drag %></div>
9
+ <%= idxf.fields_for key do |facet| %>
10
+ <div class="dd3-content panel panel-default facet-config-<%= key.parameterize %>">
11
+ <div class="panel-heading page">
12
+ <%= facet.hidden_field :weight, 'data-property' => 'weight' %>
13
+ <%= facet.check_box :show, checked: config.show, label: "", title: key %>
14
+ <div class="main row">
15
+ <div class="col-sm-7">
16
+ <h3 class="panel-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
17
+ <a href="#edit-in-place" class="field-label edit-in-place"><%= facet_field_label(key) %></a>
18
+ <%= facet.hidden_field :label, value: facet_field_label(key), class: 'form-control input-sm', data: {:"edit-field-target" => 'true'} %>
19
+ </h3>
20
+ </div>
21
+ <div class="facet-metadata col-sm-5">
22
+ <%= content_tag :span, t(:'.document_count', count: metadata[:document_count]) %>
23
+ <% if metadata[:document_count] > 0 %>
24
+ • <%= content_tag :span, t(:'.value_count', count: metadata[:value_count]) %>
25
+ <% if metadata[:terms].any? %>
26
+ <%= tag("span", class: 'btn-with-tooltip glyphicon glyphicon-info-sign', data: {container: 'body', toggle: 'tooltip', placement: 'top', title: metadata[:terms].keys.map(&:to_s).join(" • ")}) %>
27
+ <% end %>
28
+ <% end %>
29
+ </div>
30
+ </div>
31
+ </div>
32
+ </div>
33
+ <% end %>
34
+ </li>
35
+ <% end %>
36
+ <% end %>
37
+ </ol>
38
+ </div>
@@ -0,0 +1,58 @@
1
+ <% default_field = @blacklight_configuration.blacklight_config.default_search_field %>
2
+ <%= field_set_tag(t(:'.header'), id: 'search_fields') do %>
3
+ <p class="instructions"><%= t(:'.help') %></p>
4
+ <p class="instructions"><%= t(:'.instructions') %></p>
5
+ <p class="instructions">
6
+ <div class="checkbox">
7
+ <label>
8
+ <%= check_box_tag :enable_feature, '1', @blacklight_configuration.blacklight_config.search_fields.select { |_k, v| v.enabled && v.include_in_simple_select != false }.any?, data: { behavior: 'enable-feature', target: '#search_fields' } %> <%= t(:'.enable_feature') %>
9
+ </label>
10
+ </div>
11
+ </p>
12
+
13
+ <%= f.fields_for :search_fields, @blacklight_configuration.blacklight_config.search_fields.keys do |vt| %>
14
+ <ol class="dd-list col-md-7 disabled-search-option search_fields_admin">
15
+ <li>
16
+ <div class="panel panel-default">
17
+ <div class="panel-content">
18
+ <div class="panel-heading">
19
+ <h3 class="panel-title">
20
+ <%= vt.fields_for default_field.key, default_field do |field| %>
21
+ <%= field.check_box_without_bootstrap :enabled, data: { readonly: true }, class: 'disabled' %>
22
+ <%= field.hidden_field :label, readonly: true %>
23
+ <%= field.hidden_field :weight, value: "-1", readonly: true %>
24
+ <%= default_field.label %>
25
+ <% end %>
26
+ </h3>
27
+ </div>
28
+ </div>
29
+ </div>
30
+ </li>
31
+ </ol>
32
+ <div class="panel-group dd search_fields_admin col-sm-7" id="nested-search-fields" data-behavior="nestable" data-max-depth="1">
33
+ <ol class="dd-list">
34
+ <% @blacklight_configuration.blacklight_config.search_fields.select { |_k, v| v.include_in_simple_select != false }.except(default_field.key).each_with_index do |(k, config), index| %>
35
+ <li class="dd-item dd3-item" data-id="<%= k %>-id">
36
+ <div class="dd3-content panel panel-default">
37
+ <div class="dd-handle dd3-handle"><%= t(:drag) %></div>
38
+ <div class="panel-heading" data-behavior="restore-default">
39
+ <div class="row">
40
+ <div class="col-sm-12">
41
+ <%= vt.fields_for k, config do |field| %>
42
+ <%= field.check_box_without_bootstrap :enabled %>
43
+ <h3 class="panel-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
44
+ <a href="#edit-in-place" class="field-label edit-in-place"><%= config.label %></a>
45
+ <%= field.hidden_field :label, {data: {:"edit-field-target" => "true"}} %>
46
+ </h3>
47
+ <%= field.hidden_field :weight, {value: index, data: {property: "weight"}} %>
48
+ <% end %>
49
+ </div>
50
+ </div>
51
+ </div>
52
+ </div>
53
+ </li>
54
+ <% end %>
55
+ </ol>
56
+ </div>
57
+ <% end %>
58
+ <% end %>
@@ -0,0 +1,53 @@
1
+ <% default_field = @blacklight_configuration.blacklight_config.default_sort_field %>
2
+ <%= field_set_tag(t(:'.header')) do %>
3
+ <p class="instructions"><%= t(:'.help') %></p>
4
+
5
+ <%= f.fields_for :sort_fields, @blacklight_configuration.blacklight_config.sort_fields.keys do |vt| %>
6
+ <ol class="dd-list col-md-7 disabled-sort-option sort_fields_admin">
7
+ <li>
8
+ <div class="panel panel-default">
9
+ <div class="panel-content">
10
+ <div class="panel-heading">
11
+ <h3 class="panel-title">
12
+ <%= vt.fields_for default_field.key, default_field do |sort| %>
13
+ <%= sort.check_box_without_bootstrap :enable, checked: true, disabled: true, data: { readonly: true } %>
14
+ <%= sort.hidden_field :enabled, value: '1', readonly: true %>
15
+ <%= sort.hidden_field :label, readonly: true %>
16
+ <%= sort.hidden_field :weight, value: "-1", readonly: true %>
17
+ <%= default_field.label %>
18
+ <% end %>
19
+ </h3>
20
+ (<%= translate_sort_fields(default_field) %>)
21
+ </div>
22
+ </div>
23
+ </div>
24
+ </li>
25
+ </ol>
26
+ <div class="panel-group dd sort_fields_admin col-sm-7" id="nested-sort-fields" data-behavior="nestable" data-max-depth="1">
27
+ <ol class="dd-list">
28
+ <% @blacklight_configuration.blacklight_config.sort_fields.except(default_field.key).each_with_index do |(k, config), index| %>
29
+ <li class="dd-item dd3-item" data-id="<%= k %>-id">
30
+ <div class="dd3-content panel panel-default">
31
+ <div class="dd-handle dd3-handle"><%= t(:drag) %></div>
32
+ <div class="panel-heading" data-behavior="restore-default">
33
+ <div class="row">
34
+ <div class="col-sm-12">
35
+ <%= vt.fields_for k, config do |sort| %>
36
+ <%= sort.check_box_without_bootstrap :enabled %>
37
+ <h3 class="panel-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
38
+ <a href="#edit-in-place" class="field-label edit-in-place"><%= config.label %></a>
39
+ <%= sort.hidden_field :label, {data: {:"edit-field-target" => "true"}} %>
40
+ </h3>
41
+ (<%= translate_sort_fields(config) %>)
42
+ <%= sort.hidden_field :weight, {value: index, data: {property: "weight"}} %>
43
+ <% end %>
44
+ </div>
45
+ </div>
46
+ </div>
47
+ </div>
48
+ </li>
49
+ <% end %>
50
+ </ol>
51
+ </div>
52
+ <% end %>
53
+ <% end %>
@@ -0,0 +1,46 @@
1
+ <%= render 'spotlight/shared/curation_sidebar' %>
2
+ <div id="content" class="col-md-9">
3
+ <%= curation_page_title %>
4
+ <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_search_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
5
+
6
+ <div role="tabpanel">
7
+ <ul class="nav nav-tabs" role="tablist">
8
+ <li role="presentation" class="active">
9
+ <a href="#options" aria-controls="options" role="tab" data-toggle="tab"><%= t(:'.tab.options') %></a>
10
+ </li>
11
+ <li role="presentation">
12
+ <a href="#facets" aria-controls="facets" role="tab" data-toggle="tab"><%= t(:'.tab.facets') %></a>
13
+ </li>
14
+ <li role="presentation">
15
+ <a href="#results" aria-controls="results" role="tab" data-toggle="tab"><%= t(:'.tab.results') %></a>
16
+ </li>
17
+ </ul>
18
+ <div class="tab-content">
19
+ <div role="tabpanel" class="tab-pane active" id="options">
20
+ <%= render 'search_fields', f: f %>
21
+ </div>
22
+
23
+ <div role="tabpanel" class="tab-pane" id="facets">
24
+ <%= render 'facets', f: f %>
25
+ </div>
26
+
27
+ <div role="tabpanel" class="tab-pane" id="results">
28
+ <%= field_set_tag do %>
29
+ <%= render 'document_index_view_types', f: f %>
30
+ <%= render 'default_per_page', f: f %>
31
+ <% end %>
32
+
33
+ <%= render 'sort', f: f %>
34
+ </div>
35
+
36
+ </div>
37
+ </div>
38
+
39
+ <div class="form-actions">
40
+ <div class="primary-actions">
41
+ <%= f.submit nil, class: 'btn btn-primary' %>
42
+ </div>
43
+ </div>
44
+
45
+ <% end %>
46
+ </div>
@@ -3,7 +3,7 @@
3
3
  <div class="dd-handle dd3-handle"><%= t :drag %></div>
4
4
  <div class="dd3-content panel panel-default">
5
5
  <div class="panel-heading search">
6
- <%= f.check_box :on_landing_page, label: '' %>
6
+ <%= f.check_box :published, label: '' %>
7
7
 
8
8
  <div class="pic thumbnail"><%= image_tag(search.thumbnail.image.thumb) if search.thumbnail %></div>
9
9
  <div class="main">
@@ -2,8 +2,6 @@
2
2
  <ul class="nav sidenav">
3
3
  <% if can? :update, current_exhibit %>
4
4
  <li><%= link_to t(:'spotlight.administration.sidebar.settings'), spotlight.edit_exhibit_path(current_exhibit) %></li>
5
- <% end %>
6
- <% if can? :update, current_exhibit.appearance %>
7
5
  <li><%= link_to t(:'spotlight.administration.sidebar.appearance'), spotlight.edit_exhibit_appearance_path(current_exhibit) %></li>
8
6
  <% end %>
9
7
  <% if can? :manage, Spotlight::Role.new(exhibit: current_exhibit) %>
@@ -10,9 +10,8 @@
10
10
  <li><%= link_to t(:'spotlight.curation.sidebar.tags'), spotlight.exhibit_tags_path(current_exhibit) %></li>
11
11
  <% end %>
12
12
  <% if can? :update, current_exhibit.blacklight_configuration %>
13
- <li><%= link_to t(:'spotlight.curation.sidebar.metadata'), spotlight.exhibit_edit_metadata_path(current_exhibit) %></li>
14
- <li><%= link_to t(:'spotlight.curation.sidebar.search_facets'), spotlight.exhibit_edit_facets_path(current_exhibit) %></li>
15
- <li><%= link_to t(:'spotlight.curation.sidebar.sort_fields'), spotlight.exhibit_edit_sort_fields_path(current_exhibit) %></li>
13
+ <li><%= link_to t(:'spotlight.curation.sidebar.metadata'), spotlight.edit_exhibit_metadata_configuration_path(current_exhibit) %></li>
14
+ <li><%= link_to t(:'spotlight.curation.sidebar.search_configuration'), spotlight.edit_exhibit_search_configuration_path(current_exhibit) %></li>
16
15
  <% end %>
17
16
  <% if can? :manage, Spotlight::Search.new(exhibit: current_exhibit) %>
18
17
  <li><%= link_to t(:'spotlight.curation.sidebar.browse'), spotlight.exhibit_searches_path(current_exhibit) %></li>
@@ -2,8 +2,8 @@
2
2
  <div class="container">
3
3
  <div class="row">
4
4
  <% contact_form = Spotlight::ContactForm.new current_url: request.original_url %>
5
- <%= bootstrap_form_for contact_form, url: spotlight.exhibit_contact_form_path(current_exhibit, contact_form), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-4', html: { class: 'col-md-offset-3 col-md-7 '} do |f| %>
6
-
5
+ <%= bootstrap_form_for contact_form, url: spotlight.exhibit_contact_form_path(current_exhibit, contact_form), layout: :horizontal, label_col: 'col-sm-3', control_col: 'col-sm-9', html: { class: 'col-md-offset-2 col-md-8 '} do |f| %>
6
+
7
7
  <h2><%= t(:'.title') %></h2>
8
8
  <%= f.text_field :name %>
9
9
  <%= f.text_field :email %>
@@ -2,8 +2,12 @@
2
2
  <div class="<%= 'col-md-6' if oembed_block.text? %> col-xs-12 oembed-block pull-<%= oembed_block.content_align %>">
3
3
  <%= render_oembed_tag oembed_block.url %>
4
4
  </div>
5
+
5
6
  <% if oembed_block.text? %>
6
- <div class="col-md-6 col-xs-12 pull-<%= oembed_block.text_align %>">
7
+ <div class="text-col col-md-6">
8
+ <% unless oembed_block.title.blank? %>
9
+ <h3><%= oembed_block.title %></h3>
10
+ <% end %>
7
11
  <%= sir_trevor_markdown oembed_block.text %>
8
12
  </div>
9
13
  <% end %>
@@ -3,11 +3,11 @@
3
3
  <div class="content-block items-block row">
4
4
  <% if solr_documents_block.documents? %>
5
5
 
6
- <div class="content-block spotlight-flexbox pull-<%= solr_documents_block.content_align %> <%= solr_documents_block.text? ? "col-md-6" : "col-md-12" %> ">
7
- <% solr_documents_block.documents.each do |document| %>
6
+ <div class="items-col spotlight-flexbox pull-<%= solr_documents_block.content_align %> <%= solr_documents_block.text? ? "col-md-6" : "col-md-12" %> ">
7
+ <% solr_documents_block.each_document do |block_options, document| %>
8
8
  <div class="box" data-id="<%= document.id %>">
9
9
  <div class="contents">
10
- <% if block_thumb = solr_documents_block.document_options(document.id)[:thumbnail_image_url] %>
10
+ <% if block_thumb = block_options[:thumbnail_image_url] %>
11
11
  <div class="thumbnail"><%= link_to_document(document, image_tag(block_thumb), counter: -1) %></div>
12
12
  <% elsif has_thumbnail? document %>
13
13
  <div class="thumbnail"><%= render_thumbnail_tag(document, {}, document_counter: -1) %></div>
@@ -29,8 +29,10 @@
29
29
  <% end %>
30
30
 
31
31
  <% if solr_documents_block.text? %>
32
- <div class="text-col col-md-6 pull-<%= solr_documents_block.text_align %>">
33
- <h3><%= solr_documents_block.title %></h3>
32
+ <div class="text-col col-md-6">
33
+ <% unless solr_documents_block.title.blank? %>
34
+ <h3><%= solr_documents_block.title %></h3>
35
+ <% end %>
34
36
  <%= sir_trevor_markdown solr_documents_block.text %>
35
37
  </div>
36
38
  <% end %>
@@ -5,9 +5,9 @@
5
5
  <% if solr_documents_carousel_block.documents? %>
6
6
  <div id="<%= html_id %>" class="carousel slide" data-ride="carousel" data-interval="<%= solr_documents_carousel_block.interval %>">
7
7
  <div class="carousel-inner">
8
- <% solr_documents_carousel_block.documents.each_with_index do |document, index| %>
8
+ <% solr_documents_carousel_block.each_document.each_with_index do |(block_options, document), index| %>
9
9
  <div class="item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
10
- <% if block_thumb = solr_documents_carousel_block.document_options(document.id)[:full_image_url] %>
10
+ <% if block_thumb = block_options[:full_image_url] %>
11
11
  <%= link_to_document(document, image_tag(block_thumb), counter: -1) %>
12
12
  <% elsif has_thumbnail? document %>
13
13
  <%= render_thumbnail_tag(document, {}, document_counter: -1) %>
@@ -1,11 +1,11 @@
1
1
  <% solr_documents_embed_block.with_solr_helper(self) %>
2
2
 
3
3
  <div class="content-block items-block row">
4
-
4
+
5
5
  <% if solr_documents_embed_block.documents? %>
6
6
 
7
- <div class="content-block spotlight-flexbox pull-<%= solr_documents_embed_block.content_align %> <%= solr_documents_embed_block.text? ? "col-md-6" : "col-md-12" %> ">
8
- <% solr_documents_embed_block.documents.each do |document| %>
7
+ <div class="items-col spotlight-flexbox pull-<%= solr_documents_embed_block.content_align %> <%= solr_documents_embed_block.text? ? "col-md-6" : "col-md-12" %> ">
8
+ <% solr_documents_embed_block.each_document do |block_options, document| %>
9
9
  <div class="box" data-id="<%= document.id %>">
10
10
  <%= render_document_partials document, blacklight_config.view.embed.partials, (blacklight_config.view.embed.locals || {}).reverse_merge(block: solr_documents_embed_block) %>
11
11
  </div>
@@ -14,8 +14,10 @@
14
14
  <% end %>
15
15
 
16
16
  <% if solr_documents_embed_block.text? %>
17
- <div class="text-col col-md-6 pull-<%= solr_documents_embed_block.text_align %>">
18
- <h3><%= solr_documents_embed_block.title %></h3>
17
+ <div class="text-col col-md-6">
18
+ <% unless solr_documents_embed_block.title.blank? %>
19
+ <h3><%= solr_documents_embed_block.title %></h3>
20
+ <% end %>
19
21
  <%= sir_trevor_markdown solr_documents_embed_block.text %>
20
22
  </div>
21
23
  <% end %>