blacklight-spotlight 2.13.0 → 3.0.0.alpha.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (282) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/blacklight/add_circle.svg +1 -0
  3. data/app/assets/images/blacklight/arrow_back_ios.svg +1 -0
  4. data/app/assets/images/blacklight/arrow_forward_ios.svg +1 -0
  5. data/app/assets/images/blacklight/check.svg +1 -0
  6. data/app/assets/images/blacklight/check_circle.svg +1 -0
  7. data/app/assets/images/blacklight/chevron_right.svg +1 -0
  8. data/app/assets/images/blacklight/custom_fullscreen.svg +1 -0
  9. data/app/assets/images/blacklight/edit.svg +1 -0
  10. data/app/assets/images/blacklight/error.svg +1 -0
  11. data/app/assets/images/blacklight/info.svg +1 -0
  12. data/app/assets/images/blacklight/remove_circle.svg +1 -0
  13. data/app/assets/images/blacklight/remove_circle_outline.svg +1 -0
  14. data/app/assets/images/blacklight/resize_small.svg +1 -0
  15. data/app/assets/images/blacklight/warning.svg +1 -0
  16. data/app/assets/javascripts/spotlight/admin/block_mixins/autocompleteable.js +1 -1
  17. data/app/assets/javascripts/spotlight/admin/block_mixins/plustextable.js +2 -2
  18. data/app/assets/javascripts/spotlight/admin/blocks/browse_block.js +1 -1
  19. data/app/assets/javascripts/spotlight/admin/blocks/pages_block.js +1 -1
  20. data/app/assets/javascripts/spotlight/admin/blocks/resources_block.js +7 -7
  21. data/app/assets/javascripts/spotlight/admin/blocks/solr_documents_base_block.js +3 -3
  22. data/app/assets/javascripts/spotlight/admin/blocks/uploaded_items_block.js +7 -7
  23. data/app/assets/javascripts/spotlight/admin/catalog_edit.js +2 -2
  24. data/app/assets/javascripts/spotlight/admin/multi_image_selector.js +2 -2
  25. data/app/assets/javascripts/spotlight/admin/reindex_monitor.js +1 -1
  26. data/app/assets/javascripts/spotlight/admin/search_typeahead.js +2 -2
  27. data/app/assets/javascripts/spotlight/admin/sir-trevor/block_controls.js +1 -1
  28. data/app/assets/javascripts/spotlight/admin/users.js +1 -1
  29. data/app/assets/javascripts/spotlight/user/index.js +1 -0
  30. data/app/assets/javascripts/spotlight/user/zpr_links.js.erb +6 -6
  31. data/app/assets/stylesheets/spotlight/_blacklight_configuration.scss +44 -4
  32. data/app/assets/stylesheets/spotlight/_blacklight_overrides.scss +4 -8
  33. data/app/assets/stylesheets/spotlight/_bootstrap_overrides.scss +31 -14
  34. data/app/assets/stylesheets/spotlight/_browse.scss +16 -13
  35. data/app/assets/stylesheets/spotlight/_catalog.scss +13 -7
  36. data/app/assets/stylesheets/spotlight/_collapse_toggle.scss +10 -14
  37. data/app/assets/stylesheets/spotlight/_curation.scss +34 -32
  38. data/app/assets/stylesheets/spotlight/_exhibit_admin.scss +4 -29
  39. data/app/assets/stylesheets/spotlight/_exhibits_index.scss +16 -14
  40. data/app/assets/stylesheets/spotlight/_featured_browse_categories_block.scss +22 -20
  41. data/app/assets/stylesheets/spotlight/_footer.scss +2 -2
  42. data/app/assets/stylesheets/spotlight/_header.scss +18 -39
  43. data/app/assets/stylesheets/spotlight/_item_text_block.scss +1 -24
  44. data/app/assets/stylesheets/spotlight/_mixins.scss +3 -8
  45. data/app/assets/stylesheets/spotlight/_multi_up_item_grid.scss +1 -1
  46. data/app/assets/stylesheets/spotlight/_nestable.scss +1 -2
  47. data/app/assets/stylesheets/spotlight/_pages.scss +33 -54
  48. data/app/assets/stylesheets/spotlight/_report_a_problem.scss +7 -1
  49. data/app/assets/stylesheets/spotlight/_sir-trevor_overrides.scss +9 -9
  50. data/app/assets/stylesheets/spotlight/_slideshow_block.scss +13 -11
  51. data/app/assets/stylesheets/spotlight/_spotlight.scss +0 -1
  52. data/app/assets/stylesheets/spotlight/_translations.scss +12 -12
  53. data/app/assets/stylesheets/spotlight/_variables.scss +14 -15
  54. data/app/assets/stylesheets/spotlight/_variables_bootstrap.scss +7 -7
  55. data/app/assets/stylesheets/spotlight/typeahead.css +1 -1
  56. data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +3 -2
  57. data/app/controllers/concerns/spotlight/catalog.rb +1 -1
  58. data/app/controllers/concerns/spotlight/controller.rb +3 -3
  59. data/app/controllers/concerns/spotlight/search_helper.rb +23 -0
  60. data/app/controllers/spotlight/browse_controller.rb +18 -4
  61. data/app/controllers/spotlight/catalog_controller.rb +13 -17
  62. data/app/controllers/spotlight/dashboards_controller.rb +5 -1
  63. data/app/controllers/spotlight/exhibits_controller.rb +1 -1
  64. data/app/controllers/spotlight/home_pages_controller.rb +32 -3
  65. data/app/controllers/spotlight/pages_controller.rb +19 -1
  66. data/app/controllers/spotlight/search_configurations_controller.rb +3 -3
  67. data/app/controllers/spotlight/searches_controller.rb +4 -1
  68. data/app/controllers/spotlight/solr_controller.rb +1 -2
  69. data/app/helpers/spotlight/application_helper.rb +1 -1
  70. data/app/helpers/spotlight/browse_helper.rb +1 -1
  71. data/app/helpers/spotlight/crud_link_helpers.rb +19 -0
  72. data/app/helpers/spotlight/pages_helper.rb +1 -1
  73. data/app/mailers/spotlight/contact_mailer.rb +1 -1
  74. data/app/models/concerns/spotlight/access_controls_enforcement_search_builder.rb +2 -2
  75. data/app/models/concerns/spotlight/exhibit_analytics.rb +1 -3
  76. data/app/models/concerns/spotlight/exhibit_documents.rb +1 -1
  77. data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb +11 -3
  78. data/app/models/spotlight/ability.rb +1 -1
  79. data/app/models/spotlight/analytics/ga.rb +25 -35
  80. data/app/models/spotlight/analytics/ga_model.rb +29 -0
  81. data/app/models/spotlight/blacklight_configuration.rb +5 -3
  82. data/app/models/spotlight/contact_form.rb +11 -4
  83. data/app/models/spotlight/exhibit.rb +0 -4
  84. data/app/models/spotlight/field_metadata.rb +3 -9
  85. data/app/models/spotlight/page.rb +0 -3
  86. data/app/models/spotlight/page_configurations.rb +1 -1
  87. data/app/models/spotlight/role.rb +0 -4
  88. data/app/models/spotlight/search.rb +3 -17
  89. data/app/presenters/spotlight/iiif_manifest_presenter.rb +5 -1
  90. data/app/serializers/spotlight/exhibit_export_serializer.rb +69 -28
  91. data/app/serializers/spotlight/page_representer.rb +1 -1
  92. data/app/views/catalog/_save_search.html.erb +6 -4
  93. data/app/views/devise/mailer/invitation_instructions.html.erb +1 -1
  94. data/app/views/layouts/spotlight/base.html.erb +48 -0
  95. data/app/views/layouts/spotlight/spotlight.html.erb +16 -54
  96. data/app/views/shared/_about_navbar.html.erb +2 -2
  97. data/app/views/shared/_browse_navbar.html.erb +2 -2
  98. data/app/views/shared/_curated_features_navbar.html.erb +4 -4
  99. data/app/views/shared/_exhibit_navbar.html.erb +5 -5
  100. data/app/views/shared/_header_navbar.html.erb +8 -13
  101. data/app/views/shared/_masthead.html.erb +1 -1
  102. data/app/views/shared/_site_sidebar.html.erb +6 -6
  103. data/app/views/shared/_user_util_links.html.erb +47 -0
  104. data/app/views/spotlight/about_pages/_contact.html.erb +3 -4
  105. data/app/views/spotlight/about_pages/_contacts.html.erb +1 -1
  106. data/app/views/spotlight/about_pages/_sidebar.html.erb +3 -5
  107. data/app/views/spotlight/about_pages/index.html.erb +7 -6
  108. data/app/views/spotlight/admin_users/index.html.erb +78 -79
  109. data/app/views/spotlight/appearances/edit.html.erb +26 -23
  110. data/app/views/spotlight/browse/_search.html.erb +2 -2
  111. data/app/views/spotlight/browse/_search_box.html.erb +9 -6
  112. data/app/views/spotlight/browse/_search_title.html.erb +1 -1
  113. data/app/views/spotlight/browse/_sort_and_per_page.html.erb +3 -5
  114. data/app/views/spotlight/browse/index.html.erb +4 -6
  115. data/app/views/spotlight/browse/show.html.erb +1 -1
  116. data/app/views/spotlight/catalog/_admin_header.html.erb +2 -2
  117. data/app/views/spotlight/catalog/_curation_mode_toggle_default.html.erb +1 -1
  118. data/app/views/spotlight/catalog/_document_admin_table.html.erb +4 -4
  119. data/app/views/spotlight/catalog/_edit_sidecar.html.erb +1 -1
  120. data/app/views/spotlight/catalog/_index_compact_default.html.erb +1 -2
  121. data/app/views/spotlight/catalog/_reindex_progress_panel.html.erb +3 -5
  122. data/app/views/spotlight/catalog/admin.html.erb +12 -12
  123. data/app/views/spotlight/contact_forms/new.html.erb +1 -3
  124. data/app/views/spotlight/contacts/edit.html.erb +6 -5
  125. data/app/views/spotlight/contacts/new.html.erb +6 -5
  126. data/app/views/spotlight/custom_fields/edit.html.erb +6 -5
  127. data/app/views/spotlight/custom_fields/new.html.erb +6 -5
  128. data/app/views/spotlight/dashboards/_analytics.html.erb +3 -3
  129. data/app/views/spotlight/dashboards/_page.html.erb +6 -6
  130. data/app/views/spotlight/dashboards/_page_activity.html.erb +5 -5
  131. data/app/views/spotlight/dashboards/_reindexing_activity.html.erb +12 -12
  132. data/app/views/spotlight/dashboards/analytics.html.erb +11 -11
  133. data/app/views/spotlight/dashboards/show.html.erb +13 -13
  134. data/app/views/spotlight/exhibits/_confirmation_status.html.erb +3 -4
  135. data/app/views/spotlight/exhibits/_contact.html.erb +3 -3
  136. data/app/views/spotlight/exhibits/_delete.html.erb +7 -5
  137. data/app/views/spotlight/exhibits/_exhibit_card.html.erb +2 -2
  138. data/app/views/spotlight/exhibits/_exhibit_card_front.html.erb +2 -2
  139. data/app/views/spotlight/exhibits/_form.html.erb +5 -5
  140. data/app/views/spotlight/exhibits/_languages.html.erb +2 -2
  141. data/app/views/spotlight/exhibits/_new_exhibit_form.html.erb +0 -2
  142. data/app/views/spotlight/exhibits/edit.html.erb +43 -42
  143. data/app/views/spotlight/exhibits/index.html.erb +40 -41
  144. data/app/views/spotlight/exhibits/new.html.erb +4 -5
  145. data/app/views/spotlight/feature_pages/_header.html.erb +12 -14
  146. data/app/views/spotlight/feature_pages/_sidebar.html.erb +2 -4
  147. data/app/views/spotlight/featured_images/_form.html.erb +4 -4
  148. data/app/views/spotlight/filters/_form.html.erb +1 -1
  149. data/app/views/spotlight/home_pages/_edit_page_link.html.erb +1 -1
  150. data/app/views/spotlight/home_pages/_sidebar.html.erb +1 -3
  151. data/app/views/spotlight/metadata_configurations/_metadata_field.html.erb +4 -4
  152. data/app/views/spotlight/metadata_configurations/edit.html.erb +5 -4
  153. data/app/views/spotlight/pages/_edit_page_link.html.erb +1 -1
  154. data/app/views/spotlight/pages/_form.html.erb +7 -7
  155. data/app/views/spotlight/pages/_order_pages.html.erb +2 -2
  156. data/app/views/spotlight/pages/_page.html.erb +11 -11
  157. data/app/views/spotlight/pages/_view_type_group.html.erb +1 -1
  158. data/app/views/spotlight/pages/edit.html.erb +2 -4
  159. data/app/views/spotlight/pages/index.html.erb +5 -4
  160. data/app/views/spotlight/pages/show.html.erb +5 -4
  161. data/app/views/spotlight/resources/_external_resources_form.html.erb +2 -2
  162. data/app/views/spotlight/resources/_form.html.erb +1 -1
  163. data/app/views/spotlight/resources/csv_upload/_form.html.erb +1 -1
  164. data/app/views/spotlight/resources/iiif/_form.html.erb +1 -1
  165. data/app/views/spotlight/resources/json_upload/_form.html.erb +1 -1
  166. data/app/views/spotlight/resources/new.html.erb +25 -23
  167. data/app/views/spotlight/resources/upload/_form.html.erb +2 -2
  168. data/app/views/spotlight/roles/index.html.erb +60 -57
  169. data/app/views/spotlight/search_configurations/_facet_metadata.html.erb +3 -1
  170. data/app/views/spotlight/search_configurations/_facets.html.erb +19 -18
  171. data/app/views/spotlight/search_configurations/_search_fields.html.erb +6 -6
  172. data/app/views/spotlight/search_configurations/_sort.html.erb +6 -6
  173. data/app/views/spotlight/search_configurations/edit.html.erb +42 -40
  174. data/app/views/spotlight/searches/_form.html.erb +15 -10
  175. data/app/views/spotlight/searches/_search.html.erb +29 -22
  176. data/app/views/spotlight/searches/edit.html.erb +6 -5
  177. data/app/views/spotlight/searches/index.html.erb +32 -31
  178. data/app/views/spotlight/shared/_configuration_sidebar.html.erb +6 -6
  179. data/app/views/spotlight/shared/_curation_sidebar.html.erb +8 -9
  180. data/app/views/spotlight/shared/_exhibit_sidebar.html.erb +6 -8
  181. data/app/views/spotlight/shared/_locale_picker.html.erb +3 -3
  182. data/app/views/spotlight/shared/_report_a_problem.html.erb +2 -2
  183. data/app/views/spotlight/sir_trevor/blocks/_browse_block.html.erb +1 -1
  184. data/app/views/spotlight/sir_trevor/blocks/_link_to_search_block.html.erb +1 -1
  185. data/app/views/spotlight/sir_trevor/blocks/_oembed_block.html.erb +2 -2
  186. data/app/views/spotlight/sir_trevor/blocks/_search_results_block.html.erb +2 -2
  187. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb +8 -8
  188. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb +8 -8
  189. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb +3 -4
  190. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb +32 -31
  191. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb +5 -5
  192. data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb +8 -10
  193. data/app/views/spotlight/sites/edit.html.erb +31 -34
  194. data/app/views/spotlight/sites/edit_exhibits.html.erb +28 -29
  195. data/app/views/spotlight/tags/index.html.erb +25 -24
  196. data/app/views/spotlight/translations/_browse_categories.html.erb +20 -15
  197. data/app/views/spotlight/translations/_general.html.erb +69 -91
  198. data/app/views/spotlight/translations/_metadata.html.erb +18 -14
  199. data/app/views/spotlight/translations/_page.html.erb +2 -2
  200. data/app/views/spotlight/translations/_search_fields.html.erb +26 -20
  201. data/app/views/spotlight/translations/edit.html.erb +16 -14
  202. data/config/locales/spotlight.en.yml +3 -0
  203. data/config/routes.rb +1 -1
  204. data/lib/generators/spotlight/install_generator.rb +2 -2
  205. data/lib/generators/spotlight/scaffold_resource_generator.rb +1 -1
  206. data/lib/generators/spotlight/templates/spotlight.scss +0 -1
  207. data/lib/spotlight/engine.rb +12 -0
  208. data/lib/spotlight/version.rb +1 -1
  209. data/spec/controllers/application_controller_spec.rb +2 -2
  210. data/spec/controllers/spotlight/browse_controller_spec.rb +1 -1
  211. data/spec/controllers/spotlight/catalog_controller_spec.rb +13 -13
  212. data/spec/controllers/spotlight/dashboards_controller_spec.rb +2 -1
  213. data/spec/controllers/spotlight/search_configurations_controller_spec.rb +1 -1
  214. data/spec/examples.txt +50 -1489
  215. data/spec/features/add_items_spec.rb +2 -2
  216. data/spec/features/browse_category_admin_spec.rb +3 -3
  217. data/spec/features/browse_category_spec.rb +3 -3
  218. data/spec/features/catalog_spec.rb +1 -1
  219. data/spec/features/exhibits/translation_editing_spec.rb +21 -21
  220. data/spec/features/feature_page_spec.rb +1 -1
  221. data/spec/features/home_page_spec.rb +3 -3
  222. data/spec/features/javascript/blocks/featured_browse_categories_block_spec.rb +1 -1
  223. data/spec/features/javascript/blocks/link_to_search_block_spec.rb +1 -1
  224. data/spec/features/javascript/blocks/search_result_block_spec.rb +9 -4
  225. data/spec/features/javascript/blocks/solr_documents_block_spec.rb +23 -15
  226. data/spec/features/javascript/blocks/solr_documents_carousel_block_spec.rb +29 -0
  227. data/spec/features/javascript/blocks/uploaded_items_block_spec.rb +2 -2
  228. data/spec/features/javascript/edit_in_place_spec.rb +1 -0
  229. data/spec/features/javascript/feature_page_admin_spec.rb +11 -11
  230. data/spec/features/javascript/locale_selector_spec.rb +0 -1
  231. data/spec/features/javascript/multi_image_select_spec.rb +3 -3
  232. data/spec/features/javascript/reindex_monitor_spec.rb +2 -2
  233. data/spec/features/javascript/roles_admin_spec.rb +2 -2
  234. data/spec/features/javascript/search_context_spec.rb +4 -6
  235. data/spec/features/site_users_management_spec.rb +1 -1
  236. data/spec/helpers/spotlight/application_helper_spec.rb +2 -1
  237. data/spec/helpers/spotlight/crud_link_helpers_spec.rb +19 -0
  238. data/spec/helpers/spotlight/languages_helper_spec.rb +1 -0
  239. data/spec/lib/spotlight/controller_spec.rb +2 -2
  240. data/spec/models/sir_trevor_rails/blocks/solr_documents_block_spec.rb +38 -0
  241. data/spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb +7 -6
  242. data/spec/models/spotlight/analytics/ga_spec.rb +16 -1
  243. data/spec/models/spotlight/contact_form_spec.rb +37 -5
  244. data/spec/models/spotlight/exhibit_spec.rb +8 -4
  245. data/spec/presenters/spotlight/iiif_manifest_presenter_spec.rb +4 -0
  246. data/spec/routing/spotlight/exhibit_catalog_spec.rb +15 -11
  247. data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb +60 -0
  248. data/spec/test_app_templates/Gemfile.extra +3 -0
  249. data/spec/test_app_templates/catalog_controller.rb +4 -0
  250. data/spec/test_app_templates/lib/generators/test_app_generator.rb +2 -2
  251. data/spec/views/shared/_header_navbar.html.erb_spec.rb +1 -1
  252. data/spec/views/shared/_masthead.html.erb_spec.rb +1 -1
  253. data/spec/views/{_user_util_links.html.erb_spec.rb → shared/_user_util_links.html.erb_spec.rb} +1 -1
  254. data/spec/views/spotlight/about_pages/_sidebar.html.erb_spec.rb +2 -2
  255. data/spec/views/spotlight/about_pages/index.html.erb_spec.rb +2 -2
  256. data/spec/views/spotlight/browse/_search.html.erb_spec.rb +1 -1
  257. data/spec/views/spotlight/browse/_sort_and_per_page.html.erb_spec.rb +2 -13
  258. data/spec/views/spotlight/browse/show.html.erb_spec.rb +2 -2
  259. data/spec/views/spotlight/catalog/admin.html.erb_spec.rb +1 -1
  260. data/spec/views/spotlight/dashboards/_reindexing_activity.html.erb_spec.rb +5 -5
  261. data/spec/views/spotlight/dashboards/analytics.html.erb_spec.rb +1 -1
  262. data/spec/views/spotlight/exhibits/_exhibit_card_front.html.erb_spec.rb +2 -2
  263. data/spec/views/spotlight/exhibits/edit.html.erb_spec.rb +1 -1
  264. data/spec/views/spotlight/exhibits/index.html.erb_spec.rb +1 -1
  265. data/spec/views/spotlight/feature_pages/_sidebar.html.erb_spec.rb +7 -7
  266. data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +3 -2
  267. data/spec/views/spotlight/metadata_configurations/edit.html.erb_spec.rb +2 -1
  268. data/spec/views/spotlight/pages/index.html.erb_spec.rb +2 -2
  269. data/spec/views/spotlight/pages/show.html.erb_spec.rb +3 -3
  270. data/spec/views/spotlight/searches/_search.html.erb_spec.rb +1 -1
  271. data/spec/views/spotlight/searches/edit.html.erb_spec.rb +3 -3
  272. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb +3 -3
  273. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +1 -1
  274. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb +2 -2
  275. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb +1 -1
  276. data/spec/views/spotlight/translations/_page.html.erb_spec.rb +2 -2
  277. data/vendor/assets/javascripts/bootstrap-tagsinput.js +1 -1
  278. data/vendor/assets/stylesheets/sir-trevor/_variables.scss +15 -8
  279. metadata +31 -28
  280. data/app/assets/stylesheets/spotlight/_navbar.scss +0 -48
  281. data/app/views/_user_util_links.html.erb +0 -50
  282. data/app/views/shared/_modal.html.erb +0 -6
