First pass at a Hanging Protocol implementation and editor (LT-131)

Packages/viewerbase/client/components/viewer/toolbar/toolbar.html

@@ -10,11 +10,17 @@
             {{ /if }}
 
             {{ #if includeLayoutButton }}
-                {{ >layoutButton }}
+            <div class="btn-group">
+                <button id="layout" type="button" class="btn btn-sm btn-default dropdown-toggle" data-container="body" data-toggle="dropdown" aria-expanded="false" data-placement="right" title="Layout" rel="tooltip">
+                    <span class="fa fa-th-large"></span>
+                </button>
+                {{  >layoutChooser }}
+            </div>
             {{ /if }}
 
             {{ #if includeHangingProtocolButtons }}
                 {{ >hangingProtocolButtons }}
+                {{ >matchedProtocols }}
             {{ /if }}
 
             {{ #each btnGroup }}

Packages/viewerbase/client/components/viewer/toolbar/toolbar.js

@@ -152,7 +152,7 @@ Template.toolbar.onRendered(function() {
     var states = toolManager.getToolDefaultStates();
     var disabledToolButtons = states.disabledToolButtons;
     var allToolbarButtons = $('#toolbar').find('button');
-    if (disabledToolButtons.length > 0) {
+    if (disabledToolButtons && disabledToolButtons.length > 0) {
         for (var i = 0; i < allToolbarButtons.length; i++) {
             var toolbarButton = allToolbarButtons[i];
             $(toolbarButton).prop('disabled', false);
@@ -191,7 +191,7 @@ Template.toolbar.helpers({
             return this.toolbarOptions.includeHangingProtocolButtons;
         }
 
-        return false;
+        return true;
     },
     btnGroup: function() {
         if (this.toolbarOptions && this.toolbarOptions.btnGroup !== undefined) {