Merge branch 'master' into schema-view-En-Hua

4 files changed, 47 insertions, 6 deletions

diff --git a/src/client/goldenLayout.js b/src/client/goldenLayout.js
index 238f1ac0a..896237e1d 100644
--- a/src/client/goldenLayout.js
+++ b/src/client/goldenLayout.js
@@ -1583,7 +1583,7 @@
             close: 'close',
             maximise: 'maximise',
             minimise: 'minimise',
-            popout: 'open in new window',
+            popout: 'new tab',
             popin: 'pop in',
             tabDropdown: 'additional tabs'
         }
@@ -2355,6 +2355,7 @@
             this.element.hide();
         }
     });
+
     /**
      * This class represents a header above a Stack ContentItem.
      *
@@ -2362,6 +2363,7 @@
      * @param {lm.item.AbstractContentItem} parent
      */
     lm.controls.Header = function (layoutManager, parent) {
+
         lm.utils.EventEmitter.call(this);
 
         this.layoutManager = layoutManager;
@@ -4449,7 +4451,11 @@
     lm.items.Stack = function (layoutManager, config, parent) {
         lm.items.AbstractContentItem.call(this, layoutManager, config, parent);
 
-        this.element = $('<div class="lm_item lm_stack"></div>');
+        this.element = $(
+            '<div class="lm_item lm_stack">'
+            + '<p class="empty-tabs-message">Click <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAUCAAAAABHICnvAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAHdElNRQfkCBsXMgbrEyzaAAAAT0lEQVQY02NgIAcIu8tgEW3/u4IDQ5B14/8LQlhFhckVFfCJjIyIOfP/QWpEZGSQJFS05s9fIPj3/z+YmseCTxS7CZS7DI+PsYcOjpAkDAA6H0KZxzDzlgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0wOC0yN1QyMzo1MDowNi0wNDowMDvgVpQAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDgtMjdUMjM6NTA6MDYtMDQ6MDBKve4oAAAAAElFTkSuQmCC"/> to create a new tab</p>'
+            + '</div>'
+        );
         this._activeContentItem = null;
         var cfg = layoutManager.config;
         this._header = { // defaults' reconstruction from old configuration style
@@ -5029,7 +5035,7 @@
             'close',
             'maximise',
             'minimise',
-            'open in new window'
+            'new tab'
         ];
     };
 
diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index c3cdb7dde..15cd2c144 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -59,6 +59,10 @@
 .mainView-container {
     color: $dark-gray;
 
+    .lm_goldenlayout {
+        background: $medium-gray;
+    }
+
     .lm_title {
         background: $light-gray;
         color: $dark-gray;
@@ -166,12 +170,14 @@
         position: absolute;
         z-index: 2;
         background-color: $light-gray;
+
         .editable-title {
             background-color: $light-gray;
         }
     }
 
 }
+
 .mainView-libraryHandle {
     background-color: $light-gray;
 }
@@ -179,20 +185,24 @@
 {
     .propertiesView {
         background-color: #252525;
+
         input {
             background-color: $medium-gray;
         }
-        .propertiesView-sharingTable 
-        {
+
+        .propertiesView-sharingTable {
             background-color: $medium-gray;
         }
+
         .editable-title {
             background-color: $medium-gray;
         }
+
         .propertiesView-field {
             background-color: $medium-gray;
         }
     }
+
     .mainView-propertiesDragger,
     .mainView-libraryHandle {
         background: #353535;
@@ -202,8 +212,9 @@
     .contextMenu-cont {
         background: $medium-gray;
         color: $white;
+
         input::placeholder {
-            color:$white;
+            color: $white;
         }
     }
 }
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 6d0d5eb39..9a885fbf8 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -466,6 +466,7 @@ export class MainView extends React.Component {
             </div>;
     }
 
+
     expandFlyout = action((button: Doc) => {
         // bcz: What's going on here!?  
         // Chrome(not firefox) seems to have a bug when the flyout expands and there's a zoomed freeform tab.  All of the div below the CollectionFreeFormView's main div
diff --git a/src/client/views/collections/CollectionDockingView.scss b/src/client/views/collections/CollectionDockingView.scss
index 77e7b86ea..b2ee33807 100644
--- a/src/client/views/collections/CollectionDockingView.scss
+++ b/src/client/views/collections/CollectionDockingView.scss
@@ -65,6 +65,29 @@
     display: inline;
 }
 
+.empty-tabs-message {
+    position: absolute;
+    width: 100%;
+    z-index: 1;
+    top: 50%;
+    z-index: 1;
+    text-align: center;
+    font-size: 18;
+    color: $dark-gray;
+
+    img {
+        position: relative;
+        top: -1px;
+        margin: 0 5px;
+    }
+}
+
+.lm_header,
+.lm_items {
+    z-index: 2;
+    position: relative;
+}
+
 .lm_drag_tab {
     padding: 0;
     width: 15px !important;