blacklight-spotlight 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31319372e35468cdf48c2e5537ce4bfefac6f13a
-  data.tar.gz: 95e24029e38199e97049fb7bd473b1446b8caec7
+  metadata.gz: 351909ac5de4d14fb42941ccf4a0f256a1e5f33a
+  data.tar.gz: dc6ff75445a24ca3ee49ef3776ea0b3ab6b37b62
 SHA512:
-  metadata.gz: 85d25c21a72c38d78517c6025d4db128eda270a86d280a1e532d9902bea2d81ac38346716ec684ac8750176dbea4be744911f0a9b8736d4f68a9404c4c33f0fd
-  data.tar.gz: 0bba96afb2b8df22de90bc36a4447bc1b15fb970b6cb8737b272f0696d5ba9e412c769ba93dead4d7859b2f4258c878fc4b3e6a6a00f3a2d3e8a5d2e0280ef69
+  metadata.gz: d26fcd3db00fb8981613e734e698e05d1cc416ce1e8e205bdf2f6748e7a912fcefab2008a3b432a124e363e54a2b26623edfbf6c34299cbd67f18d7b47c59504
+  data.tar.gz: b6abc8e74091524fcb57b34175a54541929b070ad9c44c24349e8539d6e11e7c19fe8819960b10a0dafb86c43a0eaaa1cca74b924351bdd96d3d433e16c81ef9

data/app/assets/javascripts/spotlight/blocks/resources_block.js