@@ -1,55 +1,17 @@
1
- <!DOCTYPE html>
2
- <%= content_tag :html, class: 'no-js', **(try(:html_tag_attributes) || {}) do %>
3
- <head>
4
- <meta charset="utf-8">
5
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
6
-
7
- <!-- Mobile viewport optimization h5bp.com/ad -->
8
- <meta name="HandheldFriendly" content="True">
9
- <meta name="viewport" content="width=device-width,initial-scale=1.0">
10
-
11
- <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
12
- <!--[if IEMobile]>
13
- <meta http-equiv="cleartype" content="on">
14
- <![endif]-->
15
-
16
- <title><%= h(@page_title || application_name.to_s) %></title>
17
- <link href="<%= current_exhibit ? spotlight.opensearch_exhibit_catalog_url(current_exhibit, format: 'xml') : main_app.opensearch_catalog_url(format: 'xml') %>" title="<%= h(@page_title || application_name.to_str) %>" type="application/opensearchdescription+xml" rel="search"/>
18
- <%= favicon_link_tag 'favicon.ico' %>
19
- <% if current_exhibit %>
20
- <%= exhibit_stylesheet_link_tag "application" %>
21
- <% else %>
22
- <%= stylesheet_link_tag "application" %>
23
- <% end %>
24
- <%= javascript_include_tag "application" %>
25
- <%= csrf_meta_tags %>
26
- <%= content_for(:head) %>
27
- <%= description %>
28
- <%= twitter_card %>
29
- <%= opengraph %>
30
- <%= javascript_tag '$.fx.off = true;' if Rails.env.test? %>
31
-
32
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
33
- <!--[if lt IE 9]>
34
- <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
35
- <![endif]-->
36
-
37
- </head>
38
- <body class="<%= render_body_class %>">
39
- <%= render partial: 'shared/header_navbar' %>
40
- <%= render partial: 'shared/masthead' %>
41
- <%= content_for?(:header_content) ? yield(:header_content) : "" %>
42
-
43
- <%= render partial: 'shared/ajax_modal' %>
44
-
45
- <div id="main-container" class="container">
46
- <%= render partial: '/flash_msg', layout: 'shared/flash_messages' %>
47
-
48
- <div class="row">
49
- <%= content_for?(:content) ? yield(:content) : yield %>
50
- </div>
51
- </div>
52
-
53
- <%= render :partial => 'shared/footer' %>
54
- </body>
1
+ <% content_for(:content) do %>
2
+ <% if content_for? :sidebar %>
3
+ <section id="content" class="<%= main_content_classes %> order-last">
4
+ <%= yield %>
5
+ </section>
6
+
7
+ <aside id="sidebar" class="<%= sidebar_classes %> <%= content_for(:sidebar_position) || 'order-first' %>">
8
+ <%= content_for(:sidebar) %>
9
+ </aside>
10
+ <% else %>
11
+ <section class="col-md-12">
12
+ <%= yield %>
13
+ </section>
14
+ <% end %>
55
15
  <% end %>
