blacklight-spotlight 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e1e38c99f14e8cbfe3482e6d4adb02adc7dd6cd
-  data.tar.gz: e7c12eb9e49ecf927dd98f9331d363d796bc4825
+  metadata.gz: d5a848d17a782a172979d2f5f1474be224e5aa50
+  data.tar.gz: aaf3bb7c7c594a324f31bacc68a854576bcadfa3
 SHA512:
-  metadata.gz: 3bea84a5474d94a0fe33b0d041675c2dd1647dfb4ab2968638bb70563eaad164a2e46dd1655893a99e30bbee06a59cd2eca5ceec758aca930b1dcf765906663d
-  data.tar.gz: f94dbfd2a1507db4e4938144c1c65a1f13995aea9113792eabe15589affd017433dfbbca4b5b1424c5988daf34f4bf7f7dcf9308a65071344ec0c5f261976c3c
+  metadata.gz: fa6893ca19f7e9607d5398f2920af9954b9edee98a4e0cd59e120057ed1aed8c0b901bbe2933efdd9aef2140a6c04708b442472b8a55133055db960be35e9190
+  data.tar.gz: 41d04adaad2035a0ee4693b41ed794fe5b8d4d627f1b638cc6d07967385919424c4789e0ef4e1ff13a14b3a57cb950bd333f02120fe522a5fd1cd102b9e5b468

data/app/assets/javascripts/spotlight/reindex_monitor.js

@@ -0,0 +1,109 @@
+Spotlight.onLoad(function() {
+  $('[data-behavior="reindex-monitor"]').reindexMonitor();
+});
+
+(function($) {
+  $.fn.reindexMonitor = function() {
+    var monitorElements = this;
+    var defaultRefreshRate = 3000;
+    var panelContainer;
+
+    $(monitorElements).each(function() {
+      panelContainer = $(this);
+      var monitorUrl = panelContainer.data('monitorUrl');
+      var refreshRate = panelContainer.data('refreshRate') || defaultRefreshRate;
+      setInterval(function() {
+        checkMonitorUrl(monitorUrl);
+      }, refreshRate);
+    });
+
+    function checkMonitorUrl(url) {
+      $.ajax(url).success(success).fail(fail);
+    }
+
+    function success(data) {
+      if (data.in_progress) {
+        monitorPanel().show();
+        updateMonitorPanel(data);
+      } else {
+        monitorPanel().hide();
+      }
+    }
+
+    function fail() { monitorPanel().hide(); }
+
+    function updateMonitorPanel(data) {
+      panelStartDate().text(data.started);
+      panelCurrentDate().text(data.updated_at);
+      panelCompleted().text(data.completed);
+      updatePanelTotals(data);
+      updatePanelErrorMessage(data);
+      updateProgressBar(data);
+    }
+
+    function updateProgressBar(data) {
+      var percentage = calculatePercentage(data);
+      progressBar()
+        .attr('aria-valuemax', data.total)
+        .attr('aria-valuenow', percentage)
+        .css('width', percentage + '%')
+        .text(percentage + '%');
+    }
+
+    function updatePanelErrorMessage(data) {
+      // We currently do not store this state,
+      // but with this code we can in the future.
+      if ( data.errored ) {
+        panelErrorMessage().show();
+      } else {
+        panelErrorMessage().hide();
+      }
+    }
+
+    function updatePanelTotals(data) {
+      panelTotals().each(function() {
+        $(this).text(data.total);
+      });
+    }
+
+    function calculatePercentage(data) {
+      return Math.floor((data.completed / data.total) * 100);
+    }
+
+    function monitorPanel() {
+      return panelContainer.find('.index-status');
+    }
+
+    function panelStartDate() {
+      return monitorPanel()
+               .find('[data-behavior="monitor-start"]')
+               .find('[data-behavior="date"]');
+    }
+
+    function panelCurrentDate() {
+      return monitorPanel()
+               .find('[data-behavior="monitor-current"]')
+               .find('[data-behavior="date"]');
+    }
+
+    function panelTotals() {
+      return monitorPanel().find('[data-behavior="total"]');
+    }
+
+    function panelCompleted() {
+      return monitorPanel()
+               .find('[data-behavior="monitor-current"]')
+               .find('[data-behavior="completed"]');
+    }
+
+    function progressBar() {
+      return monitorPanel().find('.progress-bar');
+    }
+
+    function panelErrorMessage() {
+      return monitorPanel().find('[data-behavior="monitor-error"]');
+    }
+
+    return this;
+  };
+})(jQuery);

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

