Merge branch 'master' of https://github.com/nasa/openmctweb into search-explore

platform/commonUI/browse/bundle.json

@@ -92,7 +92,7 @@
             },
             {
                 "key": "window",
-                "name": "Open in a new tab",
+                "name": "Open In New Tab",
                 "implementation": "windowing/NewTabAction.js",
                 "description": "Open in a new browser tab",
                 "category": ["view-control", "contextual"],

platform/commonUI/browse/res/templates/browse.html

@@ -23,8 +23,9 @@
     <mct-include key="'topbar-browse'"></mct-include>
     <div class="holder browse-area s-browse-area abs" ng-controller="BrowseController">
         <mct-split-pane class='contents abs' anchor='left'>
-            <div class='split-pane-component treeview pane'
+            <div
-                 style="min-width: 150px; max-width: 800px; width: 25%;">
+                class='split-pane-component treeview pane left'
+                >
                 <mct-representation key="'create-button'" mct-object="navigatedObject">
                 </mct-representation>
                 <div>

platform/commonUI/browse/res/templates/browse/object-header.html

@@ -25,6 +25,6 @@
 	    <span ng-if="parameters.mode" class='action'>{{parameters.mode}}</span>
 	    <span class='type-name'>{{type.getName()}}</span>
 	    <span class='title-label'>{{model.name}}</span>
-		<!--a id='actions-menu' class='ui-symbol context-available' onclick="alert('Not yet functional. This will display a dropdown menu of options for this object.');">v</a-->
+		<a id='actions-menu' class='ui-symbol context-available' onclick="alert('Not yet functional. This will display a dropdown menu of options for this object.');">v</a>
 	</span>
 </div>

platform/commonUI/edit/res/templates/edit-object.html

@@ -23,74 +23,47 @@
                     mct-object="domainObject"
                     ng-model="representation">
 </mct-representation>
-<div class="holder edit-area abs"
+<div class="holder edit-area abs">
-     ng-controller="SplitPaneController as vSplitter">
+    <mct-split-pane class='contents abs' anchor='right'>
-    <mct-toolbar name="mctToolbar"
+        <div class='split-pane-component pane left edit-main'>
-                 structure="toolbar.structure"
+            <mct-toolbar name="mctToolbar"
-                 ng-model="toolbar.state">
+                         structure="toolbar.structure"
-    </mct-toolbar>
+                         ng-model="toolbar.state">
-    <div class='split-layout vertical contents abs work-area'>
+            </mct-toolbar>
-        <div
+            <div class='holder abs object-holder work-area'>
-            class='abs pane left edit-main'
-            ng-style="{ right: (vSplitter.state()+5) + 'px'}"
-            >
-            <div class='holder abs object-holder'>
                 <mct-representation key="representation.selected.key"
                                     toolbar="toolbar"
                                     mct-object="representation.selected.key && domainObject">
                 </mct-representation>
             </div>
         </div>
-
+        <mct-splitter></mct-splitter>
-        <!-- MAIN VERTICAL SPLITTER -->
         <div
-            class="splitter"
+            class='split-pane-component pane right edit-objects menus-to-left'
-            ng-style="{ right: vSplitter.state() + 'px'}"
-            mct-drag-down="vSplitter.startMove()"
-            mct-drag="vSplitter.move(-delta[0], 100, 1000)"
-            ></div>
-
-
-        <div
-            class='abs pane right edit-objects menus-to-left'
             ng-controller='EditPanesController as editPanes'
-            ng-style="{ width: (vSplitter.state()-4) + 'px', right: '0px'}"
             >
-            <div
+            <mct-split-pane class='contents abs' anchor='bottom'>
-                class='holder abs split-layout horizontal'
+                <div
-                ng-controller="SplitPaneController as hSplitter"
-                >
-	            <div
                     class="abs pane top accordion"
-                    ng-style="{ bottom: (hSplitter.state()+8) + 'px', top: '0px' }"
                     ng-controller="ToggleController as toggle"
                     >
-                    <mct-container key="accordion" title="Library">
+                    <mct-container key="accordion" label="Library">
                         <mct-representation key="'tree'"
-                                            alias="foo1"
                                             mct-object="editPanes.getRoot()">
                         </mct-representation>
                     </mct-container>
-		        </div>
-                <!-- HORZ SPLITTER -->
-                <div
-                        class="splitter"
-                        ng-style="{ bottom: hSplitter.state() + 'px', top: 'auto' }"
-                        mct-drag-down="hSplitter.startMove()"
-                        mct-drag="hSplitter.move(-delta[1], 120, 1000)"
-                        >
                 </div>
-	            <div
+                <mct-splitter></mct-splitter>
+                <div
                     class="abs pane bottom accordion"
-                    ng-style="{ bottom: '0px', height: (hSplitter.state()-4) + 'px'}"
                     ng-controller="ToggleController as toggle"
                     >
-                    <mct-container key="accordion" title="Elements">
+                    <mct-container key="accordion" label="Elements">
                         <mct-representation key="'edit-elements'" mct-object="domainObject">
                         </mct-representation>
                     </mct-container>
-				</div>
+                </div>
-            </div>
+            </mct-split-pane>
         </div>
-    </div>
+    </mct-split-pane>
 </div>

platform/commonUI/general/bundle.json

@@ -164,7 +164,7 @@
             {
                 "key": "accordion",
                 "templateUrl": "templates/containers/accordion.html",
-                "attributes": [ "title" ]
+                "attributes": [ "label" ]
             }
         ],
         "representations": [

platform/commonUI/general/res/css/forms.css

@@ -120,8 +120,8 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/* line 24, ../sass/forms/_elems.scss */
+/* line 22, ../sass/forms/_elems.scss */
-.form .section-header {
+.section-header {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -129,13 +129,14 @@
   font-size: 0.8em;
   margin-top: 5px;
   padding: 5px; }
-  /* line 30, ../sass/forms/_elems.scss */
+  /* line 28, ../sass/forms/_elems.scss */
-  .form .section-header:first-child {
+  .section-header:first-child {
     margin-top: 0; }
-/* line 34, ../sass/forms/_elems.scss */
+
+/* line 35, ../sass/forms/_elems.scss */
 .form .form-section {
   position: relative; }
-/* line 38, ../sass/forms/_elems.scss */
+/* line 39, ../sass/forms/_elems.scss */
 .form .form-row {
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -146,10 +147,10 @@
   margin-top: 5px;
   padding: 5px;
   position: relative; }
-  /* line 45, ../sass/forms/_elems.scss */
+  /* line 46, ../sass/forms/_elems.scss */
   .form .form-row.first {
     border-top: none; }
-  /* line 49, ../sass/forms/_elems.scss */
+  /* line 50, ../sass/forms/_elems.scss */
   .form .form-row .label,
   .form .form-row .controls {
     -moz-box-sizing: border-box;
@@ -161,47 +162,47 @@
     font-size: 0.75rem;
     line-height: 22px;
     min-height: 22px; }
-  /* line 60, ../sass/forms/_elems.scss */
+  /* line 61, ../sass/forms/_elems.scss */
   .form .form-row > .label {
     float: left;
     position: relative;
     white-space: nowrap;
     width: 20%; }
-  /* line 68, ../sass/forms/_elems.scss */
+  /* line 69, ../sass/forms/_elems.scss */
   .form .form-row .value {
     color: #cccccc; }
-  /* line 72, ../sass/forms/_elems.scss */
+  /* line 73, ../sass/forms/_elems.scss */
   .form .form-row .controls {
     float: left;
     position: relative;
     width: 79.9%; }
-    /* line 79, ../sass/forms/_elems.scss */
+    /* line 80, ../sass/forms/_elems.scss */
     .form .form-row .controls .l-composite-control.l-checkbox {
       display: inline-block;
       line-height: 14px;
       margin-right: 5px; }
-    /* line 88, ../sass/forms/_elems.scss */
+    /* line 89, ../sass/forms/_elems.scss */
     .form .form-row .controls input[type="text"] {
       height: 22px;
       line-height: 22px;
       margin-top: -4px;
       vertical-align: baseline; }
-    /* line 95, ../sass/forms/_elems.scss */
+    /* line 96, ../sass/forms/_elems.scss */
     .form .form-row .controls .l-med input[type="text"] {
       width: 200px; }
-    /* line 99, ../sass/forms/_elems.scss */
+    /* line 100, ../sass/forms/_elems.scss */
     .form .form-row .controls .l-small input[type="text"] {
       width: 50px; }
-    /* line 103, ../sass/forms/_elems.scss */
+    /* line 104, ../sass/forms/_elems.scss */
     .form .form-row .controls .l-numeric input[type="text"] {
       text-align: right; }
-    /* line 107, ../sass/forms/_elems.scss */
+    /* line 108, ../sass/forms/_elems.scss */
     .form .form-row .controls .select {
       margin-right: 5px; }
-  /* line 112, ../sass/forms/_elems.scss */
+  /* line 113, ../sass/forms/_elems.scss */
   .form .form-row .field-hints {
     color: #666666; }
-  /* line 116, ../sass/forms/_elems.scss */
+  /* line 117, ../sass/forms/_elems.scss */
   .form .form-row .selector-list {
     -moz-border-radius: 2px;
     -webkit-border-radius: 2px;
@@ -214,7 +215,7 @@
     position: relative;
     height: 150px;
     overflow: auto; }
-    /* line 127, ../sass/forms/_elems.scss */
+    /* line 128, ../sass/forms/_elems.scss */
     .form .form-row .selector-list .wrapper {
       overflow-y: auto;
       position: absolute;
@@ -223,24 +224,24 @@
       bottom: 5px;
       left: 5px; }
 
-/* line 141, ../sass/forms/_elems.scss */
+/* line 142, ../sass/forms/_elems.scss */
 label.form-control.checkbox input {
   margin-right: 5px;
   vertical-align: top; }
 
-/* line 147, ../sass/forms/_elems.scss */
+/* line 148, ../sass/forms/_elems.scss */
 .hint,
 .s-hint {
   font-size: 0.9em; }
 
-/* line 152, ../sass/forms/_elems.scss */
+/* line 153, ../sass/forms/_elems.scss */
 .l-result {
   display: inline-block;
   min-width: 32px;
   min-height: 32px;
   position: relative;
   vertical-align: top; }
-  /* line 159, ../sass/forms/_elems.scss */
+  /* line 160, ../sass/forms/_elems.scss */
   .l-result div.s-hint {
     -moz-border-radius: 2px;
     -webkit-border-radius: 2px;
@@ -391,7 +392,7 @@ input[type="text"] {
   margin: 0 0 2px 2px;
   overflow: hidden;
   position: relative; }
-  /* line 152, ../sass/_mixins.scss */
+  /* line 162, ../sass/_mixins.scss */
   .form-control.select:not(.disabled):hover {
     background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU3NTc1NyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
     background-size: 100%;
@@ -400,10 +401,10 @@ input[type="text"] {
     background-image: -webkit-linear-gradient(#636363, #575757);
     background-image: linear-gradient(#636363, #575757);
     color: #bdbdbd; }
-    /* line 155, ../sass/_mixins.scss */
+    /* line 165, ../sass/_mixins.scss */
     .form-control.select:not(.disabled):hover.btn-menu .invoke-menu {
       color: #878787; }
-  /* line 160, ../sass/_mixins.scss */
+  /* line 170, ../sass/_mixins.scss */
   .form-control.select.btn-menu .invoke-menu {
     color: #757575; }
   /* line 29, ../sass/forms/_selects.scss */

platform/commonUI/general/res/css/items.css

@@ -136,7 +136,7 @@
     margin-bottom: 3px;
     margin-right: 3px;
     position: relative; }
-    /* line 152, ../sass/_mixins.scss */
+    /* line 162, ../sass/_mixins.scss */
     .items-holder .item.grid-item:not(.disabled):hover {
       background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzcwNzA3MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzYzNjM2MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
       background-size: 100%;
@@ -145,65 +145,79 @@
       background-image: -webkit-linear-gradient(#707070, #636363);
       background-image: linear-gradient(#707070, #636363);
       color: #bdbdbd; }
-      /* line 155, ../sass/_mixins.scss */
+      /* line 165, ../sass/_mixins.scss */
       .items-holder .item.grid-item:not(.disabled):hover.btn-menu .invoke-menu {
         color: #949494; }
-    /* line 160, ../sass/_mixins.scss */
+    /* line 170, ../sass/_mixins.scss */
     .items-holder .item.grid-item.btn-menu .invoke-menu {
       color: #828282; }
-    /* line 42, ../sass/items/_item.scss */
-    .items-holder .item.grid-item .item-main .item-type {
-      -moz-transition-property: "color";
-      -o-transition-property: "color";
-      -webkit-transition-property: "color";
-      transition-property: "color";
-      -moz-transition-duration: 200ms;
-      -o-transition-duration: 200ms;
-      -webkit-transition-duration: 200ms;
-      transition-duration: 200ms;
-      -moz-transition-timing-function: ease-in-out;
-      -o-transition-timing-function: ease-in-out;
-      -webkit-transition-timing-function: ease-in-out;
-      transition-timing-function: ease-in-out; }
     /* line 46, ../sass/items/_item.scss */
     .items-holder .item.grid-item:hover .item-main .item-type {
       color: #0099cc !important; }
-    /* line 49, ../sass/items/_item.scss */
+      /* line 48, ../sass/items/_item.scss */
+      .items-holder .item.grid-item:hover .item-main .item-type .l-icon-link {
+        color: #49dedb; }
+    /* line 52, ../sass/items/_item.scss */
     .items-holder .item.grid-item:hover .item-main .item-open {
       opacity: 1; }
-    /* line 54, ../sass/items/_item.scss */
+    /* line 57, ../sass/items/_item.scss */
     .items-holder .item.grid-item .contents {
       top: 5px;
       right: 5px;
       bottom: 5px;
       left: 5px; }
-    /* line 58, ../sass/items/_item.scss */
+    /* line 61, ../sass/items/_item.scss */
     .items-holder .item.grid-item .bar.top-bar.abs {
       bottom: auto;
       height: 20px;
       line-height: 20px;
       z-index: 5; }
-      /* line 63, ../sass/items/_item.scss */
+      /* line 66, ../sass/items/_item.scss */
       .items-holder .item.grid-item .bar.top-bar.abs .left, .items-holder .item.grid-item .bar.top-bar.abs .right {
         width: auto; }
-        /* line 65, ../sass/items/_item.scss */
+        /* line 68, ../sass/items/_item.scss */
         .items-holder .item.grid-item .bar.top-bar.abs .left .icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon {
-          margin-left: 5px; }
+          margin-left: 3px; }
-    /* line 70, ../sass/items/_item.scss */
+          /* line 70, ../sass/items/_item.scss */
+          .items-holder .item.grid-item .bar.top-bar.abs .left .icon.l-icon-link, .items-holder .item.grid-item .bar.top-bar.abs .right .icon.l-icon-link {
+            color: #49dedb; }
+    /* line 76, ../sass/items/_item.scss */
     .items-holder .item.grid-item .bar.bottom-bar.abs {
       top: auto;
       height: 30px;
       padding: 5px; }
-    /* line 76, ../sass/items/_item.scss */
+    /* line 82, ../sass/items/_item.scss */
     .items-holder .item.grid-item .item-main {
       line-height: 160px;
       z-index: 1; }
-      /* line 82, ../sass/items/_item.scss */
+      /* line 88, ../sass/items/_item.scss */
       .items-holder .item.grid-item .item-main .item-type {
+        overflow: false;
+        position: absolute;
+        top: 40px;
+        right: 40px;
+        bottom: 40px;
+        left: 40px;
+        width: auto;
+        height: auto;
         color: #737373;
         text-align: center;
-        font-size: 6em; }
+        font-size: 96.9px;
-      /* line 88, ../sass/items/_item.scss */
+        line-height: 102px;
+        bottom: auto;
+        height: 102px;
+        top: 30px; }
+        /* line 100, ../sass/items/_item.scss */
+        .items-holder .item.grid-item .item-main .item-type .l-icon-link {
+          color: #1a8e8b;
+          height: 36px;
+          line-height: 36px;
+          position: absolute;
+          font-size: 32px;
+          left: 0px;
+          bottom: 10px;
+          z-index: 2; }
+      /* line 112, ../sass/items/_item.scss */
       .items-holder .item.grid-item .item-main .item-open {
         -moz-transition-property: "opacity";
         -o-transition-property: "opacity";
@@ -223,17 +237,17 @@
         width: 50px;
         pointer-events: none;
         text-align: right; }
-    /* line 100, ../sass/items/_item.scss */
+    /* line 124, ../sass/items/_item.scss */
     .items-holder .item.grid-item .title {
       text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px;
       color: #cccccc;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis; }
-    /* line 108, ../sass/items/_item.scss */
+    /* line 132, ../sass/items/_item.scss */
     .items-holder .item.grid-item .details {
       font-size: 0.8em; }
-    /* line 111, ../sass/items/_item.scss */
+    /* line 135, ../sass/items/_item.scss */
     .items-holder .item.grid-item.selected {
       background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYjRmMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
       background-size: 100%;
@@ -255,7 +269,7 @@
       color: #999;
       display: inline-block;
       color: #80dfff; }
-      /* line 152, ../sass/_mixins.scss */
+      /* line 162, ../sass/_mixins.scss */
       .items-holder .item.grid-item.selected:not(.disabled):hover {
         background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzJlY2JmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzE0YzRmZiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
         background-size: 100%;
@@ -264,21 +278,21 @@
         background-image: -webkit-linear-gradient(#2ecbff, #14c4ff);
         background-image: linear-gradient(#2ecbff, #14c4ff);
         color: #bdbdbd; }
-        /* line 155, ../sass/_mixins.scss */
+        /* line 165, ../sass/_mixins.scss */
         .items-holder .item.grid-item.selected:not(.disabled):hover.btn-menu .invoke-menu {
           color: #75ddff; }
-      /* line 160, ../sass/_mixins.scss */
+      /* line 170, ../sass/_mixins.scss */
       .items-holder .item.grid-item.selected.btn-menu .invoke-menu {
         color: #52d4ff; }
-      /* line 116, ../sass/items/_item.scss */
+      /* line 140, ../sass/items/_item.scss */
       .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) {
         color: #80dfff; }
-      /* line 117, ../sass/items/_item.scss */
+      /* line 141, ../sass/items/_item.scss */
       .items-holder .item.grid-item.selected .item-main .item-open {
         color: #80dfff; }
-      /* line 118, ../sass/items/_item.scss */
+      /* line 142, ../sass/items/_item.scss */
       .items-holder .item.grid-item.selected .title {
         color: white; }
-      /* line 120, ../sass/items/_item.scss */
+      /* line 144, ../sass/items/_item.scss */
       .items-holder .item.grid-item.selected:hover .item-main .item-type {
         color: white !important; }

platform/commonUI/general/res/css/tree.css

@@ -99,20 +99,20 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/* line 22, ../sass/tree/_tree.scss */
+/* line 23, ../sass/tree/_tree.scss */
 ul.tree {
   margin: 0;
   padding: 0; }
-  /* line 266, ../sass/_mixins.scss */
+  /* line 276, ../sass/_mixins.scss */
   ul.tree li {
     list-style-type: none;
     margin: 0;
     padding: 0; }
-  /* line 24, ../sass/tree/_tree.scss */
+  /* line 25, ../sass/tree/_tree.scss */
   ul.tree li {
     display: block;
     position: relative; }
-    /* line 27, ../sass/tree/_tree.scss */
+    /* line 28, ../sass/tree/_tree.scss */
     ul.tree li span.tree-item {
       -moz-border-radius: 2px;
       -webkit-border-radius: 2px;
@@ -122,21 +122,21 @@ ul.tree {
       -webkit-transition: background-color 0.25s;
       transition: background-color 0.25s;
       display: block;
-      font-size: 0.80em;
+      font-size: 0.8em;
       height: 1.4rem;
       line-height: 1.4rem;
       margin-bottom: 3px;
       position: relative; }
-      /* line 38, ../sass/tree/_tree.scss */
+      /* line 39, ../sass/tree/_tree.scss */
       ul.tree li span.tree-item .view-control {
         display: inline-block;
         margin-left: 5px;
         font-size: 0.75em;
         width: 10px; }
-        /* line 44, ../sass/tree/_tree.scss */
+        /* line 45, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item .view-control:hover {
           color: #ffc700; }
-      /* line 49, ../sass/tree/_tree.scss */
+      /* line 50, ../sass/tree/_tree.scss */
       ul.tree li span.tree-item .label {
         display: block;
         overflow: hidden;
@@ -147,35 +147,46 @@ ul.tree {
         left: 0px;
         width: auto;
         height: auto;
-        left: 20px; }
+        left: 15px; }
-        /* line 55, ../sass/tree/_tree.scss */
+        /* line 57, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item .label .type-icon {
-          overflow: hidden;
+          overflow: false;
           position: absolute;
-          top: 0px;
+          top: 0;
-          right: 0px;
+          right: 0;
-          bottom: 0px;
+          bottom: 0;
-          left: 0px;
+          left: 0;
           width: auto;
           height: auto;
           text-shadow: rgba(0, 0, 0, 0.6) 0 1px 2px;
-          color: #0099cc; }
+          color: #0099cc;
-          /* line 59, ../sass/tree/_tree.scss */
+          left: 5px;
-          ul.tree li span.tree-item .label .type-icon .alert {
+          right: auto;
-            text-shadow: rgba(0, 0, 0, 0.3) 0 1px 2px;
+          width: 1em; }
-            background: #333;
+          /* line 65, ../sass/tree/_tree.scss */
-            color: #ff3c00;
+          ul.tree li span.tree-item .label .type-icon .icon.l-icon-link, ul.tree li span.tree-item .label .type-icon .icon.l-icon-alert {
-            font-size: 0.7em;
+            text-shadow: black 0 1px 2px;
-            margin-top: -3px;
-            top: 0;
-            right: auto;
-            bottom: auto;
-            left: 9px;
-            height: auto;
-            width: auto;
             position: absolute;
             z-index: 2; }
-        /* line 75, ../sass/tree/_tree.scss */
+          /* line 71, ../sass/tree/_tree.scss */
+          ul.tree li span.tree-item .label .type-icon .icon.l-icon-alert {
+            color: #ff3c00;
+            font-size: 8px;
+            line-height: 8px;
+            height: 8px;
+            width: 8px;
+            top: 1px;
+            right: -2px; }
+          /* line 77, ../sass/tree/_tree.scss */
+          ul.tree li span.tree-item .label .type-icon .icon.l-icon-link {
+            color: #49dedb;
+            font-size: 8px;
+            line-height: 8px;
+            height: 8px;
+            width: 8px;
+            left: -3px;
+            bottom: 5px; }
+        /* line 86, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item .label .title-label {
           overflow: hidden;
           position: absolute;
@@ -186,55 +197,55 @@ ul.tree {
           width: auto;
           height: auto;
           display: block;
-          left: 20px;
+          left: 30px;
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap; }
-      /* line 87, ../sass/tree/_tree.scss */
+      /* line 97, ../sass/tree/_tree.scss */
       ul.tree li span.tree-item.loading {
         pointer-events: none; }
-        /* line 89, ../sass/tree/_tree.scss */
+        /* line 99, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item.loading .label {
           opacity: 0.5; }
-          /* line 91, ../sass/tree/_tree.scss */
+          /* line 101, ../sass/tree/_tree.scss */
           ul.tree li span.tree-item.loading .label .title-label {
             font-style: italic; }
-        /* line 95, ../sass/tree/_tree.scss */
+        /* line 105, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item.loading .wait-spinner {
           margin-left: 14px; }
-      /* line 100, ../sass/tree/_tree.scss */
+      /* line 110, ../sass/tree/_tree.scss */
       ul.tree li span.tree-item.selected {
         background: #005177;
         color: #fff; }
-        /* line 104, ../sass/tree/_tree.scss */
+        /* line 114, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item.selected .view-control {
           color: #0099cc; }
-        /* line 107, ../sass/tree/_tree.scss */
+        /* line 117, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item.selected .label .type-icon {
           color: #fff; }
-      /* line 113, ../sass/tree/_tree.scss */
+      /* line 123, ../sass/tree/_tree.scss */
       ul.tree li span.tree-item:not(.selected):hover {
         background: #404040;
         color: #cccccc; }
-        /* line 116, ../sass/tree/_tree.scss */
+        /* line 126, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item:not(.selected):hover .context-trigger {
           display: block; }
-        /* line 119, ../sass/tree/_tree.scss */
+        /* line 129, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item:not(.selected):hover .icon {
           color: #33ccff; }
-      /* line 125, ../sass/tree/_tree.scss */
+      /* line 135, ../sass/tree/_tree.scss */
       ul.tree li span.tree-item:not(.loading) {
         cursor: pointer; }
-      /* line 129, ../sass/tree/_tree.scss */
+      /* line 139, ../sass/tree/_tree.scss */
       ul.tree li span.tree-item .context-trigger {
         top: -1px;
         position: absolute;
         right: 3px; }
-        /* line 135, ../sass/tree/_tree.scss */
+        /* line 145, ../sass/tree/_tree.scss */
         ul.tree li span.tree-item .context-trigger .invoke-menu {
           font-size: 0.75em;
           height: 0.9rem;
           line-height: 0.9rem; }
-  /* line 144, ../sass/tree/_tree.scss */
+  /* line 154, ../sass/tree/_tree.scss */
   ul.tree ul.tree {
     margin-left: 15px; }

platform/commonUI/general/res/fonts/symbols/iconmoon.io-WTD-Symbols-v2.0.json

@@ -1,8 +1,8 @@
 {
 	"metadata": {
 		"name": "WTD Symbols v2.",
-		"lastOpened": 1435266597671,
+		"lastOpened": 1435765696898,
-		"created": 1435266594435
+		"created": 1435764071891
 	},
 	"iconSets": [
 		{
@@ -352,7 +352,7 @@
 					"tempChar": ""
 				},
 				{
-					"order": 45,
+					"order": 75,
 					"id": 30,
 					"prevSize": 32,
 					"code": 244,
@@ -415,13 +415,21 @@
 					"name": "icon-object",
 					"tempChar": ""
 				},
+				{
+					"order": 73,
+					"id": 77,
+					"prevSize": 32,
+					"code": 63,
+					"name": "icon-object-unknown",
+					"tempChar": ""
+				},
 				{
 					"order": 53,
 					"id": 22,
 					"prevSize": 32,
 					"code": 86,
 					"name": "icon-packet",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 54,
@@ -429,7 +437,7 @@
 					"prevSize": 32,
 					"code": 234,
 					"name": "icon-page",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 55,
@@ -437,7 +445,7 @@
 					"prevSize": 32,
 					"code": 241,
 					"name": "icon-pause",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 56,
@@ -445,7 +453,7 @@
 					"prevSize": 32,
 					"code": 112,
 					"name": "icon-pencil",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 65,
@@ -453,7 +461,7 @@
 					"prevSize": 32,
 					"code": 79,
 					"name": "icon-people",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 57,
@@ -461,7 +469,7 @@
 					"prevSize": 32,
 					"code": 239,
 					"name": "icon-play",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 58,
@@ -469,7 +477,7 @@
 					"prevSize": 32,
 					"code": 233,
 					"name": "icon-plot-resource",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 59,
@@ -477,7 +485,7 @@
 					"prevSize": 32,
 					"code": 43,
 					"name": "icon-plus",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 60,
@@ -485,7 +493,7 @@
 					"prevSize": 32,
 					"code": 45,
 					"name": "icon-minus",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 61,
@@ -493,7 +501,7 @@
 					"prevSize": 32,
 					"code": 54,
 					"name": "icon-sine",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 62,
@@ -501,7 +509,7 @@
 					"prevSize": 32,
 					"code": 228,
 					"name": "icon-T",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 63,
@@ -509,7 +517,7 @@
 					"prevSize": 32,
 					"code": 116,
 					"name": "icon-telemetry-panel",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 64,
@@ -517,7 +525,7 @@
 					"prevSize": 32,
 					"code": 84,
 					"name": "icon-telemetry",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 18,
@@ -525,7 +533,7 @@
 					"prevSize": 32,
 					"code": 246,
 					"name": "icon-thumbs-strip",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 67,
@@ -533,7 +541,7 @@
 					"prevSize": 32,
 					"code": 83,
 					"name": "icon-timeline",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 68,
@@ -541,7 +549,7 @@
 					"prevSize": 32,
 					"code": 245,
 					"name": "icon-timer",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 69,
@@ -549,7 +557,7 @@
 					"prevSize": 32,
 					"code": 90,
 					"name": "icon-trash",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 70,
@@ -557,7 +565,7 @@
 					"prevSize": 32,
 					"code": 229,
 					"name": "icon-two-parts-both",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 71,
@@ -565,7 +573,7 @@
 					"prevSize": 32,
 					"code": 231,
 					"name": "icon-two-parts-one-only",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 72,
@@ -573,7 +581,7 @@
 					"prevSize": 32,
 					"code": 120,
 					"name": "icon-x-heavy",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 66,
@@ -581,7 +589,7 @@
 					"prevSize": 32,
 					"code": 58946,
 					"name": "icon-x",
-					"tempChar": ""
+					"tempChar": ""
 				}
 			],
 			"id": 2,
@@ -1289,7 +1297,7 @@
 				{
 					"id": 30,
 					"paths": [
-						"M832 0h-640c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192zM832 640l-128-128-512 320 320-512-128-128h448v448z"
+						"M1024 512l-512-512v307.2l-512 204.8v256h512v256z"
 					],
 					"attrs": [
 						{}
@@ -1410,6 +1418,20 @@
 						"icon-object"
 					]
 				},
+				{
+					"id": 77,
+					"paths": [
+						"M510-2l-512 320v384l512 320 512-320v-384l-512-320zM585.4 859.2c-21.2 20.8-46 30.8-76 30.8-31.2 0-56.2-9.8-76.2-29.6-20-20-29.6-44.8-29.6-76.2 0-30.4 10.2-55.2 31-76.2s45.2-31.2 74.8-31.2c29.6 0 54.2 10.4 75.6 32s31.8 46.4 31.8 76c-0.2 29-10.8 54-31.4 74.4zM638.2 546.6c-23.6 11.8-37.4 22-43.4 32.4-3.6 6.2-6 14.8-7.4 26.8v41h-161.4v-44.2c0-40.2 4.4-69.8 13-88 8-17.2 22.6-30.2 44.8-40l34.8-15.4c32-14.2 48.2-35.2 48.2-62.8 0-16-6-30.4-17.2-41.8-11.2-11.2-25.6-17.2-41.6-17.2-24 0-54.4 10-62.8 57.4l-2.2 12.2h-147l1.4-16.2c4-44.6 17-82.4 38.8-112.2 19.6-27 45.6-48.6 77-64.6s64.6-24 98.2-24c60.6 0 110.2 19.4 151.4 59.6 41.2 40 61.2 88 61.2 147.2 0 70.8-28.8 121.4-85.8 149.8z"
+					],
+					"attrs": [
+						{}
+					],
+					"isMulticolor": false,
+					"grid": 0,
+					"tags": [
+						"icon-object-unknown"
+					]
+				},
 				{
 					"id": 22,
 					"paths": [

platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg

@@ -18,6 +18,7 @@
 <glyph unicode="&#x36;" d="M1022.294 448c-1.746 7.196-3.476 14.452-5.186 21.786-20.036 85.992-53.302 208.976-98 306.538-22.42 48.938-45.298 86.556-69.946 115.006-48.454 55.93-98.176 67.67-131.356 67.67s-82.902-11.74-131.356-67.672c-24.648-28.45-47.528-66.068-69.948-115.006-44.696-97.558-77.962-220.544-98-306.538-21.646-92.898-46.444-175.138-71.71-237.836-16.308-40.46-30.222-66.358-40.6-82.604-10.378 16.246-24.292 42.142-40.6 82.604-23.272 57.75-46.144 132.088-66.524 216.052h-197.362c1.746-7.196 3.476-14.452 5.186-21.786 20.036-85.992 53.302-208.976 98-306.538 22.42-48.938 45.298-86.556 69.946-115.006 48.454-55.932 98.176-67.672 131.356-67.672s82.902 11.74 131.356 67.672c24.648 28.45 47.528 66.068 69.948 115.006 44.696 97.558 77.962 220.544 98 306.538 21.646 92.898 46.444 175.138 71.71 237.836 16.308 40.46 30.222 66.358 40.6 82.604 10.378-16.246 24.292-42.142 40.6-82.604 23.274-57.748 46.146-132.086 66.526-216.050h197.36z" />
 <glyph unicode="&#x3c;" d="M256 448l512-512v1024z" />
 <glyph unicode="&#x3e;" d="M768 448l-512 512v-1024z" />
+<glyph unicode="&#x3f;" d="M510 962l-512-320v-384l512-320 512 320v384l-512 320zM585.4 100.8c-21.2-20.8-46-30.8-76-30.8-31.2 0-56.2 9.8-76.2 29.6-20 20-29.6 44.8-29.6 76.2 0 30.4 10.2 55.2 31 76.2s45.2 31.2 74.8 31.2c29.6 0 54.2-10.4 75.6-32s31.8-46.4 31.8-76c-0.2-29-10.8-54-31.4-74.4zM638.2 413.4c-23.6-11.8-37.4-22-43.4-32.4-3.6-6.2-6-14.8-7.4-26.8v-41h-161.4v44.2c0 40.2 4.4 69.8 13 88 8 17.2 22.6 30.2 44.8 40l34.8 15.4c32 14.2 48.2 35.2 48.2 62.8 0 16-6 30.4-17.2 41.8-11.2 11.2-25.6 17.2-41.6 17.2-24 0-54.4-10-62.8-57.4l-2.2-12.2h-147l1.4 16.2c4 44.6 17 82.4 38.8 112.2 19.6 27 45.6 48.6 77 64.6s64.6 24 98.2 24c60.6 0 110.2-19.4 151.4-59.6 41.2-40 61.2-88 61.2-147.2 0-70.8-28.8-121.4-85.8-149.8z" />
 <glyph unicode="&#x41;" d="M512 960c-214.866 0-398.786-132.372-474.744-320h90.744c56.86 0 107.938-24.724 143.094-64h240.906l-192 192h256l320-320-320-320h-256l192 192h-240.906c-35.156-39.276-86.234-64-143.094-64h-90.744c75.958-187.628 259.878-320 474.744-320 282.77 0 512 229.23 512 512s-229.23 512-512 512z" />
 <glyph unicode="&#x43;" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM768 384h-256c-35.2 0-64 28.8-64 64v384c0 35.2 28.8 64 64 64s64-28.8 64-64v-320h192c35.2 0 64-28.8 64-64s-28.8-64-64-64z" />
 <glyph unicode="&#x44;" d="M1024 768c0-106.039-229.23-192-512-192s-512 85.961-512 192c0 106.039 229.23 192 512 192s512-85.961 512-192zM512 448c-282.77 0-512 85.962-512 192v-512c0-106.038 229.23-192 512-192s512 85.962 512 192v512c0-106.038-229.23-192-512-192z" />
@@ -72,7 +73,7 @@
 <glyph unicode="&#xf1;" d="M126 962h256v-1024h-256v1024zM638 962h256v-1024h-256v1024z" />
 <glyph unicode="&#xf2;" d="M640 704v128c0 70.4-57.6 128-128 128h-384c-70.4 0-128-57.6-128-128v-384c0-70.4 57.6-128 128-128h128v139.6c0 134.8 109.6 244.4 244.4 244.4h139.6zM896 576h-384c-70.4 0-128-57.6-128-128v-384c0-70.4 57.6-128 128-128h384c70.4 0 128 57.6 128 128v384c0 70.4-57.6 128-128 128z" />
 <glyph unicode="&#xf3;" d="M293.4 448l218.6 218.6 256-256v421.4c0 70.4-57.6 128-128 128h-512c-70.4 0-128-57.6-128-128v-512c0-70.4 57.6-128 128-128h421.4l-256 256zM1024 512h-128v-320l-384 384-128-128 384-384h-320v-128h576z" />
-<glyph unicode="&#xf4;" d="M832 960h-640c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h640c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM832 320l-128 128-512-320 320 512-128 128h448v-448z" />
+<glyph unicode="&#xf4;" d="M1024 448l-512 512v-307.2l-512-204.8v-256h512v-256z" />
 <glyph unicode="&#xf5;" d="M638 898c0 35.4-28.6 64-64 64h-128c-35.4 0-64-28.6-64-64s28.6-64 64-64h128c35.4 0 64 28.6 64 64zM510 834c-247.4 0-448-200.6-448-448s200.6-448 448-448 448 200.6 448 448-200.6 448-448 448zM510 386h-336c0 185.2 150.8 336 336 336v-336z" />
 <glyph unicode="&#xf6;" d="M448 578c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320zM1024 578c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320zM448 2c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320zM1024 2c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320z" />
 <glyph unicode="&#xe600;" d="M832 447.6c0 0.2 0 0.2 0 0.4v320c0 105.6-86.4 192-192 192h-448c-105.6 0-192-86.4-192-192v-320c0-105.6 86.4-192 192-192h263.6l-197.2 445.6 573.6-254zM766.8 300.2l193.8 20.4-576.6 255.4 255.4-576.6 20.4 193.8 257-257.2 107.2 107.2z" />

platform/commonUI/general/res/sass/_autoflow.scss

@@ -27,6 +27,16 @@
 	$valPad: 5px;
 	$rowH: 15px;
 	font-size: 0.75rem;
+
+	&:hover {
+		.l-autoflow-header .l-btn.change-column-width {
+			@include trans-prop-nice-fade(50ms);
+			opacity: 1;
+		}
+	}
+
+
+
 	.l-autoflow-header {
 		bottom: auto;
 		height: $headerH;
@@ -35,6 +45,10 @@
 		span {
 			vertical-align: middle;
 		}
+		.l-btn.change-column-width {
+			@include trans-prop-nice-fade(500ms);
+			opacity: 0;
+		}
 		.l-filter {
 			margin-left: $interiorMargin;
 			input.t-filter-input {

platform/commonUI/general/res/sass/_constants.scss

@@ -42,6 +42,7 @@ $colorKeySelectedBg: #005177;
 $colorKeyFg: #fff;
 $colorAlt1: #ffc700;
 $colorAlert: #ff3c00;
+$colorIconLink: #49dedb;
 $colorPausedBg: #c56f01;
 $colorPausedFg: #fff;
 $colorCreateBtn: $colorKey;
@@ -118,7 +119,7 @@ $tabularHeaderH: 18px;
 $tabularTdPadLR: $itemPadLR;
 $tabularTdPadTB: 2px;
 // Imagery
-$imageMainControlBarH: 20px;
+$imageMainControlBarH: 22px;
 $imageThumbsD: 120px;
 $imageThumbsWrapperH: $imageThumbsD * 1.4;
 $imageThumbPad: 1px;

platform/commonUI/general/res/sass/_hide-non-functional.scss

@@ -32,15 +32,5 @@
 	.browse-area.holder {
 		// When .browse.top-bar is hidden, set the top of the browse-area holder
 		top: $bodyMargin;
-		> .contents.split-layout {
-			// Don't pad in from top and bottom
-			//top: 0; bottom: 0;
-			.object-browse-bar {
-				.btn.key-window {
-					// Hide the Open in New Window button
-//					display: none;
-				}
-			}
-		}
 	}
 }

platform/commonUI/general/res/sass/_icons.scss

@@ -20,68 +20,63 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 .triangle {
-    $myColor: $colorKey;
+	$myColor: $colorKey;
-    $mySize: 10px;
+	$mySize: 10px;
-    @include triangle-right($mySize, $myColor);
+	@include triangle-right($mySize, $myColor);
-    &.triangle-down {
+	&.triangle-down {
-        @include triangle-down($mySize, $myColor);
+		@include triangle-down($mySize, $myColor);
-    }
+	}
 }
 
 .ui-symbol {
-    $c: $colorKey;
+	$c: $colorKey;
-    &.icon {
+	&.icon {
-        color: $c;
+		color: $c;
-        @include txtShdwSubtle();
+		@include txtShdwSubtle();
-        &.alert {
+		&.alert {
-            color: $colorAlert;
+			color: $colorAlert;
-            &:hover {
+			&:hover {
-                color: lighten($colorAlert, $ltGamma);
+				color: lighten($colorAlert, $ltGamma);
-            }
+			}
-        }
+		}
-        &.major {
+		&.major {
-            font-size: 1.65em;
+			font-size: 1.65em;
-        }
+		}
-    }
+	}
 }
 
 .bar .icon {
-    display: inline-block;
+	display: inline-block;
 }
 
 .invoke-menu {
-    //@include invokeMenu(); // $colorKey
 	text-shadow: none;
-    display: inline-block;
+	display: inline-block;
-    //font-size: 0.8rem;// Normalizing for new icomoon symbols font
-    //vertical-align: middle;// Normalizing for new icomoon symbols font
 }
 
 .btn-menu .invoke-menu,
 .icon.major .invoke-menu {
-    margin-left: $interiorMarginSm;
+	margin-left: $interiorMarginSm;
 }
 
-/*
-.object-header .type-icon {
-    color: $colorKey;
-	margin-right: $interiorMarginSm;
-}
-*/
-
 .menu .type-icon,
 .tree-item .type-icon,
 .super-menu.menu .type-icon {
-    //font-size: $menuLineH * 0.8; //.93 // Normalizing for new icomoon symbols font
+	position: absolute;
-    //line-height: $menuLineH * 1.13; // Normalizing for new icomoon symbols font
-    position: absolute;
 }
 
 .tree-item .type-icon {
-    font-size: 16px; // 16px is crisp size
+	font-size: 16px; // 16px is crisp size
 }
 
-.super-menu.menu.dropdown .icon {
+.l-icon-link:before {
-	//font-size: $menuLineH * 0.95 // Normalizing for new icomoon symbols font
+	content: "\f4";
 }
 
+.l-icon-alert {
+	display: none !important; // Remove this when alerts are enabled
+	&:before {
+		color: $colorAlert;
+		content: "!";
+	}
+}

platform/commonUI/general/res/sass/_initialization.scss

@@ -0,0 +1,20 @@
+// Classes for initializing states of objects
+
+.browse-mode {
+    .split-layout {
+        .split-pane-component.pane.left {
+            width: 15%;
+        }
+    }
+}
+
+.edit-mode {
+    .split-layout {
+        .split-pane-component.pane.right {
+            width: 15%;
+            .pane.bottom {
+                height: 30%;
+            }
+        }
+    }
+}

platform/commonUI/general/res/sass/_main.scss

@@ -70,4 +70,5 @@
 @import "properties";
 @import "autoflow";
 @import "iframe";
+@import "initialization";
 @import "hide-non-functional";

platform/commonUI/general/res/sass/_mixins.scss

@@ -26,6 +26,16 @@
     width: auto; height: auto;
 }
 
+@mixin ancillaryIcon($d, $c) {
+	// Used for small icons used in combination with larger icons,
+	// like the link and alert icons in tree items.
+	color: $c;
+	font-size: $d;
+	line-height: $d;
+	height: $d;
+	width: $d;
+}
+
 @mixin trans-prop-nice($props, $t: 500ms) {
 	@if $t == 0 {
 		@include transition-property(none);

platform/commonUI/general/res/sass/controls/_buttons.scss

@@ -130,9 +130,11 @@ $pad: $interiorMargin * $baseRatio;
 	}
 
 	&.pause-play {
-		&.paused {
+/*		&.paused {
-			@include pulse(500ms);
+			.icon {
-		}
+				@include pulse(500ms);
+			}
+		}*/
 		.icon:before {
 			content:"\0000F1";
 		}

platform/commonUI/general/res/sass/controls/_controls.scss

@@ -79,7 +79,7 @@
 			content: "^";
 			display: block;
 			font-family: 'symbolsfont';
-			font-size: 1.2em;
+			font-size: 0.9em;
 			position: absolute;
 			right: $interiorMargin;
 			text-transform: none;
@@ -182,7 +182,7 @@
 	display: inline-block;
 	font-size: $h * $btnFontSizeToH;
 	height: $h;
-	line-height: $h;
+	line-height: $h - 3;
 	.icon:not(.invoke-menu) {
 		//		position: relative;
 		//		top: -0.04em;
@@ -348,6 +348,15 @@ label.checkbox.custom {
 	}
 }
 
+.context-available {
+	$c: $colorKey;
+	color: $c;
+	//padding: 0 5px;
+	&:hover {
+		color: lighten($c, 10%);
+	}
+}
+
 .view-switcher {
 	@include trans-prop-nice-fade($controlFadeMs);
 }
@@ -365,6 +374,15 @@ label.checkbox.custom {
 			margin-right: $interiorMargin;
 			vertical-align: middle;
 		}
+		.context-available {
+			opacity: 0;
+			font-size: 0.8em;
+		}
+		&:hover {
+			.context-available {
+				opacity: 1;
+			}
+		}
 	}
 }
 

platform/commonUI/general/res/sass/controls/_menus.scss

@@ -39,6 +39,7 @@
 			li {
                 @include box-sizing(border-box);
 				border-top: 1px solid lighten($bg, 20%);
+				color: lighten($bg, 60%);
 				line-height: $menuLineH;
 				padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW;
 				white-space: nowrap;
@@ -47,17 +48,18 @@
 				}
 				&:hover {
 					background: $bgHover;
-					a {
+					color: $colorKeyFg;
-						color: $colorKeyFg;
+					//a {
-					}
+					//	color: $colorKeyFg;
+					//}
 					.icon {
 						color: lighten($iconColor, 20%);
 					}
 				}
-				a {
+				//a {
-					color: lighten($bg, 60%);
+				//	color: lighten($bg, 60%);
-					display: block;
+				//	display: block;
-				}
+				//}
 				.type-icon {
                     left: $interiorMargin * 2;
 				}

platform/commonUI/general/res/sass/edit/_editor.scss

@@ -32,11 +32,19 @@
     .edit-corner {
         width: $handleD;
         height: $handleD;
+        &:hover {
+            z-index: 11;
+        }
         &.edit-resize-nw {
             @include border-bottom-right-radius($cr);
             cursor: nw-resize;
             top: 0; left: 0;
         }
+        &.edit-resize-ne {
+            @include border-bottom-left-radius($cr);
+            cursor: ne-resize;
+            top: 0; right: 0;
+        }
         &.edit-resize-se {
             @include border-top-left-radius($cr);
             cursor: se-resize;
@@ -89,7 +97,7 @@
         &:hover {
             @include boxShdwLarge();
             border-color: $colorKey;
-            z-index: 2;
+            //z-index: 2;
             .view-switcher {
                 opacity: 1;
             }

platform/commonUI/general/res/sass/forms/_elems.scss

@@ -19,18 +19,19 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+.section-header {
+	@include border-radius(3px);
+	background: rgba(white, 0.1);
+	font-size: 0.8em;
+	margin-top: $interiorMargin;
+	padding: $interiorMargin;
+	&:first-child {
+		margin-top: 0;
+	}
+}
+
 .form {
 //	@include test(orange);
-	.section-header {
-		@include border-radius(3px);
-		background: rgba(white, 0.1);
-		font-size: 0.8em;
-		margin-top: $interiorMargin;
-		padding: $interiorMargin;
-		&:first-child {
-			margin-top: 0;
-		}
-	}
 	.form-section {
 		position: relative;
 	}

platform/commonUI/general/res/sass/items/_item.scss

@@ -29,6 +29,9 @@
         &.grid-item {
             //div { @include test() }
             $d: $ueBrowseGridItemLg;
+            //$iconD: 100px;
+            $iconMargin: 40px;
+            $iconD: ($d - ($iconMargin * 2)) * 0.85;
             $transTime: 200ms;
             @include btnSubtle($colorItemBase);
             box-sizing: border-box;
@@ -39,12 +42,12 @@
             margin-bottom: $interiorMarginSm;
             margin-right: $interiorMarginSm;
             position: relative;
-            .item-main .item-type {
-                @include trans-prop-nice("color", $transTime);
-            }
             &:hover .item-main {
 	            .item-type {
 		            color: $colorKey !important;
+                    .l-icon-link {
+                        color: $colorIconLink;
+                    }
                 }
 	            .item-open {
 		            //display: block;
@@ -63,7 +66,10 @@
 	                .left, .right {
 		                width: auto;
 		                .icon {
-			                margin-left: $interiorMargin;
+			                margin-left: $interiorMarginSm;
+                            &.l-icon-link {
+                                color: $colorIconLink;
+                            }
 		                }
 	                }
                 }
@@ -80,10 +86,28 @@
                 line-height: $lh;
 	            z-index: 1;
                 .item-type {
+                    //@include trans-prop-nice("color", $transTime);
+                    @include absPosDefault($iconMargin, false);
+                    //@include test(red);
                     color: $colorItemFg;
                     text-align: center;
-                    font-size: 6em;
+                    font-size: $iconD * 0.95; //6em;
+                    line-height: $iconD;
+                    bottom: auto;
+                    height: $iconD;
+                    top: $iconMargin - 10;
                     //line-height: $lh;
+                    .l-icon-link {
+                        // When the link icon is in the item-type icon holder
+                        color: darken($colorIconLink, 25%);
+                        height: 36px;
+                        line-height: 36px;
+                        position: absolute;
+                        font-size: 32px;
+                        left: 0px;
+                        bottom: 10px;
+                        z-index: 2;
+                    }
                 }
                 .item-open {
                     //@include test();

platform/commonUI/general/res/sass/plots/_plots-main.scss

@@ -22,7 +22,7 @@
 $yBarW: 60px;
 $yLabelW: auto;
 $xBarH: 32px;
-$legendH: 24px;
+$legendH: 20px;
 $colorHash: rgba(white, 0.3);
 $styleHash: dashed;
 $swatchD: 8px;
@@ -201,6 +201,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
 	.legend-item {
 		display: inline-block;
 		margin-right: $interiorMarginLg;
+		margin-bottom: $interiorMarginSm;
 		span {
 			vertical-align: middle;
 		}

platform/commonUI/general/res/sass/tree/_tree.scss

@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+
 ul.tree {
 	@include menuUlReset();
 	li {
@@ -29,7 +30,7 @@ ul.tree {
 			@include border-radius($basicCr);
 			@include single-transition(background-color, 0.25s);
 			display: block;
-			font-size: 0.80em;
+			font-size: 0.8em;
 			height: $menuLineH;
 			line-height: $menuLineH;
 			margin-bottom: $interiorMarginSm;
@@ -48,38 +49,47 @@ ul.tree {
 
 			.label {
 				display: block;
-//				border: 1px solid rgba(blue, 0.5);
+//				@include test(orange);
 				@include absPosDefault();
-				left: $runningItemW + $interiorMargin;
+				//left: $runningItemW + $interiorMargin; // Adding pad to left to make room for link icon
+				left: $runningItemW;
 
 				.type-icon {
-					@include absPosDefault();
+					@include absPosDefault(0, false);
 					@include txtShdwSubtle(0.6);
 					color: $colorItemTreeIcon;
-					.alert {
+					left: $interiorMargin;
-						@include txtShdwSubtle(0.3);
+                    right: auto; width: 1em;
-						background: $colorBodyBg;
+
-						color: $colorAlert;
+					.icon {
-						font-size: 0.7em;
+						&.l-icon-link,
-						margin-top: -3px;
+						&.l-icon-alert {
-						top: 0;
+							@include txtShdwSubtle(1);
-						right: auto;
+							position: absolute;
-						bottom: auto;
+							z-index: 2;
-						left: 9px;
+						}
-						height: auto;
+						&.l-icon-alert {
-						width: auto;
+							$d: 8px;
-						position: absolute;
+							@include ancillaryIcon($d, $colorAlert);
-						z-index: 2;
+							top: 1px;
+							right: -2px;
+						}
+						&.l-icon-link {
+							$d: 8px;
+							@include ancillaryIcon($d, $colorIconLink);
+							left: -3px;
+							bottom: 5px;
+
+						}
 					}
 				}
 				.title-label {
 					@include absPosDefault();
 					display: block;
-					left: $runningItemW + ($interiorMargin);
+					left: $runningItemW + ($interiorMargin * 3);
 	                //right: $treeContextTriggerW + $interiorMargin;
 					overflow: hidden;
 					text-overflow: ellipsis;
-//					height: $menuLineH;
 					white-space: nowrap;
 				}
 			}

platform/commonUI/general/res/sass/user-environ/_frame.scss

@@ -27,7 +27,7 @@
 		border: 1px solid $bc;
 		&:hover {
 			border-color: lighten($bc, 10%);
-			z-index: 2;
+			//z-index: 2;
 		}
 		.contents {
 //			overflow: hidden;
@@ -50,9 +50,7 @@
 	&.frame-template {
 		// Hide the view switcher by default when it's in an element that's in a frame context
 		// Frame template is used because we need to target the lowest nested frame
-		// This has the effect of hiding the view switcher in nested frames in edit mode, which is desirable currently (as it's non-functional)
 		.view-switcher {
-			//display: none;
 			opacity: 0;
 			z-index: 10;
 		}

platform/commonUI/general/res/sass/user-environ/_layout.scss

@@ -196,9 +196,31 @@
     }
 }
 
+.browse-mode {
+    .split-layout {
+        .split-pane-component.pane.left {
+            min-width: 150px;
+            max-width: 50%;
+        }
+    }
+}
+
+.edit-mode {
+    .split-layout {
+        .split-pane-component.pane.right {
+            min-width: 150px;
+            max-width: 50%;
+            .split-pane-component.pane.bottom {
+                min-height: 50px;
+                max-height: 80%;
+            }
+        }
+    }
+}
+
 .pane {
     position: absolute;
-    &.treeview {
+    &.treeview.left {
 	    .create-btn-holder {
 		    bottom: auto; top: 0;
 		    height: $ueTopBarH;
@@ -210,6 +232,7 @@
 	    .tree-holder {
 		    overflow: auto;
 		    top: $ueTopBarH + $interiorMarginLg;
+            padding-right: $interiorMargin;
 	    }
     }
     &.items {
@@ -223,13 +246,6 @@
             top: $ueTopBarH + $interiorMarginLg;
         }
     }
-	&.edit-main {
-		.object-holder {
-			top: 0;
-		}
-	}
-	&.edit-objects {
-	}
 	.object-holder {
 		overflow: auto;
 	}
@@ -257,7 +273,7 @@
 			&:first-child {
 				margin-left: 0;
 				.holder {
-					right: $interiorMargin;
+					right: $interiorMarginSm;
 				}
 			}
 		}

platform/commonUI/general/res/templates/containers/accordion.html

@@ -19,10 +19,16 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="accordion-head" ng-click="toggle.toggle()">
+<div
-    {{container.title}}
+    class="accordion-head"
+    ng-click="toggle.toggle()"
+    ng-class="{ expanded:!toggle.isActive() }"
+    >
+    {{container.label}}
+</div>
+<div
+    class="accordion-contents"
+    ng-show="!toggle.isActive()"
+    ng-transclude
+    >
 </div>
-<div class="accordion-contents"
-     ng-show="!toggle.isActive()"
-     ng-transclude>
-</div>

platform/commonUI/general/res/templates/controls/switcher.html

@@ -20,7 +20,6 @@
  at runtime from the About dialog for additional information.
 -->
 <span ng-controller="ViewSwitcherController">
-
     <div
 	    class="view-switcher menu-element btn btn-menu dropdown click-invoke"
 	    ng-if="view.length > 1"
@@ -40,21 +39,12 @@
 
         <div class="menu dropdown" ng-show="toggle.isActive()">
             <ul>
-                <li ng-repeat="option in view">
+                <li ng-repeat="option in view"
-                    <a ng-click="ngModel.selected = option; toggle.setState(false)">
+                    ng-click="ngModel.selected = option; toggle.setState(false)">
-                        <span class="ui-symbol type-icon icon">{{option.glyph}}</span>
+                    <span class="ui-symbol type-icon icon">{{option.glyph}}</span>
-	                    {{option.name}}
+                    {{option.name}}
-                    </a>
                 </li>
             </ul>
         </div>
     </div>
-
-	<!-- CH commented out 2/24/15 - really don't think we need this. Single view is what it is. -->
-    <!--span class="btn"
-          ng-if="view.length === 1">
-        <span class="ui-symbol icon type-icon">{{ngModel.selected.glyph}}</span>
-        <span>{{ngModel.selected.name}}</span>
-    </span-->
-
 </span>

platform/commonUI/general/res/templates/menu/context-menu.html

@@ -23,15 +23,14 @@
     <div class="menu context-menu dropdown">
         <ul>
 
-            <li ng-repeat="menuAction in menuActions">
+            <li ng-repeat="menuAction in menuActions"
-                <a href=""
+                ng-click="menuAction.perform()"
-                   ng-click="menuAction.perform()"
+                title="{{menuAction.getMetadata().description}}"
-                   title="{{menuAction.getMetadata().description}}">
+                >
-                    <span class="ui-symbol icon type-icon">
+                <span class="ui-symbol icon type-icon">
-                        {{menuAction.getMetadata().glyph}}
+                    {{menuAction.getMetadata().glyph}}
-                    </span>
+                </span>
-                    {{menuAction.getMetadata().name}}
+                {{menuAction.getMetadata().name}}
-                </a>
             </li>
 
         </ul>

platform/features/layout/res/templates/layout.html

@@ -75,13 +75,12 @@
                   mct-drag="controller.continueDrag(delta)"
                   mct-drag-up="controller.endDrag()">
             </span>
-            <!--span
+            <span
-                class="edit-corner edit-resize-nw"
+                class="edit-corner edit-resize-ne"
-                style="position: absolute; right: 0px; width: 12px; top: 0px; height: 12px; cursor: ne-resize;"
                   mct-drag-down="controller.startDrag(childObject.getId(), [0,1], [1,-1])"
                   mct-drag="controller.continueDrag(delta)"
                   mct-drag-up="controller.endDrag()">
-            </span-->
+            </span>
             <span
                 class="edit-corner edit-resize-sw"
                   mct-drag-down="controller.startDrag(childObject.getId(), [1,0], [-1,1])"