16
+
17
+ <%= render template: "layouts/spotlight/base" %>
@@ -1,3 +1,3 @@
1
1
  <% if current_exhibit.main_about_page %>
2
- <li class="<%= "active" if on_about_page? %>"><%= link_to navigation.label_or_default, [spotlight, current_exhibit, current_exhibit.main_about_page] %></li>
3
- <% end %>
2
+ <li class="nav-item <%= "active" if on_about_page? %>"><%= link_to navigation.label_or_default, [spotlight, current_exhibit, current_exhibit.main_about_page], class: 'nav-link' %></li>
3
+ <% end %>
@@ -1,3 +1,3 @@
1
1
  <% if current_exhibit.browse_categories? %>
2
- <li class="<%= "active" if on_browse_page? %>"><%= link_to navigation.label_or_default, spotlight.exhibit_browse_index_path(current_exhibit) %></li>
3
- <% end %>
2
+ <li class="nav-item <%= "active" if on_browse_page? %>"><%= link_to navigation.label_or_default, spotlight.exhibit_browse_index_path(current_exhibit), class: 'nav-link' %></li>
3
+ <% end %>
@@ -1,15 +1,15 @@
1
1
  <% published_top_level_feature_pages = current_exhibit.feature_pages.for_locale.published.at_top_level -%>
