blacklight-spotlight 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c24e4327c4f2ecc1ce94f54a9a57911460a6a5bc
-  data.tar.gz: d55edc7e57c318fc0f9ad58d16f97f923d7af42a
+  metadata.gz: 6bac2d83148f6c9a1aa532408a2effa05bc24a90
+  data.tar.gz: 159afad18eb3f2517565a596ae5370fe03886b3f
 SHA512:
-  metadata.gz: f2c0ba29eda4636f6c89ffab236434143f273ccd47114518607ad1c5fd45f57c8e0a0fc601b5f606e64ca103618267d46085d0e4782cf78923a4c1608f9f21df
-  data.tar.gz: 5b77388991866723e7ebf665f9a1951cb1064b05b210c06153b8eb5b2869d6136ae2f235054961308493711ce751f2524a5ab1d99ed766a21ce9fef7112c9ba7
+  metadata.gz: cfd4c44bb04e705ca0a1efead0491ca55d2ead843f0a7a22e009471a6426213072a6d9bdd0ddcce12973dc346f43b6d8382e996aafb665cceb69d7c0d44c01b4
+  data.tar.gz: fbd5a0e58e03d519febe79fe96ca6b0bcbdde3bdb92b4f11c0ebb07d46e2b6cb711f935d2de6ea3b550eacf587421c6ea94d765cf143bc468e03dcc6428f3736

data/Rakefile

@@ -4,7 +4,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.0.0.zip"
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.6.0.zip"
 
 require 'rdoc/task'
 

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

@@ -17,4 +17,4 @@
 //= require bootstrap/tooltip
 //= require bootstrap/popover
 //= require bootstrap-tagsinput
-//= require_tree .
+//= require_tree .

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

@@ -6,4 +6,32 @@ Spotlight.onLoad(function() {
   // Handle weighting the pages and their children.
   updateWeightsAndRelationships($('#nested-fields .metadata_fields'));
   updateWeightsAndRelationships($('#nested-fields.facet_fields'));
+
+  $('.field-label').on('click.inplaceedit', function() {
+    var $input = $(this).next('input');
+    var $label = $(this);
+
+    $label.hide();
+    $input.val($label.text());
+    $input.attr('type', 'text');
+    $input.select();
+    $input.focus();
+
+    $input.on('keypress', function(e) {
+      if(e.which == 13) {
+        $input.trigger('blur.inplaceedit');
+        return false;
+      }
+    });
+
+    $input.on('blur.inplaceedit', function() {
+      $label.text($input.val());
+      $label.show();
+      $input.attr('type', 'hidden');
+
+      return false;
+    });
+
+    return false;
+  });
 });

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

@@ -1,5 +1,47 @@
 Spotlight.onLoad(function() {
-  // By default tags input binds on page ready to [data-role=tagsinput],
-  // however, that doesn't work with Turbolinks. So we init manually:
-  $('#solr_document_exhibit_tag_list').tagsinput();
+  if($('#solr_document_exhibit_tag_list').length > 0) {
+    // By default tags input binds on page ready to [data-role=tagsinput],
+    // however, that doesn't work with Turbolinks. So we init manually:
+    $('#solr_document_exhibit_tag_list').tagsinput();
+
+    var tags = new Bloodhound({
+      datumTokenizer: function(d) { return Bloodhound.tokenizers.whitespace(d.name); },
+      queryTokenizer: Bloodhound.tokenizers.whitespace,
+      limit: 10,
+      prefetch: {
+        url: $('#solr_document_exhibit_tag_list').data('autocomplete_url'),
+        ttl: 1,
+        filter: function(list) {
+          return $.map(list, function(tag) { return { name: tag }; });
+        }
+      }
+    });
+
+    tags.initialize();
+
+    $('#solr_document_exhibit_tag_list').tagsinput('input').typeahead({highlight: true, hint: false}, {
+      name: 'tags',
+      displayKey: 'name',
+      source: tags.ttAdapter()
+    }).bind('typeahead:selected', $.proxy(function (obj, datum) {
+      $('#solr_document_exhibit_tag_list').tagsinput('add', datum.name);
+      $('#solr_document_exhibit_tag_list').tagsinput('input').typeahead('val', '');
+    }));
+  }
+
+      $(".visiblity_toggle").bl_checkbox_submit({
+          //css_class is added to elements added, plus used for id base
+          css_class: "toggle_visibility",
+          //success is called at the end of the ajax success callback
+          success: function (public){
+            // We store the selector of the label to toggle in a data attribute in the form
+            var private_label = $($(this).data("label-toggle-target"));
+            if ( public ) {
+              private_label.slideUp();
+            } else {
+              private_label.slideDown();
+            }
+          }
+      }); 
+
 });

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

