blacklight 6.20.0 → 7.3.0

data/app/assets/stylesheets/blacklight/_header.scss

@@ -2,67 +2,80 @@
   Header bar at top (Bootstrap nav-bar)
 */
 
-#header-navbar {
-  .navbar-brand {  /* The main logo image for the Blacklight instance */
-  	width: 150px;
-    height: 50px;
-    @if $logo-image {
-      background: transparent $logo-image no-repeat top left;
-    }
+.topbar > .container {
+  @media (max-width: breakpoint-max(xs)) {
+    margin-left: 0;
+    margin-right: 0;
+  }
+}
 
-    @if $logo_image {
-      // deprecated
-      background: transparent image_url($logo_image) no-repeat top left;
-    }
+.navbar-brand {  /* The main logo image for the Blacklight instance */
+  @if $logo-image {
+    background: transparent $logo-image no-repeat top left;
+  }
 
-	  display: inline-block;
-	  text-indent: 100%;
-	  white-space: nowrap;
-	  overflow: hidden;
-	  padding-right:0;
-	  margin-right:20px;
-	  padding-left: 0;
+  @if $logo_image {
+    // deprecated
+    background: transparent image_url($logo_image) no-repeat top left;
   }
+
+  display: inline-block;
+  flex: 0 0 150px;
+  height: 50px;
+  margin-right:20px;
+  margin-top: -0.4rem;
+  overflow: hidden;
+  padding-left: 0;
+  padding-right: 0;
+  text-indent: 100%;
+  white-space: nowrap;
+  width: 150px;
 }
 
-#search-navbar {
+.navbar-search {
   z-index: 1;
 
-  .input-group {
-    width: 100%;
+  .search-field {
+    // This prevents the widget from being squished so the text overflows
+    min-width: 7em;
+  }
+
+  .search-query-form {
+    @extend .col-md-12;
+    @extend .col-lg-8;
+    padding-left: 0;
   }
 
-  .input-group-addon {
-    &.for-search-field {
-      background-color: $input-bg;
-      border-radius: $border-radius-base 0 0 $border-radius-base;
-      width: 15ch;
+  .submit-search-text {
+    // hide 'search' label at very small screens
+    @media screen and (max-width: breakpoint-max(xs)) {
+      @include sr-only();
     }
   }
+}
+
+#skip-link {
+  position: absolute;
+  top: 5px;
+  left: 10px;
+  z-index: 1;
 
-  .search_field {
-    background: transparent;
-    border: none;
+  .element-invisible {
+    position: absolute !important;
+    clip: rect(1px, 1px, 1px, 1px);
+    overflow: hidden;
+    height: 1px;
   }
 
-  .search-query-form {
-    @extend .col-md-8;
-    border: 0;
-    padding-left: 0;
+  .element-invisible.element-focusable:active,
+  .element-invisible.element-focusable:focus {
+    position: static !important;
+    clip: auto;
+    overflow: visible;
+    height: auto;
   }
-  .submit-search-text {
-    // hide 'search' label at very small screens
-    @media screen and (max-width: $screen-xs-min ) {      
-      // copied from .sr-only, sadly can't seem to use @extend in a media
-      // query like this, have to copy. 
-      position: absolute;
-      width: 1px;
-      height: 1px;
-      margin: -1px;
-      padding: 0;
-      overflow: hidden;
-      clip: rect(0,0,0,0);
-      border: 0;    
-    }    
+
+  a:focus {
+    background-color: $white;
   }
 }

data/app/assets/stylesheets/blacklight/_icons.scss

@@ -0,0 +1,35 @@
+.blacklight-icons {
+  display: inline-flex;
+  height: $font-size-base;
+  width: $font-size-base;
+}
+
+.blacklight-icons svg {
+  height: 1rem;
+  width: 1rem;
+  top: .125rem;
+  position: relative;
+}
+
+@each $color, $value in $theme-colors {
+  .btn-#{$color} {
+    .blacklight-icons svg {
+      @include fill-yiq(theme-color($color));
+    }
+  }
+
+  .btn-outline-#{$color} {
+    .blacklight-icons svg {
+      fill: $value;
+    }
+
+    &.hover,
+    &:hover,
+    &:active,
+    &.active {
+      .blacklight-icons svg {
+        @include fill-yiq(theme-color($color));
+      }
+    }
+  }
+}

data/app/assets/stylesheets/blacklight/_layout.scss

@@ -1,11 +1 @@
 /* Generic layout stuff */
-
-.navbar + .navbar {
-  margin-top: -$navbar-margin-bottom;
-}
-
-.navbar-inverse .navbar-toggle {
-  &:focus, &:hover {
-    border-color: $gray-light;
-  }
-}

data/app/assets/stylesheets/blacklight/_mixins.scss

@@ -0,0 +1,15 @@
+// Stroke contrast
+// Ripped off from https://github.com/twbs/bootstrap/commit/c31d52499811d5c68d122db806ce27a112b489bd
+@mixin fill-yiq($color) {
+  $r: red($color);
+  $g: green($color);
+  $b: blue($color);
+
+  $yiq: (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
+
+  @if ($yiq >= 150) {
+    fill: #111;
+  } @else {
+    fill: #fff;
+  }
+}

data/app/assets/stylesheets/blacklight/_modal.scss

@@ -1,29 +1,21 @@
-#ajax-modal {
+.modal-content {
+  @extend .clearfix;
 
-  .modal-content {
-    @extend .clearfix;
-  }
-
-  #email_form {
-    width: auto;
-  }
-
-  .facet_pagination.top {
+  .facet-pagination.top {
   	display: none;
   }
 
-  #sidebar {
+  .page-sidebar {
     display: none;
   }
 
-  button.close {
-	  display: block;
+  .blacklight-modal-close {
+    display: block;
   }
 }
 
-
-/* app/views/catalog/facet.html.erb may be rendered as a modal or a whole page.
-   When it's a whole page, don't show the close button. */
-button.ajax-modal-close.close {
+// app/views/catalog/facet.html.erb may be rendered as a modal or a whole page.
+// When it's a whole page, don't show the close button.
+.blacklight-modal-close {
 	display: none;
 }

data/app/assets/stylesheets/blacklight/_pagination.scss

@@ -1,21 +1,12 @@
-.page_links {
+.page-links {
   display: inline-block;
   border: 1px solid transparent;
-  padding: $padding-base-vertical $padding-base-horizontal;
+  padding: $input-btn-padding-y $input-btn-padding-x;
   padding-left: 0;
 }
 
 .pagination {
-  text-align: center ;
-}
-
-
-.pagination-xs {
-  li {
-    a,
-    span {
-      border: none;
-      padding: $padding-xs-vertical $padding-xs-horizontal;
-    }
+  @media (max-width: breakpoint-max(sm)) {
+    flex-wrap: wrap;
   }
 }

data/app/assets/stylesheets/blacklight/_search_form.scss

@@ -0,0 +1,7 @@
+// bootstrap does flex-grow: 1 by default which makes the
+// text input roughly the same size as the select in many cases
+.input-group > .form-control {
+  &.search-q {
+    flex-grow: 3;
+  }
+}

data/app/assets/stylesheets/blacklight/_search_history.scss

@@ -1,20 +1,12 @@
 /* Search History */
-.search_history
-{
-
-  .constraint 
-  {
+.search-history {
+  .constraint {
+    @extend .px-3;
     display: block;
-    text-indent: -$padding-large-horizontal;
-    padding-left: $padding-large-horizontal;
-
+    text-indent: -1 * map-get($spacers, 3);
   }
 
-  .filterName, .filterSeparator
-  {
+  .filter-name, .filter-separator {
     @extend .text-muted;
   }
 }
-
-
-

data/app/assets/stylesheets/blacklight/_search_results.scss

@@ -1,10 +1,10 @@
 // the search results on the index view of the catalog
-#documents {
+.documents-list {
   .document {
-    margin-top: $padding-base-vertical;
-    padding-top: $padding-base-vertical;
-    border-bottom:1px dotted $table-border-color;
     @extend .clearfix;
+    border-bottom: 1px dotted $table-border-color;
+    margin-top: $spacer;
+    padding-top: $spacer;
 
     .document-title-heading {
       @extend h5;
@@ -13,16 +13,17 @@
     // bookmarks checkbox on index, give it some
     // lower margin when it collapses
     .index-document-functions {
-      margin-bottom: ($line-height-computed / 2);
-      @media (min-width: $screen-sm-min) {
+      margin-bottom: ($spacer * 1.5);
+
+      @media (min-width: breakpoint-min(sm)) {
         margin-bottom: 0;
       }
     }
 
     .document-thumbnail {
       float: right;
-      padding-left: $line-height-computed;
-      margin-bottom: $line-height-computed;
+      margin-bottom: ($spacer * 3);
+      padding-left: ($spacer * 3);
     }
   }
 }

data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss

@@ -1,6 +1,5 @@
 .twitter-typeahead {
-  float: left;
-  width: 100%;
+  flex-grow: 2;
   z-index: $zindex-typeahead;
 
   input.tt-input.form-control {

data/app/assets/stylesheets/blacklight/blacklight.scss

@@ -2,4 +2,4 @@
 
 /* This is the default blacklight theme. */
 
-@import 'blacklight/blacklight_base';
+@import 'blacklight_base';

data/app/builders/blacklight/action_builder.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Blacklight
+  # Dynamically creates methods on the given controller (typically CatalogController)
+  # for handling configured show tools
+  class ActionBuilder
+    def initialize(klass, name, opts)
+      @klass = klass
+      @name = name
+      @opts = opts
+    end
+
+    attr_reader :klass, :name, :opts
+
+    # Define a simple action handler for the tool as long as the method
+    # doesn't already exist or the `:define_method` option is not `false`
+    def build
+      return if skip?
+
+      callback = opts.fetch(:callback, nil).inspect
+      validator = opts.fetch(:validator, nil).inspect
+      klass.class_eval <<EORUBY, __FILE__, __LINE__ + 1
+          def #{name}
+            @response, @documents = action_documents
+
+            if request.post? && #{callback} &&
+               (#{validator}.blank? || send(#{validator}))
+
+              send(#{callback}, @documents)
+
+              flash[:success] ||= I18n.t("blacklight.#{name}.success", default: nil)
+
+              respond_to do |format|
+                format.html do
+                  return render "#{name}_success" if request.xhr?
+                  redirect_to action_success_redirect_path
+                end
+              end
+            else
+              respond_to do |format|
+                format.html do
+                  return render layout: false if request.xhr?
+                  # Otherwise draw the full page
+                end
+              end
+            end
+          end
+EORUBY
+    end
+
+    private
+
+    def skip?
+      klass.method_defined?(name) || opts[:define_method] == false
+    end
+  end
+end

data/app/controllers/bookmarks_controller.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-class BookmarksController < CatalogController  
+class BookmarksController < CatalogController
   include Blacklight::Bookmarks
-end 
+end

data/app/controllers/catalog_controller.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-class CatalogController < ApplicationController  
+class CatalogController < ApplicationController
   include Blacklight::Catalog
-end 
+end

data/app/controllers/concerns/blacklight/base.rb

@@ -3,38 +3,5 @@ module Blacklight::Base
   extend ActiveSupport::Concern
 
   include Blacklight::Configurable
-  include Blacklight::SearchHelper
-
   include Blacklight::SearchContext
-
-  included do
-    # When Blacklight::Exceptions::InvalidRequest is raised, the rsolr_request_error method is executed.
-    # The index action will more than likely throw this one.
-    # Example, when the standard query parser is used, and a user submits a "bad" query.
-    rescue_from Blacklight::Exceptions::InvalidRequest, with: :handle_request_error if respond_to? :rescue_from
-  end
-
-  protected
-
-  # when The index throws an error (Blacklight::Exceptions::InvalidRequest), this method is executed.
-  def handle_request_error(exception)
-    if Rails.env.development? || Rails.env.test?
-      raise exception # Rails own code will catch and give usual Rails error page with stack trace
-    else
-
-      flash_notice = I18n.t('blacklight.search.errors.request_error')
-
-      # If there are errors coming from the index page, we want to trap those sensibly
-
-      if flash[:notice] == flash_notice
-        logger.error "Cowardly aborting rsolr_request_error exception handling, because we redirected to a page that raises another exception"
-        raise exception
-      end
-
-      logger.error exception
-
-      flash[:notice] = flash_notice 
-      redirect_to root_path
-    end
-  end
 end