2
2
  <% if published_top_level_feature_pages.present? %>
3
3
  <% if published_top_level_feature_pages.many? %>
4
- <li class="dropdown">
5
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= navigation.label_or_default %> <b class="caret"></b></a>
4
+ <li class="nav-item dropdown">
5
+ <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><%= navigation.label_or_default %> <b class="caret"></b></a>
6
6
  <ul class="dropdown-menu">
7
7
  <% published_top_level_feature_pages.each do |page| %>
8
- <li><%= link_to page.title, [spotlight, page.exhibit, page] %></li>
8
+ <li><%= link_to page.title, [spotlight, page.exhibit, page], class: 'dropdown-item' %></li>
9
9
  <% end %>
10
10
  </ul>
11
11
  </li>
12
12
  <% else %>
13
- <li class="<%= "active" if current_page?(url_for([spotlight, published_top_level_feature_pages.first.exhibit, published_top_level_feature_pages.first])) %>"><%= link_to published_top_level_feature_pages.first.title, [spotlight, published_top_level_feature_pages.first.exhibit, published_top_level_feature_pages.first] %></li>
13
+ <li class="nav-item <%= "active" if current_page?(url_for([spotlight, published_top_level_feature_pages.first.exhibit, published_top_level_feature_pages.first])) %>"><%= link_to published_top_level_feature_pages.first.title, [spotlight, published_top_level_feature_pages.first.exhibit, published_top_level_feature_pages.first], class: 'nav-link' %></li>
14
14
  <% end %>