@@ -3,9 +3,9 @@ Spotlight.onLoad(function() {
     container = $(this).parent().parent();
     input = container.find('.input-group input[type="text"]').first().clone();
     input.val('');
-    input.attr('id', input.attr('id').replace('0', container.children().length));
-    input.attr('name', input.attr('name').replace('0', container.children().length));
-    container.append(input);
+    input.attr('id', input.attr('id').replace('0', container.find('input[type="text"]').length));
+    input.attr('name', input.attr('name').replace('0', container.find('input[type="text"]').length));
+    input.insertBefore(container.find('.help-block'));
   });
 
   $('.btn-with-tooltip').tooltip();

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

@@ -0,0 +1,64 @@
+Spotlight.onLoad(function() {
+  serializeObservedForms(observedForms());
+});
+// All the observed forms
+function observedForms(){
+  return $('[data-form-observer]');
+}
+// Serialize all observed forms on the page
+function serializeObservedForms(forms){
+  forms.each(function(){
+    serializeFormStatus($(this));
+    unbindObservedFormSubmit();
+  });
+}
+// Unbind observing form on submit (which we have to do because of turbolinks)
+function unbindObservedFormSubmit(){
+  observedForms().each(function(){
+    $(this).on("submit", function(){
+      $(this).data("being-submitted", true);
+    });
+  });
+}
+// Store form serialization in data attribute
+function serializeFormStatus(form){
+  form.data("serialized-form", formSerialization(form));
+}
+// Do custom serialization of the sir-trevor form data
+function formSerialization(form){
+  var content_editable = [];
+  var i=0;
+  $("[contenteditable='true']", form).each(function(){
+    content_editable.push("&contenteditable_" + i + "=" + $(this).text());
+  });
+  return form.serialize() + content_editable.join();
+}
+// Get the stored serialized form status
+function serializedFormStatus(form){
+  return form.data("serialized-form");
+}
+// Check all observed forms on page for status change
+function observedFormsStatusHasChanged(){
+  var unsaved_changes = false;
+  observedForms().each(function(){
+    if ( !$(this).data("being-submitted") ) {
+      if (serializedFormStatus($(this)) != formSerialization($(this))) {
+        unsaved_changes = true;
+      }
+    }
+  });
+  return unsaved_changes;
+}
+// Compare stored and current form serializations
+// to determine if the form has changed before
+// unload and before any turbolinks change event
+$(window).on('beforeunload page:before-change', function(event) {
+  if ( observedFormsStatusHasChanged() ) {
+    var message = "You have unsaved changes. Are you sure you want to leave this page?";
+    if ( event.type == "beforeunload" ) {
+      return message;
+    }else{
+      return confirm(message)
+    }
+  }
+});

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

