Merge remote-tracking branch 'origin/master' into UtilizeRootInActions

Conflicts:
	shelly/filewell/static/filewell/src/actions/__tests__/FolderActions-test.js
	shelly/filewell/static/filewell/src/stores/DirectoryStore.js

Author: bpostlethwaite

test-dashboard/toolpanel-dashboard/.gitignore

@@ -0,0 +1 @@
+old-style.css

test-dashboard/toolpanel-dashboard/index.html

@@ -9,8 +9,8 @@
     <link type="text/css" rel="stylesheet" href="./../../shelly/shelly/static/css/tipsy.css" />
 
     <!-- ToolPanel Required Plotly CSS -->
-    <link rel="stylesheet" type="text/css" href="workspace-style.css"/>
     <link rel="stylesheet" type="text/css" href="./../../shelly/shelly/static/css/plotly.css"/>
+    <link rel="stylesheet" type="text/css" href="old-style.css">
     <link rel="stylesheet" type="text/css" href="./../../shelly/shelly/static/plotlycss/fonts/unified/icons.css" />
 
 </head>

test-dashboard/toolpanel-dashboard/temp-build-css.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+node-sass ../../shelly/shelly/static/css/style.scss > old-style.css

test-dashboard/toolpanel-dashboard/ui.js

@@ -4,14 +4,37 @@ var Plotly = window.Plotly;
 var ToolPanel = window.ToolPanel;
 var divs = [];
 
+function createRemoveButton () {
+    var removeButton = document.createElement('button');
+    removeButton.innerHTML = 'remove toolpanel';
+    removeButton.id = 'removeButton';
+    document.body.appendChild(removeButton);
+
+    removeButton.onclick = function () {
+        divs[0].toolPanel.remove();
+    };
+}
+
 function createPlot (divId) {
     var containerDiv = document.getElementById('main');
     var graphDiv = document.createElement('div');
+    var toolDiv = document.createElement('div');
+    containerDiv.style.width = '100%';
+    containerDiv.style.height = '100%';
+    containerDiv.style.clear = 'both';
+
     graphDiv.id = divId;
-    graphDiv.style.width = '45%';
+    graphDiv.style.width = '80%';
     graphDiv.style.display = 'inline-block';
-    graphDiv.style.margin = '10px';
+    graphDiv.style.margin = '0px';
     graphDiv.style.position = 'relative';
+    graphDiv.style.verticalAlign = 'top';
+
+    toolDiv.style.verticalAlign = 'top';
+    toolDiv.style.width = '130px';
+    toolDiv.style.display = 'inline-block';
+
+    containerDiv.appendChild(toolDiv);
     containerDiv.appendChild(graphDiv);
 
     var trace1 = {
@@ -35,12 +58,16 @@ function createPlot (divId) {
         popoverContainer: containerDiv
     });
 
-    graphDiv.toolPanel.makeMenu();
+    graphDiv.toolPanel.makeMenu({
+        toolMenuContainer: toolDiv
+    });
 
-    divs.push(graphDiv);
+    divs.push(graphDiv, toolDiv);
 
 }
 
-['one', 'two'].forEach(function (index) {
+['one'].forEach(function (index) {
     createPlot(index);
 });
+
+createRemoveButton();