blacklight-spotlight 3.0.0.alpha.10 → 3.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27efff1c809c87463bcd240ccc65b6edca2182b73238f1027bc178a2f009ab5e
-  data.tar.gz: 9df0f469fa0bc43f39a718d2cdb3bc7909e25da15a2e1d189ccc054b006eb579
+  metadata.gz: 8e21e66d81a96d330d76726b9a41e44ea7495653b75d9d5b211f4a607cc4afec
+  data.tar.gz: 9f6cc613d234db387773a9b80ae7a72e7c3610ab01996a116df4997668dc0703
 SHA512:
-  metadata.gz: fc49fe51f1c599c5c3569d4387f7b2c1e124e9d8369a2b554ec26e441d8197f4f7e154cec7ab0b9c8fd3bdb8597315675da6d54b129df4774cdafbecfa339c9f
-  data.tar.gz: c06bc5cd170cf772c13bf220bb8e0ebb136b81fb7a575b6cbfe16704fe77c4cf42c759131f9fda803361b909537ba97e9e366e58f4ab99b68d4275408b3c7853
+  metadata.gz: dc889b0bf136bde52dcb6e8d99776be47261cff5e4310ad3297018e77d5d25818f46df0d874ac379dfa91f8177a648135e84f4ef0ee5810c30bc3d87c90caed8
+  data.tar.gz: efe143a5c7125d9b6d18aa972d2a1c4357cf2c42f34ed62c0b2b402af4d16c6473087c63b3cb605a07127edb2f65a0d038772037bb7560ca5497a734f6b89bfd

data/README.md

@@ -1,7 +1,7 @@
 spotlight
 =========
 