@@ -5,13 +5,13 @@ Spotlight.Block.Resources = (function(){
     formable: true,
     autocompleteable: true,
     show_heading: true,
-    
+
     title: function() { return i18n.t("blocks:" + this.type + ":title"); },
     description: function() { return i18n.t("blocks:" + this.type + ":description"); },
 
     icon_name: "resources",
     blockGroup: function() { return i18n.t("blocks:group:items") },
-    
+
     primary_field_key: "primary-caption-field",
     show_primary_field_key: "show-primary-caption",
     secondary_field_key: "secondary-caption-field",
@@ -63,11 +63,11 @@ Spotlight.Block.Resources = (function(){
       var panel = $(_.template(markup)(this));
       var context = this;
 
-      $('.remove a', panel).on('click', function(e) { 
-        e.preventDefault(); 
+      $('.remove a', panel).on('click', function(e) {
+        e.preventDefault();
         $(this).closest('.field').remove();
         context.afterPanelDelete();
-        
+
       });
 
       this.afterPanelRender(data, panel);
@@ -78,14 +78,15 @@ Spotlight.Block.Resources = (function(){
     afterPanelRender: function(data, panel) {
 
     },
-    
+
     afterPanelDelete: function() {
 
     },
 
-    createItemPanel: function(data) { 
+    createItemPanel: function(data) {
       var panel = this._itemPanel(data);
       $(panel).appendTo(this.$el.find('.panels > ol'));
+      this.$el.find('[data-behavior="nestable"]').trigger('change');
     },
 
     item_options: function() { return ""; },
@@ -126,7 +127,7 @@ Spotlight.Block.Resources = (function(){
 
       this.$el.find('[data-input-select-target]').selectRelatedInput();
     },
-    
+
     afterLoadData: function(data) {
       var context = this;
       $.each(Object.keys(data.item || {}).map(function(k) { return data.item[k]}).sort(function(a,b) { return a.weight - b.weight; }), function(index, item) {
@@ -135,4 +136,4 @@ Spotlight.Block.Resources = (function(){
     },
   });
 
-})();
+})();

data/app/assets/javascripts/spotlight/blocks/uploaded_items_block.js

@@ -0,0 +1,129 @@
+SirTrevor.Blocks.UploadedItems = (function(){
+  return Spotlight.Block.Resources.extend({
+    textable: true,
+    uploadable: true,
+    autocompleteable: false,
+
+    id_key: 'file',
+
+    type: 'uploaded_items',
+
+    icon_name: 'items',
+
+    blockGroup: 'undefined',
+
+    // Clear out the default Uploadable upload options
+    // since we will be using our own custom controls
+    upload_options: { html: '' },
+
+    fileInput: function() { return this.$el.find('input[type="file"]'); },
+
+    onBlockRender: function(){
+      SpotlightNestable.init(this.$el.find('[data-behavior="nestable"]'));
+
+      this.fileInput().on('change', (function(ev) {
+        this.onDrop(ev.currentTarget);
+      }).bind(this));
+    },
+
+    onDrop: function(transferData){
+      var file = transferData.files[0],
+          urlAPI = (typeof URL !== "undefined") ? URL : (typeof webkitURL !== "undefined") ? webkitURL : null;
+
+      // Handle one upload at a time
+      if (/image/.test(file.type)) {
+        this.loading();
+
+        this.uploader(
+          file,
+          function(data) {
+            this.createItemPanel(data);
+            this.fileInput().val('');
+            this.ready();
+          },
+          function(error) {
+            this.addMessage(i18n.t('blocks:image:upload_error'));
+            this.ready();
+          }
+        );
+      }
+    },
+
+    title: function() { return i18n.t('blocks:uploaded_items:title'); },
+    description: function() { return i18n.t('blocks:uploaded_items:description'); },
+
+    globalIndex: 0,
+
+    _itemPanel: function(data) {
+      var index = "file_" + this.globalIndex++;
+      var checked = 'checked="checked"';
+
+      if (data.display == 'false') {
+        checked = '';
+      }
+
+      var dataId = data.id || data.uid;
+      var dataTitle = data.title || data.name;
+      var dataUrl = data.url || data.file.url;
+
+      var markup = [
+          '<li class="field form-inline dd-item dd3-item" data-id="' + index + '" id="' + this.formId("item_" + dataId) + '">',
+            '<input type="hidden" name="item[' + index + '][id]" value="' + dataId + '" />',
+            '<input type="hidden" name="item[' + index + '][title]" value="' + dataTitle + '" />',
+            '<input type="hidden" name="item[' + index + '][url]" data-item-grid-thumbnail="true"  value="' + dataUrl + '"/>',
+            '<input data-property="weight" type="hidden" name="item[' + index + '][weight]" value="' + data.weight + '" />',
+            '<div class="dd-handle dd3-handle"><%= i18n.t("blocks:resources:panel:drag") %></div>',
+              '<div class="dd3-content panel panel-default">',
+                '<div class="panel-heading item-grid">',
+                  '<div class="checkbox">',
+                    '<input name="item[' + index + '][display]" type="hidden" value="false" />',
+                    '<input name="item[' + index + '][display]" id="'+ this.formId(this.display_checkbox + '_' + dataId) + '" type="checkbox" ' + checked + ' class="item-grid-checkbox" value="true"  />',
+                    '<label class="sr-only" for="'+ this.formId(this.display_checkbox + '_' + dataId) +'"><%= i18n.t("blocks:resources:panel:display") %></label>',
+                  '</div>',
+                  '<div class="pic thumbnail">',
+                    '<img src="' + dataUrl + '" />',
+                  '</div>',
+                  '<div class="main">',
+                    '<div class="title panel-title">' + dataTitle + '</div>',
+                  '</div>',
+                  '<div class="remove pull-right">',
+                    '<a data-item-grid-panel-remove="true" href="#"><%= i18n.t("blocks:resources:panel:remove") %></a>',
+                  '</div>',
+                '</div>',
+              '</div>',
+            '</li>'
+      ].join("\n");
+
+      var panel = $(_.template(markup)(this));
+      var context = this;
+
+      $('.remove a', panel).on('click', function(e) {
+        e.preventDefault();
+        $(this).closest('.field').remove();
+        context.afterPanelDelete();
+      });
+
+      this.afterPanelRender(data, panel);
+
+      return panel;
+    },
+
+    template: [
+      '<div class="form oembed-text-admin clearfix">',
+        '<div class="widget-header">',
+          '<%= description() %>',
+        '</div>',
+        '<div class="row">',
+          '<div class="form-group col-md-8">',
+            '<div class="panels dd nestable-item-grid" data-behavior="nestable" data-max-depth="1">',
+              '<ol class="dd-list">',
+              '</ol>',
+            '</div>',
+            '<input type="file" id="uploaded_item_url" name="file[file_0][file_data]" />',
+          '</div>',
+        '</div>',
+        '<%= text_area() %>',
+      '</div>'
+    ].join("\n")
+  });
+})();

data/app/assets/javascripts/spotlight/sir-trevor/locales.js

@@ -21,6 +21,11 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
     url: "URL",
   },
 
+  uploaded_items: {
+    title: "Uploaded Item Row",
+    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."
+  },
+
   featured_pages: {
     title:  "Feature Pages",
     description: "This widget highlights feature pages. Each highlighted item links to the corresponding feature page."
@@ -68,7 +73,7 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
       title: "Maximum carousel height"
     }
   },
-  
+
   solr_documents_embed: {
     title: "Item Embed",
     description: "This widget embeds exhibit items on a page. Optionally, you can add a heading and/or text to be displayed adjacent to the items.",
@@ -98,4 +103,4 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
     undefined: "Standard widgets",
     items: "Exhibit item widgets"
   }
-});
+});

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

@@ -0,0 +1,97 @@
+.exhibit-card {
+  box-sizing: border-box;
+  float: left;
+  height: $exhibit-card-height;
+  margin: 0 -1 * $exhibit-card-gutter $exhibit-card-gutter $exhibit-card-gutter;
+  //               image width        +       gutter         + border (x2)
+  max-width: $exhibit-card-image-size + $exhibit-card-gutter + 2px;
+  padding: 0 $exhibit-card-gutter 0 0;
+  perspective: 1000; // for flip animation
+  position: relative;
+
+  .flipper {
+    position: relative;
+    transform-style: preserve-3d;
+    transition: 0.6s;
+  }
+
+  &.hover .flipper,
+  &:hover .flipper {
+    -ms-filter: "FlipH"; // autoprefixer doesn't handle this case.
+    filter: FlipH;
+    transform: rotateY(180deg);
+  }
+}
+
+.card-face {
+  backface-visibility: hidden;
+  background-color: $exhibit-card-bg;
+  border: 1px solid $exhibit-card-border;
+  height: $exhibit-card-height;
+  left: 0;
+  position: absolute;
+  top: 0;
+  transform-style: preserve-3d;
+  transition: 0.6s;
+  width: 100%;
+}
+
+.card-title {
+  @extend .h5;
+  @extend .text-center;
+
+  font-size: $font-size-h4;
+}
+
+.card-front {
+  transform: rotateY(0deg);
+  z-index: 2;
+
+  img {
+    height: $exhibit-card-image-size;
+    object-fit: cover;
+    width: $exhibit-card-image-size;
+  }
+
+  .card-title {
+    padding-top: $padding-large-vertical;
+  }
+}
+
+.card-back {
+  box-shadow: $exhibit-card-shadow;
+  padding: 0 $exhibit-card-gutter;
+  transform: rotateY(-180deg);
+
+  .card-title {
+    border-bottom: 1px dotted $exhibit-card-border;
+    line-height: $headings-line-height;
+    margin-bottom: $padding-base-vertical;
+    padding-bottom: $padding-base-vertical;
+  }
+
+  .subtitle {
+    @extend .h5;
+    @extend .text-center;
+    line-height: $headings-line-height;
+  }
+
+  .description {
+    font-size: $font-size-h6;
+  }
+
+  .visit-exhibit {
+    bottom: $exhibit-card-gutter;
+    position: absolute;
+  }
+}
+
+.center-btn {
+  left: 50%;
+  position: absolute;
+
+  .btn {
+    left: -50%;
+    position: relative;
+  }
+}

data/app/assets/stylesheets/spotlight/_sir-trevor_overrides.scss

@@ -91,6 +91,15 @@
     }
   }
 
