blacklight-spotlight 3.0.0.alpha.9 → 3.0.0.rc4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +3 -3
- data/app/assets/images/blacklight/arrow-alt-circle-left.svg +1 -0
- data/app/assets/images/blacklight/arrow-alt-circle-right.svg +1 -0
- data/app/assets/javascripts/spotlight/admin/{add_new_page_button.js → add_new_button.js} +7 -0
- data/app/assets/javascripts/spotlight/admin/block_mixins/autocompleteable.js +4 -4
- data/app/assets/javascripts/spotlight/admin/blocks/browse_block.js +55 -1
- data/app/assets/javascripts/spotlight/admin/blocks/browse_group_categories_block.js +88 -0
- data/app/assets/javascripts/spotlight/admin/blocks/pages_block.js +1 -1
- data/app/assets/javascripts/spotlight/admin/blocks/solr_documents_base_block.js +1 -1
- data/app/assets/javascripts/spotlight/admin/blocks/uploaded_items_block.js +7 -2
- data/app/assets/javascripts/spotlight/admin/crop.es6 +11 -0
- data/app/assets/javascripts/spotlight/admin/croppable.js +1 -1
- data/app/assets/javascripts/spotlight/admin/index.js +0 -2
- data/app/assets/javascripts/spotlight/admin/reindex_monitor.js +1 -0
- data/app/assets/javascripts/spotlight/admin/search_typeahead.js +2 -2
- data/app/assets/javascripts/spotlight/admin/sir-trevor/block_controls.js +21 -12
- data/app/assets/javascripts/spotlight/admin/sir-trevor/locales.js +11 -3
- data/app/assets/javascripts/spotlight/user/browse_group_categories.js +59 -0
- data/app/assets/javascripts/spotlight/user/index.js +1 -0
- data/app/assets/stylesheets/spotlight/_accessibility.scss +1 -1
- data/app/assets/stylesheets/spotlight/_breadcrumbs.scss +8 -0
- data/app/assets/stylesheets/spotlight/_browse.scss +16 -0
- data/app/assets/stylesheets/spotlight/_catalog.scss +6 -6
- data/app/assets/stylesheets/spotlight/_curation.scss +6 -0
- data/app/assets/stylesheets/spotlight/_featured_browse_categories_block.scss +214 -83
- data/app/assets/stylesheets/spotlight/_header.scss +1 -1
- data/app/assets/stylesheets/spotlight/_item_text_block.scss +6 -0
- data/app/assets/stylesheets/spotlight/_pages.scss +9 -4
- data/app/assets/stylesheets/spotlight/_report_a_problem.scss +5 -2
- data/app/assets/stylesheets/spotlight/_spotlight.scss +2 -0
- data/app/assets/stylesheets/spotlight/_translations.scss +7 -0
- data/app/assets/stylesheets/spotlight/browse_group_categories_block.scss +92 -0
- data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +1 -2
- data/app/controllers/concerns/spotlight/search_helper.rb +2 -8
- data/app/controllers/spotlight/appearances_controller.rb +0 -12
- data/app/controllers/spotlight/browse_controller.rb +7 -3
- data/app/controllers/spotlight/catalog_controller.rb +5 -2
- data/app/controllers/spotlight/concerns/application_controller.rb +13 -2
- data/app/controllers/spotlight/dashboards_controller.rb +1 -1
- data/app/controllers/spotlight/exhibits_controller.rb +2 -3
- data/app/controllers/spotlight/featured_images_controller.rb +1 -1
- data/app/controllers/spotlight/groups_controller.rb +80 -0
- data/app/controllers/spotlight/pages_controller.rb +6 -9
- data/app/controllers/spotlight/resources/csv_upload_controller.rb +1 -1
- data/app/controllers/spotlight/searches_controller.rb +7 -19
- data/app/controllers/spotlight/translations_controller.rb +46 -0
- data/app/helpers/spotlight/application_helper.rb +20 -1
- data/app/helpers/spotlight/crop_helper.rb +4 -1
- data/app/helpers/spotlight/crud_link_helpers.rb +1 -1
- data/app/helpers/spotlight/main_app_helpers.rb +1 -1
- data/app/helpers/spotlight/pages_helper.rb +1 -1
- data/app/jobs/concerns/spotlight/job_tracking.rb +47 -0
- data/app/jobs/concerns/spotlight/limit_concurrency.rb +33 -0
- data/app/jobs/spotlight/add_uploads_from_csv.rb +34 -6
- data/app/jobs/spotlight/application_job.rb +8 -0
- data/app/jobs/spotlight/cleanup_job_trackers_job.rb +13 -0
- data/app/jobs/spotlight/default_thumbnail_job.rb +1 -3
- data/app/jobs/spotlight/reindex_exhibit_job.rb +36 -0
- data/app/jobs/spotlight/reindex_job.rb +49 -41
- data/app/jobs/spotlight/rename_sidecar_field_job.rb +2 -2
- data/app/jobs/spotlight/update_job_trackers_job.rb +20 -0
- data/app/mailers/spotlight/indexing_complete_mailer.rb +3 -2
- data/app/models/concerns/spotlight/exhibit_defaults.rb +1 -1
- data/app/models/concerns/spotlight/translatables.rb +17 -1
- data/app/models/concerns/spotlight/user.rb +2 -1
- data/app/models/sir_trevor_rails/blocks/browse_group_categories_block.rb +25 -0
- data/app/models/spotlight/ability.rb +2 -0
- data/app/models/spotlight/about_page.rb +3 -1
- data/app/models/spotlight/blacklight_configuration.rb +2 -1
- data/app/models/spotlight/contact.rb +1 -1
- data/app/models/spotlight/custom_field.rb +3 -3
- data/app/models/spotlight/event.rb +13 -0
- data/app/models/spotlight/exhibit.rb +18 -14
- data/app/models/spotlight/feature_page.rb +3 -1
- data/app/models/spotlight/featured_image.rb +29 -12
- data/app/models/spotlight/group.rb +22 -0
- data/app/models/spotlight/group_member.rb +11 -0
- data/app/models/spotlight/home_page.rb +3 -1
- data/app/models/spotlight/job_tracker.rb +105 -0
- data/app/models/spotlight/main_navigation.rb +2 -2
- data/app/models/spotlight/masthead.rb +1 -1
- data/app/models/spotlight/page.rb +5 -1
- data/app/models/spotlight/page_configurations.rb +6 -0
- data/app/models/spotlight/page_content.rb +2 -0
- data/app/models/spotlight/reindex_progress.rb +44 -27
- data/app/models/spotlight/resource.rb +24 -58
- data/app/models/spotlight/resources/csv_upload.rb +2 -1
- data/app/models/spotlight/resources/iiif_harvester.rb +10 -1
- data/app/models/spotlight/resources/iiif_manifest.rb +11 -7
- data/app/models/spotlight/resources/iiif_service.rb +1 -1
- data/app/models/spotlight/resources/json_upload.rb +12 -0
- data/app/models/spotlight/resources/upload.rb +25 -2
- data/app/models/spotlight/search.rb +10 -1
- data/app/models/spotlight/solr_document_sidecar.rb +9 -6
- data/app/models/spotlight/temporary_image.rb +8 -0
- data/app/services/spotlight/etl.rb +7 -0
- data/app/services/spotlight/etl/context.rb +52 -0
- data/app/services/spotlight/etl/executor.rb +194 -0
- data/app/services/spotlight/etl/loaders.rb +12 -0
- data/app/services/spotlight/etl/pipeline.rb +81 -0
- data/app/services/spotlight/etl/solr_loader.rb +96 -0
- data/app/services/spotlight/etl/sources.rb +25 -0
- data/app/services/spotlight/etl/step.rb +82 -0
- data/app/services/spotlight/etl/transforms.rb +64 -0
- data/app/services/spotlight/exhibit_import_export_service.rb +482 -0
- data/app/services/spotlight/validity_checker.rb +5 -5
- data/app/values/custom_field_name.rb +1 -0
- data/app/views/catalog/_save_search.html.erb +1 -1
- data/app/views/spotlight/about_pages/_empty.html.erb +5 -5
- data/app/views/spotlight/browse/_search.html.erb +5 -3
- data/app/views/spotlight/browse/_search_title.html.erb +2 -1
- data/app/views/spotlight/browse/index.html.erb +13 -0
- data/app/views/spotlight/catalog/_document.html.erb +2 -4
- data/app/views/spotlight/catalog/index.iiif_json.jbuilder +22 -0
- data/app/views/spotlight/contacts/_form.html.erb +1 -1
- data/app/views/spotlight/dashboards/_reindexing_activity.html.erb +6 -6
- data/app/views/spotlight/feature_pages/_empty.html.erb +5 -5
- data/app/views/spotlight/featured_images/_form.html.erb +1 -1
- data/app/views/spotlight/featured_images/_upload_form.html.erb +1 -1
- data/app/views/spotlight/home_pages/_empty.html.erb +3 -3
- data/app/views/spotlight/indexing_complete_mailer/documents_indexed.html.erb +9 -0
- data/app/views/spotlight/pages/_form.html.erb +2 -2
- data/app/views/spotlight/searches/_form.html.erb +13 -0
- data/app/views/spotlight/searches/_group.html.erb +27 -0
- data/app/views/spotlight/searches/_search.html.erb +1 -0
- data/app/views/spotlight/searches/index.html.erb +58 -17
- data/app/views/spotlight/shared/_honeypot_field.html.erb +4 -0
- data/app/views/spotlight/shared/_locale_picker.html.erb +1 -1
- data/app/views/spotlight/shared/_report_a_problem.html.erb +7 -10
- data/app/views/spotlight/sir_trevor/blocks/_browse_block.html.erb +1 -0
- data/app/views/spotlight/sir_trevor/blocks/_browse_group_categories_block.html.erb +45 -0
- data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb +7 -1
- data/app/views/spotlight/translations/_browse_categories.html.erb +29 -3
- data/app/views/spotlight/translations/_general.html.erb +7 -7
- data/app/views/spotlight/translations/_groups.html.erb +34 -0
- data/app/views/spotlight/translations/_import.html.erb +24 -0
- data/app/views/spotlight/translations/_metadata.html.erb +1 -1
- data/app/views/spotlight/translations/_page.html.erb +5 -5
- data/app/views/spotlight/translations/_pages.html.erb +4 -4
- data/app/views/spotlight/translations/_pages_table.html.erb +5 -5
- data/app/views/spotlight/translations/_search_fields.html.erb +3 -3
- data/app/views/spotlight/translations/edit.html.erb +14 -6
- data/app/views/spotlight/translations/show.yaml.yamlbuilder +81 -0
- data/config/i18n-tasks.yml +7 -0
- data/config/locales/spotlight.ar.yml +57 -24
- data/config/locales/spotlight.en.yml +184 -128
- data/config/routes.rb +16 -1
- data/db/migrate/20200403161512_add_subtitle_to_searches.rb +7 -0
- data/db/migrate/20210113092223_create_spotlight_groups.rb +23 -0
- data/db/migrate/20210122082032_create_job_trackers.rb +22 -0
- data/db/migrate/20210126123041_create_events.rb +15 -0
- data/lib/generators/spotlight/install_generator.rb +23 -2
- data/lib/generators/spotlight/scaffold_resource_generator.rb +5 -13
- data/lib/generators/spotlight/templates/config/initializers/sir_trevor_rails.rb +10 -0
- data/lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb +3 -1
- data/lib/spotlight/engine.rb +35 -4
- data/lib/spotlight/upload_field_config.rb +1 -0
- data/lib/spotlight/version.rb +1 -1
- data/spec/controllers/spotlight/about_pages_controller_spec.rb +3 -3
- data/spec/controllers/spotlight/browse_controller_spec.rb +24 -1
- data/spec/controllers/spotlight/catalog_controller_spec.rb +4 -2
- data/spec/controllers/spotlight/contacts_controller_spec.rb +2 -2
- data/spec/controllers/spotlight/feature_pages_controller_spec.rb +11 -0
- data/spec/controllers/spotlight/groups_controller_spec.rb +103 -0
- data/spec/controllers/spotlight/home_pages_controller_spec.rb +2 -2
- data/spec/controllers/spotlight/resources/csv_upload_controller_spec.rb +4 -4
- data/spec/controllers/spotlight/searches_controller_spec.rb +10 -3
- data/spec/controllers/spotlight/translations_controller_spec.rb +53 -2
- data/spec/controllers/spotlight/view_configurations_controller_spec.rb +1 -1
- data/spec/examples.txt +1448 -125
- data/spec/factories/featured_images.rb +4 -0
- data/spec/factories/group.rb +17 -0
- data/spec/factories/job_trackers.rb +9 -0
- data/spec/factories/searches.rb +11 -1
- data/spec/features/add_contacts_spec.rb +1 -1
- data/spec/features/add_items_spec.rb +9 -4
- data/spec/features/browse_category_admin_spec.rb +39 -7
- data/spec/features/browse_category_navigation_spec.rb +44 -0
- data/spec/features/browse_category_spec.rb +2 -2
- data/spec/features/catalog_spec.rb +2 -2
- data/spec/features/create_exhibit_spec.rb +5 -4
- data/spec/features/dashboard_spec.rb +7 -7
- data/spec/features/edit_search_fields_spec.rb +2 -2
- data/spec/features/exhibits/administration_spec.rb +3 -3
- data/spec/features/exhibits/edit_metadata_fields_spec.rb +1 -1
- data/spec/features/exhibits/language_create_edit_spec.rb +3 -3
- data/spec/features/exhibits/translation_editing_spec.rb +57 -8
- data/spec/features/home_page_spec.rb +13 -4
- data/spec/features/item_admin_spec.rb +4 -4
- data/spec/features/javascript/about_page_admin_spec.rb +1 -1
- data/spec/features/javascript/block_controls_spec.rb +3 -1
- data/spec/features/javascript/blocks/browse_group_categories_block_spec.rb +64 -0
- data/spec/features/javascript/blocks/uploaded_items_block_spec.rb +4 -1
- data/spec/features/javascript/browse_group_admin_spec.rb +45 -0
- data/spec/features/javascript/edit_in_place_spec.rb +3 -3
- data/spec/features/javascript/feature_page_admin_spec.rb +1 -1
- data/spec/features/javascript/reindex_monitor_spec.rb +1 -1
- data/spec/features/javascript/search_config_admin_spec.rb +1 -1
- data/spec/features/report_a_problem_spec.rb +6 -5
- data/spec/features/site_users_management_spec.rb +4 -4
- data/spec/helpers/spotlight/crud_link_helpers_spec.rb +3 -3
- data/spec/helpers/spotlight/pages_helper_spec.rb +10 -2
- data/spec/i18n_spec.rb +0 -2
- data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb +13 -1
- data/spec/jobs/spotlight/reindex_exhibit_job_spec.rb +43 -0
- data/spec/jobs/spotlight/reindex_job_spec.rb +30 -59
- data/spec/mailers/spotlight/indexing_complete_mailer_spec.rb +11 -1
- data/spec/models/sir_trevor_rails/blocks/browse_group_categories_block_spec.rb +41 -0
- data/spec/models/solr_document_spec.rb +2 -3
- data/spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb +1 -0
- data/spec/models/spotlight/exhibit_spec.rb +21 -59
- data/spec/models/spotlight/featured_image_spec.rb +27 -0
- data/spec/models/spotlight/group_spec.rb +19 -0
- data/spec/models/spotlight/main_navigation_spec.rb +1 -1
- data/spec/models/spotlight/page_spec.rb +6 -1
- data/spec/models/spotlight/reindex_progress_spec.rb +89 -87
- data/spec/models/spotlight/resource_spec.rb +69 -90
- data/spec/models/spotlight/resources/iiif_harvester_spec.rb +9 -10
- data/spec/models/spotlight/resources/upload_spec.rb +43 -79
- data/spec/models/spotlight/role_spec.rb +3 -3
- data/spec/models/spotlight/search_spec.rb +30 -3
- data/spec/models/spotlight/solr_document_sidecar_spec.rb +1 -0
- data/spec/services/spotlight/etl/context_spec.rb +66 -0
- data/spec/services/spotlight/etl/executor_spec.rb +149 -0
- data/spec/services/spotlight/etl/pipeline_spec.rb +22 -0
- data/spec/services/spotlight/etl/solr_loader_spec.rb +76 -0
- data/spec/services/spotlight/etl/step_spec.rb +70 -0
- data/spec/{serializers/spotlight/exhibit_export_serializer_spec.rb → services/spotlight/exhibit_import_export_service_spec.rb} +168 -23
- data/spec/services/spotlight/iiif_resource_resolver_spec.rb +1 -1
- data/spec/spec_helper.rb +3 -6
- data/spec/support/features/test_features_helpers.rb +15 -0
- data/spec/test_app_templates/Gemfile.extra +1 -3
- data/spec/test_app_templates/catalog_controller.rb +6 -3
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +1 -1
- data/spec/views/shared/_exhibit_navbar.html.erb_spec.rb +1 -1
- data/spec/views/spotlight/browse/index.html.erb_spec.rb +2 -0
- data/spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb +1 -1
- data/spec/views/spotlight/dashboards/_reindexing_activity.html.erb_spec.rb +28 -25
- data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +3 -3
- data/spec/views/spotlight/pages/show.html.erb_spec.rb +1 -0
- data/spec/views/spotlight/search_configurations/_facets.html.erb_spec.rb +1 -1
- data/spec/views/spotlight/search_configurations/_sort.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/translations/_import.html.erb_spec.rb +24 -0
- data/vendor/assets/javascripts/leaflet-iiif.js +46 -21
- data/vendor/assets/javascripts/tiny-slider.js +3218 -0
- data/vendor/assets/stylesheets/tiny-slider.css +1 -0
- metadata +444 -289
- data/app/models/concerns/spotlight/resources/open_graph.rb +0 -36
- data/app/models/spotlight/reindexing_log_entry.rb +0 -42
- data/app/serializers/spotlight/exhibit_export_serializer.rb +0 -205
- data/app/serializers/spotlight/featured_image_representer.rb +0 -29
- data/app/serializers/spotlight/main_navigation_representer.rb +0 -13
- data/app/serializers/spotlight/page_representer.rb +0 -33
- data/app/services/spotlight/resources/iiif_builder.rb +0 -19
- data/app/services/spotlight/solr_document_builder.rb +0 -76
- data/app/services/spotlight/upload_solr_document_builder.rb +0 -57
- data/spec/factories/reindexing_log_entries.rb +0 -54
- data/spec/models/spotlight/reindexing_log_entry_spec.rb +0 -129
- data/spec/models/spotlight/resources/open_graph_spec.rb +0 -65
- data/spec/services/spotlight/solr_document_builder_spec.rb +0 -66
- data/vendor/assets/javascripts/handlebars-v1.3.0.js +0 -2746
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 55231336b3b4a0eae1abdd68bbeb8ede968d5ffbe4359f29f83a3a27124a4b05
|
4
|
+
data.tar.gz: b2f2bfc6230b5081493484393a26670961486217b64b7a96b9659979eab64381
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c3d2a9d1203e0950c79844e4fad0b2083e3cc8d1b63a357ce47a2760ac48b13ec9c2f4e2f0890add8a533d71f61bf7a96a684b74710c564b3e17d919635b592a
|
7
|
+
data.tar.gz: 842054ed3d1c5d46c5c6f9bb3180efdf83feee8f1bf44ae607865d6bea2f9d4589e1b19990cbb53a65ba4249fd5794dca213830be71b055a28b69e188b29dde7
|
data/README.md
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
spotlight
|
2
2
|
=========
|
3
3
|
|
4
|
-
|
4
|
+
![CI](https://github.com/projectblacklight/spotlight/workflows/CI/badge.svg) | [![Gem Version](https://badge.fury.io/rb/blacklight-spotlight.png)](http://badge.fury.io/rb/blacklight-spotlight) | [Release Notes](https://github.com/projectblacklight/spotlight/releases) | [Design Documents](https://github.com/projectblacklight/spotlight/releases/tag/v0.0.0)
|
5
5
|
|
6
6
|
Spotlight is open source software that enables librarians, curators, and other content experts to easily build feature-rich websites that showcase collections and objects from a digital repository, uploaded items, or a combination of the two. Spotlight is a plug-in for [Blacklight](https://github.com/projectblacklight/blacklight), an open source, Ruby on Rails Engine that provides a basic discovery interface for searching an Apache Solr index.
|
7
7
|
|
@@ -9,7 +9,7 @@ Read more about what Spotlight is, our motivations for creating it, and how to i
|
|
9
9
|
|
10
10
|
## Requirements
|
11
11
|
|
12
|
-
1. Ruby (2.
|
12
|
+
1. Ruby (2.5.0 or greater)
|
13
13
|
2. Rails (5.1 or greater)
|
14
14
|
3. Java (7 or greater) *for Solr*
|
15
15
|
4. ImageMagick (http://www.imagemagick.org/script/index.php) due to [carrierwave](https://github.com/carrierwaveuploader/carrierwave#adding-versions)
|
@@ -93,7 +93,7 @@ Spotlight ships with [`i18n-tasks`](https://github.com/glebm/i18n-tasks) to help
|
|
93
93
|
$ bundle exec i18n-tasks health
|
94
94
|
```
|
95
95
|
|
96
|
-
See [developer-facing instructions for enabling translation](https://github.com/projectblacklight/spotlight/wiki/Translations) on the wiki.
|
96
|
+
See [developer-facing instructions for enabling translation](https://github.com/projectblacklight/spotlight/wiki/Translations) on the wiki.
|
97
97
|
|
98
98
|
## Community
|
99
99
|
|
@@ -0,0 +1 @@
|
|
1
|
+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M256 504C119 504 8 393 8 256S119 8 256 8s248 111 248 248-111 248-248 248zm116-292H256v-70.9c0-10.7-13-16.1-20.5-8.5L121.2 247.5c-4.7 4.7-4.7 12.2 0 16.9l114.3 114.9c7.6 7.6 20.5 2.2 20.5-8.5V300h116c6.6 0 12-5.4 12-12v-64c0-6.6-5.4-12-12-12z"/></svg>
|
@@ -0,0 +1 @@
|
|
1
|
+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M256 8c137 0 248 111 248 248S393 504 256 504 8 393 8 256 119 8 256 8zM140 300h116v70.9c0 10.7 13 16.1 20.5 8.5l114.3-114.9c4.7-4.7 4.7-12.2 0-16.9l-114.3-115c-7.6-7.6-20.5-2.2-20.5 8.5V212H140c-6.6 0-12 5.4-12 12v64c0 6.6 5.4 12 12 12z"/></svg>
|
@@ -13,6 +13,7 @@
|
|
13
13
|
var cancel = $("input[data-behavior='cancel']", target);
|
14
14
|
var input = $("input[type='text']", target);
|
15
15
|
var original_width = button.outerWidth();
|
16
|
+
var expanded = false;
|
16
17
|
|
17
18
|
// Animate button open when the mouse enters or
|
18
19
|
// the button is given focus (i.e. clicked/tabbed)
|
@@ -43,7 +44,13 @@
|
|
43
44
|
}
|
44
45
|
});
|
45
46
|
function expandButton(){
|
47
|
+
// If this has not yet been expanded, recalculate original_width to
|
48
|
+
// handle things that may have been originally hidden.
|
49
|
+
if (!expanded) {
|
50
|
+
original_width = button.outerWidth();
|
51
|
+
}
|
46
52
|
if(button.outerWidth() <= (original_width + 5)) {
|
53
|
+
expanded = true;
|
47
54
|
button.animate(
|
48
55
|
{width: settings.animate_width + 'px'}, settings.speed, function(){
|
49
56
|
target.show(0, function(){
|
@@ -18,6 +18,10 @@
|
|
18
18
|
this.transform_autocomplete_results = _.identity;
|
19
19
|
}
|
20
20
|
|
21
|
+
if (_.isUndefined(this['autocomplete_control'])) {
|
22
|
+
this.autocomplete_control = function() { return '<input type="text" class="st-input-string form-control item-input-field" data-twitter-typeahead="true" placeholder="<%= i18n.t("blocks:autocompleteable:placeholder")%>"/>' };
|
23
|
+
}
|
24
|
+
|
21
25
|
if (_.isUndefined(this['bloodhoundOptions'])) {
|
22
26
|
this.bloodhoundOptions = function() {
|
23
27
|
return {
|
@@ -30,10 +34,6 @@
|
|
30
34
|
}
|
31
35
|
},
|
32
36
|
|
33
|
-
autocomplete_control: function() {
|
34
|
-
return '<input type="text" class="st-input-string form-control item-input-field" data-twitter-typeahead="true" placeholder="<%= i18n.t("blocks:autocompleteable:placeholder")%>"/>';
|
35
|
-
},
|
36
|
-
|
37
37
|
addAutocompletetoSirTrevorForm: function() {
|
38
38
|
$('[data-twitter-typeahead]', this.inner).spotlightSearchTypeAhead({bloodhound: this.bloodhound(), template: this.autocomplete_template()}).on('typeahead:selected typeahead:autocompleted', this.autocompletedHandler()).on( 'focus', function() {
|
39
39
|
if($(this).val() === '') {
|
@@ -10,7 +10,7 @@ SirTrevor.Blocks.Browse = (function(){
|
|
10
10
|
autocomplete_url: function() {
|
11
11
|
return $(this.inner).closest('form[data-autocomplete-exhibit-searches-path]').data('autocomplete-exhibit-searches-path').replace("%25QUERY", "%QUERY");
|
12
12
|
},
|
13
|
-
autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{
|
13
|
+
autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{full_title}}</span><br/><small> {{description}}</small></div>' },
|
14
14
|
|
15
15
|
bloodhoundOptions: function() {
|
16
16
|
return {
|
@@ -21,6 +21,60 @@ SirTrevor.Blocks.Browse = (function(){
|
|
21
21
|
};
|
22
22
|
},
|
23
23
|
|
24
|
+
_itemPanel: function(data) {
|
25
|
+
var index = "item_" + this.globalIndex++;
|
26
|
+
var checked;
|
27
|
+
if (data.display == "true") {
|
28
|
+
checked = "checked='checked'"
|
29
|
+
} else {
|
30
|
+
checked = "";
|
31
|
+
}
|
32
|
+
var resource_id = data.slug || data.id;
|
33
|
+
var markup = [
|
34
|
+
'<li class="field form-inline dd-item dd3-item" data-resource-id="' + resource_id + '" data-id="' + index + '" id="' + this.formId("item_" + data.id) + '">',
|
35
|
+
'<input type="hidden" name="item[' + index + '][id]" value="' + resource_id + '" />',
|
36
|
+
'<input type="hidden" name="item[' + index + '][full_title]" value="' + (data.full_title || data.title) + '" />',
|
37
|
+
'<input data-property="weight" type="hidden" name="item[' + index + '][weight]" value="' + data.weight + '" />',
|
38
|
+
'<div class="card d-flex dd3-content">',
|
39
|
+
'<div class="dd-handle dd3-handle"><%= i18n.t("blocks:resources:panel:drag") %></div>',
|
40
|
+
'<div class="card-header item-grid">',
|
41
|
+
'<div class="d-flex">',
|
42
|
+
'<div class="checkbox">',
|
43
|
+
'<input name="item[' + index + '][display]" type="hidden" value="false" />',
|
44
|
+
'<input name="item[' + index + '][display]" id="'+ this.formId(this.display_checkbox + '_' + data.id) + '" type="checkbox" ' + checked + ' class="item-grid-checkbox" value="true" />',
|
45
|
+
'<label class="sr-only" for="'+ this.formId(this.display_checkbox + '_' + data.id) +'"><%= i18n.t("blocks:resources:panel:display") %></label>',
|
46
|
+
'</div>',
|
47
|
+
'<div class="pic">',
|
48
|
+
'<img class="img-thumbnail" src="' + (data.thumbnail_image_url || ((data.iiif_tilesource || "").replace("/info.json", "/full/!100,100/0/default.jpg"))) + '" />',
|
49
|
+
'</div>',
|
50
|
+
'<div class="main">',
|
51
|
+
'<div class="title card-title">' + (data.full_title || data.title) + '</div>',
|
52
|
+
'<div>' + (data.slug || data.id) + '</div>',
|
53
|
+
'</div>',
|
54
|
+
'<div class="remove float-right">',
|
55
|
+
'<a data-item-grid-panel-remove="true" href="#"><%= i18n.t("blocks:resources:panel:remove") %></a>',
|
56
|
+
'</div>',
|
57
|
+
'</div>',
|
58
|
+
'</div>',
|
59
|
+
'</div>',
|
60
|
+
'</li>'
|
61
|
+
].join("\n");
|
62
|
+
|
63
|
+
var panel = $(_.template(markup)(this));
|
64
|
+
var context = this;
|
65
|
+
|
66
|
+
$('.remove a', panel).on('click', function(e) {
|
67
|
+
e.preventDefault();
|
68
|
+
$(this).closest('.field').remove();
|
69
|
+
context.afterPanelDelete();
|
70
|
+
|
71
|
+
});
|
72
|
+
|
73
|
+
this.afterPanelRender(data, panel);
|
74
|
+
|
75
|
+
return panel;
|
76
|
+
},
|
77
|
+
|
24
78
|
item_options: function() { return [
|
25
79
|
'<label>',
|
26
80
|
'<input type="hidden" name="display-item-counts" value="false" />',
|
@@ -0,0 +1,88 @@
|
|
1
|
+
/*
|
2
|
+
Sir Trevor BrowseGroupCategories
|
3
|
+
*/
|
4
|
+
|
5
|
+
SirTrevor.Blocks.BrowseGroupCategories = (function(){
|
6
|
+
|
7
|
+
return Spotlight.Block.Resources.extend({
|
8
|
+
type: "browse_group_categories",
|
9
|
+
icon_name: "browse",
|
10
|
+
bloodhoundOptions: function() {
|
11
|
+
var that = this;
|
12
|
+
return {
|
13
|
+
prefetch: {
|
14
|
+
url: this.autocomplete_url(),
|
15
|
+
ttl: 0,
|
16
|
+
filter: function(response) {
|
17
|
+
// Let the dom know that the response has been returned
|
18
|
+
$(that.inner).attr('data-browse-groups-fetched', true);
|
19
|
+
return response;
|
20
|
+
}
|
21
|
+
}
|
22
|
+
};
|
23
|
+
},
|
24
|
+
|
25
|
+
autocomplete_control: function() {
|
26
|
+
return '<input type="text" class="st-input-string form-control item-input-field" data-twitter-typeahead="true" placeholder="<%= i18n.t("blocks:browse_group_categories:autocomplete")%>"/>';
|
27
|
+
},
|
28
|
+
autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}"><span class="autocomplete-title">{{title}}</span><br/></div>' },
|
29
|
+
autocomplete_url: function() { return $(this.inner).closest('form[data-autocomplete-exhibit-browse-groups-path]').data('autocomplete-exhibit-browse-groups-path').replace("%25QUERY", "%QUERY"); },
|
30
|
+
_itemPanel: function(data) {
|
31
|
+
var index = "item_" + this.globalIndex++;
|
32
|
+
var checked;
|
33
|
+
if (data.display == "true") {
|
34
|
+
checked = "checked='checked'"
|
35
|
+
} else {
|
36
|
+
checked = "";
|
37
|
+
}
|
38
|
+
var resource_id = data.slug || data.id;
|
39
|
+
var markup = [
|
40
|
+
'<li class="field form-inline dd-item dd3-item" data-resource-id="' + resource_id + '" data-id="' + index + '" id="' + this.formId("item_" + data.id) + '">',
|
41
|
+
'<input type="hidden" name="item[' + index + '][id]" value="' + resource_id + '" />',
|
42
|
+
'<input type="hidden" name="item[' + index + '][title]" value="' + data.title + '" />',
|
43
|
+
'<input data-property="weight" type="hidden" name="item[' + index + '][weight]" value="' + data.weight + '" />',
|
44
|
+
'<div class="card d-flex dd3-content">',
|
45
|
+
'<div class="dd-handle dd3-handle"><%= i18n.t("blocks:resources:panel:drag") %></div>',
|
46
|
+
'<div class="d-flex card-header item-grid justify-content-between">',
|
47
|
+
'<div class="d-flex flex-grow-1">',
|
48
|
+
'<div class="checkbox">',
|
49
|
+
'<input name="item[' + index + '][display]" type="hidden" value="false" />',
|
50
|
+
'<input name="item[' + index + '][display]" id="'+ this.formId(this.display_checkbox + '_' + data.id) + '" type="checkbox" ' + checked + ' class="item-grid-checkbox" value="true" />',
|
51
|
+
'<label class="sr-only" for="'+ this.formId(this.display_checkbox + '_' + data.id) +'"><%= i18n.t("blocks:resources:panel:display") %></label>',
|
52
|
+
'</div>',
|
53
|
+
'<div class="main">',
|
54
|
+
'<div class="title card-title">' + data.title + '</div>',
|
55
|
+
'</div>',
|
56
|
+
'</div>',
|
57
|
+
'<div class="d-flex">',
|
58
|
+
'<a data-item-grid-panel-remove="true" href="#"><%= i18n.t("blocks:resources:panel:remove") %></a>',
|
59
|
+
'</div>',
|
60
|
+
'</div>',
|
61
|
+
'</div>',
|
62
|
+
'</li>'
|
63
|
+
].join("\n");
|
64
|
+
|
65
|
+
var panel = $(_.template(markup)(this));
|
66
|
+
var context = this;
|
67
|
+
|
68
|
+
$('a[data-item-grid-panel-remove]', panel).on('click', function(e) {
|
69
|
+
e.preventDefault();
|
70
|
+
$(this).closest('.field').remove();
|
71
|
+
context.afterPanelDelete();
|
72
|
+
|
73
|
+
});
|
74
|
+
|
75
|
+
this.afterPanelRender(data, panel);
|
76
|
+
|
77
|
+
return panel;
|
78
|
+
},
|
79
|
+
|
80
|
+
item_options: function() { return [
|
81
|
+
'<label>',
|
82
|
+
'<input type="hidden" name="display-item-counts" value="false" />',
|
83
|
+
'<input type="checkbox" name="display-item-counts" value="true" checked />',
|
84
|
+
'<%= i18n.t("blocks:browse_group_categories:item_counts") %>',
|
85
|
+
'</label>'
|
86
|
+
].join("\n") },
|
87
|
+
});
|
88
|
+
})();
|
@@ -8,7 +8,7 @@ SirTrevor.Blocks.FeaturedPages = (function(){
|
|
8
8
|
icon_name: "pages",
|
9
9
|
|
10
10
|
autocomplete_url: function() { return $(this.inner).closest('form[data-autocomplete-exhibit-pages-path]').data('autocomplete-exhibit-pages-path').replace("%25QUERY", "%QUERY"); },
|
11
|
-
autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{
|
11
|
+
autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small> {{description}}</small></div>' },
|
12
12
|
bloodhoundOptions: function() {
|
13
13
|
return {
|
14
14
|
prefetch: {
|
@@ -85,7 +85,7 @@ SirTrevor.Blocks.SolrDocumentsBase = (function(){
|
|
85
85
|
|
86
86
|
$.ajax(manifestUrl).done(
|
87
87
|
function(manifest) {
|
88
|
-
var Iiif =
|
88
|
+
var Iiif = spotlightAdminIiif;
|
89
89
|
var iiifManifest = new Iiif(manifestUrl, manifest);
|
90
90
|
|
91
91
|
var thumbs = iiifManifest.imagesArray();
|
@@ -85,9 +85,13 @@ SirTrevor.Blocks.UploadedItems = (function(){
|
|
85
85
|
'</div>',
|
86
86
|
'<div class="main form-horizontal">',
|
87
87
|
'<div class="title card-title">' + dataTitle + '</div>',
|
88
|
-
'<div class="field">',
|
88
|
+
'<div class="field row mr-3">',
|
89
89
|
'<label for="' + this.formId('caption_' + dataId) + '" class="col-form-label col-md-3"><%= i18n.t("blocks:uploaded_items:caption") %></label>',
|
90
|
-
'<input type="text" class="form-control" id="' + this.formId('caption_' + dataId) + '" name="item[' + index + '][caption]" data-field="caption"/>',
|
90
|
+
'<input type="text" class="form-control col" id="' + this.formId('caption_' + dataId) + '" name="item[' + index + '][caption]" data-field="caption"/>',
|
91
|
+
'</div>',
|
92
|
+
'<div class="field row mr-3">',
|
93
|
+
'<label for="' + this.formId('link_' + dataId) + '" class="col-form-label col-md-3"><%= i18n.t("blocks:uploaded_items:link") %></label>',
|
94
|
+
'<input type="text" class="form-control col" id="' + this.formId('link_' + dataId) + '" name="item[' + index + '][link]" data-field="link"/>',
|
91
95
|
'</div>',
|
92
96
|
'</div>',
|
93
97
|
'<div class="remove float-right">',
|
@@ -99,6 +103,7 @@ SirTrevor.Blocks.UploadedItems = (function(){
|
|
99
103
|
|
100
104
|
var panel = $(_.template(markup)(this));
|
101
105
|
panel.find('[data-field="caption"]').val(data.caption);
|
106
|
+
panel.find('[data-field="link"]').val(data.link);
|
102
107
|
var context = this;
|
103
108
|
|
104
109
|
$('.remove a', panel).on('click', function(e) {
|
@@ -40,6 +40,12 @@ export default class Crop {
|
|
40
40
|
this.renderCropperMap();
|
41
41
|
|
42
42
|
if (this.imageLayer) {
|
43
|
+
// Force a broken layer's container to be an element before removing.
|
44
|
+
// Code in leaflet-iiif land calls delete on the image layer's container when removing,
|
45
|
+
// which errors if there is an issue fetching the info.json and stops further necessary steps to execute.
|
46
|
+
if(!this.imageLayer._container) {
|
47
|
+
this.imageLayer._container = $('<div></div>');
|
48
|
+
}
|
43
49
|
this.cropperMap.removeLayer(this.imageLayer);
|
44
50
|
}
|
45
51
|
|
@@ -269,6 +275,11 @@ export default class Crop {
|
|
269
275
|
|
270
276
|
successHandler(data, stat, xhr) {
|
271
277
|
this.setIiifFields({ tilesource: data.tilesource });
|
278
|
+
this.setUploadId(data.id);
|
279
|
+
}
|
280
|
+
|
281
|
+
setUploadId(id) {
|
282
|
+
$('#' + this.formPrefix + "_upload_id").val(id);
|
272
283
|
}
|
273
284
|
|
274
285
|
aspectRatioPreservingRectangleEditor(aspect) {
|
@@ -12,7 +12,7 @@ Spotlight.onLoad(function() {
|
|
12
12
|
$.fn.croppable = function() {
|
13
13
|
var croppables = this;
|
14
14
|
|
15
|
-
var Crop =
|
15
|
+
var Crop = spotlightAdminCrop;
|
16
16
|
$(croppables).each(function() {
|
17
17
|
var cropElement = $(this);
|
18
18
|
var c = new Crop(cropElement);
|
@@ -1,5 +1,5 @@
|
|
1
1
|
//= require typeahead.bundle.min.js
|
2
|
-
//= require handlebars
|
2
|
+
//= require handlebars
|
3
3
|
|
4
4
|
(function($){
|
5
5
|
$.fn.spotlightSearchTypeAhead = function( options ) {
|
@@ -73,7 +73,7 @@ function addImageSelector(input, panel, manifestUrl, initialize) {
|
|
73
73
|
var cropper = input.data('iiifCropper');
|
74
74
|
$.ajax(manifestUrl).done(
|
75
75
|
function(manifest) {
|
76
|
-
var Iiif =
|
76
|
+
var Iiif = spotlightAdminIiif;
|
77
77
|
var iiifManifest = new Iiif(manifestUrl, manifest);
|
78
78
|
|
79
79
|
var thumbs = iiifManifest.imagesArray();
|
@@ -40,19 +40,28 @@
|
|
40
40
|
}
|
41
41
|
}
|
42
42
|
|
43
|
-
|
44
|
-
var group = groups[
|
45
|
-
var groupEl = $("<div class='st-controls-group'><div class='st-group-col-form-label'>" +
|
43
|
+
function generateBlock(groups, key) {
|
44
|
+
var group = groups[key];
|
45
|
+
var groupEl = $("<div class='st-controls-group'><div class='st-group-col-form-label'>" + key + "</div></div>");
|
46
46
|
var buttons = group.reduce(function(memo, btn) {
|
47
47
|
return memo += btn;
|
48
48
|
}, "");
|
49
49
|
groupEl.append(buttons);
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
50
|
+
return groupEl[0].outerHTML;
|
51
|
+
}
|
52
|
+
|
53
|
+
var standardWidgets = generateBlock(groups, i18n.t("blocks:group:undefined"));
|
54
|
+
|
55
|
+
var exhibitWidgets = Object.keys(groups).map(function(key) {
|
56
|
+
if (key !== i18n.t("blocks:group:undefined")) {
|
57
|
+
return generateBlock(groups, key);
|
54
58
|
}
|
55
|
-
}
|
59
|
+
}).filter(function (element) {
|
60
|
+
return element != null;
|
61
|
+
});
|
62
|
+
|
63
|
+
var blocks = [standardWidgets].concat(exhibitWidgets).join("<hr />");
|
64
|
+
return blocks;
|
56
65
|
}
|
57
66
|
|
58
67
|
function render(Blocks, availableTypes) {
|
@@ -65,7 +74,7 @@
|
|
65
74
|
elButtons.appendChild(el);
|
66
75
|
return elButtons;
|
67
76
|
}
|
68
|
-
|
77
|
+
|
69
78
|
global.Spotlight.BlockControls = function() { };
|
70
79
|
global.Spotlight.BlockControls.create = function(editor) {
|
71
80
|
// REFACTOR - should probably not know about blockManager
|
@@ -83,10 +92,10 @@
|
|
83
92
|
SirTrevor = null;
|
84
93
|
el = null;
|
85
94
|
}
|
86
|
-
|
95
|
+
|
87
96
|
function insert(e) {
|
88
97
|
e.stopPropagation();
|
89
|
-
|
98
|
+
|
90
99
|
var parent = this.parentNode;
|
91
100
|
if (!parent || hide() === parent) { return; }
|
92
101
|
$('.st-block__inner', parent).after(el);
|
@@ -101,7 +110,7 @@
|
|
101
110
|
|
102
111
|
$(editor.wrapper).delegate(".st-block-replacer", "click", insert);
|
103
112
|
$(editor.wrapper).delegate(".st-block-controls__button", "click", insert);
|
104
|
-
|
113
|
+
|
105
114
|
return {
|
106
115
|
el: el,
|
107
116
|
hide: hide,
|
@@ -9,9 +9,16 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
|
|
9
9
|
item_counts: "Include item counts?"
|
10
10
|
},
|
11
11
|
|
12
|
+
browse_group_categories: {
|
13
|
+
autocomplete: "Enter a browse group title...",
|
14
|
+
title: "Browse Group Categories",
|
15
|
+
description: "This widget displays all browse categories associated with a selected browse group as a horizontally-scrolling row. Each selected browse group is displayed as a separate row. Each displayed category in a group links to the corresponding browse category results page.",
|
16
|
+
item_counts: "Include category item counts?"
|
17
|
+
},
|
18
|
+
|
12
19
|
link_to_search: {
|
13
20
|
title: "Saved Searches",
|
14
|
-
description: "This widget highlights saved searches. Each highlighted saved search links to the search results page generated by the saved search parameters. Any saved search listed on the Curation > Browse
|
21
|
+
description: "This widget highlights saved searches. Each highlighted saved search links to the search results page generated by the saved search parameters. Any saved search listed on the Curation > Browse categories page, whether published or not, can be highlighted as a saved search.",
|
15
22
|
item_counts: "Include item counts?"
|
16
23
|
},
|
17
24
|
|
@@ -29,8 +36,9 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
|
|
29
36
|
|
30
37
|
uploaded_items: {
|
31
38
|
title: "Uploaded Item Row",
|
32
|
-
description: "This widget displays uploaded items in a horizontal row. Optionally, you can add a heading and/or text to be displayed adjacent to the items.",
|
33
|
-
caption: 'Caption'
|
39
|
+
description: "This widget displays uploaded items in a horizontal row. Optionally, you can add a heading and/or text to be displayed adjacent to the items. The item caption and link URL fields are also optional.",
|
40
|
+
caption: 'Caption',
|
41
|
+
link: 'Link URL'
|
34
42
|
},
|
35
43
|
|
36
44
|
featured_pages: {
|