15
15
  <% end %>
@@ -1,18 +1,18 @@
1
- <div id="exhibit-navbar" class="exhibit-navbar navbar navbar-default" role="navigation">
1
+ <div id="exhibit-navbar" class="exhibit-navbar navbar navbar-light navbar-expand-md" role="navigation">
2
2
  <div class="container">
3
3
  <% if resource_masthead? %>
4
4
  <%= link_to(current_exhibit.title, spotlight.exhibit_path(current_exhibit), class: 'navbar-brand') %>
5
5
  <% end %>
6
6
 
7
- <ul class="nav navbar-nav">
8
- <li class="<%= "active" if current_page?([spotlight, current_exhibit]) %>"><%= link_to t(:'spotlight.curation.nav.home'), [spotlight, current_exhibit] %></li>
7
+ <ul class="navbar-nav <%= resource_masthead? ? 'justify-content-md-end' : 'mr-auto' %>">
8
+ <li class="nav-item <%= "active" if current_page?([spotlight, current_exhibit]) %>"><%= link_to t(:'spotlight.curation.nav.home'), [spotlight, current_exhibit], class: 'nav-link' %></li>
9
9
  <% current_exhibit.main_navigations.displayable.each do |navigation| %>
10
10
  <%= render partial: "shared/#{navigation.nav_type}_navbar", locals: { navigation: navigation } %>