-[![Build Status](https://travis-ci.org/projectblacklight/spotlight.png?branch=master)](https://travis-ci.org/projectblacklight/spotlight) | [![Gem Version](https://badge.fury.io/rb/blacklight-spotlight.png)](http://badge.fury.io/rb/blacklight-spotlight) | [Release Notes](https://github.com/projectblacklight/spotlight/releases) | [Design Documents](https://github.com/projectblacklight/spotlight/releases/tag/v0.0.0)
+![CI](https://github.com/projectblacklight/spotlight/workflows/CI/badge.svg) | [![Gem Version](https://badge.fury.io/rb/blacklight-spotlight.png)](http://badge.fury.io/rb/blacklight-spotlight) | [Release Notes](https://github.com/projectblacklight/spotlight/releases) | [Design Documents](https://github.com/projectblacklight/spotlight/releases/tag/v0.0.0)
 
 Spotlight is open source software that enables librarians, curators, and other content experts to easily build feature-rich websites that showcase collections and objects from a digital repository, uploaded items, or a combination of the two. Spotlight is a plug-in for [Blacklight](https://github.com/projectblacklight/blacklight), an open source, Ruby on Rails Engine that provides a basic discovery interface for searching an Apache Solr index.
 

data/app/assets/images/blacklight/arrow-alt-circle-left.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M256 504C119 504 8 393 8 256S119 8 256 8s248 111 248 248-111 248-248 248zm116-292H256v-70.9c0-10.7-13-16.1-20.5-8.5L121.2 247.5c-4.7 4.7-4.7 12.2 0 16.9l114.3 114.9c7.6 7.6 20.5 2.2 20.5-8.5V300h116c6.6 0 12-5.4 12-12v-64c0-6.6-5.4-12-12-12z"/></svg>

data/app/assets/images/blacklight/arrow-alt-circle-right.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M256 8c137 0 248 111 248 248S393 504 256 504 8 393 8 256 119 8 256 8zM140 300h116v70.9c0 10.7 13 16.1 20.5 8.5l114.3-114.9c4.7-4.7 4.7-12.2 0-16.9l-114.3-115c-7.6-7.6-20.5-2.2-20.5 8.5V212H140c-6.6 0-12 5.4-12 12v64c0 6.6 5.4 12 12 12z"/></svg>

data/app/assets/images/blacklight/close.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"/></svg>

data/app/assets/images/blacklight/zoom_in.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14zm.5-7H9v2H7v1h2v2h1v-2h2V9h-2z"/></svg>

data/app/assets/images/blacklight/zoom_out.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14zM7 9h5v1H7V9z"/></svg>

data/app/assets/javascripts/spotlight/admin/{add_new_page_button.js → add_new_button.js}

@@ -13,6 +13,7 @@
       var cancel = $("input[data-behavior='cancel']", target);
       var input  = $("input[type='text']", target);
       var original_width  = button.outerWidth();
+      var expanded = false;
 
       // Animate button open when the mouse enters or
       // the button is given focus (i.e. clicked/tabbed)
@@ -43,7 +44,13 @@
         }
       });
       function expandButton(){
+        // If this has not yet been expanded, recalculate original_width to 
+        // handle things that may have been originally hidden.
+        if (!expanded) {
+          original_width  = button.outerWidth();
+        }
         if(button.outerWidth() <= (original_width + 5)) {
+          expanded = true;
           button.animate(
             {width: settings.animate_width + 'px'}, settings.speed, function(){
               target.show(0, function(){

data/app/assets/javascripts/spotlight/admin/block_mixins/autocompleteable.js

@@ -18,6 +18,10 @@
         this.transform_autocomplete_results = _.identity;
       }
 
+      if (_.isUndefined(this['autocomplete_control'])) {
+        this.autocomplete_control = function() { return '<input type="text" class="st-input-string form-control item-input-field" data-twitter-typeahead="true" placeholder="<%= i18n.t("blocks:autocompleteable:placeholder")%>"/>' };
+      }
+
       if (_.isUndefined(this['bloodhoundOptions'])) {
         this.bloodhoundOptions = function() {
           return {
@@ -30,10 +34,6 @@
       }
     },
 
-    autocomplete_control: function() {
-      return '<input type="text" class="st-input-string form-control item-input-field" data-twitter-typeahead="true" placeholder="<%= i18n.t("blocks:autocompleteable:placeholder")%>"/>';
-    },
-
     addAutocompletetoSirTrevorForm: function() {
       $('[data-twitter-typeahead]', this.inner).spotlightSearchTypeAhead({bloodhound: this.bloodhound(), template: this.autocomplete_template()}).on('typeahead:selected typeahead:autocompleted', this.autocompletedHandler()).on( 'focus', function() {
         if($(this).val() === '') {

data/app/assets/javascripts/spotlight/admin/blocks/browse_group_categories_block.js

@@ -0,0 +1,88 @@
+/*
+  Sir Trevor BrowseGroupCategories
+*/
+
+SirTrevor.Blocks.BrowseGroupCategories = (function(){
+
+  return Spotlight.Block.Resources.extend({
+    type: "browse_group_categories",
+    icon_name: "browse",
+    bloodhoundOptions: function() {
+      var that = this;
+      return {
+        prefetch: {
+          url: this.autocomplete_url(),
+          ttl: 0,
+          filter: function(response) {
+            // Let the dom know that the response has been returned
+            $(that.inner).attr('data-browse-groups-fetched', true);
+            return response;
+          }
+        }
+      };
+    },
+
+    autocomplete_control: function() {
+      return '<input type="text" class="st-input-string form-control item-input-field" data-twitter-typeahead="true" placeholder="<%= i18n.t("blocks:browse_group_categories:autocomplete")%>"/>';
+    },
+    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}"><span class="autocomplete-title">{{title}}</span><br/></div>' },
+    autocomplete_url: function() { return $(this.inner).closest('form[data-autocomplete-exhibit-browse-groups-path]').data('autocomplete-exhibit-browse-groups-path').replace("%25QUERY", "%QUERY"); },
+    _itemPanel: function(data) {
+      var index = "item_" + this.globalIndex++;
+      var checked;
+      if (data.display == "true") {
+        checked = "checked='checked'"
+      } else {
+        checked = "";
+      }
+      var resource_id = data.slug || data.id;
+      var markup = [
+        '<li class="field form-inline dd-item dd3-item" data-resource-id="' + resource_id + '" data-id="' + index + '" id="' + this.formId("item_" + data.id) + '">',
+          '<input type="hidden" name="item[' + index + '][id]" value="' + resource_id + '" />',
+          '<input type="hidden" name="item[' + index + '][title]" value="' + data.title + '" />',
+          '<input data-property="weight" type="hidden" name="item[' + index + '][weight]" value="' + data.weight + '" />',
+            '<div class="card d-flex dd3-content">',
+              '<div class="dd-handle dd3-handle"><%= i18n.t("blocks:resources:panel:drag") %></div>',
+              '<div class="d-flex card-header item-grid justify-content-between">',
+                '<div class="d-flex flex-grow-1">',
+                  '<div class="checkbox">',
+                    '<input name="item[' + index + '][display]" type="hidden" value="false" />',
+                    '<input name="item[' + index + '][display]" id="'+ this.formId(this.display_checkbox + '_' + data.id) + '" type="checkbox" ' + checked + ' class="item-grid-checkbox" value="true"  />',
+                    '<label class="sr-only" for="'+ this.formId(this.display_checkbox + '_' + data.id) +'"><%= i18n.t("blocks:resources:panel:display") %></label>',
+                  '</div>',
+                  '<div class="main">',
+                    '<div class="title card-title">' + data.title + '</div>',
+                  '</div>',
+                '</div>',
+                '<div class="d-flex">',
+                  '<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;
+
+      $('a[data-item-grid-panel-remove]', panel).on('click', function(e) {
+        e.preventDefault();
+        $(this).closest('.field').remove();
+        context.afterPanelDelete();
+
+      });
+
+      this.afterPanelRender(data, panel);
+
+      return panel;
+    },
+
+    item_options: function() { return [
+      '<label>',
+        '<input type="hidden" name="display-item-counts" value="false" />',
+        '<input type="checkbox" name="display-item-counts" value="true" checked />',
+        '<%= i18n.t("blocks:browse_group_categories:item_counts") %>',
+      '</label>'
+    ].join("\n") },
+  });
+})();

data/app/assets/javascripts/spotlight/admin/blocks/pages_block.js

@@ -8,7 +8,7 @@ SirTrevor.Blocks.FeaturedPages = (function(){
     icon_name: "pages",
 
     autocomplete_url: function() { return $(this.inner).closest('form[data-autocomplete-exhibit-pages-path]').data('autocomplete-exhibit-pages-path').replace("%25QUERY", "%QUERY"); },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{log "Look at me"}}{{log thumbnail_image_url}}{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
+    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
     bloodhoundOptions: function() {
       return {
         prefetch: {

data/app/assets/javascripts/spotlight/admin/blocks/solr_documents_base_block.js

@@ -85,7 +85,7 @@ SirTrevor.Blocks.SolrDocumentsBase = (function(){
 
       $.ajax(manifestUrl).done(
         function(manifest) {
-          var Iiif = require('spotlight/admin/iiif');
+          var Iiif = spotlightAdminIiif;
           var iiifManifest = new Iiif(manifestUrl, manifest);
 
           var thumbs = iiifManifest.imagesArray();

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

@@ -130,9 +130,16 @@ SirTrevor.Blocks.UploadedItems = (function(){
             '</div>',
             '<input type="file" id="uploaded_item_url" name="file[file_0][file_data]" />',
           '</div>',
+          '<div class="col-md-4">',
+            '<input name="<%= zpr_key %>" type="hidden" value="false" />',
+            '<input name="<%= zpr_key %>" id="<%= formId(zpr_key) %>" data-key="<%= zpr_key %>" type="checkbox" value="true" />',
+            '<label for="<%= formId(zpr_key) %>"><%= i18n.t("blocks:solr_documents:zpr:title") %></label>',
+          '</div>',
         '</div>',
         '<%= text_area() %>',
       '</div>'
-    ].join("\n")
+    ].join("\n"),
+
+    zpr_key: 'zpr_link'
   });
 })();

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

@@ -1,50 +1,16 @@
 Spotlight.onLoad(function() {
-  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: 100,
-      prefetch: {
-        url: $('#solr_document_exhibit_tag_list').data('autocomplete_url'),
-        ttl: 1,
-        filter: function(list) {
-          return $.map(list, function(tag) { return { name: tag }; });
-        }
+  $(".visiblity_toggle").blCheckboxSubmit({
+    //css_class is added to elements added, plus used for id base
+    cssClass: "toggle_visibility",
+    //success is called at the end of the ajax success callback
+    success: function (isPublic){
+      // We store the selector of the label to toggle in a data attribute in the form
+      var docTarget = $($(this).data("label-toggle-target"));
+      if ( isPublic ) {
+        docTarget.removeClass("blacklight-private");
+      } else {
+        docTarget.addClass("blacklight-private");
       }
-    });
-
-    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', '');
-    })).bind('blur', function() {
-      $('#solr_document_exhibit_tag_list').tagsinput('add', $('#solr_document_exhibit_tag_list').tagsinput('input').typeahead('val'));
-      $('#solr_document_exhibit_tag_list').tagsinput('input').typeahead('val', '');
-    });
-  }
-
-      $(".visiblity_toggle").blCheckboxSubmit({
-          //css_class is added to elements added, plus used for id base
-          cssClass: "toggle_visibility",
-          //success is called at the end of the ajax success callback
-          success: function (isPublic){
-            // We store the selector of the label to toggle in a data attribute in the form
-            var docTarget = $($(this).data("label-toggle-target"));
-            if ( isPublic ) {
-              docTarget.removeClass("blacklight-private");
-            } else {
-              docTarget.addClass("blacklight-private");
-            }
-          }
-      });
-
+    }
+  });
 });

data/app/assets/javascripts/spotlight/admin/crop.es6

@@ -40,6 +40,12 @@ export default class Crop {
     this.renderCropperMap();
 
     if (this.imageLayer) {
+      // Force a broken layer's container to be an element before removing.
+      // Code in leaflet-iiif land calls delete on the image layer's container when removing,
+      // which errors if there is an issue fetching the info.json and stops further necessary steps to execute.
+      if(!this.imageLayer._container) {
+        this.imageLayer._container = $('<div></div>');
+      }
       this.cropperMap.removeLayer(this.imageLayer);
     }
 

data/app/assets/javascripts/spotlight/admin/croppable.js

@@ -12,7 +12,7 @@ Spotlight.onLoad(function() {
   $.fn.croppable = function() {
     var croppables = this;
 
-    var Crop = require('spotlight/admin/crop');
+    var Crop = spotlightAdminCrop;
     $(croppables).each(function() {
       var cropElement = $(this);
       var c = new Crop(cropElement);

data/app/assets/javascripts/spotlight/admin/exhibit_tag_autocomplete.js

@@ -0,0 +1,37 @@
+Spotlight.onLoad(function() {
+  $('[data-autocomplete-tag="true"]').each(function(_i, el) {
+    var $el = $(el);
+    // By default tags input binds on page ready to [data-role=tagsinput],
+    // however, that doesn't work with Turbolinks. So we init manually:
+    $el.tagsinput();
+
+    var tags = new Bloodhound({
+      datumTokenizer: function(d) { return Bloodhound.tokenizers.whitespace(d.name); },
+      queryTokenizer: Bloodhound.tokenizers.whitespace,
+      limit: 100,
+      prefetch: {
+        url: $el.data('autocomplete-url'),
+        ttl: 1,
+        filter: function(list) {
+          // Let the dom know that the response has been returned
+          $el.attr('data-autocomplete-fetched', true);
+          return $.map(list, function(tag) { return { name: tag }; });
+        }
+      }
+    });
+
+    tags.initialize();
+
+    $el.tagsinput('input').typeahead({highlight: true, hint: false}, {
+      name: 'tags',
+      displayKey: 'name',
+      source: tags.ttAdapter()
+    }).bind('typeahead:selected', $.proxy(function (obj, datum) {
+      $el.tagsinput('add', datum.name);
+      $el.tagsinput('input').typeahead('val', '');
+    })).bind('blur', function() {
+      $el.tagsinput('add', $el.tagsinput('input').typeahead('val'));
+      $el.tagsinput('input').typeahead('val', '');
+    });
+  });
+});

data/app/assets/javascripts/spotlight/admin/index.js

@@ -12,7 +12,5 @@
 //= require Path.Drag
 //= require MutationObserver
 
-// Provide AMD module support
-//= require almond
 //= require polyfill.min.js
 //= require_tree .

data/app/assets/javascripts/spotlight/admin/{reindex_monitor.js → progress_monitor.js}

@@ -1,9 +1,9 @@
 Spotlight.onLoad(function() {
-  $('[data-behavior="reindex-monitor"]').reindexMonitor();
+  $('[data-behavior="progress-panel"]').progressMonitor();
 });
 
 (function($) {
-  $.fn.reindexMonitor = function() {
+  $.fn.progressMonitor = function() {
     var monitorElements = this;
     var defaultRefreshRate = 3000;
     var panelContainer;
@@ -11,6 +11,7 @@ Spotlight.onLoad(function() {
 
     $(monitorElements).each(function() {
       panelContainer = $(this);
+      panelContainer.hide();
       var monitorUrl = panelContainer.data('monitorUrl');
       var refreshRate = panelContainer.data('refreshRate') || defaultRefreshRate;
       pollers.push(
@@ -48,10 +49,14 @@ Spotlight.onLoad(function() {
     function updateMonitorPanel(data) {
       panelStartDate().text(data.started_at);
       panelCurrentDate().text(data.updated_at);
-      panelCompleted().text(data.completed);
+      panelCompletedDate().text(data.updated_at);
+      panelCurrent().text(data.completed);
+      setPanelCompleted(data.finished);
       updatePanelTotals(data);
       updatePanelErrorMessage(data);
       updateProgressBar(data);
+
+      panelContainer.show();
     }
 
     function updateProgressBar(data) {
@@ -84,6 +89,7 @@ Spotlight.onLoad(function() {
     }
 
     function calculatePercentage(data) {
+      if (data.total == 0) return 0;
       return Math.floor((data.completed / data.total) * 100);
     }
 
@@ -103,11 +109,17 @@ Spotlight.onLoad(function() {
                .find('[data-behavior="date"]');
     }
 
+    function panelCompletedDate() {
+      return monitorPanel()
+               .find('[data-behavior="monitor-completed"]')
+               .find('[data-behavior="date"]');
+    }
+
     function panelTotals() {
       return monitorPanel().find('[data-behavior="total"]');
     }
 
-    function panelCompleted() {
+    function panelCurrent() {
       return monitorPanel()
                .find('[data-behavior="monitor-current"]')
                .find('[data-behavior="completed"]');
@@ -121,6 +133,16 @@ Spotlight.onLoad(function() {
       return monitorPanel().find('[data-behavior="monitor-error"]');
     }
 
+    function setPanelCompleted(finished) {
+      var panel = monitorPanel().find('[data-behavior="monitor-completed"]');
+
+      if (finished) {
+        panel.show();
+      } else {
+        panel.hide();
+      }
+    }
+
     return this;
   };
 })(jQuery);

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

@@ -1,5 +1,5 @@
 //= require typeahead.bundle.min.js
-//= require handlebars-v1.3.0.js
+//= require handlebars
 
 (function($){
   $.fn.spotlightSearchTypeAhead = function( options ) {
@@ -73,7 +73,7 @@ function addImageSelector(input, panel, manifestUrl, initialize) {
   var cropper = input.data('iiifCropper');
   $.ajax(manifestUrl).done(
     function(manifest) {
-      var Iiif = require('spotlight/admin/iiif');
+      var Iiif = spotlightAdminIiif;
       var iiifManifest = new Iiif(manifestUrl, manifest);
 
       var thumbs = iiifManifest.imagesArray();

data/app/assets/javascripts/spotlight/admin/sir-trevor/block_controls.js

@@ -40,19 +40,28 @@
       }
     }
 
-    return Object.keys(groups).reduce(function(memo, groupKey) {
-      var group   = groups[groupKey];
-      var groupEl = $("<div class='st-controls-group'><div class='st-group-col-form-label'>" + groupKey + "</div></div>");
+    function generateBlock(groups, key) {
+      var group   = groups[key];
+      var groupEl = $("<div class='st-controls-group'><div class='st-group-col-form-label'>" + key + "</div></div>");
       var buttons = group.reduce(function(memo, btn) {
         return memo += btn;
       }, "");
       groupEl.append(buttons);
-      if (memo.length === 0) {
-        return memo += groupEl[0].outerHTML;
-      } else {
-        return memo += "<hr />" + groupEl[0].outerHTML;
+      return groupEl[0].outerHTML;
+    }
+
+    var standardWidgets = generateBlock(groups, i18n.t("blocks:group:undefined"));
+
+    var exhibitWidgets = Object.keys(groups).map(function(key) {
+      if (key !== i18n.t("blocks:group:undefined")) {
+        return generateBlock(groups, key);
       }
-    }, "");
+    }).filter(function (element) {
+      return element != null;
+    });
+
+    var blocks = [standardWidgets].concat(exhibitWidgets).join("<hr />");
+    return blocks;
   }
 
   function render(Blocks, availableTypes) {
@@ -65,7 +74,7 @@
     elButtons.appendChild(el);
     return elButtons;
   }
-  
+
   global.Spotlight.BlockControls = function() { };
   global.Spotlight.BlockControls.create = function(editor) {
     // REFACTOR - should probably not know about blockManager
@@ -83,10 +92,10 @@
       SirTrevor = null;
       el = null;
     }
-    
+
     function insert(e) {
       e.stopPropagation();
-      
+
       var parent = this.parentNode;
       if (!parent || hide() === parent) { return; }
       $('.st-block__inner', parent).after(el);
@@ -101,7 +110,7 @@
 
     $(editor.wrapper).delegate(".st-block-replacer", "click", insert);
     $(editor.wrapper).delegate(".st-block-controls__button", "click", insert);
-    
+
     return {
       el: el,
       hide: hide,