blacklight-spotlight 2.13.0 → 3.0.0.alpha.1

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb

@@ -20,9 +20,9 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb',
   it 'has a slideshow block' do
     render partial: p, locals: { item_carousel_block: block }
     expect(rendered).to have_selector '.carousel-block'
-    expect(rendered).to have_selector '.carousel-control.left'
-    expect(rendered).to have_selector '.carousel-control.right'
-    expect(rendered).to have_selector '.item', text: 'thumb', count: 3
+    expect(rendered).to have_selector '.carousel-control-prev.left'
+    expect(rendered).to have_selector '.carousel-control-next.right'
+    expect(rendered).to have_selector '.carousel-item', text: 'thumb', count: 3
     expect(rendered).to have_selector '.carousel-indicators'
     expect(rendered).to have_selector '.carousel-indicators li', count: 3
   end

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb

@@ -30,7 +30,7 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb', typ
     expect(rendered).to have_selector 'h3', text: 'Some title'
     expect(rendered).to have_content 'Some text'
     expect(rendered).to have_selector '.box', text: 'OSD'
-    expect(rendered).to have_selector '.items-col.pull-left'
+    expect(rendered).to have_selector '.items-col'
     expect(rendered).to have_selector '.text-col'
   end
 end

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb

@@ -25,7 +25,7 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb',
   it 'has a slideshow block' do
     render partial: p, locals: { item_carousel_block: block }
     expect(rendered).to have_selector '.item-features'
-    expect(rendered).to have_selector '.item', text: 'thumb', count: 3
+    expect(rendered).to have_selector '.carousel-item', text: 'thumb', count: 3
     expect(rendered).to have_selector '.carousel-indicators'
     expect(rendered).to have_selector '.carousel-indicators li', count: 3
   end
@@ -33,7 +33,7 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb',
   it 'truncates long titles' do
     render partial: p, locals: { item_carousel_block: block }
     expect(rendered).to have_selector '.item-features'
-    expect(rendered).to have_selector '.item', text: 'thumb', count: 3
+    expect(rendered).to have_selector '.carousel-item', text: 'thumb', count: 3
     expect(rendered).to have_selector '.carousel-indicators'
     expect(rendered).to have_selector '.carousel-indicators li', count: 3
     expect(rendered).to have_selector '.carousel-indicators li', text: 'a' * 92 + '...'

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb

@@ -24,7 +24,7 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb', type
     expect(rendered).to have_selector 'h3', text: 'Some title'
     expect(rendered).to have_content 'Some text'
     expect(rendered).to have_selector '.box', text: 'thumb', count: 3
-    expect(rendered).to have_selector '.items-col.pull-left'
+    expect(rendered).to have_selector '.items-col'
     expect(rendered).to have_selector '.text-col'
   end
 end

data/spec/views/spotlight/translations/_page.html.erb_spec.rb

@@ -22,7 +22,7 @@ describe 'spotlight/translations/_page.html.erb', type: :view do
     page.published = true
     render
 
-    expect(rendered).to have_css('.glyphicon.glyphicon-ok')
+    expect(rendered).to have_css('.translation-complete')
   end
 
   context 'when there is a translated page' do
@@ -44,7 +44,7 @@ describe 'spotlight/translations/_page.html.erb', type: :view do
       it 'includes an alert icon' do
         render
 
-        expect(rendered).to have_css('.glyphicon.glyphicon-alert')
+        expect(rendered).to have_css('.translation-warning')
       end
     end
 

data/vendor/assets/javascripts/bootstrap-tagsinput.js