11
11
  <% end %>
12
12
  </ul>
13
13
  <% if should_render_spotlight_search_bar? %>
14
- <div class="navbar-right navbar-nav nav">
15
- <%= render_search_bar %>
14
+ <div class="navbar-right navbar-nav">
15
+ <%= render_search_bar %>
16
16
  </div>
17
17
  <% end %>
18
18
  </div>
@@ -1,17 +1,12 @@
1
- <div id="header-navbar" class="navbar navbar-default navbar-static-top navbar-inverse" role="navigation">
2
- <div class="container">
3
- <div class="navbar-header">
4
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#user-util-collapse">
5
- <span class="sr-only"><%= t :toggle_nav %></span>
6
- <span class="icon-bar"></span>
7
- <span class="icon-bar"></span>
8
- <span class="icon-bar"></span>
1
+ <nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
2
+ <div class="<%= container_classes %>">
3
+ <%= link_to application_name, main_app.root_path, class: 'mb-0 navbar-brand navbar-logo' %>
4
+ <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="<%= t :toggle_nav %>">
5
+ <span class="navbar-toggler-icon"></span>
9
6
  </button>
10
- <%= link_to application_name, main_app.root_path, class: "navbar-brand" %>
11
- </div>
12
7
 
13
- <div class="collapse navbar-collapse" id="user-util-collapse">
14
- <%= render :partial=>'/user_util_links' %>
8
+ <div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
9
+ <%= render partial: 'shared/user_util_links' %>
15
10
  </div>
16
11
  </div>
17
- </div>
12
+ </nav>
@@ -13,7 +13,7 @@
13
13
  <%= render 'shared/exhibit_navbar' if current_exhibit && resource_masthead? %>
14
14
 
15
15
  <div class="container site-title-container">
16
- <div class="site-title h1">
16
+ <div class="site-title h2">
17
17
  <% if content_for? :masthead %>
18
18
  <%= content_for :masthead %>
19
19
  <% elsif current_exhibit %>
@@ -1,19 +1,19 @@
1
1
  <% if can?(:manage, Spotlight::Site.instance) || can?(:create, Spotlight::Exhibit) %>
2
2
  <h4 class="nav-heading"><%=t(:'.header') %></h4>
3
- <ul class="nav sidenav">
4
- <li><%= link_to t('.documentation'), 'https://github.com/projectblacklight/spotlight/wiki/Configuration-settings' %></li>
3
+ <ul class="nav sidenav flex-column">
4
+ <li class="nav-item"><%= link_to t('.documentation'), 'https://github.com/projectblacklight/spotlight/wiki/Configuration-settings', class: 'nav-link' %></li>
5
5
 
6
6
  <% if can? :manage, Spotlight::Site.instance %>
7
- <li><%= link_to t(:'spotlight.sites.edit.page_title'), spotlight.edit_site_path %></li>
7
+ <li class="nav-item"><%= link_to t(:'spotlight.sites.edit.page_title'), spotlight.edit_site_path, class: 'nav-link' %></li>
8
8
  <% end %>
9
9
 
10
10
  <% if can? :manange, Spotlight::Exhibit %>
11
- <li><%= link_to t(:'spotlight.sites.edit_exhibits.page_title'), spotlight.edit_site_exhibits_path %></li>
12
- <li><%= link_to t(:'spotlight.admin_users.index.page_title'), spotlight.admin_users_path %></li>
11
+ <li class="nav-item"><%= link_to t(:'spotlight.sites.edit_exhibits.page_title'), spotlight.edit_site_exhibits_path, class: 'nav-link' %></li>
12
+ <li class="nav-item"><%= link_to t(:'spotlight.admin_users.index.page_title'), spotlight.admin_users_path, class: 'nav-link' %></li>
13
13
  <% end %>
14
14
  </ul>
15
15
 
16
16
  <ul class="nav sidenav nav-pills nav-stacked">
17
- <li><%= link_to t(:'spotlight.sites.new.page_title'), spotlight.new_exhibit_path, class: 'btn btn-default btn-nav', role: 'button' if can? :create, Spotlight::Exhibit %></li>
17
+ <li class="nav-item"><%= link_to t(:'spotlight.sites.new.page_title'), spotlight.new_exhibit_path, class: 'btn btn-outline-secondary btn-nav', role: 'button' if can? :create, Spotlight::Exhibit %></li>
18
18
  </ul>
19
19
  <% end %>
@@ -0,0 +1,47 @@
1
+ <ul class="navbar-nav mr-auto">
2
+ <%= render_nav_actions do |config, action|%>
3
+ <li class="nav-item"><%= action %></li>
4
+ <% end %>
5
+ </ul>
6
+
7
+ <ul class="navbar-nav">
8
+ <%= render '/spotlight/shared/locale_picker' %>
9
+ <% if current_user %>
10
+ <li class="nav-item dropdown">
11
+ <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><%=current_user%> <b class="caret"></b></a>
12
+ <ul class="dropdown-menu">
13
+ <% if can? :manage, Spotlight::Site.instance %>
14
+ <li><%= link_to t(:'spotlight.header_links.edit_site'), spotlight.edit_site_path, class: 'dropdown-item' %></li>
15
+ <% end %>
16
+ <% if can? :create, Spotlight::Exhibit %>
17
+ <li>
18
+ <%= link_to t(:'spotlight.header_links.create_exhibit'), spotlight.new_exhibit_path, class: 'dropdown-item' %>
19
+ </li>
20
+ <li class="dropdown-divider"></li>
21
+ <% end %>
22
+ <% if current_exhibit && can?(:curate, current_exhibit) %>
23
+ <li>
24
+ <%= link_to t('spotlight.header_links.dashboard'), spotlight.exhibit_dashboard_path(current_exhibit), class: 'dropdown-item' %>
25
+ </li>
26
+ <li class="dropdown-divider"></li>
27
+ <% end %>
28
+
29
+ <li>
30
+ <%= link_to "Change Password", main_app.edit_user_registration_path, class: 'dropdown-item' %>
31
+ </li>
32
+ <li>
33
+ <%= link_to t('spotlight.header_links.logout'), main_app.destroy_user_session_path, class: 'dropdown-item' %>
34
+ </li>
35
+ </ul>
36
+ </li>
37
+ <% else %>
38
+ <li class="nav-item">
39
+ <%= link_to t('spotlight.header_links.login'), main_app.new_user_session_path, class: 'nav-link' %>
40
+ </li>
41
+ <% end %>
42
+ <% if current_exhibit and show_contact_form? %>
43
+ <li class="nav-item">
44
+ <%= link_to t('spotlight.header_links.contact'), spotlight.new_exhibit_contact_form_path(current_exhibit), data: {behavior: 'contact-link', target: 'report-problem-form' }, class: 'nav-link' %>
45
+ </li>
46
+ <% end %>
47
+ </ul>
@@ -1,12 +1,12 @@
1
1
  <li class="dd-item dd3-item" data-id="<%= f.object.id %>" itemscope itemtype="http://schema.org/Person">