+  .st-icon-uploaded_items {
+    @extend .icon;
+    background-image: image-url('spotlight/blocks/item-row.png');
+
+    &:hover {
+      background-image: image-url('spotlight/blocks/item-row-on.png');
+    }
+  }
+
   .st-icon-search_results {
     @extend .icon;
     background-image: image-url('spotlight/blocks/results.png');
@@ -196,4 +205,4 @@
 
 .st-block-positioner {
   left: -6.5em;
-}
+}

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

@@ -16,6 +16,7 @@
 @import "spotlight/edit_in_place";
 @import "spotlight/featured_browse_categories_block";
 @import "spotlight/item_text_block";
+@import "spotlight/uploaded_items_block";
 @import "spotlight/multi_image_selector";
 @import "spotlight/multi_up_item_grid";
 @import "spotlight/slideshow_block";
@@ -26,6 +27,7 @@
 @import "spotlight/bootstrap_overrides";
 @import "spotlight/blacklight_overrides";
 @import "spotlight/report_a_problem";
+@import "spotlight/exhibits_index";
 
 
 

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

@@ -0,0 +1,7 @@
+[data-type='uploaded_items'] {
+  // SirTrevor's Uploadable mixin adds a
+  // styled div that we need to remove
+  .st-block__inputs {
+    display: none;
+  }
+}

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