@@ -1,10 +1,8 @@
 .dd-item td {
-  text-align:center;
-
   &:first-child {
     padding: 0;
     
-    a {
+    .edit-in-place {
       cursor: text;
       color: inherit;
       text-decoration: none;
@@ -23,7 +21,6 @@
       
     }
 
-    text-align: left;
     .dd3-handle:before {
       top: 3px;
     }
@@ -49,15 +46,19 @@
   }
 }
 
-#nested-fields {
-  margin-bottom: 1em;
+.dd-table {
+  margin-top: 2 * $padding-large-vertical;
+
   th {
     &:first-child {
       padding-left: 40px;
-      text-align: left;
     }
-    text-align:center;
   }
+}
+
+#nested-fields {
+  margin-bottom: 1em;
+
   .metadata-select {
     display: inline-block;
     min-width: 72px;

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

@@ -21,20 +21,28 @@
 }
 
 .sidenav {
-
   margin-bottom: 24px;
 
-  li > a {
-    padding: 0 15px 0 0;
-  }
+  .active {
+    a {
+      color: $black;
 
-  &.top-level {
-    li > a {
-      padding-left: 0;
+      &:hover {
+        background-color: inherit;
+      }
     }
   }
 }
 
+.nav-heading {
+  margin: 0;
+  padding: $nav-link-padding;
+}
+
+.btn-nav {
+  margin: $nav-link-padding;
+}
+
 h1,h2,h3,h4,h5,h6 {
   .label {
     font-size: $font-size-base;

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

@@ -1,6 +1,3 @@
-$masthead-height: 180px;
-$masthead-image-blur: 1px;
-
 @mixin masthead-background-containers() {
   position: absolute;
   left: 0;
@@ -31,23 +28,39 @@ $masthead-image-blur: 1px;
   }
 }
 
-#exhibit-masthead,
-#exhibit-navbar {
-  z-index: 1;
+.navbar-static-top {
+  margin-bottom: 0;
 }
 
-#exhibit-navbar {
-  z-index: 100;
+.masthead {
+  background-color: $masthead-bg;
+  border-bottom: 1px solid $navbar-default-border;
+  margin-bottom: $padding-large-vertical * 2.5;
+  overflow: hidden;
+  padding: 0;
+  position: relative;
+  // allow dropdowns in the top nav to stack above the masthead
+  z-index: $zindex-navbar - 1;
 
-  &.page-masthead {
-    @include transparent-masthead-navigation-menu();
-    background-color: $navbar-transparent-page-bg;
-    border-bottom: 1px solid $navbar-transparent-border;
-    margin-bottom: 0;
-    margin-top: 0;
 
-    .navbar-nav {
-      float: right;
+  .site-title {
+    padding-bottom: $padding-base-vertical;
+    position: relative;
+    white-space: nowrap;
+  }
+
+  small {
+    @extend .hidden-xs;
+
+    display: block;
+    margin-top: $padding-base-vertical;
+    padding-bottom: $padding-base-vertical;
+    padding-top: $padding-base-vertical;
+  }
+
+  .navbar {
+    &:last-child {
+      margin-bottom: 0;
     }
   }
 
@@ -56,81 +69,46 @@ $masthead-image-blur: 1px;
   }
 }
 
-#exhibit-masthead.with-image + #exhibit-navbar.navbar-default {
-  @include transparent-masthead-navigation-menu();
-  background-color: $navbar-transparent-bg;
-  border-top: 1px solid $navbar-transparent-border;
-}
-
-.navbar + .navbar {
-  margin-top: 0;
-}
-
-#header-navbar {
-  margin-bottom: 0;
-}
-
-#exhibit-masthead {
-  height: $masthead-height;
-  margin-bottom: -50px;
-  padding: 0;
-  position: static;
-
-  & > .container {
-    position: relative;
-    top: 33%;
-    -webkit-transform: translateY(-50%);
-    transform: translateY(-50%);
+.resource-masthead {
+  .site-title {
+    @extend .text-center;
   }
 
-  &.with-page-masthead {
-    margin-bottom: $padding-base-vertical;
-    margin-top: -51px;
-
-    > .container {
-      top: 60%;
-    }
-
-    .navbar-brand {
-      font-size: $font-size-large;
-      text-shadow: 1px 1px 0 $black;
-    }
-
-    .search-title {
-      text-align: center;
-
-      small {
-        text-transform: uppercase;
-      }
-    }
+  .navbar {
+    border-bottom: 1px solid $navbar-transparent-border;
+    border-top: 0;
+    margin-bottom: 0;
   }
 
-  .site-title {
-    font-size: 30px;
+  .navbar-nav {
+    float: right;
   }
 
-  small {
-    display: block;
-    padding-top: $padding-base-vertical;
-    @extend .hidden-xs;
+  .search-query-form {
+    display: none;
   }
+}
 
-  &.with-image {
-    .site-title,
-    .search-title {
-      color: $white;
-      text-shadow: 1px 1px 0 $black;
-    }
+.site-title-container {
+  max-height: $masthead-height - $navbar-height;
+  
+  padding-bottom: $padding-large-vertical;
+  padding-top: $padding-large-vertical;
+}
 
-    small {
-      color: $white;
-    }
+.image-masthead {
+  .navbar {
+    @include transparent-masthead-navigation-menu();
+    background-color: $navbar-transparent-page-bg;
   }
 
-  &.with-page-masthead {
-    .site-title {
-      margin-top: $padding-large-vertical * 3;
-    }
+  .h1 {
+    color: $white;
+    text-shadow: 1px 1px 0 $black;
+  }
+
+  small {
+    color: $white;
   }
 
   // This is to add a background image to the masthead, in a way that
@@ -139,16 +117,21 @@ $masthead-image-blur: 1px;
     @include masthead-background-containers();
     background-repeat: no-repeat;
     background-size: cover;
+
+    // Add right border to image to hide lighter blurred edge
+    border-right: 1px solid $black;
+
     // Add small amount of blur to help text stand out
     //filter: url(masthead/blur.svg#blur); // for older versions of FF
     -webkit-filter: blur($masthead-image-blur);
     filter: blur($masthead-image-blur);
+
+    height: $masthead-height;
+
     // Shift image slightly to hide blurred edge of image
     margin-left: -$masthead-image-blur;
     margin-top: -$masthead-image-blur;
     overflow: hidden;
-    // Add right border to image to hide lighter blurred edge
-    border-right: 1px solid $black;
   }
 
   // Include gradient to improve text legibility,
@@ -161,15 +144,9 @@ $masthead-image-blur: 1px;
        rgba(0, 0, 0, 0.4),
        rgba(0, 0, 0, 0.5)
      );
-  }
-}
 
-// Margin between bottom of masthead and start of page content.
-// Need to apply bottom margin to different element, depending on
-// whether it is a regular masthead or a browse category masthead
-#exhibit-masthead + #exhibit-navbar,
-#exhibit-navbar + #exhibit-masthead {
-  margin-bottom: $padding-large-vertical * 2.5;
+    height: $masthead-height;
+  }
 }
 
 .col-md-4 {

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

@@ -3,6 +3,10 @@ $footer-height: 118px !default;
 $white: #ffffff !default;
 $black: #000000 !default;
 
+$masthead-bg: $well-bg !default;
+$masthead-height: 180px !default;
+$masthead-image-blur: 1px !default;
+
 $exhibit-card-height: 350px !default;
 $exhibit-card-bg: $well-bg !default;
 $exhibit-card-border: $well-border !default;

data/app/controllers/spotlight/attachments_controller.rb

@@ -9,11 +9,8 @@ module Spotlight
     # POST /attachments
     def create
       @attachment.attributes = attachment_params
-      if @attachment.save
-        render json: @attachment
-      else
-        render action: 'new'
-      end
+      @attachment.save!
+      render json: @attachment
     end
 
     private

data/app/controllers/spotlight/browse_controller.rb

@@ -11,7 +11,7 @@ module Spotlight
     before_action :attach_breadcrumbs
     record_search_parameters only: :show
 
-    before_action :set_masthead, only: :show
+    helper_method :should_render_spotlight_search_bar?
 
     def index
       @searches = @exhibit.searches.published
@@ -47,8 +47,20 @@ module Spotlight
       @_prefixes ||= super + ['catalog']
     end
 
-    def set_masthead
-      self.current_masthead = @search.masthead if @search.masthead && @search.masthead.display?
+    def current_masthead
+      if resource_masthead?
+        @search.masthead
+      else
+        super
+      end
+    end
+
+    def resource_masthead?
+      @search && @search.masthead && @search.masthead.display?
+    end
+
+    def should_render_spotlight_search_bar?
+      !resource_masthead?
     end
   end
 end