2
2
  <div class="dd-handle dd3-handle"><%= t :drag %></div>
3
- <div class="dd3-content panel panel-default">
4
- <div class="panel-heading page">
3
+ <div class="dd3-content card">
4
+ <div class="card-header page">
5
5
  <%= f.check_box :show_in_sidebar, label: '' %>
6
6
  <%= f.hidden_field :id %>
7
7
  <%= f.hidden_field :weight, data: {property: "weight"} %>
8
8
  <div class="main">
9
- <div class="contact-links pull-right">
9
+ <div class="contact-links float-right">
10
10
  <%= exhibit_edit_link f.object, :class => 'btn btn-link' %> &middot;
11
11
  <%= exhibit_delete_link f.object, :class => 'btn btn-link' %>
12
12
  </div>
@@ -16,4 +16,3 @@
16
16
  </div>
17
17
 
18
18
  </li>
19
-
@@ -1,5 +1,5 @@
1
1
  <h4 class='contacts-header'><%= t :'.header' %></h4>
2
- <ol class="nav sidenav contacts">
2
+ <ol class="nav sidenav contacts flex-column">
3
3
  <% current_exhibit.contacts.published.each do |contact| %>
4
4
  <li itemscope itemtype="http://schema.org/Person">
5
5
  <%= render partial: "contact_properties", locals: {contact: contact} %>
@@ -1,15 +1,13 @@
1
1
  <% cache_unless current_user, [current_exhibit, @page] do %>
2
- <div id="sidebar" class="col-md-3" role="complementary">
3
2
  <h4 class="nav-heading"><%= current_exhibit.main_navigations.about.label_or_default %></h4>
4
- <ul class="nav sidenav">
3
+ <ul class="nav sidenav flex-column">
5
4
  <% current_exhibit.about_pages.for_locale.published.each do |page| %>
6
- <li class="<%= 'active' if current_page? [spotlight, current_exhibit, page] %>">
7
- <%= link_to page.title, [spotlight, current_exhibit, page] %>
5
+ <li class="nav-item <%= 'active' if current_page? [spotlight, current_exhibit, page] %>">
6
+ <%= link_to page.title, [spotlight, current_exhibit, page], class: 'nav-link' %>
8
7
  </li>
9
8
  <% end %>
10
9
  </ul>
11
10
  <%= cache current_exhibit do %>
12
11
  <%= render 'contacts' if current_exhibit.contacts.published.present? %>
13
12
  <% end %>
14
- </div>
15
13
  <% end %>
@@ -1,7 +1,8 @@
1
- <%= render 'spotlight/shared/exhibit_sidebar' %>
2
- <div id="content" class="col-md-9">
3
- <%= render 'order_pages' %>
4
- <% if can? :manage, Spotlight::Contact.new(exhibit: @exhibit) %>
1
+ <% content_for(:sidebar) do %>
2
+ <%= render 'spotlight/shared/exhibit_sidebar' %>
3
+ <% end %>
4
+
5
+ <%= render 'order_pages' %>
6
+ <% if can? :manage, Spotlight::Contact.new(exhibit: @exhibit) %>
5
7
  <%= render 'contacts_form' %>
6
- <% end %>
7
- </div>
8
+ <% end %>
@@ -1,94 +1,93 @@
1
- <div id="content" class="col-md-9 admin-users">
2
- <%= page_title(t('.section'), t('.page_title')) %>
3
- <%= bootstrap_form_for Spotlight::Engine.user_class.new, url: spotlight.admin_users_path do |f| %>
4
- <h3 class="instructions"><%= t :'.instructions' %></h3>
5
- <table class="table table-striped ">
6
- <thead>
1
+ <%= page_title(t('.section'), t('.page_title')) %>
2
+ <%= bootstrap_form_for Spotlight::Engine.user_class.new, html: { class: 'admin-users' }, url: spotlight.admin_users_path do |f| %>
3
+ <h3 class="instructions"><%= t :'.instructions' %></h3>
4
+ <table class="table table-striped">
5
+ <thead>
6
+ <tr>
7
+ <th><%= Spotlight::Engine.user_class.human_attribute_name(:email) %></th>
8
+ </tr>
9
+ </thead>
10
+ <tbody class="table">
11
+ <% @site.roles.map(&:user).each do |user| %>
7
12
  <tr>
8
- <th><%= Spotlight::Engine.user_class.human_attribute_name(:email) %></th>
9
- </tr>
10
- </thead>
11
- <tbody class="table">
12
- <% @site.roles.map(&:user).each do |user| %>
13
- <tr>
14
- <td class="<%= 'invite-pending' if user.invite_pending? %>">
15
- <%= user.email %>
16
- <span class='label label-warning pending-label'><%= t('.pending') %></span>
17
- </td>
18
- <td>
19
- <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-danger pull-right') unless user == current_user %>
20
- </td>
21
- </tr>
22
- <% end %>
23
- <tr data-edit-for='new'>
24
- <td>
25
- <%= f.email_field :email, hide_label: true %>
26
- <span data-user-role='admin'></span>
13
+ <td class="<%= 'invite-pending' if user.invite_pending? %>">
14
+ <%= user.email %>
15
+ <span class='badge badge-warning pending-label'><%= t('.pending') %></span>
27
16
  </td>