@@ -1,4 +1,11 @@
-$footer-top-margin: 3 * $padding-small-vertical;
-$footer-height: 118px;
-$white: #FFFFFF;
-$black: #000000;
+$footer-top-margin: 3 * $padding-small-vertical !default;
+$footer-height: 118px !default;
+$white: #ffffff !default;
+$black: #000000 !default;
+
+$exhibit-card-height: 350px !default;
+$exhibit-card-bg: $well-bg !default;
+$exhibit-card-border: $well-border !default;
+$exhibit-card-gutter: $padding-large-horizontal !default;
+$exhibit-card-image-size: 273px !default;
+$exhibit-card-shadow: inset 2px 2px 5px -2px $exhibit-card-border !default;

data/app/controllers/spotlight/exhibits_controller.rb

@@ -2,18 +2,26 @@ module Spotlight
   ##
   # Administrative CRUD actions for an exhibit
   class ExhibitsController < Spotlight::ApplicationController
-    before_action :authenticate_user!
+    before_action :authenticate_user!, except: [:index]
     include Blacklight::SearchHelper
 
     load_and_authorize_resource
 
+    def index
+      if @exhibits.one?
+        redirect_to @exhibits.first
+      else
+        render layout: 'spotlight/home'
+      end
+    end
+
     def new
       build_initial_exhibit_contact_emails
     end
 
     def process_import
       @exhibit.import(JSON.parse(import_exhibit_params.read))
-      if @exhibit.save
+      if @exhibit.save && @exhibit.reindex_later
         redirect_to spotlight.exhibit_dashboard_path(@exhibit), notice: t(:'helpers.submit.exhibit.updated', model: @exhibit.class.model_name.human.downcase)
       else
         render action: :import
@@ -80,6 +88,13 @@ module Spotlight
       )
     end
 
+    def create_params
+      params.require(:exhibit).permit(
+        :title,
+        :slug
+      )
+    end
+
     def import_exhibit_params
       params.require(:file)
     end

data/app/helpers/spotlight/main_app_helpers.rb

@@ -4,7 +4,7 @@ module Spotlight
   module MainAppHelpers
     include Spotlight::NavbarHelper
     def cache_key_for_spotlight_exhibits
-      Spotlight::Exhibit.maximum(:updated_at).try(:utc).try(:to_s, :number)
+      "#{Spotlight::Exhibit.count}/#{Spotlight::Exhibit.maximum(:updated_at).try(:utc)}"
     end
 
     def on_browse_page?

data/app/helpers/spotlight/navbar_helper.rb

@@ -7,7 +7,7 @@ module Spotlight
     # if the exhibit is not searchable, we're not in an exhibit, or the top-level
     # exhibit masthead isn't being used (e.g. on a browse category)
     def should_render_spotlight_search_bar?
-      exhibit_masthead? && (current_exhibit.nil? || current_exhibit.searchable?)
+      exhibit_masthead? && current_exhibit && current_exhibit.searchable?
     end
   end
 end