Account for changes to workspace workflow in Cilantro

This uses a safer way of registering custom UI elements as not to stomp on the Cilantro version and also adds the loading overlay to the workspace template that varify overrides.

Signed-off-by: Don Naegely <[email protected]>

varify/static/js/src/ui/workflows/workspace.js

@@ -1,19 +1,22 @@
 /* global define */
 
 define([
+    'underscore',
     'cilantro',
     'marionette',
     '../sample',
     '../../utils'
-], function(c, Marionette, sample, utils) {
+], function(_, c, Marionette, sample, utils) {
 
 
     var WorkspaceWorkflow = c.ui.WorkspaceWorkflow.extend({
         template: 'varify/workflows/workspace',
 
-        ui: {
-            sampleVariantSetHelp: '[data-target=sample-variant-set-help]',
-            createVariantSetButton: '[data-target=create-variant-set]'
+        ui: function() {
+            return _.extend({
+                sampleVariantSetHelp: '[data-target=sample-variant-set-help]',
+                createVariantSetButton: '[data-target=create-variant-set]'
+            }, c.ui.WorkspaceWorkflow.prototype.ui);
         },
 
         events: {

varify/static/templates/workflows/workspace.html

@@ -18,3 +18,7 @@ <h4>Variant Sets <i data-target=sample-variant-set-help class='icon icon-questio
         <div data-target='public-query-region'></div>
     </div>
 </div>
+
+<div class='loading-overlay hide'>
+    <h4><i class='icon-spinner icon-spin'></i> Loading Query</h4>
+</div>