@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
   var defaultOptions = {
     tagClass: function(item) {
-      return 'label label-info';
+      return 'badge badge-info';
     },
     itemValue: function(item) {
       return item ? item.toString() : item;

data/vendor/assets/stylesheets/sir-trevor/_variables.scss

@@ -1,23 +1,30 @@
 // Adjusted from upstream to use bootstrap's colors.
 
 $text-block-font-size: 1.275em;
-
+$text-color: $body-color;
 $text-block-font-color: $text-color;
-$accent-color: $btn-primary-bg;
-$base-ui-color: $gray;
-$light-ui-color: $gray-light;
-$blocks-control-bg-color: $panel-default-heading-bg;
-$blocks-control-border-color: $panel-default-border;
-$error-color: $brand-danger;
+$accent-color: theme-color("primary");
+$base-ui-color: theme-color("secondary");
+$light-ui-color: $gray-400;
+$blocks-control-bg-color: $card-cap-bg;
+$blocks-control-border-color: $card-border-color;
+$error-color: theme-color("danger");
 $selection-color: #B4D5FE;
 
 $inner-block-padding: $grid-gutter-width $grid-gutter-width $grid-gutter-width + 18px $grid-gutter-width;
 
 $block-controls-height: 164px;
-$block-add-height: $line-height-computed * 2;
+$block-add-height: $line-height-lg * 2;
 $block-controls-color:#9B9B9B;
 
 $border-size: 2px;
 $border-style: solid;
 $default-border: $border-size $border-style $accent-color;
 
+$padding-base-horizontal: $spacer;
+$padding-large-horizontal: $spacer;
+$padding-large-vertical: $spacer;
+$padding-base-vertical: $spacer;
+$padding-small-vertical: $spacer * 0.5;
+$padding-small-horizontal: $spacer * 0.25;
+$padding-xs-horizontal: $spacer * 0.1;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 3.0.0.alpha.1
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.20'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.20'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -117,14 +117,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
@@ -173,20 +173,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: blacklight-oembed
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -785,6 +771,20 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/images/blacklight/add_circle.svg
+- app/assets/images/blacklight/arrow_back_ios.svg
+- app/assets/images/blacklight/arrow_forward_ios.svg
+- app/assets/images/blacklight/check.svg
+- app/assets/images/blacklight/check_circle.svg
+- app/assets/images/blacklight/chevron_right.svg
+- app/assets/images/blacklight/custom_fullscreen.svg
+- app/assets/images/blacklight/edit.svg
+- app/assets/images/blacklight/error.svg
+- app/assets/images/blacklight/info.svg
+- app/assets/images/blacklight/remove_circle.svg
+- app/assets/images/blacklight/remove_circle_outline.svg
+- app/assets/images/blacklight/resize_small.svg
+- app/assets/images/blacklight/warning.svg
 - app/assets/images/spotlight/blocks/sir-trevor-icons.svg
 - app/assets/images/spotlight/default_browse_thumbnail.jpg
 - app/assets/images/spotlight/default_thumbnail.jpg
@@ -863,7 +863,6 @@ files:
 - app/assets/stylesheets/spotlight/_mixins.scss
 - app/assets/stylesheets/spotlight/_multi_image_selector.scss
 - app/assets/stylesheets/spotlight/_multi_up_item_grid.scss
-- app/assets/stylesheets/spotlight/_navbar.scss
 - app/assets/stylesheets/spotlight/_nestable.scss
 - app/assets/stylesheets/spotlight/_pages.scss
 - app/assets/stylesheets/spotlight/_report_a_problem.scss
@@ -882,6 +881,7 @@ files:
 - app/controllers/concerns/spotlight/catalog.rb
 - app/controllers/concerns/spotlight/config.rb
 - app/controllers/concerns/spotlight/controller.rb
+- app/controllers/concerns/spotlight/search_helper.rb
 - app/controllers/spotlight/about_pages_controller.rb
 - app/controllers/spotlight/admin_users_controller.rb
 - app/controllers/spotlight/appearances_controller.rb
@@ -975,6 +975,7 @@ files:
 - app/models/spotlight/ability.rb
 - app/models/spotlight/about_page.rb
 - app/models/spotlight/analytics/ga.rb
+- app/models/spotlight/analytics/ga_model.rb
 - app/models/spotlight/attachment.rb
 - app/models/spotlight/blacklight_configuration.rb
 - app/models/spotlight/contact.rb
@@ -1027,7 +1028,6 @@ files:
 - app/uploaders/spotlight/attachment_uploader.rb
 - app/uploaders/spotlight/featured_image_uploader.rb
 - app/values/custom_field_name.rb
-- app/views/_user_util_links.html.erb
 - app/views/blacklight/nav/_bookmark.html.erb
 - app/views/blacklight/nav/_saved_searches.html.erb
 - app/views/blacklight/nav/_search_history.html.erb
@@ -1035,6 +1035,7 @@ files:
 - app/views/catalog/_save_search.html.erb
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/mailer/invitation_instructions.html.erb
+- app/views/layouts/spotlight/base.html.erb
 - app/views/layouts/spotlight/home.html.erb
 - app/views/layouts/spotlight/spotlight.html.erb
 - app/views/shared/_about_navbar.html.erb
@@ -1046,8 +1047,8 @@ files:
 - app/views/shared/_footer.html.erb
 - app/views/shared/_header_navbar.html.erb
 - app/views/shared/_masthead.html.erb
-- app/views/shared/_modal.html.erb
 - app/views/shared/_site_sidebar.html.erb
+- app/views/shared/_user_util_links.html.erb
 - app/views/spotlight/about_pages/_contact.html.erb
 - app/views/spotlight/about_pages/_contact_properties.html.erb
 - app/views/spotlight/about_pages/_contacts.html.erb
@@ -1395,6 +1396,7 @@ files:
 - spec/features/javascript/blocks/rule_block_spec.rb
 - spec/features/javascript/blocks/search_result_block_spec.rb
 - spec/features/javascript/blocks/solr_documents_block_spec.rb
+- spec/features/javascript/blocks/solr_documents_carousel_block_spec.rb
 - spec/features/javascript/blocks/uploaded_items_block_spec.rb
 - spec/features/javascript/edit_in_place_spec.rb
 - spec/features/javascript/feature_page_admin_spec.rb
@@ -1519,12 +1521,12 @@ files:
 - spec/test_app_templates/spotlight_test.rake
 - spec/uploaders/spotlight/attachment_uploader_spec.rb
 - spec/uploaders/spotlight/featured_image_uploader_spec.rb
-- spec/views/_user_util_links.html.erb_spec.rb
 - spec/views/shared/_analytics.html.erb_spec.rb
 - spec/views/shared/_exhibit_navbar.html.erb_spec.rb
 - spec/views/shared/_footer.html.erb_spec.rb
 - spec/views/shared/_header_navbar.html.erb_spec.rb
 - spec/views/shared/_masthead.html.erb_spec.rb
+- spec/views/shared/_user_util_links.html.erb_spec.rb
 - spec/views/spotlight/about_pages/_empty.html.erb_spec.rb
 - spec/views/spotlight/about_pages/_sidebar.html.erb_spec.rb
 - spec/views/spotlight/about_pages/index.html.erb_spec.rb
@@ -1625,11 +1627,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections
@@ -1674,6 +1676,7 @@ test_files:
 - spec/features/feature_page_spec.rb
 - spec/features/home_page_spec.rb
 - spec/features/javascript/blocks/featured_browse_categories_block_spec.rb
+- spec/features/javascript/blocks/solr_documents_carousel_block_spec.rb
 - spec/features/javascript/blocks/link_to_search_block_spec.rb
 - spec/features/javascript/blocks/featured_pages_block_spec.rb
 - spec/features/javascript/blocks/search_result_block_spec.rb
@@ -1890,7 +1893,7 @@ test_files:
 - spec/views/shared/_footer.html.erb_spec.rb
 - spec/views/shared/_masthead.html.erb_spec.rb
 - spec/views/shared/_analytics.html.erb_spec.rb
-- spec/views/_user_util_links.html.erb_spec.rb
+- spec/views/shared/_user_util_links.html.erb_spec.rb
 - spec/helpers/spotlight/crud_link_helpers_spec.rb
 - spec/helpers/spotlight/application_helper_spec.rb
 - spec/helpers/spotlight/pages_helper_spec.rb

data/app/assets/stylesheets/spotlight/_navbar.scss

@@ -1,48 +0,0 @@
-// Transparent navbar styling, adapted directly from Bootstrap's navbar styles:
-// https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_navbar.scss
-
-.navbar-transparent {
-  background-color: $navbar-transparent-bg;
-  border-color: $navbar-transparent-border;
-
-  .navbar-brand {
-    color: $navbar-transparent-brand-color;
-    &:hover,
-    &:focus {
-      color: $navbar-transparent-brand-hover-color;
-      background-color: $navbar-transparent-brand-hover-bg;
-    }
-  }
-
-  .navbar-text {
-    color: $navbar-transparent-color;
-  }
-
-  .navbar-nav {
-    > li > a {
-      color: $navbar-transparent-link-color;
-
-      &:hover,
-      &:focus {
-        color: $navbar-transparent-link-hover-color;
-        background-color: $navbar-transparent-link-hover-bg;
-      }
-    }
-    > .active > a {
-      &,
-      &:hover,
-      &:focus {
-        color: $navbar-transparent-link-active-color;
-        background-color: $navbar-transparent-link-active-bg;
-      }
-    }
-    > .disabled > a {
-      &,
-      &:hover,
-      &:focus {
-        color: $navbar-transparent-link-disabled-color;
-        background-color: $navbar-transparent-link-disabled-bg;
-      }
-    }
-  }
-}

data/app/views/_user_util_links.html.erb

@@ -1,50 +0,0 @@
-<div class="navbar-right">
-
-  <ul class="nav navbar-nav">
-    <%= render_nav_actions do |config, action|%>
-      <li><%= action %></li>
-    <% end %>
-  </ul>
-
-  <ul class="nav navbar-nav">
-    <%= render '/spotlight/shared/locale_picker' %>
-    <% if current_user %>
-      <li class="dropdown">
-      <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=current_user%> <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-          <% if can? :manage, Spotlight::Site.instance %>
-            <li><%= link_to t(:'spotlight.header_links.edit_site'), spotlight.edit_site_path %></li>
-          <% end %>
-          <% if can? :create, Spotlight::Exhibit %>
-            <li>
-              <%= link_to t(:'spotlight.header_links.create_exhibit'), spotlight.new_exhibit_path %>
-            </li>
-            <li class="divider"></li>
-          <% end %>
-          <% if current_exhibit && can?(:curate, current_exhibit) %>
-            <li>
-              <%= link_to t('spotlight.header_links.dashboard'), spotlight.exhibit_dashboard_path(current_exhibit) %>
-            </li>
-            <li class="divider"></li>
-          <% end %>
-
-          <li>
-            <%= link_to "Change Password", main_app.edit_user_registration_path %>
-          </li>
-          <li>
-            <%= link_to t('spotlight.header_links.logout'), main_app.destroy_user_session_path %>
-          </li>
-        </ul>
-      </li>
-    <% else %>
-      <li>
-        <%= link_to t('spotlight.header_links.login'), main_app.new_user_session_path %>
-      </li>
-    <% end %>
-    <% if current_exhibit and show_contact_form? %>
-      <li>
-        <%= link_to t('spotlight.header_links.contact'), spotlight.new_exhibit_contact_form_path(current_exhibit), data: {behavior: 'contact-link', target: 'report-problem-form' } %>
-      </li>
-    <% end %>
-  </ul>
-</div>

data/app/views/shared/_modal.html.erb

@@ -1,6 +0,0 @@
-<div id="ajax-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="modal menu" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-    </div>
-  </div>
-</div>