28
17
  <td>
29
- <div class="form-actions">
30
- <div class="primary-actions">
31
- <%= cancel_link f.object, '#', class: 'btn btn-link', data: { behavior: 'cancel-edit' } %>
32
- <%= f.submit t('.save'), class: 'btn btn-primary'%>
33
- </div>
34
- </div>
35
- </td>
36
- </tr>
37
- <tr data-edit-for='new'>
38
- <td colspan='2'>
18
+ <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-danger float-right') unless user == current_user %>
39
19
  </td>
40
20
  </tr>
41
- </tbody>
42
- </table>
21
+ <% end %>
22
+ <tr data-edit-for='new'>
23
+ <td>
24
+ <%= f.email_field :email, hide_label: true %>
25
+ <span data-user-role='admin'></span>
26
+ </td>
27
+ <td>
28
+ <div class="form-actions">
29
+ <div class="primary-actions">
30
+ <%= cancel_link f.object, '#', class: 'btn btn-link', data: { behavior: 'cancel-edit' } %>
31
+ <%= f.submit t('.save'), class: 'btn btn-primary'%>
32
+ </div>
33
+ </div>
34
+ </td>
35
+ </tr>
36
+ <tr data-edit-for='new'>
37
+ <td colspan='2'>
38
+ </td>
39
+ </tr>
40
+ </tbody>
41
+ </table>
43
42
 
44
- <div class="form-actions">
45
- <div class="primary-actions">
46
- <%= link_to(t('.create'), 'javascript:;', class: 'btn btn-default', data: { behavior: 'new-user' }) %>
47
- </div>
43
+ <div class="form-actions">
44
+ <div class="primary-actions">
45
+ <%= link_to(t('.create'), 'javascript:;', class: 'btn btn-secondary', data: { behavior: 'new-user' }) %>
48
46
  </div>
47
+ </div>
49
48
 
50
- <h3 class="instructions"><%= t :'.admins_curators' %></h3>
51
- <div id="admins_curators" class="well well-sm">
52
- <div class='btn-toolbar pull-right'>
53
- <button class="btn btn-xs btn-default copy-email-addresses" data-clipboard-target="#admins_curators">
49
+ <h3 class="instructions"><%= t :'.admins_curators' %></h3>
50
+ <div id="admins_curators" class="card card-body bg-light">
51
+ <div class='btn-toolbar float-right'>
52
+ <button class="btn btn-sm btn-secondary copy-email-addresses" data-clipboard-target="#admins_curators">
54
53
  <%= t('.copy') %>
55
- </button>
56
- </div>
57
- <%= Spotlight::Engine.user_class.with_roles.pluck(:email).sort.join(', ') %>
54
+ </button>
58
55
  </div>
56
+ <%= Spotlight::Engine.user_class.with_roles.pluck(:email).sort.join(', ') %>
57
+ </div>
59
58
 
60
- <h3 class="instructions"><%= t :'.all_users' %></h3>
61
- <table class="table table-striped ">
62
- <thead>
59
+ <h3 class="instructions"><%= t :'.all_users' %></h3>
60
+ <table class="table table-striped ">
61
+ <thead>
62
+ <tr>
63
+ <th><%= Spotlight::Engine.user_class.human_attribute_name(:email) %></th>
64
+ <th><%= Spotlight::Engine.user_class.human_attribute_name(:role) %></th>
65
+ </tr>
66
+ </thead>
67
+ <tbody class="table">
68
+ <% @users.each do |user| %>
63
69
  <tr>
64
- <th><%= Spotlight::Engine.user_class.human_attribute_name(:email) %></th>
65
- <th><%= Spotlight::Engine.user_class.human_attribute_name(:role) %></th>
70
+ <td class="<%= 'invite-pending' if user.invite_pending? %>">
71
+ <%= user.email %>
72
+ <span class='badge badge-warning pending-label'><%= t('.pending') %></span>
73
+ </td>
74
+ <td class="role">
75
+ <%= user.roles.map { |r| r.role.titleize }.uniq.join(", ") %>
76
+ </td>
77
+ <td class="text-right">
78
+ <% if user.superadmin? %>
79
+ <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-danger') unless user == current_user %>
80
+ <% else %>
81
+ <%= link_to(t('.update'), admin_user_path(user), method: :patch, class: 'btn btn-default') %>
82
+ <% end %>
83
+ </td>
66
84
  </tr>
67
- </thead>
68
- <tbody class="table">
69
- <% @users.each do |user| %>
70
- <tr>
71
- <td class="<%= 'invite-pending' if user.invite_pending? %>">
72
- <%= user.email %>
73
- <span class='label label-warning pending-label'><%= t('.pending') %></span>
74
- </td>
75
- <td class="role">
76
- <%= user.roles.map { |r| r.role.titleize }.uniq.join(", ") %>
77
- </td>
78
- <td>
79
- <% if user.superadmin? %>
80
- <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-danger pull-right') unless user == current_user %>
81
- <% else %>
82
- <%= link_to(t('.update'), admin_user_path(user), method: :patch, class: 'btn btn-default pull-right') %>
83
- <% end %>
84
- </td>
85
- </tr>
86
- <% end %>
87
- </tbody>
88
- </table>
89
- <% end %>
90
- </div>
85
+ <% end %>
86
+ </tbody>
87
+ </table>
88
+ <% end %>
91
89
 
92
- <aside class="col-md-3">
90
+ <% content_for(:sidebar_position) { 'order-last' } %>
91
+ <% content_for(:sidebar) do %>
93
92
  <%= render "shared/site_sidebar" %>
94
- </aside>
93
+ <% end %>