@@ -26,14 +26,13 @@ SirTrevor.Blocks.ItemText =  (function(){
           '<label for="' + id_key + '" class="col-sm-2 control-label">Selected item</label>',
           '<div class="col-sm-6 field">',
             '<input name="' + id_key + '"',
-            ' class="st-input-string form-control ' + type + '" type="text" id="' + id_key + '" />',
+            ' class="st-input-string form-control ' + type + '" type="text" id="' + id_key + '" data-twitter-typeahead="true" />',
           '</div>',
         '</div>',
         '<div class="form-group">',
           '<label for="' + text_key + '" class="col-sm-2 control-label">Text</label>',
           '<div class="col-sm-6 field">',
-            '<textarea name="' + text_key + '"',
-            ' class="form-control" type="text" id="' + text_key + '" rows="8"></textarea>',
+          '<div id="' + text_key + '" class="st-text-block" contenteditable="true"></div>',
           '</div>',
         '</div>',
       '</div>',
@@ -71,7 +70,16 @@ SirTrevor.Blocks.ItemText =  (function(){
       var data = {};
       data[id_key] = this.$('#' + id_key).val();
       data[title_key] = this.$('#' + title_key).is(':checked');
-      data[text_key] = this.$('#' + text_key).val();
+
+      if (this.hasTextBlock()) {
+        var content = this.getTextBlock().html();
+        if (content.length > 0) {
+          data.text = SirTrevor.toMarkdown(content, this.type);
+        }else{
+          data.text = "";
+        }
+      }
+
       data[align_key] = this.$('[name=' + align_key + ']:checked').val();
       this.setData(data);
     },
@@ -81,9 +89,9 @@ SirTrevor.Blocks.ItemText =  (function(){
     },
 
     loadData: function(data){
+      this.getTextBlock().html(SirTrevor.toHTML(data.text, this.type));
       this.$('#' + id_key).val(data[id_key]);
       this.$('#' + title_key).prop('checked', data[title_key]);
-      this.$('#' + text_key).val(data[text_key]);
       this.$('#' + align_key + "-" + data[align_key]).prop("checked", true);
     }
   });

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

@@ -0,0 +1,96 @@
+/*
+  Sir Trevor MutliUpItemGrid Block.
+  This block takes an ID,
+  fetches the record from solr,
+  displays the image, title,
+  and any provided text
+  and displays them.
+*/
+
+SirTrevor.Blocks.MultiUpItemGrid =  (function(){
+  var key = "item-grid"
+  var id_key = key + "-id";
+  var display_checkbox = key + "-display";
+  var caption_key = key + "-display-caption";
+  var field_key = key + "caption-field";
+  var max_fields = 5;
+  var type = "multi-up-item-grid";
+
+  var template = _.template([
+    '<div class="form-inline ' + key + '-admin">',
+      '<div class="widget-header">',
+        'This widget displays one to five thumbnail images of repository items in a single row grid. Optionally, you can a caption below each image..',
+      '</div>',
+      '<div class="col-sm-9">',
+        '<label for="' + id_key + '_0" class="control-label">Selected items to display</label>',
+        '<div class="form-group">',
+          buildInputFields(max_fields, id_key, display_checkbox),
+        '</div>',
+      '</div>',
+      '<div class="col-sm-3">',
+        '<label for"' + caption_key + '">',
+          '<input name="' + caption_key + '" type="hidden" value="false" />',
+          '<input name="' + caption_key + '" id="' + caption_key + '" type="checkbox" value="true" />',
+          'Display caption',
+        '</label>',
+        '<div class="field-select">',
+          '<label for="' + field_key + '">Caption field</label>',
+          '<select name="' + field_key + '" id="' + field_key + '">',
+            '<option value="title">Title</option>',
+          '</select>',
+        '</div>',
+      '</div>',
+      '<div class="clearFix"></div>',
+    '</div>'
+  ].join("\n"));
+
+  return SirTrevor.Block.extend({
+
+    type: type,
+
+    title: function() { return "Multi-Up Item Grid"; },
+
+    editorHTML: function() {
+      return template(this);
+    },
+
+    icon_name: type,
+
+    toData: function() {
+      var data = {};
+      this.$('.item-grid-input').each(function(){
+        data[$(this).attr("id")] = $(this).val();
+      });
+      this.$('.item-grid-checkbox').each(function(){
+        data[$(this).attr("id")] = $("[name='" + $(this).attr('name') + "']:checked").val();
+      });
+      data[caption_key] = this.$('[name=' + caption_key + ']:checked').val();
+      this.setData(data);
+    },
+
+    onBlockRender: function() {
+      addAutocompletetoSirTrevorForm();
+    },
+
+    loadData: function(data){
+      this.$('.item-grid-input').each(function(){
+        $(this).val(data[$(this).attr("id")]);
+      });
+      this.$('.item-grid-checkbox').each(function(){
+        $(this).prop('checked', data[$(this).attr("id")]);
+      });
+      this.$('#' + caption_key).prop('checked', data[caption_key])
+    }
+  });
+})();
+function buildInputFields(times, id, checkbox){
+  output = ""
+  for(var i=0; i < times; i++){
+    output += '<div class="col-sm-9 field">';
+      output += '<input name="' + checkbox + '_' + i + '" type="hidden" value="false" />';
+      output += '<input name="' + checkbox + '_' + i + '" id="' + checkbox + '_' + i + '" type="checkbox" class="item-grid-checkbox" value="true" />';
+      output += '<input name="' + id + '_' + i + '" class="st-input-string item-grid-input form-control" data-twitter-typeahead="true" type="text" id="' + id + '_' + i + '" />';
+    output += '</div>';
+  }
+  return output;
+}

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

@@ -2,11 +2,13 @@
 // All this logic will automatically be available in application.js.
 Spotlight.onLoad(function() {
   // Initialize Nestable for nested pages
-  $('#nested-pages.about_page_admin').nestable({maxDepth: 1});
-  $('#nested-pages.feature_page_admin').nestable({maxDepth: 2, expandBtnHTML: "", collapseBtnHTML: ""});
+  $('#nested-pages.about_pages_admin').nestable({maxDepth: 1});
+  $('#nested-pages.feature_pages_admin').nestable({maxDepth: 2, expandBtnHTML: "", collapseBtnHTML: ""});
   $('#nested-pages.search_admin').nestable({maxDepth: 1});
+  $('.contacts_admin').nestable({maxDepth: 1});
   // Handle weighting the pages and their children.
   updateWeightsAndRelationships($('#nested-pages'));
+  updateWeightsAndRelationships($('.contacts_admin'));
 
    $.each($('.dd-handle'), function(k, el){
       var height;
@@ -17,22 +19,31 @@ Spotlight.onLoad(function() {
       }
       $(el).css('height', height);
     });
+
+    SirTrevor.EventBus.on('block:create:new', addTitleToSirTrevorBlock);
+    SirTrevor.EventBus.on('block:create:existing', addTitleToSirTrevorBlock);
 });
 
+function addTitleToSirTrevorBlock(block){
+  block.$inner.append("<div class='st-title'>" + block.title() + "</div>");
+};
+
 function updateWeightsAndRelationships(selector){
   $.each(selector, function() {
-    $(this).on('change',function(){
+    $(this).on('change', function(event){
+      // Scope to a container because we may have two orderable sections on the page (e.g. About page has pages and contacts)
+      container = $(event.currentTarget);
       var data = $(this).nestable('serialize')
       var weight = 0;
       for(var i in data){
         var parent_id = data[i]['id'];
-        parent_node = findNode(parent_id)
+        parent_node = findNode(parent_id, container);
         setWeight(parent_node, weight++);
         if(data[i]['children']){
           var children = data[i]['children'];
           for(var child in children){
             var id = children[child]['id']
-            child_node = findNode(id);
+            child_node = findNode(id, container);
             setWeight(child_node, weight++);
             setParent(child_node, parent_id);
           }
@@ -44,8 +55,8 @@ function updateWeightsAndRelationships(selector){
   });
 }
 
-function findNode(id) {
-  return $("[data-id="+id+"]");
+function findNode(id, container) {
+  return container.find("[data-id="+id+"]");
 }
 
 function setWeight(node, weight) {

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

@@ -16,7 +16,7 @@ var results = new Bloodhound({
 });
 
 function addAutocompletetoSirTrevorForm() {
-  $('input[name="item-id"]').typeahead(null, {
+  $('[data-twitter-typeahead]').typeahead(null, {
       displayKey: 'id',
       source: results.ttAdapter(),
       templates: {

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

@@ -0,0 +1,21 @@
+#nested-fields {
+  margin-bottom: 1em;
+  .dd-item td:first-child {
+    padding-left: 40px;
+    position: relative;
+    
+    a {
+      cursor: text;
+      color: inherit;
+      text-decoration: none;
+    }
+    &:hover {
+      background: #F7F7D0;
+      cursor: text;
+    }
+  }
+
+  th:first-child {
+    padding-left: 40px;
+  }
+}

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

@@ -0,0 +1,29 @@
+
+.page-header {
+  border-bottom: none;
+  small {
+    font-size: $font-size-h2;
+    display: block;
+    margin-top: $padding-base-vertical;
+  }
+}
+
+.sidenav {
+
+  margin-bottom: 24px;
+
+  li > a {
+    padding: 3px 15px;
+  }
+
+  .dashboard > a {
+    padding-left: 0;
+  }
+}
+
+h1,h2,h3,h4,h5,h6 {
+  .label {
+    font-size: $font-size-base;
+    vertical-align: super;
+  }
+}