[CLI] Auto-focus

[CLI] Add license header
Merge remote-tracking branch 'origin/open147' into cli
2015-10-08 15:06:35 -07:00 · 2015-10-08 15:03:19 -07:00 · 2015-10-08 14:56:24 -07:00 · 2015-10-08 14:52:22 -07:00 · 2015-10-08 14:48:50 -07:00 · 2015-10-08 14:35:43 -07:00
241 changed files with 6697 additions and 23225 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-web: node app.js --port $PORT
+web: node app.js --port $PORT --include example/localstorage
--- a/README.md
+++ b/README.md
@@ -103,21 +103,6 @@ This build will:

 Run as `mvn clean install`.

-### Building Documentation
-
-Open MCT Web's documentation is generated by an
-[npm](https://www.npmjs.com/)-based build:
-
-* `npm install` _(only needs to run once)_
-* `npm run docs`
-
-Documentation will be generated in `target/docs`. Note that diagram
-generation is dependent on having [Cairo](http://cairographics.org/download/)
-installed; see
-[node-canvas](https://github.com/Automattic/node-canvas#installation)'s
-documentation for help with installation.
-
-
 # Glossary

 Certain terms are used throughout Open MCT Web with consistent meanings
--- a/bundles.json
+++ b/bundles.json
@@ -6,12 +6,10 @@
    "platform/commonUI/browse",
    "platform/commonUI/edit",
    "platform/commonUI/dialog",
-    "platform/commonUI/formats",
    "platform/commonUI/general",
    "platform/commonUI/inspect",
    "platform/commonUI/mobile",
    "platform/commonUI/themes/espresso",
-    "platform/commonUI/notification",
    "platform/containment",
    "platform/execution",
    "platform/telemetry",
--- a/docs/gendocs.js
+++ b/docs/gendocs.js
@@ -30,8 +30,7 @@
 var CONSTANTS = {
        DIAGRAM_WIDTH: 800,
        DIAGRAM_HEIGHT: 500
-    },
-    TOC_HEAD = "# Table of Contents";
+    };

 GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be defined
 (function () {
@@ -45,7 +44,6 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
        split = require("split"),
        stream = require("stream"),
        nomnoml = require('nomnoml'),
-        toc = require("markdown-toc"),
        Canvas = require('canvas'),
        options = require("minimist")(process.argv.slice(2));

@@ -112,9 +110,6 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
            done();
        };
        transform._flush = function (done) {
-            // Prepend table of contents
-            markdown =
-                [ TOC_HEAD, toc(markdown).content, "", markdown ].join("\n");
            this.push("<html><body>\n");
            this.push(marked(markdown));
            this.push("\n</body></html>\n");
@@ -138,8 +133,8 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
        customRenderer.link = function (href, title, text) {
            // ...but only if they look like relative paths
            return (href || "").indexOf(":") === -1 && href[0] !== "/" ?
-                    renderer.link(href.replace(/\.md/, ".html"), title, text) :
-                    renderer.link.apply(renderer, arguments);
+                renderer.link(href.replace(/\.md/, ".html"), title, text) :
+                renderer.link.apply(renderer, arguments);
        };
        return customRenderer;
    }
@@ -184,17 +179,13 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
    glob(options['in'] + "/**/*.@(html|css|png)", {}, function (err, files) {
        files.forEach(function (file) {
            var destination = file.replace(options['in'], options.out),
-                destPath = path.dirname(destination),
-                streamOptions = {};
-            if (file.match(/png$/)){
-                streamOptions.encoding = null;
-            } else {
-                streamOptions.encoding = 'utf8';
-            }
-            
+                destPath = path.dirname(destination);
+
            mkdirp(destPath, function (err) {
-                fs.createReadStream(file, streamOptions)
-                    .pipe(fs.createWriteStream(destination, streamOptions));
+                fs.createReadStream(file, { encoding: 'utf8' })
+                    .pipe(fs.createWriteStream(destination, {
+                        encoding: 'utf8'
+                    }));
            });
        });
    });
--- a/docs/src/architecture/Platform.md
+++ b/docs/src/architecture/Platform.md
@@ -35,26 +35,16 @@ in __any of these tiers__.
 * _DOM_: The rendered HTML document, composed from HTML templates which
  have been processed by AngularJS and will be updated by AngularJS
  to reflect changes from the presentation layer. User interactions
-  are initiated from here and invoke behavior in the presentation layer. HTML 
-  templates are written in Angular’s template syntax; see the [Angular documentation on templates](https://docs.angularjs.org/guide/templates). 
-  These describe the page as actually seen by the user. Conceptually, 
-  stylesheets (controlling the lookandfeel of the rendered templates) belong 
-  in this grouping as well. 
+  are initiated from here and invoke behavior in the presentation layer.
 * [_Presentation layer_](#presentation-layer): The presentation layer
  is responsible for updating (and providing information to update)
  the displayed state of the application. The presentation layer consists
  primarily of _controllers_ and _directives_. The presentation layer is
  concerned with inspecting the information model and preparing it for
  display.
-* [_Information model_](#information-model): Provides a common (within Open MCT 
-  Web) set of interfaces for dealing with “things”  domain objects  within the 
-  system. Userfacing concerns in a Open MCT Web application are expressed as 
-  domain objects; examples include folders (used to organize other domain 
-  objects), layouts (used to build displays), or telemetry points (used as 
-  handles for streams of remote measurements.) These domain objects expose a 
-  common set of interfaces to allow reusable user interfaces to be built in the 
-  presentation and template tiers; the specifics of these behaviors are then 
-  mapped to interactions with underlying services. 
+* [_Information model_](#information-model): The information model
+  describes the state and behavior of the objects with which the user
+  interacts.
 * [_Service infrastructure_](#service-infrastructure): The service
  infrastructure is responsible for providing the underlying general
  functionality needed to support the information model. This includes
@@ -62,9 +52,7 @@ in __any of these tiers__.
  back-end.
 * _Back-end_: The back-end is out of the scope of Open MCT Web, except
  for the interfaces which are utilized by adapters participating in the
-  service infrastructure. Includes the underlying persistence stores, telemetry 
-  streams, and so forth which the Open MCT Web client is being used to interact 
-  with.
+  service infrastructure.

 ## Application Start-up

--- a/docs/src/guide/index.md
+++ b/docs/src/guide/index.md
--- a/docs/src/index.html
+++ b/docs/src/index.html
@@ -29,9 +29,8 @@
    Sections:
    <ul>
        <li><a href="api/">API</a></li>
-        <li><a href="architecture/">Architecture Overview</a></li>
        <li><a href="guide/">Developer Guide</a></li>
-        <li><a href="tutorials/">Tutorials</a></li>
+        <li><a href="architecture/">Architecture Overview</a></li>
    </ul>
 </body>
 </html>
--- a/docs/src/tutorials/images/add-task.png
+++ b/docs/src/tutorials/images/add-task.png
--- a/docs/src/tutorials/images/bar-plot-2.png
+++ b/docs/src/tutorials/images/bar-plot-2.png
--- a/docs/src/tutorials/images/bar-plot-3.png
+++ b/docs/src/tutorials/images/bar-plot-3.png
--- a/docs/src/tutorials/images/bar-plot-4.png
+++ b/docs/src/tutorials/images/bar-plot-4.png
--- a/docs/src/tutorials/images/bar-plot.png
+++ b/docs/src/tutorials/images/bar-plot.png
--- a/docs/src/tutorials/images/chrome.png
+++ b/docs/src/tutorials/images/chrome.png
--- a/docs/src/tutorials/images/remove-task.png
+++ b/docs/src/tutorials/images/remove-task.png
--- a/docs/src/tutorials/images/telemetry-1.png
+++ b/docs/src/tutorials/images/telemetry-1.png
--- a/docs/src/tutorials/images/telemetry-2.png
+++ b/docs/src/tutorials/images/telemetry-2.png
--- a/docs/src/tutorials/images/telemetry-3.png
+++ b/docs/src/tutorials/images/telemetry-3.png
--- a/docs/src/tutorials/images/todo-edit.png
+++ b/docs/src/tutorials/images/todo-edit.png
--- a/docs/src/tutorials/images/todo-list.png
+++ b/docs/src/tutorials/images/todo-list.png
--- a/docs/src/tutorials/images/todo-restyled.png
+++ b/docs/src/tutorials/images/todo-restyled.png
--- a/docs/src/tutorials/images/todo-selection.png
+++ b/docs/src/tutorials/images/todo-selection.png
--- a/docs/src/tutorials/images/todo.png
+++ b/docs/src/tutorials/images/todo.png
--- a/docs/src/tutorials/index.md
+++ b/docs/src/tutorials/index.md
--- a/example/generator/bundle.json
+++ b/example/generator/bundle.json
@@ -16,23 +16,6 @@
                "implementation": "SinewaveLimitCapability.js"
            }
        ],
-        "formats": [
-            {
-                "key": "example.delta",
-                "implementation": "SinewaveDeltaFormat.js"
-            }
-        ],
-        "constants": [
-            {
-                "key": "TIME_CONDUCTOR_DOMAINS",
-                "value": [
-                    { "key": "time", "name": "Time" },
-                    { "key": "yesterday", "name": "Yesterday" },
-                    { "key": "delta", "name": "Delta", "format": "example.delta" }
-                ],
-                "priority": -1
-            }
-        ],
        "types": [
            {
                "key": "generator",
@@ -51,15 +34,6 @@
                        {
                            "key": "time",
                            "name": "Time"
-                        },
-                        {
-                            "key": "yesterday",
-                            "name": "Yesterday"
-                        },
-                        {
-                            "key": "delta",
-                            "name": "Delta",
-                            "format": "example.delta"
                        }
                    ],
                    "ranges": [
@@ -87,4 +61,4 @@
            }
        ]
    }
-}
+}
--- a/example/generator/src/SinewaveDeltaFormat.js
+++ b/example/generator/src/SinewaveDeltaFormat.js
@@ -1,68 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,Promise*/
-
-define(
-    ['./SinewaveConstants', 'moment'],
-    function (SinewaveConstants, moment) {
-        "use strict";
-
-        var START_TIME = SinewaveConstants.START_TIME,
-            FORMAT_REGEX = /^-?\d+:\d+:\d+$/,
-            SECOND = 1000,
-            MINUTE = SECOND * 60,
-            HOUR = MINUTE * 60;
-
-        function SinewaveDeltaFormat() {
-        }
-
-        function twoDigit(v) {
-            return v >= 10 ? String(v) : ('0' + v);
-        }
-
-        SinewaveDeltaFormat.prototype.format = function (value) {
-            var delta = Math.abs(value - START_TIME),
-                negative = value < START_TIME,
-                seconds = Math.floor(delta / SECOND) % 60,
-                minutes = Math.floor(delta / MINUTE) % 60,
-                hours = Math.floor(delta / HOUR);
-            return (negative ? "-" : "") +
-                [ hours, minutes, seconds ].map(twoDigit).join(":");
-        };
-
-        SinewaveDeltaFormat.prototype.validate = function (text) {
-            return FORMAT_REGEX.test(text);
-        };
-
-        SinewaveDeltaFormat.prototype.parse = function (text) {
-            var negative = text[0] === "-",
-                parts = text.replace("-", "").split(":");
-            return [ HOUR, MINUTE, SECOND ].map(function (sz, i) {
-                return parseInt(parts[i], 10) * sz;
-            }).reduce(function (a, b) {
-                return a + b;
-            }, 0) * (negative ? -1 : 1) + START_TIME;
-        };
-
-        return SinewaveDeltaFormat;
-    }
-);
--- a/example/generator/src/SinewaveLimitCapability.js
+++ b/example/generator/src/SinewaveLimitCapability.js
@@ -30,25 +30,25 @@ define(
            YELLOW = 0.5,
            LIMITS = {
                rh: {
-                    cssClass: "s-limit-upr s-limit-red",
+                    cssClass: "s-limit-upr-red",
                    low: RED,
                    high: Number.POSITIVE_INFINITY,
                    name: "Red High"
                },
                rl: {
-                    cssClass: "s-limit-lwr s-limit-red",
+                    cssClass: "s-limit-lwr-red",
                    high: -RED,
                    low: Number.NEGATIVE_INFINITY,
                    name: "Red Low"
                },
                yh: {
-                    cssClass: "s-limit-upr s-limit-yellow",
+                    cssClass: "s-limit-upr-yellow",
                    low: YELLOW,
                    high: RED,
                    name: "Yellow High"
                },
                yl: {
-                    cssClass: "s-limit-lwr s-limit-yellow",
+                    cssClass: "s-limit-lwr-yellow",
                    low: -RED,
                    high: -YELLOW,
                    name: "Yellow Low"
--- a/example/notifications/src/DialogLaunchIndicator.js
+++ b/example/notifications/src/DialogLaunchIndicator.js
@@ -19,38 +19,45 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,window*/
+/*global define,Promise*/

+/**
+ * Module defining SinewaveTelemetry. Created by vwoeltje on 11/12/14.
+ */
 define(
    [],
    function () {
        "use strict";

+        var firstObservedTime = Date.now();
+
        /**
-         * A tool for manually invoking dialogs. When included this
-         * indicator will allow for dialogs of different types to be
-         * launched for demonstration and testing purposes.
+         *
         * @constructor
         */
-        function DialogLaunchIndicator() {
+        function SinewaveTelemetry(request) {
+            var latestObservedTime = Date.now(),
+                count = Math.floor((latestObservedTime - firstObservedTime) / 1000),
+                period = request.period || 30,
+                generatorData = {};

+            generatorData.getPointCount = function () {
+                return count;
+            };
+
+            generatorData.getDomainValue = function (i, domain) {
+                return i * 1000 +
+                        (domain !== 'delta' ? firstObservedTime : 0);
+            };
+
+            generatorData.getRangeValue = function (i, range) {
+                range = range || "sin";
+                return Math[range](i * Math.PI * 2 / period);
+            };
+
+            return generatorData;
        }

-        DialogLaunchIndicator.template = 'dialogLaunchTemplate';
-
-        DialogLaunchIndicator.prototype.getGlyph = function () {
-            return "i";
-        };
-        DialogLaunchIndicator.prototype.getGlyphClass = function () {
-            return 'caution';
-        };
-        DialogLaunchIndicator.prototype.getText = function () {
-            return "Launch test dialog";
-        };
-        DialogLaunchIndicator.prototype.getDescription = function () {
-            return "Launch test dialog";
-        };
-
-        return DialogLaunchIndicator;
+        return SinewaveTelemetry;
    }
-);
+);
--- a/example/generator/src/SinewaveTelemetryProvider.js
+++ b/example/generator/src/SinewaveTelemetryProvider.js
@@ -25,8 +25,8 @@
 * Module defining SinewaveTelemetryProvider. Created by vwoeltje on 11/12/14.
 */
 define(
-    ["./SinewaveTelemetrySeries"],
-    function (SinewaveTelemetrySeries) {
+    ["./SinewaveTelemetry"],
+    function (SinewaveTelemetry) {
        "use strict";

        /**
@@ -45,7 +45,7 @@ define(
            function generateData(request) {
                return {
                    key: request.key,
-                    telemetry: new SinewaveTelemetrySeries(request)
+                    telemetry: new SinewaveTelemetry(request)
                };
            }

@@ -112,4 +112,4 @@ define(

        return SinewaveTelemetryProvider;
    }
-);
+);
--- a/example/generator/src/SinewaveTelemetrySeries.js
+++ b/example/generator/src/SinewaveTelemetrySeries.js
@@ -1,78 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,Promise*/
-
-/**
- * Module defining SinewaveTelemetry. Created by vwoeltje on 11/12/14.
- */
-define(
-    ['./SinewaveConstants'],
-    function (SinewaveConstants) {
-        "use strict";
-
-        var ONE_DAY = 60 * 60 * 24,
-            firstObservedTime = Math.floor(SinewaveConstants.START_TIME / 1000);
-
-        /**
-         *
-         * @constructor
-         */
-        function SinewaveTelemetrySeries(request) {
-            var timeOffset = (request.domain === 'yesterday') ? ONE_DAY : 0,
-                latestTime = Math.floor(Date.now() / 1000) - timeOffset,
-                firstTime = firstObservedTime - timeOffset,
-                endTime = (request.end !== undefined) ?
-                        Math.floor(request.end / 1000) : latestTime,
-                count = Math.min(endTime, latestTime) - firstTime,
-                period = +request.period || 30,
-                generatorData = {},
-                requestStart = (request.start === undefined) ? firstTime :
-                        Math.max(Math.floor(request.start / 1000), firstTime),
-                offset = requestStart - firstTime;
-
-            if (request.size !== undefined) {
-                offset = Math.max(offset, count - request.size);
-            }
-
-            generatorData.getPointCount = function () {
-                return count - offset;
-            };
-
-            generatorData.getDomainValue = function (i, domain) {
-                // delta uses the same numeric values as the default domain,
-                // so it's not checked for here, just formatted for display
-                // differently.
-                return (i + offset) * 1000 + firstTime * 1000 -
-                    (domain === 'yesterday' ? ONE_DAY : 0);
-            };
-
-            generatorData.getRangeValue = function (i, range) {
-                range = range || "sin";
-                return Math[range]((i + offset) * Math.PI * 2 / period);
-            };
-
-            return generatorData;
-        }
-
-        return SinewaveTelemetrySeries;
-    }
-);
--- a/example/notifications/bundle.json
+++ b/example/notifications/bundle.json
@@ -1,47 +0,0 @@
-{
-    "extensions": {
-        "templates": [
-            {
-                "key": "dialogLaunchTemplate",
-                "templateUrl": "dialog-launch.html"
-            },
-            {
-                "key": "notificationLaunchTemplate",
-                "templateUrl": "notification-launch.html"
-            }
-        ],
-        "controllers": [
-            {
-                "key": "DialogLaunchController",
-                "implementation": "DialogLaunchController.js",
-                "depends": [
-                    "$scope",
-                    "$timeout",
-                    "$log",
-                    "dialogService",
-                    "notificationService"
-                ]
-            },
-            {
-                "key": "NotificationLaunchController",
-                "implementation": "NotificationLaunchController.js",
-                "depends": [
-                    "$scope",
-                    "$timeout",
-                    "$log",
-                    "notificationService"
-                ]
-            }
-        ],
-        "indicators": [
-            {
-                "implementation": "DialogLaunchIndicator.js",
-                "priority": "fallback"
-            },
-            {
-                "implementation": "NotificationLaunchIndicator.js",
-                "priority": "fallback"
-            }
-        ]
-    }
-}
--- a/example/notifications/res/dialog-launch.html
+++ b/example/notifications/res/dialog-launch.html
@@ -1,10 +0,0 @@
-<span class="status block ok" ng-controller="DialogLaunchController">
-    <span class="ui-symbol status-indicator">&#xe600;</span>
-    <span class="label">
-        <a ng-click="launchProgress(true)">Known</a> |
-        <a ng-click="launchProgress(false)">Unknown</a> |
-        <a ng-click="launchError()">Error</a> |
-        <a ng-click="launchInfo()">Info</a>
-    </span>
-    <span class="count">Dialogs</span>
-</span>
--- a/example/notifications/res/notification-launch.html
+++ b/example/notifications/res/notification-launch.html
@@ -1,10 +0,0 @@
-<span class="status block ok" ng-controller="NotificationLaunchController">
-    <span class="ui-symbol status-indicator">&#xe600;</span>
-    <span class="label">
-        <a ng-click="newInfo()">Success</a> |
-        <a ng-click="newError()">Error</a> |
-        <a ng-click="newAlert()">Alert</a> |
-        <a ng-click="newProgress()">Progress</a>
-    </span>
-    <span class="count">Notifications</span>
-</span>
--- a/example/notifications/src/DialogLaunchController.js
+++ b/example/notifications/src/DialogLaunchController.js
@@ -1,150 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        /**
-         * A controller for the dialog launch view. This view allows manual
-         * launching of dialogs for demonstration and testing purposes. It
-         * also demonstrates the use of the DialogService.
-         * @param $scope
-         * @param $timeout
-         * @param $log
-         * @param dialogService
-         * @param notificationService
-         * @constructor
-         */
-        function DialogLaunchController($scope, $timeout, $log, dialogService, notificationService) {
-
-            /*
-            Demonstrates launching a progress dialog and updating it
-             periodically with the progress of an ongoing process.
-             */
-            $scope.launchProgress = function (knownProgress) {
-                var model = {
-                    title: "Progress Dialog Example",
-                    progress: 0,
-                    hint: "Do not navigate away from this page or close this browser tab while this operation is in progress.",
-                    actionText: "Calculating...",
-                    unknownProgress: !knownProgress,
-                    unknownDuration: false,
-                    severity: "info",
-                    options: [
-                        {
-                            label: "Cancel Operation",
-                            callback: function () {
-                                $log.debug("Operation cancelled");
-                                dialogService.dismiss();
-                            }
-                        },
-                        {
-                            label: "Do something else...",
-                            callback: function () {
-                                $log.debug("Something else pressed");
-                            }
-                        }
-                    ]
-                };
-
-                function incrementProgress() {
-                    model.progress = Math.min(100, Math.floor(model.progress + Math.random() * 30));
-                    model.progressText = ["Estimated time remaining: about ", 60 - Math.floor((model.progress / 100) * 60), " seconds"].join(" ");
-                    if (model.progress < 100) {
-                        $timeout(incrementProgress, 1000);
-                    }
-                }
-
-                if (dialogService.showBlockingMessage(model)) {
-                    //Do processing here
-                    model.actionText = "Processing 100 objects...";
-                    if (knownProgress) {
-                        $timeout(incrementProgress, 1000);
-                    }
-                } else {
-                    $log.error("Could not display modal dialog");
-                }
-            };
-
-
-            /*
-             Demonstrates launching an error dialog
-             */
-            $scope.launchError = function () {
-                var model = {
-                    title: "Error Dialog Example",
-                    actionText: "Something happened, and it was not good.",
-                    severity: "error",
-                    options: [
-                        {
-                            label: "Try Again",
-                            callback: function () {
-                                $log.debug("Try Again Pressed");
-                                dialogService.dismiss();
-                            }
-                        },
-                        {
-                            label: "Cancel",
-                            callback: function () {
-                                $log.debug("Cancel Pressed");
-                                dialogService.dismiss();
-                            }
-                        }
-                    ]
-                };
-
-                if (!dialogService.showBlockingMessage(model)) {
-                    $log.error("Could not display modal dialog");
-                }
-            };
-
-            /*
-             Demonstrates launching an error dialog
-             */
-            $scope.launchInfo = function () {
-                var model = {
-                    title: "Info Dialog Example",
-                    actionText: "This is an example of a blocking info" +
-                    " dialog. This dialog can be used to draw the user's" +
-                    " attention to an event.",
-                    severity: "info",
-                    primaryOption: {
-                            label: "OK",
-                            callback: function () {
-                                $log.debug("OK Pressed");
-                                dialogService.dismiss();
-                            }
-                        }
-                };
-
-                if (!dialogService.showBlockingMessage(model)) {
-                    $log.error("Could not display modal dialog");
-                }
-            };
-
-        }
-        return DialogLaunchController;
-    }
-);
--- a/example/notifications/src/NotificationLaunchController.js
+++ b/example/notifications/src/NotificationLaunchController.js
@@ -1,172 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        /**
-         * Allows launching of notification messages for the purposes of
-         * demonstration and testing. Also demonstrates use of
-         * the NotificationService. Notifications are non-blocking messages that
-         * appear at the bottom of the screen to inform the user of events
-         * in a non-intrusive way. For more information see the
-         * {@link NotificationService}
-         * @param $scope
-         * @param $timeout
-         * @param $log
-         * @param notificationService
-         * @constructor
-         */
-        function NotificationLaunchController($scope, $timeout, $log, notificationService) {
-            var messageCounter = 1;
-
-            function getExampleActionText() {
-                var actionTexts = [
-                    "Adipiscing turpis mauris in enim elementu hac, enim aliquam etiam.",
-                    "Eros turpis, pulvinar turpis eros eu",
-                    "Lundium nascetur a, lectus montes ac, parturient in natoque, duis risus risus pulvinar pid rhoncus, habitasse auctor natoque!"
-                ];
-                return actionTexts[Math.floor(Math.random()*3)];
-            }
-
-            function getExampleActions() {
-                var actions = [
-                    {
-                        label: "Try Again",
-                        callback: function () {
-                            $log.debug("Try Again pressed");
-                        }
-                    },
-                    {
-                        label: "Remove",
-                        callback: function () {
-                            $log.debug("Remove pressed");
-                        }
-                    },
-                    {
-                        label: "Cancel",
-                        callback: function () {
-                            $log.debug("Cancel pressed");
-                        }
-                    }
-                ];
-
-                // Randomly remove some actions off the top; leave at least one
-                actions.splice(0,Math.floor(Math.random() * actions.length));
-
-                return actions;
-            }
-
-            function getExampleSeverity() {
-                var severities = [
-                    "info",
-                    "alert",
-                    "error"
-                ];
-                return severities[Math.floor(Math.random() * severities.length)];
-            }
-
-            /**
-             * Launch a new notification with a severity level of 'Error'.
-             */
-            $scope.newError = function(){
-
-                notificationService.notify({
-                    title: "Example error notification " + messageCounter++,
-                    hint: "An error has occurred",
-                    severity: "error",
-                    primaryOption: {
-                        label: 'Retry',
-                        callback: function() {
-                            $log.info('Retry clicked');
-                        }
-                    },
-                    options: getExampleActions()});
-            };
-            /**
-             * Launch a new notification with a severity of 'Alert'.
-             */
-            $scope.newAlert = function(){
-
-                notificationService.notify({
-                    title: "Alert notification " + (messageCounter++),
-                    hint: "This is an alert message",
-                    severity: "alert",
-                    primaryOption: {
-                        label: 'Retry',
-                        callback: function() {
-                            $log.info('Retry clicked');
-                        }
-                    },
-                    options: getExampleActions()});
-            };
-
-
-            /**
-             * Launch a new notification with a progress bar that is updated
-             * periodically, tracking an ongoing process.
-             */
-            $scope.newProgress = function(){
-
-                var notificationModel = {
-                    title: "Progress notification example",
-                    severity: "info",
-                    progress: 0,
-                    actionText: getExampleActionText(),
-                    unknownProgress: false
-                };
-
-                /**
-                 * Simulate an ongoing process and update the progress bar.
-                 * @param notification
-                 */
-                function incrementProgress(notificationModel) {
-                    notificationModel.progress = Math.min(100, Math.floor(notificationModel.progress + Math.random() * 30));
-                    notificationModel.progressText = ["Estimated time" +
-                    " remaining:" +
-                    " about ", 60 - Math.floor((notificationModel.progress / 100) * 60), " seconds"].join(" ");
-                    if (notificationModel.progress < 100) {
-                        $timeout(function(){incrementProgress(notificationModel);}, 1000);
-                    }
-                }
-
-                notificationService.notify(notificationModel);
-                incrementProgress(notificationModel);
-            };
-
-            /**
-             * Launch a new notification with severity level of INFO.
-             */
-            $scope.newInfo = function(){
-
-                notificationService.info({
-                    title: "Example Info notification " + messageCounter++
-                });
-            };
-
-        }
-        return NotificationLaunchController;
-    }
-);
--- a/example/notifications/src/NotificationLaunchIndicator.js
+++ b/example/notifications/src/NotificationLaunchIndicator.js
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,window*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        function NotificationLaunchIndicator() {
-
-        }
-
-        NotificationLaunchIndicator.template = 'notificationLaunchTemplate';
-
-        NotificationLaunchIndicator.prototype.getGlyph = function () {
-            return "i";
-        };
-        NotificationLaunchIndicator.prototype.getGlyphClass = function () {
-            return 'caution';
-        };
-        NotificationLaunchIndicator.prototype.getText = function () {
-            return "Launch notification";
-        };
-        NotificationLaunchIndicator.prototype.getDescription = function () {
-            return "Launch notification";
-        };
-
-        return NotificationLaunchIndicator;
-    }
-);
--- a/example/profiling/bundle.json
+++ b/example/profiling/bundle.json
@@ -4,11 +4,7 @@
            {
                "implementation": "WatchIndicator.js",
                "depends": ["$interval", "$rootScope"]
-            },
-            {
-                "implementation": "DigestIndicator.js",
-                "depends": ["$interval", "$rootScope"]
            }
        ]
    }
-}
+}
--- a/ideas/cli/bundle.json
+++ b/ideas/cli/bundle.json
@@ -0,0 +1,22 @@
+{
+    "extensions": {
+        "routes": [
+            {
+                "when": "/cli",
+                "templateUrl": "templates/cli.html"
+            }
+        ],
+        "controllers": [
+            {
+                "key": "CLIController",
+                "implementation": "CLIController.js",
+                "depends": [ "$scope", "navigationService", "objectService" ]
+            }
+        ],
+        "stylesheets": [
+            {
+                "stylesheetUrl": "stylesheets/cli.css"
+            }
+        ]
+    }
+}
--- a/ideas/cli/res/stylesheets/cli.css
+++ b/ideas/cli/res/stylesheets/cli.css
@@ -0,0 +1,47 @@
+.iw-container {
+    position: absolute;
+    bottom: 30px;
+    left: 0;
+    top: 0;
+    right: 0;
+}
+
+.iw-stdin {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 30px;
+    width: calc(100% - 8px);
+    margin: 4px;
+    font-family: monospace;
+    font-size: 16px;
+}
+
+.iw-stdout {
+    position: absolute;
+    left: 6px;
+    right: 6px;
+    top: 12px;
+    bottom: 44px;
+    border: 1px #211 solid;
+    border-radius: 12px;
+    padding: 8px;
+    background: #302;
+    overflow: auto;
+    box-shadow: inset 0px 2px 8px 0px rgba(0, 0, 0, 0.5);
+}
+
+.iw-stdout span {
+    display: block;
+    font-family: monospace;
+    color: #FD9;
+    font-size: 16px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+    min-height: 1em;
+    white-space: pre;
+}
+
+.iw-stdout span.iw-user-input {
+    color: gray;
+}
--- a/ideas/cli/res/templates/cli.html
+++ b/ideas/cli/res/templates/cli.html
@@ -0,0 +1,15 @@
+<div class="abs holder-all browse-mode" ng-controller="CLIController">
+    <div class="iw-container">
+        <div class="iw-stdout" mct-scroll-y="stdoutScroll">
+            <span ng-repeat="line in stdout track by $index"
+                  class="{{line.cssClass}}"
+                  ng-bind="line.text">
+            </span>
+        </div>
+        <form ng-submit="enter(stdin)">
+            <input type="text" class="iw-stdin" ng-model="stdin" autofocus>
+        </form>
+    </div>
+    <mct-include key="'bottombar'"></mct-include>
+</div>
+
--- a/ideas/cli/src/CLIController.js
+++ b/ideas/cli/src/CLIController.js
@@ -0,0 +1,177 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define(function () {
+    'use strict';
+    return function CLIController($scope, navigationService, objectService) {
+        var unlistenToMutation,
+            currentComposition = [];
+
+        function print(str, cssClass) {
+            $scope.stdout.push({
+                text: str,
+                cssClass: cssClass
+            });
+            $scope.stdoutScroll = Number.MAX_VALUE;
+        }
+
+        function pad(str, length) {
+            while (str.length < length) {
+                str += " ";
+            }
+            return str;
+        }
+
+        function summarize(domainObject) {
+            var type = domainObject.getCapability("type"),
+                typeName = type ? type.getName() : "Object",
+                location = domainObject.getCapability('location'),
+                isLink = (location && location.isLink()),
+                suffix = isLink ? " (link)" : "";
+            return "[" + typeName + "] " + domainObject.getModel().name + suffix;
+        }
+
+        function printComposition(domainObject) {
+            return domainObject.useCapability("composition").then(function (c) {
+                currentComposition = c;
+                c.forEach(function (childObject, i) {
+                    print(i + ") " + summarize(childObject));
+                });
+            });
+        }
+
+        function printObject(domainObject, callback) {
+            // Exclude the root object; nobody wants to see that
+            if (domainObject.hasCapability("context")) {
+                print(summarize(domainObject));
+            }
+            if (domainObject.hasCapability('composition')) {
+                printComposition(domainObject).then(callback);
+            } else {
+                callback();
+            }
+        }
+
+        function unlisten() {
+            if (unlistenToMutation) {
+                unlistenToMutation();
+                unlistenToMutation = undefined;
+            }
+        }
+
+        function navChange(domainObject) {
+            unlisten();
+            unlistenToMutation = domainObject.getCapability("mutation")
+                .listen(function () { printObject(domainObject); });
+            printObject(domainObject);
+        }
+
+        function findTarget(id) {
+            if (id === "this") {
+                return navigationService.getNavigation();
+            } else {
+                return currentComposition[parseInt(id, 10)];
+            }
+        }
+
+        function listActions(domainObject, index) {
+            // Don't show actions for the root
+            if (!domainObject.hasCapability('context')) {
+                return;
+            }
+
+            domainObject.getCapability('action').getActions().forEach(function (a) {
+                var metadata = a.getMetadata(),
+                    desc = metadata.description,
+                    suffix = index !== undefined ? (" " + index) : "";
+                print(pad(metadata.key + suffix, 32) + (desc || ""));
+            });
+        }
+
+        function performAction(domainObject, action) {
+            domainObject.getCapability('action').perform(action);
+        }
+
+        function handleInput(input) {
+            var parts = input.split(" "),
+                targetObject;
+
+            if (input.length === 0) {
+                targetObject = navigationService.getNavigation();
+                if (targetObject) {
+                    printObject(targetObject, function () {
+                        print("");
+                        listActions(targetObject);
+                    });
+                }
+                return;
+            } else if (parts.length === 1) {
+                if (isNaN(parseInt(parts[0], 10))) {
+                    targetObject = navigationService.getNavigation();
+                    performAction(targetObject, parts[0]);
+                    return;
+                }
+                targetObject = findTarget(parts[0]);
+                if (targetObject) {
+                    listActions(targetObject, parts[0]);
+                    return;
+                }
+            } else if (parts.length === 2) {
+                targetObject = findTarget(parts[1]);
+                if (targetObject) {
+                    performAction(targetObject, parts[0]);
+                    return;
+                }
+            }
+
+            // Any parse-able input should have returned already.
+            print("SYNTAX ERROR. READY.");
+        }
+
+        if (!navigationService.getNavigation()) {
+            objectService.getObjects(["ROOT"]).then(function (objects) {
+                navigationService.setNavigation(objects.ROOT);
+            });
+        }
+
+        navigationService.addListener(navChange);
+
+        $scope.stdout = [];
+        $scope.stdin = "";
+        $scope.stdoutScroll = 0;
+
+        $scope.enter = function (input) {
+            $scope.stdin = "";
+            print("");
+            print(input, "iw-user-input");
+            print("");
+
+            handleInput(input);
+        };
+
+        $scope.$on("$destroy", function () {
+            navigationService.removeListener(navChange);
+            unlisten();
+        });
+    };
+});
--- a/package.json
+++ b/package.json
@@ -22,8 +22,7 @@
    "split": "^1.0.0",
    "mkdirp": "^0.5.1",
    "nomnoml": "^0.0.3",
-    "canvas": "^1.2.7",
-    "markdown-toc": "^0.11.7"
+    "canvas": "^1.2.7"
  },
  "scripts": {
    "start": "node app.js",
--- a/platform/commonUI/browse/bundle.json
+++ b/platform/commonUI/browse/bundle.json
@@ -1,9 +1,4 @@
 {
-    "configuration": {
-        "paths": {
-            "uuid": "uuid"
-        }
-    },
    "extensions": {
        "routes": [
            {
@@ -31,10 +26,10 @@
                ]
            },
            {
-                "key": "PaneController",
-                "implementation": "PaneController.js",
+                "key": "BrowseTreeController",
+                "implementation": "BrowseTreeController.js",
                "priority": "preferred",
-                "depends": [ "$scope", "agentService","$window" ]
+                "depends": [ "$scope", "agentService" ]
            },
            {
                "key": "BrowseObjectController",
@@ -110,9 +105,15 @@
        "actions": [
            {
                "key": "navigate",
+                "description": "Browse to this object.",
                "implementation": "navigation/NavigateAction.js",
                "depends": [ "navigationService", "$q" ]
            },
+            {
+                "key": "back",
+                "implementation": "navigation/BackAction.js",
+                "description": "Navigate to the parent of this object."
+            },
            {
                "key": "window",
                "name": "Open In New Tab",
--- a/platform/commonUI/browse/res/templates/back-arrow.html
+++ b/platform/commonUI/browse/res/templates/back-arrow.html
@@ -24,7 +24,7 @@
 <a
   class='type-icon icon ui-symbol s-back'
   ng-show="context.getPath().length > 2"
-   ng-click="context.getParent().getCapability('action').perform('navigate')">
+   ng-click="domainObject.getCapability('action').perform('back')">
    {
 </a>

--- a/platform/commonUI/browse/res/templates/browse-object.html
+++ b/platform/commonUI/browse/res/templates/browse-object.html
@@ -41,8 +41,10 @@
            </mct-representation>
        </div>
    </div>
-    <mct-representation key="representation.selected.key"
-                        mct-object="representation.selected.key && domainObject"
-                        class="abs object-holder">
-    </mct-representation>
+
+    <div class='object-holder abs vscroll'>
+        <mct-representation key="representation.selected.key"
+                            mct-object="representation.selected.key && domainObject">
+        </mct-representation>
+    </div>
 </span>
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -22,27 +22,20 @@

 <div class="abs holder-all browse-mode" ng-controller="BrowseController">
    <mct-include key="'topbar-browse'"></mct-include>
-    <div class="abs holder holder-main browse-area s-browse-area browse-wrapper"
-         ng-controller="PaneController as modelPaneTree"
-         ng-class="modelPaneTree.visible() ? 'pane-tree-showing' : 'pane-tree-hidden'">
-        <mct-split-pane class='abs contents'
-                        anchor='left'>
+    <div class="holder browse-area s-browse-area abs browse-wrapper"
+         ng-controller="BrowseTreeController as tree"
+         ng-class="tree.visible() ? 'browse-showtree' : 'browse-hidetree'">
+        <mct-split-pane class='contents abs' anchor='left'>
            <div class='split-pane-component treeview pane left'>
-                <!--<a class="mini-tab-icon anchor-left toggle-pane toggle-search mobile-hide"
-                   title="Enable search"
-                   ng-click="modelPaneTree.toggle()"
-                   ng-class="{ collapsed : !modelPaneTree.visible() }"
-                   ng-style="{ opacity: modelPaneTree.visible()? 0:1 }"></a>-->
-                <div class="holder holder-create-and-search abs l-mobile">
-                    <mct-representation key="'create-button'"
-                                        mct-object="navigatedObject"
-                                        mct-device="desktop">
+                <div class="holder abs l-mobile">
+                    <mct-representation key="'create-button'" mct-object="navigatedObject">
                    </mct-representation>
                    <div class='holder search-holder abs'
                         ng-class="{active: treeModel.search}">
-                        <mct-include key="'search'"
+                        <mct-representation key="'search'"
+                                     mct-object="domainObject"
                                     ng-model="treeModel">
-                        </mct-include>
+                        </mct-representation>
                    </div>
                    <div class='tree-holder abs mobile-tree-holder'
                         ng-hide="treeModel.search">
@@ -55,40 +48,17 @@
                </div>
            </div>

-            <mct-splitter class="splitter-treeview mobile-hide"></mct-splitter>
+            <mct-splitter class="mobile-hide"></mct-splitter>

-            <div class='split-pane-component items pane primary-pane right'>
-                <a class="mini-tab-icon anchor-left toggle-pane toggle-tree"
-                   title="{{ modelPaneTree.visible()? 'Hide' : 'Show' }} this pane"
-                   ng-click="modelPaneTree.toggle()"
-                   ng-class="{ collapsed : !modelPaneTree.visible() }"></a>
-
-                <div class='holder holder-object-and-inspector abs l-mobile' id='content-area'
-                     ng-controller="PaneController as modelPaneInspect"
-                     ng-class="modelPaneInspect.visible() ? 'pane-inspect-showing' : 'pane-inspect-hidden'">
-
-                    <mct-split-pane class='l-object-and-inspector contents abs' anchor='right'>
-                        <div class='split-pane-component t-object pane primary-pane left'>
-                            <mct-representation mct-object="navigatedObject"
-                                                key="'browse-object'"
-                                                class="abs holder holder-object">
-                            </mct-representation>
-                        </div>
-
-                        <mct-splitter class="splitter-inspect mobile-hide flush-right edge-shdw"></mct-splitter>
-
-                        <div class="split-pane-component t-inspect pane right mobile-hide">
-                            <mct-representation key="'object-inspector'"
-                                                mct-object="domainObject"
-                                                ng-model="treeModel">
-                            </mct-representation>
-                            <a class="mini-tab-icon anchor-right mobile-hide toggle-pane toggle-inspect"
-                               title="{{ modelPaneInspect.visible()? 'Hide' : 'Show' }} the Inspection pane"
-                               ng-click="modelPaneInspect.toggle()"
-                               ng-class="{ collapsed : !modelPaneInspect.visible() }"></a>
-                        </div>
-                    </mct-split-pane>
+            <div class='split-pane-component items pane right-repr'>
+                <div class='holder abs l-mobile' id='content-area'>
+                    <mct-representation mct-object="navigatedObject"
+                                        key="'browse-object'">
+                    </mct-representation>
                </div>
+                <div class="key-properties ui-symbol icon mobile-menu-icon desktop-hide"
+                     mct-device="mobile"
+                     ng-click="tree.toggle()">m</div>
            </div>
        </mct-split-pane>
    </div>
--- a/platform/commonUI/browse/res/templates/browse/object-header.html
+++ b/platform/commonUI/browse/res/templates/browse/object-header.html
@@ -19,7 +19,7 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<div class='object-header'>
+<div class='object-header object-header-mobile'>
    <span class='type-icon ui-symbol'>{{type.getGlyph()}}</span>
    <!--span class='type-name mobile-important-hide'>{{type.getName()}}</span-->
    <span class="l-elem-wrapper l-flex">
--- a/platform/commonUI/browse/res/templates/create/create-button.html
+++ b/platform/commonUI/browse/res/templates/create/create-button.html
@@ -19,12 +19,13 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<span ng-controller="ClickAwayController as createController">
-    <div class="s-menu-btn major create-btn" ng-click="createController.toggle()">
+<div class="menu-element wrapper" ng-controller="ClickAwayController as createController">
+    <div class="s-menu major create-btn" ng-click="createController.toggle()">
+		<span class="ui-symbol icon type-icon">&#x2b;</span>
 		<span class="title-label">Create</span>
    </div>
    <div class="menu super-menu" ng-show="createController.isActive()">
        <mct-representation mct-object="domainObject" key="'create-menu'">
        </mct-representation>
    </div>
-</span>
+</div>
--- a/platform/commonUI/browse/res/templates/items/grid-item.html
+++ b/platform/commonUI/browse/res/templates/items/grid-item.html
@@ -26,8 +26,14 @@
            <div class='ui-symbol profile' title='Shared'>&#x4f;</div>
            <mct-representation class="desktop-hide" key="'info-button'" mct-object="domainObject"></mct-representation>
        </div>
-        <div class='item-main abs lg'>
-            <span class="t-item-icon" ng-class="{ 'l-icon-link':location.isLink() }">{{type.getGlyph()}}</span>
+        <div class='item-main abs'>
+            <div class='ui-symbol icon lg item-type'>
+                {{type.getGlyph()}}
+                <span
+                    class="ui-symbol l-icon-link" title="This object is a link"
+                    ng-show="location.isLink()"
+                    ></span>
+            </div>
            <div class='ui-symbol abs item-open'>}</div>
        </div>
        <div class='bottom-bar bar abs'>
--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -153,6 +153,7 @@ define(
            $scope.$on("$destroy", function () {
                navigationService.removeListener(setNavigation);
            });
+
        }

        return BrowseController;
--- a/platform/commonUI/browse/src/BrowseTreeController.js
+++ b/platform/commonUI/browse/src/BrowseTreeController.js
@@ -33,12 +33,10 @@ define(
         * @constructor
         * @memberof platform/commonUI/browse
         */
-        function PaneController($scope, agentService, $window) {
+        function BrowseTreeController($scope, agentService) {
            var self = this;
            this.agentService = agentService;
-
-            // Fast and cheap: if this has been opened in a new window, hide panes by default
-            this.state = !$window.opener;
+            this.state = true;

            /**
             * Callback to invoke when any selection occurs in the tree.
@@ -46,7 +44,7 @@ define(
             * to the tree representation.
             *
             * @property {Function} callback
-             * @memberof platform/commonUI/browse.PaneController#
+             * @memberof platform/commonUI/browse.BrowseTreeController#
             */
            this.callback = function () {
                // Note that, since this is a callback to pass, this is not
@@ -61,20 +59,20 @@ define(
        }

        /**
-         * Toggle the visibility of the pane.
+         * Toggle the visibility of the tree.
         */
-        PaneController.prototype.toggle = function () {
+        BrowseTreeController.prototype.toggle = function () {
            this.state = !this.state;
        };

        /**
-         * Get the desired visibility state of the pane.
+         * Get the desired visibility state of the tree.
         * @returns {boolean} true when visible
         */
-        PaneController.prototype.visible = function () {
+        BrowseTreeController.prototype.visible = function () {
            return this.state;
        };

-        return PaneController;
+        return BrowseTreeController;
    }
 );
--- a/platform/commonUI/browse/src/creation/CreateAction.js
+++ b/platform/commonUI/browse/src/creation/CreateAction.js
@@ -53,11 +53,12 @@ define(
         */
        function CreateAction(type, parent, context, dialogService, creationService, policyService) {
            this.metadata = {
-                key: 'create',
+                key: 'create.' + type.getKey(),
                glyph: type.getGlyph(),
                name: type.getName(),
                type: type.getKey(),
                description: type.getDescription(),
+                category: [ 'creation' ],
                context: context
            };

--- a/platform/commonUI/browse/src/creation/CreateActionProvider.js
+++ b/platform/commonUI/browse/src/creation/CreateActionProvider.js
@@ -63,7 +63,10 @@ define(
            // domain object to serve as the container for the
            // newly-created object (although the user may later
            // make a different selection)
-            if (key !== 'create' || !destination) {
+            if (!destination) {
+                return [];
+            }
+            if (context.category && context.category !== "creation") {
                return [];
            }

--- a/platform/commonUI/browse/src/creation/CreateMenuController.js
+++ b/platform/commonUI/browse/src/creation/CreateMenuController.js
@@ -41,7 +41,7 @@ define(
            // Update the set of Create actions
            function refreshActions() {
                $scope.createActions = $scope.action ?
-                        $scope.action.getActions('create') :
+                        $scope.action.getActions({ category: "creation" }) :
                        [];
            }

--- a/platform/commonUI/browse/src/creation/CreationService.js
+++ b/platform/commonUI/browse/src/creation/CreationService.js
@@ -25,7 +25,7 @@
 * Module defining CreateService. Created by vwoeltje on 11/10/14.
 */
 define(
-    ["uuid"],
+    ["../../lib/uuid"],
    function (uuid) {
        "use strict";

--- a/platform/commonUI/browse/src/navigation/BackAction.js
+++ b/platform/commonUI/browse/src/navigation/BackAction.js
@@ -19,59 +19,50 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/
+/*global define,Promise*/

+/**
+ * Module defining NavigateAction. Created by vwoeltje on 11/10/14.
+ */
 define(
    [],
    function () {
        "use strict";

        /**
-         * Displays the number of digests that have occurred since the
-         * indicator was first instantiated.
+         * The `back` action navigates to the contextual parent of a
+         * specific domain object.
+         * @memberof platform/commonUI/browse
         * @constructor
-         * @param $interval Angular's $interval
-         * @implements {Indicator}
+         * @implements {Action}
         */
-        function DigestIndicator($interval, $rootScope) {
-            var digests = 0,
-                displayed = 0,
-                start = Date.now();
-
-            function update() {
-                var secs = (Date.now() - start) / 1000;
-                displayed = Math.round(digests / secs);
-            }
-
-            function increment() {
-                digests += 1;
-            }
-
-            $rootScope.$watch(increment);
-
-            // Update state every second
-            $interval(update, 1000);
-
-            // Provide initial state, too
-            update();
-
-            return {
-                getGlyph: function () {
-                    return ".";
-                },
-                getGlyphClass: function () {
-                    return undefined;
-                },
-                getText: function () {
-                    return displayed + " digests/sec";
-                },
-                getDescription: function () {
-                    return "";
-                }
-            };
+        function BackAction(context) {
+            this.domainObject = context.domainObject;
        }

-        return DigestIndicator;
+        /**
+         * Navigate to the object described in the context.
+         * @returns {Promise} a promise that is resolved once the
+         *          navigation has been updated
+         */
+        BackAction.prototype.perform = function () {
+            var parent = this.domainObject.getCapability("context")
+                    .getParent();
+            return parent.getCapability("action").perform("navigate");
+        };

+        /**
+         * Navigate as an action is only applicable when a domain object
+         * is described in the action context.
+         * @param {ActionContext} context the context in which the action
+         *        will be performed
+         * @returns {boolean} true if applicable
+         */
+        BackAction.appliesTo = function (context) {
+            return context.domainObject !== undefined &&
+                    context.domainObject.hasCapability("context");
+        };
+
+        return BackAction;
    }
 );
--- a/platform/commonUI/browse/src/windowing/FullscreenAction.js
+++ b/platform/commonUI/browse/src/windowing/FullscreenAction.js
@@ -53,9 +53,10 @@ define(
            // based on whether or not we are currently
            // full screen.
            var metadata = Object.create(FullscreenAction);
+            metadata.key = "fullscreen";
            metadata.glyph = screenfull.isFullscreen ? "_" : "z";
            metadata.description = screenfull.isFullscreen ?
-                EXIT_FULLSCREEN : ENTER_FULLSCREEN;
+                    EXIT_FULLSCREEN : ENTER_FULLSCREEN;
            metadata.group = "windowing";
            metadata.context = this.context;
            return metadata;
--- a/platform/commonUI/browse/test/BrowseTreeControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseTreeControllerSpec.js
@@ -22,24 +22,22 @@
 /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/

 define(
-    ["../src/PaneController"],
-    function (PaneController) {
+    ["../src/BrowseTreeController"],
+    function (BrowseTreeController) {
        'use strict';

-        describe("The PaneController", function () {
+        describe("The BrowseTreeController", function () {
            var mockScope,
                mockAgentService,
                mockDomainObjects,
-                mockWindow,
                controller;

            // We want to reinstantiate for each test case
            // because device state can influence constructor-time behavior
            function instantiateController() {
-                return new PaneController(
+                return new BrowseTreeController(
                    mockScope,
-                    mockAgentService,
-                    mockWindow
+                    mockAgentService
                );
            }

@@ -60,7 +58,6 @@ define(
                    "agentService",
                    [ "isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape" ]
                );
-                mockWindow = jasmine.createSpyObj("$window", ["open"]);
            });

            it("is initially visible", function () {
--- a/platform/commonUI/browse/test/suite.json
+++ b/platform/commonUI/browse/test/suite.json
@@ -1,7 +1,7 @@
 [
    "BrowseController",
    "BrowseObjectController",
-    "PaneController",
+    "BrowseTreeController",
    "MenuArrowController",
    "creation/CreateAction",
    "creation/CreateActionProvider",
--- a/platform/commonUI/dialog/bundle.json
+++ b/platform/commonUI/dialog/bundle.json
@@ -24,18 +24,6 @@
            {
                "key": "form-dialog",
                "templateUrl": "templates/dialog.html"
-            },
-            {
-                "key": "overlay-blocking-message",
-                "templateUrl": "templates/overlay-blocking-message.html"
-            },
-            {
-                "key": "message",
-                "templateUrl": "templates/message.html"
-            },
-            {
-                "key": "overlay-message-list",
-                "templateUrl": "templates/overlay-message-list.html"
            }
        ],
        "containers": [
--- a/platform/commonUI/dialog/res/templates/dialog.html
+++ b/platform/commonUI/dialog/res/templates/dialog.html
@@ -21,13 +21,17 @@
 -->
 <div class="abs top-bar">
    <div class="title">{{ngModel.title}}</div>
-    <div class="hint">All fields marked <span class="ui-symbol req">*</span> are required.</div>
+    <div class="hint">
+        All fields marked <span class="ui-symbol req">*</span> are required.
+    </div>
 </div>
-<div class='abs editor'>
-    <mct-form ng-model="ngModel.value"
-              structure="ngModel.structure"
-              name="createForm">
-    </mct-form>
+<div class="abs form editor">
+    <div class='abs contents l-dialog'>
+        <mct-form ng-model="ngModel.value"
+                  structure="ngModel.structure"
+                  name="createForm">
+        </mct-form>
+    </div>
 </div>
 <div class="abs bottom-bar">
    <a class='s-btn major'
--- a/platform/commonUI/dialog/res/templates/message.html
+++ b/platform/commonUI/dialog/res/templates/message.html
@@ -1,32 +0,0 @@
-<div class="l-message"
-     ng-class="'message-severity-' + ngModel.severity">
-    <div class="ui-symbol type-icon message-type"></div>
-    <div class="message-contents">
-        <div class="top-bar">
-            <div class="title">{{ngModel.title}}</div>
-            <div class="hint" ng-hide="ngModel.hint === undefined">{{ngModel.hint}}</div>
-        </div>
-        <div class="message-body">
-            <div class="message-action">
-                {{ngModel.actionText}}
-            </div>
-            <mct-include key="'progress-bar'"
-                         ng-model="ngModel"
-                         ng-show="ngModel.progress !== undefined || ngModel.unknownProgress"></mct-include>
-        </div>
-        <div class="bottom-bar">
-            <a ng-repeat="dialogOption in ngModel.options"
-               class="s-btn major"
-               ng-click="dialogOption.callback()">
-                {{dialogOption.label}}
-            </a>
-            <a class="s-btn major"
-               ng-if="ngModel.primaryOption"
-               ng-click="ngModel.primaryOption.callback()">
-                {{ngModel.primaryOption.label}}
-            </a>
-
-        </div>
-
-    </div>
-</div>
--- a/platform/commonUI/dialog/res/templates/overlay-blocking-message.html
+++ b/platform/commonUI/dialog/res/templates/overlay-blocking-message.html
@@ -1,25 +0,0 @@
-<!--
- Open MCT Web, Copyright (c) 2014-2015, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT Web is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT Web includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
-->
-<mct-container key="overlay" class="t-message-single">
-    <mct-include key="'message'" ng-model="ngModel">
-    </mct-include>
-</mct-container>
--- a/platform/commonUI/dialog/res/templates/overlay-message-list.html
+++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html
@@ -1,19 +0,0 @@
-<mct-container key="overlay" class="t-message-list">
-    <div class="message-contents">
-        <div class="abs top-bar">
-            <div class="title">{{ngModel.dialog.title}}</div>
-            <div class="hint">Displaying {{ngModel.dialog.messages.length}} message<span ng-show="ngModel.dialog.messages.length > 1">s</span>
-            </div>
-        </div>
-        <div class="abs message-body">
-            <mct-include ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'" key="'message'" ng-model="msg"></mct-include>
-        </div>
-        <div class="abs bottom-bar">
-            <a ng-repeat="dialogAction in ngModel.dialog.actions"
-               class="s-btn major"
-               ng-click="dialogAction.action()">
-                {{dialogAction.label}}
-            </a>
-        </div>
-    </div>
-</mct-container>
--- a/platform/commonUI/dialog/res/templates/overlay-options.html
+++ b/platform/commonUI/dialog/res/templates/overlay-options.html
@@ -24,11 +24,13 @@
        <div class="title">{{ngModel.dialog.title}}</div>
        <div class="hint">{{ngModel.dialog.hint}}</div>
    </div>
-    <div class='abs editor'>
-        <mct-include key="ngModel.dialog.template"
-                     parameters="ngModel.dialog.parameters"
-                     ng-model="ngModel.dialog.model">
-        </mct-include>
+    <div class="abs form outline editor">
+        <div class='abs contents l-dialog'>
+            <mct-include key="ngModel.dialog.template"
+                         parameters="ngModel.dialog.parameters"
+                         ng-model="ngModel.dialog.model">
+            </mct-include>
+        </div>
    </div>
    <div class="abs bottom-bar">
        <a ng-repeat="option in ngModel.dialog.options"
--- a/platform/commonUI/dialog/res/templates/overlay.html
+++ b/platform/commonUI/dialog/res/templates/overlay.html
@@ -22,9 +22,14 @@
 <div class="abs overlay">
    <div class="abs blocker"></div>
    <div class="abs holder">
-        <a ng-click="ngModel.cancel()"
+        <a href=""
+           ng-click="ngModel.cancel()"
           ng-if="ngModel.cancel"
-           class="clk-icon icon ui-symbol close">x</a>
-        <div class="abs contents" ng-transclude></div>
+           class="clk-icon icon ui-symbol close">
+            x
+        </a>
+        <div class="abs contents" ng-transclude>
+
+        </div>
    </div>
 </div>
--- a/platform/commonUI/dialog/src/DialogService.js
+++ b/platform/commonUI/dialog/src/DialogService.js
@@ -55,7 +55,7 @@ define(
            this.dialogVisible = false;
        };

-        DialogService.prototype.getDialogResponse = function (key, model, resultGetter, typeClass) {
+        DialogService.prototype.getDialogResponse = function (key, model, resultGetter) {
            // We will return this result as a promise, because user
            // input is asynchronous.
            var deferred = this.$q.defer(),
@@ -84,20 +84,27 @@ define(
            model.confirm = confirm;
            model.cancel = cancel;

-            if (this.canShowDialog(model)) {
+            if (this.dialogVisible) {
+                // Only one dialog should be shown at a time.
+                // The application design should be such that
+                // we never even try to do this.
+                this.$log.warn([
+                    "Dialog already showing; ",
+                    "unable to show ",
+                    model.name
+                ].join(""));
+                deferred.reject();
+            } else {
                // Add the overlay using the OverlayService, which
                // will handle actual insertion into the DOM
                this.overlay = this.overlayService.createOverlay(
                    key,
-                    model,
-                    typeClass || "t-dialog"
+                    model
                );

                // Track that a dialog is already visible, to
                // avoid spawning multiple dialogs at once.
                this.dialogVisible = true;
-            } else {
-                deferred.reject();
            }

            return deferred.promise;
@@ -150,99 +157,6 @@ define(
            );
        };

-        /**
-         * Tests if a dialog can be displayed. A modal dialog may only be
-         * displayed if one is not already visible.
-         * Will log a warning message if it can't display a dialog.
-         * @returns {boolean} true if dialog is currently visible, false
-         * otherwise
-         */
-        DialogService.prototype.canShowDialog = function(dialogModel){
-            if (this.dialogVisible){
-                // Only one dialog should be shown at a time.
-                // The application design should be such that
-                // we never even try to do this.
-                this.$log.warn([
-                    "Dialog already showing; ",
-                    "unable to show ",
-                    dialogModel.title
-                ].join(""));
-
-                return false;
-            } else {
-                return true;
-            }
-        };
-
-        /**
-         * A user action that can be performed from a blocking dialog. These
-         * actions will be rendered as buttons within a blocking dialog.
-         *
-         * @typedef DialogOption
-         * @property {string} label a label to be displayed as the button
-         * text for this action
-         * @property {function} action a function to be called when the
-         * button is clicked
-         */
-
-        /**
-         * A description of the model options that may be passed to the
-         * showBlockingMessage method. Note that the DialogModel desribed
-         * here is shared with the Notifications framework.
-         * @see NotificationService
-         *
-         * @typedef DialogModel
-         * @property {string} title the title to use for the dialog
-         * @property {string} severity the severity level of this message.
-         * These are defined in a bundle constant with key 'dialogSeverity'
-         * @property {string} hint the 'hint' message to show below the title
-         * @property {string} actionText text that indicates a current action,
-         * shown above a progress bar to indicate what's happening.
-         * @property {number} progress a percentage value (1-100)
-         * indicating the completion of the blocking task
-         * @property {string} progressText the message to show below a
-         * progress bar to indicate progress. For example, this might be
-         * used to indicate time remaining, or items still to process.
-         * @property {boolean} unknownProgress some tasks may be
-         * impossible to provide an estimate for. Providing a true value for
-         * this attribute will indicate to the user that the progress and
-         * duration cannot be estimated.
-         * @property {DialogOption} primaryOption an action that will
-         * be added to the dialog as a button. The primary action can be
-         * used as the suggested course of action for the user. Making it
-         * distinct from other actions allows it to be styled differently,
-         * and treated preferentially in banner mode.
-         * @property {DialogOption[]} options a list of actions that will
-         * be added to the dialog as buttons.
-         */
-
-        /**
-         * Displays a blocking (modal) dialog. This dialog can be used for
-         * displaying messages that require the user's
-         * immediate attention. The message may include an indication of
-         * progress, as well as a series of actions that
-         * the user can take if necessary
-         * @param {DialogModel} dialogModel defines options for the dialog
-         * @param {typeClass} string tells overlayService that this overlay should use appropriate CSS class
-         * @returns {boolean}
-         */
-        DialogService.prototype.showBlockingMessage = function(dialogModel) {
-            if (this.canShowDialog(dialogModel)) {
-                // Add the overlay using the OverlayService, which
-                // will handle actual insertion into the DOM
-                this.overlay = this.overlayService.createOverlay(
-                    "overlay-blocking-message",
-                    dialogModel,
-                    "t-dialog-sm"
-                );
-                // Track that a dialog is already visible, to
-                // avoid spawning multiple dialogs at once.
-                this.dialogVisible = true;
-                return true;
-            } else {
-                return false;
-            }
-        };

        return DialogService;
    }
--- a/platform/commonUI/dialog/src/OverlayService.js
+++ b/platform/commonUI/dialog/src/OverlayService.js
@@ -28,7 +28,7 @@ define(

        // Template to inject into the DOM to show the dialog; really just points to
        // the a specific template that can be included via mct-include
-        var TEMPLATE = '<mct-include ng-model="overlay" key="key" ng-class="typeClass"></mct-include>';
+        var TEMPLATE = '<mct-include ng-model="overlay" key="key"></mct-include>';


        /**
@@ -71,11 +71,8 @@ define(
         * @param {object} overlayModel the model to pass to the
         *        included overlay template (this will be passed
         *        in via ng-model)
-         * @param {string} typeClass the element class to use in rendering
-         *        the overlay. Can be specified to provide custom styling of
-         *        overlays
         */
-        OverlayService.prototype.createOverlay = function (key, overlayModel, typeClass) {
+        OverlayService.prototype.createOverlay = function (key, overlayModel) {
            // Create a new scope for this overlay
            var scope = this.newScope(),
                element;
@@ -93,7 +90,6 @@ define(
            // Populate the scope; will be passed directly to the template
            scope.overlay = overlayModel;
            scope.key = key;
-            scope.typeClass = typeClass || 't-dialog';

            // Create the overlay element and add it to the document's body
            element = this.$compile(TEMPLATE)(scope);
--- a/platform/commonUI/dialog/test/DialogServiceSpec.js
+++ b/platform/commonUI/dialog/test/DialogServiceSpec.js
@@ -116,22 +116,10 @@ define(
                        dialog: dialogModel,
                        confirm: jasmine.any(Function),
                        cancel: jasmine.any(Function)
-                    },
-                    't-dialog'
-                );
-            });
-
-            it("invokes the overlay service with the correct parameters when" +
-                " a blocking dialog is requested", function() {
-                var dialogModel = {};
-                expect(dialogService.showBlockingMessage(dialogModel)).toBe(true);
-                expect(mockOverlayService.createOverlay).toHaveBeenCalledWith(
-                    "overlay-blocking-message",
-                    dialogModel,
-                    "t-dialog-sm"
+                    }
                );
            });

        });
    }
-);
+);
--- a/platform/commonUI/edit/res/templates/edit-object.html
+++ b/platform/commonUI/edit/res/templates/edit-object.html
@@ -30,11 +30,12 @@
                         structure="toolbar.structure"
                         ng-model="toolbar.state">
            </mct-toolbar>
-            <mct-representation key="representation.selected.key"
-                                toolbar="toolbar"
-                                mct-object="representation.selected.key && domainObject"
-                                class="holder abs object-holder work-area">
-            </mct-representation>
+            <div class='holder abs object-holder work-area'>
+                <mct-representation key="representation.selected.key"
+                                    toolbar="toolbar"
+                                    mct-object="representation.selected.key && domainObject">
+                </mct-representation>
+            </div>
        </div>
        <mct-splitter></mct-splitter>
        <div
--- a/platform/commonUI/formats/bundle.json
+++ b/platform/commonUI/formats/bundle.json
@@ -1,26 +0,0 @@
-{
-    "name": "Time services bundle",
-    "description": "Defines interfaces and provides default implementations for handling different time systems.",
-    "extensions": {
-        "components": [
-            {
-                "provides": "formatService",
-                "type": "provider",
-                "implementation": "FormatProvider.js",
-                "depends": [ "formats[]" ]
-            }
-        ],
-        "formats": [
-            {
-                "key": "utc",
-                "implementation": "UTCTimeFormat.js"
-            }
-        ],
-        "constants": [
-            {
-                "key": "DEFAULT_TIME_FORMAT",
-                "value": "utc"
-            }
-        ]
-    }
-}
--- a/platform/commonUI/formats/src/FormatProvider.js
+++ b/platform/commonUI/formats/src/FormatProvider.js
@@ -1,114 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-
-], function (
-
-) {
-    "use strict";
-
-    /**
-     * An object used to convert between numeric values and text values,
-     * typically used to display these values to the user and to convert
-     * user input to a numeric format, particularly for time formats.
-     * @interface {Format}
-     */
-
-    /**
-     * Parse text (typically user input) to a numeric value.
-     * Behavior is undefined when the text cannot be parsed;
-     * `validate` should be called first if the text may be invalid.
-     * @method parse
-     * @memberof Format#
-     * @param {string} text the text to parse
-     * @returns {number} the parsed numeric value
-     */
-
-    /**
-     * Determine whether or not some text (typically user input) can
-     * be parsed to a numeric value by this format.
-     * @method validate
-     * @memberof Format#
-     * @param {string} text the text to parse
-     * @returns {boolean} true if the text can be parsed
-     */
-
-    /**
-     * Convert a numeric value to a text value for display using
-     * this format.
-     * @method format
-     * @memberof Format#
-     * @param {number} value the numeric value to format
-     * @returns {string} the text representation of the value
-     */
-
-    /**
-     * Provides access to `Format` objects which can be used to
-     * convert values between human-readable text and numeric
-     * representations.
-     * @interface FormatService
-     */
-
-    /**
-     * Look up a format by its symbolic identifier.
-     * @method getFormat
-     * @memberof FormatService#
-     * @param {string} key the identifier for this format
-     * @returns {Format} the format
-     * @throws {Error} errors when the requested format is unrecognized
-     */
-
-    /**
-     * Provides formats from the `formats` extension category.
-     * @constructor
-     * @implements {FormatService}
-     * @memberof platform/commonUI/formats
-     * @param {Array.<function(new : Format)>} format constructors,
-     *        from the `formats` extension category.
-     */
-    function FormatProvider(formats) {
-        var formatMap = {};
-
-        function addToMap(Format) {
-            var key = Format.key;
-            if (key && !formatMap[key]) {
-                formatMap[key] = new Format();
-            }
-        }
-
-        formats.forEach(addToMap);
-        this.formatMap = formatMap;
-    }
-
-    FormatProvider.prototype.getFormat = function (key) {
-        var format = this.formatMap[key];
-        if (!format) {
-            throw new Error("FormatProvider: No format found for " + key);
-        }
-        return format;
-    };
-
-    return FormatProvider;
-
-});
--- a/platform/commonUI/formats/src/UTCTimeFormat.js
+++ b/platform/commonUI/formats/src/UTCTimeFormat.js
@@ -1,63 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-    'moment'
-], function (
-    moment
-) {
-    "use strict";
-
-    var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss",
-        DATE_FORMATS = [
-            DATE_FORMAT,
-            "YYYY-MM-DD HH:mm",
-            "YYYY-MM-DD"
-        ];
-
-
-    /**
-     * Formatter for UTC timestamps. Interprets numeric values as
-     * milliseconds since the start of 1970.
-     *
-     * @implements {Format}
-     * @constructor
-     * @memberof platform/commonUI/formats
-     */
-    function UTCTimeFormat() {
-    }
-
-    UTCTimeFormat.prototype.format = function (value) {
-        return moment.utc(value).format(DATE_FORMAT);
-    };
-
-    UTCTimeFormat.prototype.parse = function (text) {
-        return moment.utc(text, DATE_FORMATS).valueOf();
-    };
-
-    UTCTimeFormat.prototype.validate = function (text) {
-        return moment.utc(text, DATE_FORMATS).isValid();
-    };
-
-    return UTCTimeFormat;
-});
--- a/platform/commonUI/formats/test/FormatProviderSpec.js
+++ b/platform/commonUI/formats/test/FormatProviderSpec.js
@@ -1,68 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
-
-define(
-    ['../src/FormatProvider'],
-    function (FormatProvider) {
-        'use strict';
-
-        var KEYS = [ 'a', 'b', 'c' ];
-
-        describe("The FormatProvider", function () {
-            var mockFormats,
-                mockLog,
-                mockFormatInstances,
-                provider;
-
-            beforeEach(function () {
-                mockFormatInstances = KEYS.map(function (k) {
-                    return jasmine.createSpyObj(
-                        'format-' + k,
-                        [ 'parse', 'validate', 'format' ]
-                    );
-                });
-                // Return constructors
-                mockFormats = KEYS.map(function (k, i) {
-                    function MockFormat() { return mockFormatInstances[i]; }
-                    MockFormat.key = k;
-                    return MockFormat;
-                });
-                provider = new FormatProvider(mockFormats);
-            });
-
-            it("looks up formats by key", function () {
-                KEYS.forEach(function (k, i) {
-                    expect(provider.getFormat(k))
-                        .toEqual(mockFormatInstances[i]);
-                });
-            });
-
-            it("throws an error about unknown formats", function () {
-                expect(function () {
-                    provider.getFormat('some-unknown-format');
-                }).toThrow();
-            });
-
-        });
-    }
-);
--- a/platform/commonUI/formats/test/UTCTimeFormatSpec.js
+++ b/platform/commonUI/formats/test/UTCTimeFormatSpec.js
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
-
-define(
-    ['../src/UTCTimeFormat', 'moment'],
-    function (UTCTimeFormat, moment) {
-        'use strict';
-
-        describe("The UTCTimeFormat", function () {
-            var format;
-
-            beforeEach(function () {
-                format = new UTCTimeFormat();
-            });
-
-            it("formats UTC timestamps", function () {
-                var timestamp = 12345670000,
-                    formatted = format.format(timestamp);
-                expect(formatted).toEqual(jasmine.any(String));
-                expect(moment.utc(formatted).valueOf()).toEqual(timestamp);
-            });
-
-            it("validates time inputs", function () {
-                expect(format.validate("1977-05-25 11:21:22")).toBe(true);
-                expect(format.validate("garbage text")).toBe(false);
-            });
-
-            it("parses valid input", function () {
-                var text = "1977-05-25 11:21:22",
-                    parsed = format.parse(text);
-                expect(parsed).toEqual(jasmine.any(Number));
-                expect(parsed).toEqual(moment.utc(text).valueOf());
-            });
-        });
-    }
-);
--- a/platform/commonUI/formats/test/suite.json
+++ b/platform/commonUI/formats/test/suite.json
@@ -1,4 +0,0 @@
-[
-    "FormatProvider",
-    "UTCTimeFormat"
-]
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -8,11 +8,6 @@
                "key": "urlService",
                "implementation": "services/UrlService.js",
                "depends": [ "$location" ]
-            },
-            {
-                "key": "popupService",
-                "implementation": "services/PopupService.js",
-                "depends": [ "$document", "$window" ]
            }
        ],
        "runs": [
@@ -44,35 +39,12 @@
                "key": "indicator",
                "templateUrl": "templates/indicator.html"
            },
-            {
-                "key": "message-banner",
-                "templateUrl": "templates/message-banner.html"
-            },
-            {
-                "key": "progress-bar",
-                "templateUrl": "templates/progress-bar.html"
-            },
            {
              "key": "time-controller",
              "templateUrl": "templates/controls/time-controller.html"
            }
        ],
        "controllers": [
-            {
-                "key": "TimeRangeController",
-                "implementation": "controllers/TimeRangeController.js",
-                "depends": [ "$scope", "formatService", "DEFAULT_TIME_FORMAT", "now" ]
-            },
-            {
-                "key": "DateTimePickerController",
-                "implementation": "controllers/DateTimePickerController.js",
-                "depends": [ "$scope", "now" ]
-            },
-            {
-                "key": "DateTimeFieldController",
-                "implementation": "controllers/DateTimeFieldController.js",
-                "depends": [ "$scope", "formatService", "DEFAULT_TIME_FORMAT" ]
-            },
            {
                "key": "TreeNodeController",
                "implementation": "controllers/TreeNodeController.js",
@@ -120,16 +92,6 @@
                "key": "SelectorController",
                "implementation": "controllers/SelectorController.js",
                "depends": [ "objectService", "$scope" ]
-            },
-            {
-                "key": "ObjectInspectorController",
-                "implementation": "controllers/ObjectInspectorController.js",
-                "depends": [ "$scope", "objectService" ]
-            },
-            {
-                "key": "BannerController",
-                "implementation": "controllers/BannerController.js",
-                "depends": ["$scope", "notificationService", "dialogService"]
            }
        ],
        "directives": [
@@ -143,21 +105,11 @@
                "implementation": "directives/MCTDrag.js",
                "depends": [ "$document" ]
            },
-            {
-                "key": "mctClickElsewhere",
-                "implementation": "directives/MCTClickElsewhere.js",
-                "depends": [ "$document" ]
-            },
            {
                "key": "mctResize",
                "implementation": "directives/MCTResize.js",
                "depends": [ "$timeout" ]
            },
-            {
-                "key": "mctPopup",
-                "implementation": "directives/MCTPopup.js",
-                "depends": [ "$compile", "popupService" ]
-            },
            {
                "key": "mctScrollX",
                "implementation": "directives/MCTScroll.js",
@@ -255,24 +207,12 @@
                "key": "switcher",
                "templateUrl": "templates/controls/switcher.html",
                "uses": [ "view" ]
-            },
-            {
-                "key": "object-inspector",
-                "templateUrl": "templates/object-inspector.html"
            }
        ],
        "controls": [
            {
                "key": "selector",
                "templateUrl": "templates/controls/selector.html"
-            },
-            {
-                "key": "datetime-picker",
-                "templateUrl": "templates/controls/datetime-picker.html"
-            },
-            {
-                "key": "datetime-field",
-                "templateUrl": "templates/controls/datetime-field.html"
            }
        ],
        "licenses": [
--- a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json
+++ b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json
@@ -1,70 +1,14 @@
 {
 	"metadata": {
-		"name": "WTD Symbols",
-		"lastOpened": 1446490786311,
-		"created": 1446489891263
+		"name": "WTD Symbols v24",
+		"lastOpened": 1441992412958,
+		"created": 1441992410384
 	},
 	"iconSets": [
 		{
 			"selection": [
 				{
-					"order": 113,
-					"id": 92,
-					"prevSize": 32,
-					"code": 58901,
-					"name": "icon-crosshair",
-					"tempChar": ""
-				},
-				{
-					"order": 110,
-					"id": 91,
-					"prevSize": 32,
-					"code": 58899,
-					"name": "icon-collapse-pane-left",
-					"tempChar": ""
-				},
-				{
-					"order": 111,
-					"id": 90,
-					"prevSize": 32,
-					"code": 58900,
-					"name": "icon-collapse-pane-right",
-					"tempChar": ""
-				},
-				{
-					"order": 109,
-					"id": 89,
-					"prevSize": 32,
-					"code": 58898,
-					"name": "icon-save",
-					"tempChar": ""
-				},
-				{
-					"order": 108,
-					"id": 88,
-					"prevSize": 32,
-					"code": 58897,
-					"name": "icon-dataset",
-					"tempChar": ""
-				},
-				{
-					"order": 90,
-					"id": 87,
-					"prevSize": 32,
-					"code": 58896,
-					"name": "icon-bell",
-					"tempChar": ""
-				},
-				{
-					"order": 91,
-					"id": 86,
-					"prevSize": 32,
-					"code": 58889,
-					"name": "icon-hourglass",
-					"tempChar": ""
-				},
-				{
-					"order": 92,
+					"order": 86,
 					"id": 85,
 					"prevSize": 32,
 					"code": 58888,
@@ -74,119 +18,119 @@
 						58890
 					],
 					"name": "icon-info-v15",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 93,
+					"order": 82,
 					"id": 84,
 					"prevSize": 32,
 					"code": 58887,
 					"name": "icon-x-in-circle",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 94,
+					"order": 77,
 					"id": 83,
 					"prevSize": 32,
 					"code": 58881,
 					"name": "icon-datatable",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 95,
+					"order": 78,
 					"id": 82,
 					"prevSize": 32,
 					"code": 58882,
 					"name": "icon-tabular-scrolling",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 96,
+					"order": 79,
 					"id": 81,
 					"prevSize": 32,
 					"code": 58884,
 					"name": "icon-tabular",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 97,
+					"order": 80,
 					"id": 80,
 					"prevSize": 32,
 					"code": 58885,
 					"name": "icon-calendar",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 98,
+					"order": 83,
 					"id": 78,
 					"prevSize": 32,
 					"code": 58886,
 					"name": "icon-paint-bucket",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 99,
+					"order": 1,
 					"id": 75,
 					"prevSize": 32,
 					"code": 123,
 					"name": "icon-pointer-left",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 100,
+					"order": 3,
 					"id": 74,
 					"prevSize": 32,
 					"code": 125,
 					"name": "icon-pointer-right",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 101,
+					"order": 4,
 					"id": 73,
 					"prevSize": 32,
 					"code": 80,
 					"name": "icon-person",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 102,
+					"order": 5,
 					"id": 72,
 					"prevSize": 32,
 					"code": 232,
 					"name": "icon-chain-links",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 103,
+					"order": 6,
 					"id": 71,
 					"prevSize": 32,
 					"code": 115,
 					"name": "icon-database-in-brackets",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 104,
+					"order": 7,
 					"id": 70,
 					"prevSize": 32,
 					"code": 114,
 					"name": "icon-refresh",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 105,
+					"order": 8,
 					"id": 69,
 					"prevSize": 32,
 					"code": 108,
 					"name": "icon-lock",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 106,
+					"order": 9,
 					"id": 68,
 					"prevSize": 32,
 					"code": 51,
 					"name": "icon-box-with-dashed-lines",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 10,
@@ -194,7 +138,7 @@
 					"prevSize": 32,
 					"code": 58880,
 					"name": "icon-box-with-arrow-cursor",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 11,
@@ -202,7 +146,7 @@
 					"prevSize": 32,
 					"code": 65,
 					"name": "icon-activity-mode",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 12,
@@ -210,15 +154,15 @@
 					"prevSize": 32,
 					"code": 97,
 					"name": "icon-activity",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
-					"order": 87,
+					"order": 13,
 					"id": 64,
 					"prevSize": 32,
 					"code": 33,
 					"name": "icon-alert-rect",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 14,
@@ -226,7 +170,7 @@
 					"prevSize": 32,
 					"code": 58883,
 					"name": "icon-alert-triangle",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 15,
@@ -234,7 +178,7 @@
 					"prevSize": 32,
 					"code": 238,
 					"name": "icon-arrow-double-down",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 16,
@@ -242,7 +186,7 @@
 					"prevSize": 32,
 					"code": 235,
 					"name": "icon-arrow-double-up",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 2,
@@ -250,7 +194,7 @@
 					"prevSize": 32,
 					"code": 118,
 					"name": "icon-arrow-down",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 19,
@@ -258,7 +202,7 @@
 					"prevSize": 32,
 					"code": 60,
 					"name": "icon-arrow-left",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 20,
@@ -266,7 +210,7 @@
 					"prevSize": 32,
 					"code": 62,
 					"name": "icon-arrow-right",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 21,
@@ -274,7 +218,7 @@
 					"prevSize": 32,
 					"code": 236,
 					"name": "icon-arrow-tall-down",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 22,
@@ -282,7 +226,7 @@
 					"prevSize": 32,
 					"code": 237,
 					"name": "icon-arrow-tall-up",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 23,
@@ -290,7 +234,7 @@
 					"prevSize": 32,
 					"code": 94,
 					"name": "icon-arrow-up",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 24,
@@ -298,7 +242,7 @@
 					"prevSize": 32,
 					"code": 73,
 					"name": "icon-arrows-out",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 25,
@@ -306,7 +250,7 @@
 					"prevSize": 32,
 					"code": 58893,
 					"name": "icon-arrows-right-left",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 33,
@@ -314,7 +258,7 @@
 					"prevSize": 32,
 					"code": 53,
 					"name": "icon-arrows-up-down",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 26,
@@ -322,7 +266,7 @@
 					"prevSize": 32,
 					"code": 42,
 					"name": "icon-asterisk",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 27,
@@ -330,7 +274,7 @@
 					"prevSize": 32,
 					"code": 72,
 					"name": "icon-autoflow-tabular",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 28,
@@ -338,7 +282,7 @@
 					"prevSize": 32,
 					"code": 224,
 					"name": "icon-box",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 29,
@@ -346,7 +290,7 @@
 					"prevSize": 32,
 					"code": 50,
 					"name": "icon-check",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 30,
@@ -354,7 +298,7 @@
 					"prevSize": 32,
 					"code": 67,
 					"name": "icon-clock",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 31,
@@ -362,7 +306,7 @@
 					"prevSize": 32,
 					"code": 46,
 					"name": "icon-connectivity",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 32,
@@ -370,7 +314,7 @@
 					"prevSize": 32,
 					"code": 100,
 					"name": "icon-database-query",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 17,
@@ -378,7 +322,7 @@
 					"prevSize": 32,
 					"code": 68,
 					"name": "icon-database",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 35,
@@ -386,7 +330,7 @@
 					"prevSize": 32,
 					"code": 81,
 					"name": "icon-dictionary",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 36,
@@ -394,7 +338,7 @@
 					"prevSize": 32,
 					"code": 242,
 					"name": "icon-duplicate",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 37,
@@ -402,7 +346,7 @@
 					"prevSize": 32,
 					"code": 102,
 					"name": "icon-folder-new",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 38,
@@ -410,7 +354,7 @@
 					"prevSize": 32,
 					"code": 70,
 					"name": "icon-folder",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 39,
@@ -418,7 +362,7 @@
 					"prevSize": 32,
 					"code": 95,
 					"name": "icon-fullscreen-collapse",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 40,
@@ -426,7 +370,7 @@
 					"prevSize": 32,
 					"code": 122,
 					"name": "icon-fullscreen-expand",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 41,
@@ -434,7 +378,7 @@
 					"prevSize": 32,
 					"code": 71,
 					"name": "icon-gear",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 49,
@@ -442,7 +386,7 @@
 					"prevSize": 32,
 					"code": 227,
 					"name": "icon-image",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 42,
@@ -450,7 +394,7 @@
 					"prevSize": 32,
 					"code": 225,
 					"name": "icon-layers",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 43,
@@ -458,7 +402,7 @@
 					"prevSize": 32,
 					"code": 76,
 					"name": "icon-layout",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 44,
@@ -466,7 +410,7 @@
 					"prevSize": 32,
 					"code": 226,
 					"name": "icon-line-horz",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 75,
@@ -474,7 +418,7 @@
 					"prevSize": 32,
 					"code": 244,
 					"name": "icon-link",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 46,
@@ -482,7 +426,7 @@
 					"prevSize": 32,
 					"code": 88,
 					"name": "icon-magnify-in",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 47,
@@ -490,7 +434,7 @@
 					"prevSize": 32,
 					"code": 89,
 					"name": "icon-magnify-out",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 48,
@@ -498,7 +442,7 @@
 					"prevSize": 32,
 					"code": 77,
 					"name": "icon-magnify",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 34,
@@ -506,7 +450,7 @@
 					"prevSize": 32,
 					"code": 109,
 					"name": "icon-menu",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 50,
@@ -514,7 +458,7 @@
 					"prevSize": 32,
 					"code": 243,
 					"name": "icon-move",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 51,
@@ -522,7 +466,7 @@
 					"prevSize": 32,
 					"code": 121,
 					"name": "icon-new-window",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 52,
@@ -530,7 +474,7 @@
 					"prevSize": 32,
 					"code": 111,
 					"name": "icon-object",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 73,
@@ -538,7 +482,7 @@
 					"prevSize": 32,
 					"code": 63,
 					"name": "icon-object-unknown",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 53,
@@ -546,7 +490,7 @@
 					"prevSize": 32,
 					"code": 86,
 					"name": "icon-packet",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 54,
@@ -554,7 +498,7 @@
 					"prevSize": 32,
 					"code": 234,
 					"name": "icon-page",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 55,
@@ -562,7 +506,7 @@
 					"prevSize": 32,
 					"code": 241,
 					"name": "icon-pause",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 56,
@@ -570,7 +514,7 @@
 					"prevSize": 32,
 					"code": 112,
 					"name": "icon-pencil",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 65,
@@ -578,7 +522,7 @@
 					"prevSize": 32,
 					"code": 79,
 					"name": "icon-people",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 57,
@@ -586,7 +530,7 @@
 					"prevSize": 32,
 					"code": 239,
 					"name": "icon-play",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 58,
@@ -594,7 +538,7 @@
 					"prevSize": 32,
 					"code": 233,
 					"name": "icon-plot-resource",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 59,
@@ -602,7 +546,7 @@
 					"prevSize": 32,
 					"code": 43,
 					"name": "icon-plus",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 60,
@@ -610,7 +554,7 @@
 					"prevSize": 32,
 					"code": 45,
 					"name": "icon-minus",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 61,
@@ -618,7 +562,7 @@
 					"prevSize": 32,
 					"code": 54,
 					"name": "icon-sine",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 62,
@@ -626,7 +570,7 @@
 					"prevSize": 32,
 					"code": 228,
 					"name": "icon-T",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 63,
@@ -634,7 +578,7 @@
 					"prevSize": 32,
 					"code": 116,
 					"name": "icon-telemetry-panel",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 64,
@@ -642,7 +586,7 @@
 					"prevSize": 32,
 					"code": 84,
 					"name": "icon-telemetry",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 18,
@@ -650,7 +594,7 @@
 					"prevSize": 32,
 					"code": 246,
 					"name": "icon-thumbs-strip",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 67,
@@ -658,7 +602,7 @@
 					"prevSize": 32,
 					"code": 83,
 					"name": "icon-timeline",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 68,
@@ -666,7 +610,7 @@
 					"prevSize": 32,
 					"code": 245,
 					"name": "icon-timer",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 69,
@@ -674,7 +618,7 @@
 					"prevSize": 32,
 					"code": 90,
 					"name": "icon-trash",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 70,
@@ -682,7 +626,7 @@
 					"prevSize": 32,
 					"code": 229,
 					"name": "icon-two-parts-both",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 71,
@@ -690,7 +634,7 @@
 					"prevSize": 32,
 					"code": 231,
 					"name": "icon-two-parts-one-only",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 72,
@@ -698,7 +642,7 @@
 					"prevSize": 32,
 					"code": 120,
 					"name": "icon-x-heavy",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 66,
@@ -706,7 +650,7 @@
 					"prevSize": 32,
 					"code": 58946,
 					"name": "icon-x",
-					"tempChar": ""
+					"tempChar": ""
 				}
 			],
 			"id": 2,
@@ -721,173 +665,6 @@
 			"height": 1024,
 			"prevSize": 32,
 			"icons": [
-				{
-					"id": 92,
-					"paths": [
-						"M514 2c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM860.2 450h-282.2v-282.2c69.6 12.8 133.8 46.2 185 97.4 51 51 84.4 115.2 97.2 184.8zM450 167.8v282.2h-282.2c12.8-69.6 46.2-133.8 97.4-185 51-51 115.2-84.4 184.8-97.2zM167.8 578h282.2v282.2c-69.6-12.8-133.8-46.2-185-97.4-51-51-84.4-115.2-97.2-184.8zM578 860.2v-282.2h282.2c-12.8 69.6-46.2 133.8-97.4 185-51 51-115.2 84.4-184.8 97.2z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(0, 0, 0)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-crosshair"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							0
-						]
-					}
-				},
-				{
-					"id": 91,
-					"paths": [
-						"M256 0h-256v1024h256c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192z",
-						"M512 320l512 320v-640z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(0, 0, 0)"
-						},
-						{
-							"fill": "rgb(0, 0, 0)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-collapse-pane-left"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							0,
-							0
-						]
-					}
-				},
-				{
-					"id": 90,
-					"paths": [
-						"M768 0h256v1024h-256c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192z",
-						"M512 320l-512 320v-640z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(0, 0, 0)"
-						},
-						{
-							"fill": "rgb(0, 0, 0)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-collapse-pane-right"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							0,
-							0
-						]
-					}
-				},
-				{
-					"id": 89,
-					"paths": [
-						"M192.2 576c-0.2 0-0.2 0 0 0l-0.2 448h640v-447.8c0 0 0 0-0.2-0.2h-639.6z",
-						"M978.8 210.8l-165.4-165.4c-25-25-74.2-45.4-109.4-45.4h-576c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128v-448c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v448c70.4 0 128-57.6 128-128v-576c0-35.2-20.4-84.4-45.2-109.2zM704 256c0 35.2-28.8 64-64 64h-448c-35.2 0-64-28.8-64-64v-192h320v192h128v-192h128v192z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(0, 0, 0)"
-						},
-						{
-							"fill": "rgb(0, 0, 0)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-save-v2"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							0,
-							0
-						]
-					}
-				},
-				{
-					"id": 88,
-					"paths": [
-						"M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z",
-						"M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM320 896h-128v-320h128v320zM576 896h-128v-320h128v320zM832 896h-128v-320h128v320z"
-					],
-					"attrs": [],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-dataset"
-					],
-					"colorPermutations": {
-						"125525525516161751": []
-					}
-				},
-				{
-					"id": 87,
-					"paths": [
-						"M512 1024c106 0 192-86 192-192h-384c0 106 86 192 192 192z",
-						"M896 448v-64c0-212-172-384-384-384s-384 172-384 384v64c0 70.6-57.4 128-128 128v128h1024v-128c-70.6 0-128-57.4-128-128z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(6, 161, 75)"
-						},
-						{
-							"fill": "rgb(6, 161, 75)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-bell"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							1,
-							1
-						]
-					}
-				},
-				{
-					"id": 86,
-					"paths": [
-						"M1024 0h-1024c0 282.8 229.2 512 512 512s512-229.2 512-512zM512 384c-102.6 0-199-40-271.6-112.4-41.2-41.2-72-90.2-90.8-143.6h724.6c-18.8 53.4-49.6 102.4-90.8 143.6-72.4 72.4-168.8 112.4-271.4 112.4z",
-						"M512 512c-282.8 0-512 229.2-512 512h1024c0-282.8-229.2-512-512-512z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(6, 161, 75)"
-						},
-						{
-							"fill": "rgb(6, 161, 75)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-hourglass"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							1,
-							1
-						]
-					}
-				},
 				{
 					"id": 85,
 					"paths": [
@@ -921,8 +698,7 @@
 						"icon-x-in-circle"
 					],
 					"colorPermutations": {
-						"16161751": [],
-						"125525525516161751": []
+						"16161751": []
 					}
 				},
 				{
@@ -1123,11 +899,6 @@
 							1,
 							1,
 							1
-						],
-						"125525525516161751": [
-							1,
-							1,
-							1
 						]
 					}
 				},
@@ -1280,28 +1051,18 @@
 				{
 					"id": 67,
 					"paths": [
-						"M894-2h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h400c-2.2-3.8-4-7.6-5.8-11.4l-255.2-576.8c-21.4-48.4-10.8-105 26.6-142.4 24.4-24.4 57.2-37.4 90.4-37.4 17.4 0 35.2 3.6 51.8 11l576.6 255.4c4 1.8 7.8 3.8 11.4 5.8v-400.2c0.2-70.4-57.4-128-127.8-128z",
-						"M958.6 637.4l-576.6-255.4 255.4 576.6 64.6-128.6 192 192 128-128-192-192z"
+						"M832 512.4c0-0.2 0-0.2 0-0.4v-320c0-105.6-86.4-192-192-192h-448c-105.6 0-192 86.4-192 192v320c0 105.6 86.4 192 192 192h263.6l-197.2-445.6 573.6 254z",
+						"M766.8 659.8l193.8-20.4-576.6-255.4 255.4 576.6 20.4-193.8 257 257.2 107.2-107.2z"
 					],
 					"attrs": [
-						{
-							"fill": "rgb(0, 0, 0)"
-						},
-						{
-							"fill": "rgb(0, 0, 0)"
-						}
+						{},
+						{}
 					],
 					"isMulticolor": false,
 					"grid": 0,
 					"tags": [
 						"icon-box-with-arrow-cursor"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							0,
-							0
-						]
-					}
+					]
 				},
 				{
 					"id": 66,
@@ -1577,9 +1338,6 @@
 					"colorPermutations": {
 						"16161751": [
 							0
-						],
-						"125525525516161751": [
-							0
 						]
 					}
 				},
@@ -15095,5 +14853,6 @@
 		"gridSize": 16,
 		"showLiga": false
 	},
-	"uid": -1
+	"uid": -1,
+	"time": 1441993324496
 }
--- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
+++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
--- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
+++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
@@ -76,7 +76,7 @@
 <glyph unicode="&#xf4;" glyph-name="icon-link" d="M1024 448l-512 512v-307.2l-512-204.8v-256h512v-256z" />
 <glyph unicode="&#xf5;" glyph-name="icon-timer" 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;" glyph-name="icon-thumbs-strip" 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;" glyph-name="icon-box-with-arrow-cursor" d="M894 962h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h400c-2.2 3.8-4 7.6-5.8 11.4l-255.2 576.8c-21.4 48.4-10.8 105 26.6 142.4 24.4 24.4 57.2 37.4 90.4 37.4 17.4 0 35.2-3.6 51.8-11l576.6-255.4c4-1.8 7.8-3.8 11.4-5.8v400.2c0.2 70.4-57.4 128-127.8 128zM958.6 322.6l-576.6 255.4 255.4-576.6 64.6 128.6 192-192 128 128-192 192z" />
+<glyph unicode="&#xe600;" glyph-name="icon-box-with-arrow-cursor" 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" />
 <glyph unicode="&#xe601;" glyph-name="icon-datatable" 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.8 0-512 86-512 192v-512c0-106 229.2-192 512-192s512 86 512 192v512c0-106-229.2-192-512-192zM896 385v-256c-36.6-15.6-79.8-28.8-128-39.4v256c48.2 10.6 91.4 23.8 128 39.4zM256 345.6v-256c-48.2 10.4-91.4 23.8-128 39.4v256c36.6-15.6 79.8-28.8 128-39.4zM384 70v256c41-4 83.8-6 128-6s87 2.2 128 6v-256c-41-4-83.8-6-128-6s-87 2.2-128 6z" />
 <glyph unicode="&#xe602;" glyph-name="icon-tabular-scrolling" d="M64 960c-35.2 0-64-28.8-64-64v-192h448v256h-384zM1024 704v192c0 35.2-28.8 64-64 64h-384v-256h448zM0 576v-192c0-35.2 28.8-64 64-64h384v256h-448zM960 320c35.2 0 64 28.8 64 64v192h-448v-256h384zM512-64l-256 256h512z" />
 <glyph unicode="&#xe603;" glyph-name="icon-alert-triangle" d="M998.208 111.136l-422.702 739.728c-34.928 61.124-92.084 61.124-127.012 0l-422.702-739.728c-34.928-61.126-5.906-111.136 64.494-111.136h843.428c70.4 0 99.422 50.010 64.494 111.136zM512 128c-35.2 0-64 28.8-64 64s28.8 64 64 64 64-28.8 64-64c0-35.2-28.8-64-64-64zM627.448 577.242l-38.898-194.486c-6.902-34.516-41.35-62.756-76.55-62.756s-69.648 28.24-76.552 62.758l-38.898 194.486c-6.902 34.516 16.25 62.756 51.45 62.756h128c35.2 0 58.352-28.24 51.448-62.758z" />
@@ -85,13 +85,6 @@
 <glyph unicode="&#xe606;" glyph-name="icon-paint-bucket" d="M544 736v-224c0-88.4-71.6-160-160-160s-160 71.6-160 160v97.2l-197.4-196.4c-50-50-12.4-215.2 112.4-340s290-162.4 340-112.4l417 423.6-352 352zM896-64c70.6 0 128 57.4 128 128 0 108.6-128 192-128 192s-128-83.4-128-192c0-70.6 57.4-128 128-128zM384 448c-35.4 0-64 28.6-64 64v384c0 35.4 28.6 64 64 64s64-28.6 64-64v-384c0-35.4-28.6-64-64-64z" />
 <glyph unicode="&#xe607;" glyph-name="icon-x-in-circle" d="M512 960c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM832 256l-128-128-192 192-192-192-128 128 192 192-192 192 128 128 192-192 192 192 128-128-192-192 192-192z" />
 <glyph unicode="&#xe608;" glyph-name="icon-info-v15" d="M512 960c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM512 832c70.6 0 128-57.4 128-128s-57.4-128-128-128c-70.6 0-128 57.4-128 128s57.4 128 128 128zM704 128h-384v128h64v256h256v-256h64v-128z" />
-<glyph unicode="&#xe609;" glyph-name="icon-hourglass" d="M1024 960h-1024c0-282.8 229.2-512 512-512s512 229.2 512 512zM512 576c-102.6 0-199 40-271.6 112.4-41.2 41.2-72 90.2-90.8 143.6h724.6c-18.8-53.4-49.6-102.4-90.8-143.6-72.4-72.4-168.8-112.4-271.4-112.4zM512 448c-282.8 0-512-229.2-512-512h1024c0 282.8-229.2 512-512 512z" />
 <glyph unicode="&#xe60d;" glyph-name="icon-arrows-right-left" d="M1024 448l-448-512v1024zM448 960l-448-512 448-512z" />
-<glyph unicode="&#xe610;" glyph-name="icon-bell" d="M512-64c106 0 192 86 192 192h-384c0-106 86-192 192-192zM896 512v64c0 212-172 384-384 384s-384-172-384-384v-64c0-70.6-57.4-128-128-128v-128h1024v128c-70.6 0-128 57.4-128 128z" />
-<glyph unicode="&#xe611;" glyph-name="icon-dataset" d="M896 768h-320c-16.4 16.4-96.8 96.8-109.2 109.2l-37.4 37.4c-25 25-74.2 45.4-109.4 45.4h-256c-35.2 0-64-28.8-64-64v-384c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v128c0 70.4-57.6 128-128 128zM896 512h-768c-70.4 0-128-57.6-128-128v-320c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v320c0 70.4-57.6 128-128 128zM320 64h-128v320h128v-320zM576 64h-128v320h128v-320zM832 64h-128v320h128v-320z" />
-<glyph unicode="&#xe612;" glyph-name="icon-save" d="M192.2 384c-0.2 0-0.2 0 0 0l-0.2-448h640v447.8c0 0 0 0-0.2 0.2h-639.6zM978.8 749.2l-165.4 165.4c-25 25-74.2 45.4-109.4 45.4h-576c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128v448c0 35.2 28.8 64 64 64h640c35.2 0 64-28.8 64-64v-448c70.4 0 128 57.6 128 128v576c0 35.2-20.4 84.4-45.2 109.2zM704 704c0-35.2-28.8-64-64-64h-448c-35.2 0-64 28.8-64 64v192h320v-192h128v192h128v-192z" />
-<glyph unicode="&#xe613;" glyph-name="icon-collapse-pane-left" d="M256 960h-256v-1024h256c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM512 640l512-320v640z" />
-<glyph unicode="&#xe614;" glyph-name="icon-collapse-pane-right" d="M768 960h256v-1024h-256c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192zM512 640l-512-320v640z" />
-<glyph unicode="&#xe615;" glyph-name="icon-crosshair" d="M514 958c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM860.2 510h-282.2v282.2c69.6-12.8 133.8-46.2 185-97.4 51-51 84.4-115.2 97.2-184.8zM450 792.2v-282.2h-282.2c12.8 69.6 46.2 133.8 97.4 185 51 51 115.2 84.4 184.8 97.2zM167.8 382h282.2v-282.2c-69.6 12.8-133.8 46.2-185 97.4-51 51-84.4 115.2-97.2 184.8zM578 99.8v282.2h282.2c-12.8-69.6-46.2-133.8-97.4-185-51-51-115.2-84.4-184.8-97.2z" />
 <glyph unicode="&#xe642;" glyph-name="icon-x" d="M384 448l-365.332-365.332c-24.89-24.89-24.89-65.62 0-90.51l37.49-37.49c24.89-24.89 65.62-24.89 90.51 0 0 0 365.332 365.332 365.332 365.332l365.332-365.332c24.89-24.89 65.62-24.89 90.51 0l37.49 37.49c24.89 24.89 24.89 65.62 0 90.51l-365.332 365.332c0 0 365.332 365.332 365.332 365.332 24.89 24.89 24.89 65.62 0 90.51l-37.49 37.49c-24.89 24.89-65.62 24.89-90.51 0 0 0-365.332-365.332-365.332-365.332l-365.332 365.332c-24.89 24.89-65.62 24.89-90.51 0l-37.49-37.49c-24.89-24.89-24.89-65.62 0-90.51 0 0 365.332-365.332 365.332-365.332z" />
 </font></defs></svg>
--- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
+++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
--- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
+++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
--- a/platform/commonUI/general/res/sass/_constants.scss
+++ b/platform/commonUI/general/res/sass/_constants.scss
@@ -42,17 +42,12 @@ $ueFooterH: 25px;
 $ueColMargin: 1.5%;
 $ueAppLogoW: 105px;
 $ueEditToolBarH: 25px;
-$ueBrowseLeftPaneTreeW: 25%;
-$ueBrowseRightPaneInspectW: 20%;
-$ueCollapsedPaneEdgeM: 20px;
-$uePaneMiniTabH: $ueTopBarH;
-$uePaneMiniTabW: 9px;
+$ueBrowseLeftPaneW: 25%;
 $ueEditLeftPaneW: 75%;
 $treeSearchInputBarH: 25px;
-$ueTimeControlH: (33px, 20px, 20px);
 // Overlay
-$ovrTopBarH: 45px;
-$ovrFooterH: 24px;
+$ovrTopBarH: 60px;
+$ovrFooterH: 30px;
 $overlayMargin: 25px;
 // Items
 $ueBrowseGridItemLg: 200px;
@@ -61,8 +56,7 @@ $ueBrowseGridItemBottomBarH: 30px;
 $itemPadLR: 5px;
 // Tree
 $treeVCW: 10px;
-$treeTypeIconH: 1.4em; // was 16px
-$treeTypeIconHPx: 16px;
+$treeTypeIconH: 16px;
 $treeTypeIconW: 20px;
 $treeContextTriggerW: 20px;
 // Tabular
@@ -111,8 +105,3 @@ $dirImgs: $dirCommonRes + 'images/';

 /************************** TIMINGS */
 $controlFadeMs: 100ms;
-
-/************************** LIMITS */
-$glyphLimit: '\e603';
-$glyphLimitUpr: '\0000eb';
-$glyphLimitLwr: '\0000ee';
--- a/platform/commonUI/general/res/sass/_global.scss
+++ b/platform/commonUI/general/res/sass/_global.scss
@@ -34,13 +34,17 @@
 	font-style: normal;
 }

+.ui-symbol {
+	font-family: 'symbolsfont';
+}
+
 /************************** HTML ENTITIES */
 a {
-	color: $colorA;
+	color: #ccc;
 	cursor: pointer;
 	text-decoration: none;
 	&:hover {
-		color: $colorAHov;
+		color: #fff;
 	}
 }

@@ -51,7 +55,7 @@ body, html {
 	color: $colorBodyFg;
 	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font-size: 100%;
-	font-weight: 200;
+	//font-weight: 500;
 	height: 100%;
 	width: 100%;
 	overflow: hidden;
@@ -121,14 +125,6 @@ mct-container {
 	text-align: center;
 }

-.scrolling {
-	overflow: auto;
-}
-
-.vscroll {
-	overflow-y: auto;
-}
-
 .no-margin {
 	margin: 0;
 }
--- a/platform/commonUI/general/res/sass/_hide-non-functional.scss
+++ b/platform/commonUI/general/res/sass/_hide-non-functional.scss
@@ -19,8 +19,18 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,Promise*/
+// Styles to temporarily hide non-functional elements

-define({
-    START_TIME: Date.now() - 24 * 60 * 60 * 1000 // Now minus a day.
-});
+/******************************** BROWSE */
+.browse-mode {
+	.browse {
+		&.top-bar {
+			display: none;
+		}
+	}
+
+	.browse-area.holder {
+		// When .browse.top-bar is hidden, set the top of the browse-area holder
+		top: $bodyMargin;
+	}
+}
--- a/platform/commonUI/general/res/sass/_icons.scss
+++ b/platform/commonUI/general/res/sass/_icons.scss
@@ -29,14 +29,8 @@
 }

 .ui-symbol {
-    font-family: 'symbolsfont';
-	&.type-icon {
-		color: $colorObjHdrIc;
-	}
 	&.icon {
 		color: $colorKey;
-        //position: relative;
-        font-size: inherit;
 		&.alert {
 			color: $colorAlert;
 			&:hover {
@@ -47,9 +41,6 @@
 			font-size: 1.65em;
 		}
 	}
-	&.icon-calendar:after {
-		content: "\e605";
-	}
 }

 .bar .ui-symbol {
@@ -61,7 +52,7 @@
 	display: inline-block;
 }

-.s-menu-btn .invoke-menu,
+.s-menu .invoke-menu,
 .icon.major .invoke-menu {
 	margin-left: $interiorMarginSm;
 }
@@ -72,32 +63,18 @@
 	position: absolute;
 }

+//.tree-item .type-icon {
+//	font-size: 16px; // 16px is crisp size
+//}
+
+.l-icon-link:before {
+	content: "\f4";
+}
+
 .l-icon-alert {
 	display: none !important; // Remove this when alerts are enabled
 	&:before {
 		color: $colorAlert;
 		content: "!";
 	}
-}
-
-// NEW!!
-.t-item-icon {
-	// Used in grid-item.html, tree-item, inspector location, more?
-	@extend .ui-symbol;
-    @extend .icon;
-    display: inline-block;
-    line-height: normal; // This is Ok for the symbolsfont
-    position: relative;
-    &.l-icon-link {
-        &:before {
-            color: $colorIconLink;
-            content: "\f4";
-            height: auto; width: auto;
-            position: absolute;
-            left: 0; top: 0; right: 0; bottom: 10%;
-            @include transform-origin(bottom, left);
-            @include transform(scale(0.3));
-            z-index: 2;
-        }
-    }
 }
--- a/platform/commonUI/general/res/sass/_inspector.scss
+++ b/platform/commonUI/general/res/sass/_inspector.scss
@@ -1,107 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/* Styles for the Inspector pane */
-
-.l-inspect,
-.l-inspect table tr td {
-    font-size: 0.7rem;
-}
-
-.l-inspect {
-    @extend .abs;
-    background: $colorInspectorBg;
-    color: $colorInspectorFg;
-    line-height: 140%;
-    .pane-header {
-        color: pushBack($colorInspectorFg, 20%);
-        font-size: 0.8rem;
-        &:before {
-            color: pushBack($colorInspectorFg, 10%);
-            content:'\e615'; // e615 Crosshair symbol
-            display: inline;
-            font-family: symbolsfont;
-            margin-right: $interiorMargin;
-            vertical-align: bottom;
-        }
-    }
-
-    ul li,
-    em {
-        display: block;
-        position: relative;
-    }
-
-    ul li {
-        margin-bottom: $interiorMarginLg;
-    }
-    
-    em {
-        @include border-radius($basicCr);
-        background-color: $colorInspectorSectionHeaderBg;
-        color: $colorInspectorSectionHeaderFg;
-        margin-bottom: $interiorMargin;
-        padding: $formTBPad $formLRPad;
-        text-transform: uppercase;
-    }
-
-    .inspector-properties {
-        &:not(.first) {
-            border-top: 1px solid $colorInspectorSectionHeaderBg;
-        }
-        padding: $interiorMarginSm 0;
-        .label {
-            color: $colorInspectorPropName;
-            text-transform: uppercase;
-        }
-        .value {
-            color: $colorInspectorPropVal;
-            word-break: break-all;
-        }
-    }
-
-    .inspector-location {
-        //line-height: 180%;
-        .location-item {
-            cursor: pointer;
-            display: inline-block;
-            position: relative;
-            padding: 2px 4px;
-            &:hover {
-                background: $colorItemTreeHoverBg;
-                color: $colorItemTreeHoverFg;
-                .icon {
-                    color: $colorItemTreeIconHover;
-                }
-            }
-        }
-        &:not(.last) .t-object-label .t-title-label:after {
-            color: pushBack($colorInspectorFg, 15%);
-            content: '\3e';
-            display: inline-block;
-            font-family: symbolsfont;
-            font-size: 8px;
-            line-height: inherit;
-            margin-left: $interiorMarginSm;
-            width: 4px;
-        }
-    }
-}
--- a/platform/commonUI/general/res/sass/_limits.scss
+++ b/platform/commonUI/general/res/sass/_limits.scss
@@ -1,39 +1,26 @@
-@mixin limitGlyph($iconColor, $glyph: $glyphLimit) {
-    &:before {
-        color: $iconColor;
-        content: $glyph;
-        font-family: symbolsfont;
-        font-size: 0.8em;
-        display: inline;
-        margin-right: $interiorMarginSm;
-    }
-
+@mixin limit($bg, $ic, $glyph) {
+	background: $bg !important;
+	//color: $fg !important;
+	&:before {
+		//@include pulse(1000ms);
+		color: $ic;
+		content: $glyph;
+	}
 }

-.s-limit-red { background: $colorLimitRedBg !important; }
-.s-limit-yellow { background: $colorLimitYellowBg !important; }
-
-// Handle limit when applied to a tr
-tr[class*="s-limit"] {
-    &.s-limit-red td:first-child {
-        @include limitGlyph($colorLimitRedIc);
-    }
-    &.s-limit-yellow td:first-child {
-        @include limitGlyph($colorLimitYellowIc);
-    }
-    &.s-limit-upr td:first-child:before { content:$glyphLimitUpr; }
-    &.s-limit-lwr td:first-child:before { content:$glyphLimitLwr; }
+[class*="s-limit"] {
+	//white-space: nowrap;
+	&:before {
+		display: inline-block;
+		font-family: symbolsfont;
+		font-size: 0.75em;
+		font-style: normal !important;
+		margin-right: $interiorMarginSm;
+		vertical-align: middle;
+	}
 }

-// Handle limit when applied directly to a non-tr element
-// Assume this is applied to the element that displays the limit value
-:not(tr)[class*="s-limit"] {
-    &.s-limit-red {
-        @include limitGlyph($colorLimitRedIc);
-    }
-    &.s-limit-yellow {
-        @include limitGlyph($colorLimitYellowIc);
-    }
-    &.s-limit-upr:before { content:$glyphLimitUpr; }
-    &.s-limit-lwr:before { content:$glyphLimitLwr; }
-}
+.s-limit-upr-red { @include limit($colorLimitRedBg, $colorLimitRedIc, "\0000eb"); };
+.s-limit-upr-yellow { @include limit($colorLimitYellowBg, $colorLimitYellowIc, "\0000ed"); };
+.s-limit-lwr-yellow { @include limit($colorLimitYellowBg, $colorLimitYellowIc, "\0000ec"); };
+.s-limit-lwr-red { @include limit($colorLimitRedBg, $colorLimitRedIc, "\0000ee"); };
--- a/platform/commonUI/general/res/sass/_main.scss
+++ b/platform/commonUI/general/res/sass/_main.scss
@@ -29,7 +29,8 @@
@import "helpers/bubbles";
@import "helpers/splitter";
@import "helpers/wait-spinner";
-@import "inspector";
+@import "messages";
+@import "properties";

 /********************************* CONTROLS */
@import "controls/breadcrumb";
@@ -38,7 +39,6 @@
@import "controls/controls";
@import "controls/lists";
@import "controls/menus";
-@import "controls/messages";
@import "controls/time-controller";
@import "mobile/controls/menus";

@@ -62,6 +62,7 @@
@import "mobile/tree";
@import "user-environ/frame";
@import "user-environ/top-bar";
+@import "user-environ/bottom-bar";
@import "user-environ/tool-bar";

 /********************************* VIEWS */
@@ -69,6 +70,7 @@
@import "lists/tabular";
@import "plots/plots-main";
@import "iframe";
+@import "hide-non-functional";
@import "views";
@import "items/item";
@import "mobile/item";
--- a/platform/commonUI/general/res/sass/_messages.scss
+++ b/platform/commonUI/general/res/sass/_messages.scss
@@ -0,0 +1,12 @@
+/* Styles for messages */
+
+.message {
+	&.block {
+		@include border-radius($basicCr);
+		padding: $interiorMarginLg;
+	}
+	&.error {
+		background-color: rgba($colorAlert,0.3);
+		color: lighten($colorAlert, 20%);
+	}
+}
--- a/platform/commonUI/general/res/sass/_mixins.scss
+++ b/platform/commonUI/general/res/sass/_mixins.scss
@@ -41,41 +41,36 @@
    width: $d;
 }

-@mixin trans-prop-nice($props, $dur: 500ms, $delay: 0) {
-    // Multiple $props must be in parans like this: (left, right)
-    @if $dur == 0 {
+@mixin trans-prop-nice($props, $t: 500ms) {
+    @if $t == 0 {
        @include transition-property(none);
    } @else {
        @include transition-property($props);
-        @include transition-duration($dur);
+        @include transition-duration($t);
        @include transition-timing-function(ease-in-out);
-        @include transition-delay($delay);
    }
 }

-@mixin trans-prop-nice-fade($dur: 500ms, $delay: 0) {
-    @if $dur == 0 {
+@mixin trans-prop-nice-fade($t: 0.5s) {
+    @if $t == 0 {
        @include transition-property(none);
    } @else {
-        @include transition-property(opacity, background-color, border-color, color);
-        @include transition-duration($dur);
+        @include transition-property(visibility, opacity, background-color, border-color);
+        @include transition-duration($t);
        @include transition-timing-function(ease-in-out);
-        @include transition-delay($delay);
    }
 }

-@mixin trans-prop-nice-resize-h($dur: 500ms, $delay: 0) {
+@mixin trans-prop-nice-resize-h($t: 0.5s) {
    @include transition-property(height, bottom, top);
-    @include transition-duration($dur);
+    @include transition-duration($t);
    @include transition-timing-function(ease-in-out);
-    @include transition-delay($delay);
 }

-@mixin trans-prop-nice-resize-w($dur: 500ms, $delay: 0) {
+@mixin trans-prop-nice-resize-w($t: 0.5s) {
    @include transition-property(width, left, right);
-    @include transition-duration($dur);
+    @include transition-duration($t);
    @include transition-timing-function(ease-in-out);
-    @include transition-delay($delay);
 }

@mixin triangle-right($size, $color) {
@@ -99,6 +94,7 @@
 }

@mixin triangle($dir: "left", $size: 5px, $ratio: 1, $color: red) {
+    //$size: $size*2;
    width: 0;
    height: 0;
    $slopedB: $size/$ratio solid transparent;
@@ -133,24 +129,6 @@
    background-size: $d $d;
 }

-@mixin bgVertStripes($c: yellow, $a: 0.1, $d: 40px) {
-    @include background-image(linear-gradient(-90deg,
-        rgba($c, $a) 0%, rgba($c, $a) 50%,
-        transparent 50%, transparent 100%
-    ));
-    background-repeat: repeat;
-    background-size: $d $d;
-}
-
-@mixin bgVertFuzzyStripes($c: yellow, $a: 0.1, $d: 40px) {
-    @include background-image(linear-gradient(-90deg,
-        rgba($c, $a) 0%, transparent 50%,
-        transparent 50%, rgba($c, $a) 100%
-    ));
-    background-repeat: repeat;
-    background-size: $d $d;
-}
-
@mixin bgTicks($c: $colorBodyFg, $repeatDir: 'x') {
    $deg: 90deg;
    @if ($repeatDir != 'x') {
@@ -178,28 +156,31 @@
 }

@mixin controlGrippy($b, $direction: horizontal, $w: 1px, $style: dotted) {
-    //&:before {
-    //@include trans-prop-nice("border-color", 25ms);
-    content: '';
-    display: block;
-    //height: auto;
-    pointer-events: none;
-    position: absolute;
-    z-index: 2;
+    &:before {
+        @include trans-prop-nice("border-color", 0.75s);
+        content: '';
+        display: block;
+        height: auto;
+        pointer-events: none;
+        position: absolute;
+        z-index: 2;

-    @if $direction == "horizontal" {
-        border-top: $w $style darken($b, 15%);
-        top: 2px;
-        left: 5px;
-        right: 5px;
-        height: 1px;
+        @if $direction == "horizontal" {
+            border-top: $w $style darken($b, 15%);
+            top: 2px;
+            left: 5px;
+            right: 5px;

-    } @else if $direction == "vertical" {
-        border-left: $w $style darken($b, 15%);
-        left: 2px;
-        bottom: 5px;
-        top: 5px;
-        width: 1px;
+        } @else if $direction == "vertical" {
+            border-left: $w $style darken($b, 15%);
+            left: 2px;
+            bottom: 5px;
+            top: 5px;
+        }
+    }
+    &:not(.disabled):hover:before {
+        @include trans-prop-nice("border-color", 25ms);
+        border-color: $colorGrippyInteriorHover;
    }
 }

@@ -275,12 +256,6 @@
 	@return percentage($d);
 }

-@function splitterHandleInset($splitterD: 21px, $splitterHandleD: 1px) {
-    // Space to either side of the handle
-    @return ($splitterD - $splitterHandleD) * 0.5;
-}
-
-
 /*********************************************** CONTROLS, FORM ELEMENTS */

@mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) {
@@ -372,7 +347,9 @@
    /* This doesn't work on an element inside an element with absolute positioning that has height: auto */
    //position: relative;
    top: 50%;
-    @include transform(translateY(-50%));
+    -webkit-transform: translateY(-50%);
+    -ms-transform: translateY(-50%);
+    transform: translateY(-50%);
 }

@mixin verticalCenterBlock($holderH, $itemH) {
@@ -397,8 +374,22 @@
    overflow-y: $showBar;
 }

+@mixin wait-spinner($b: 5px, $c: $colorAlt1) {
+    display: block;
+    position: absolute;
+    -webkit-animation: rotation .6s infinite linear;
+    -moz-animation: rotation .6s infinite linear;
+    -o-animation: rotation .6s infinite linear;
+    animation: rotation .6s infinite linear;
+    border-color: rgba($c, 0.25);
+    border-top-color: rgba($c, 1.0);
+    border-style: solid;
+    border-width: $b;
+    border-radius: 100%;
+}
+
@mixin test($c: #ffcc00, $a: 0.2) {
-    background-color: rgba($c, $a) !important;
+    background-color: rgba($c, $a);
 }

@mixin tmpBorder($c: #ffcc00, $a: 0.75) {
--- a/platform/commonUI/notification/src/NotificationIndicator.js
+++ b/platform/commonUI/notification/src/NotificationIndicator.js
@@ -19,17 +19,17 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,window*/
+/* Classes to be used for lists of properties and values */

-define(
-    [],
-    function () {
-        "use strict";
-
-        function NotificationIndicator() {}
-
-        NotificationIndicator.template = 'notificationIndicatorTemplate';
-
-        return NotificationIndicator;
+.properties {
+    .s-row {
+        border-top: 1px solid $colorInteriorBorder;
+        font-size: 0.8em;
+        &:first-child {
+            border: none;
+        }
+        .s-value {
+            color: #fff;
+        }
    }
-);
+}
--- a/platform/commonUI/general/res/sass/_views.scss
+++ b/platform/commonUI/general/res/sass/_views.scss
@@ -10,6 +10,9 @@
 	&.fixed {
 		font-size: 0.8em;
 	}
+	&.scrolling {
+		overflow: auto;
+	}
 	.controls,
 	label,
 	.inline-block {
--- a/platform/commonUI/general/res/sass/controls/_buttons.scss
+++ b/platform/commonUI/general/res/sass/controls/_buttons.scss
@@ -22,17 +22,13 @@
 $baseRatio: 1.5;
 $pad: $interiorMargin * $baseRatio;

-.s-btn,
-.s-icon-btn {
+.s-btn {
+    @include box-sizing(border-box);
    @include user-select(none);
    cursor: pointer;
    text-decoration: none;
    height: $btnStdH;
    line-height: $btnStdH;
-}
-
-.s-btn {
-    @include box-sizing(border-box);
    padding: 0 $pad;
    font-size: 0.7rem;

@@ -93,155 +89,6 @@ $pad: $interiorMargin * $baseRatio;
    }
 }

-.s-icon-btn {
-    @extend .ui-symbol;
-    color: $colorBtnIcon;
-    &:hover {
-        color: lighten($colorBtnIcon, $ltGamma);
-    }
-}
-
-.mini-tab {
-    // Meant to be used as pane hide/show control elements in concert with mct-splitter
-    //@extend .ui-symbol;
-    @include desktop {
-        //@include test(green);
-        $iconH: $uePaneMiniTabH;
-        $iconW: $uePaneMiniTabW;
-        $iconInnerLR: 0;
-        $arwD: 9px;
-        $arwOffsetX: 0px;
-        $arwAnimOffsetX: 2px + $iconInnerLR;
-        $cBg: pullForward($colorBodyBg, 15%);
-        $cFg: $cBg;
-
-
-        @include border-radius($basicCr);
-        //@include boxShdw($shdwBtns);
-        @include box-sizing(border-box);
-        @include trans-prop-nice((color, background-color), 100ms);
-        color: $cFg;
-        cursor: pointer;
-        font-family: symbolsfont;
-        font-size: $arwD;
-        display: block;
-        position: absolute;
-        line-height: $iconH;
-        height: $iconH; width: $iconW;
-        text-align: center;
-
-        &:hover {
-            //background-color: $cBg;
-            color: $colorKey; //pullForward($cFg, $ltGamma);
-        }
-
-        &.collapsed {
-            // State when the pane this element controls has been collapsed
-            @include btnSubtle($colorBtnBg, $colorKey, $colorBtnFg, $colorBtnIcon);
-            &:before { opacity: 0; }
-            &:after { opacity: 1; }
-            &:hover {
-                &:before { opacity: 1; }
-                &:after { opacity: 0; }
-            }
-
-        }
-
-        &:before,
-        &:after {
-            //@include test();
-            @include trans-prop-nice((left, right, opacity), 250ms);
-            display: block;
-            height: 100%;
-            position: absolute;
-        }
-
-        &:before {
-            // Always the arrow icon
-            //@include test(green);
-            //font-size: $arwD;
-            width: $arwD;
-        }
-        &:after {
-            // Always icon; content is set in _layout.scss
-            width: 100%;
-            text-align: center;
-            opacity: 0;
-        }
-
-        &.anchor-left {
-            // |<
-            text-align: right;
-            &:before {
-                content:'\3c'; // Collapse left icon e613
-                right: $iconInnerLR;
-            }
-            //&:hover:before { right: $arwAnimOffsetX; }
-            &.collapsed {
-                @include border-left-radius(0);
-                text-align: left;
-                &:before {
-                    content:'\3e';
-                    left: $iconInnerLR;
-                }
-                &:hover:before { left: $arwAnimOffsetX; }
-            }
-        }
-        &.anchor-right {
-            // >|
-            text-align: left;
-            &:before {
-                content:'\3e'; // Collapse right icon e614
-                left: $iconInnerLR;
-            }
-            //&:hover:before { left: $arwAnimOffsetX; }
-            &.collapsed {
-                @include border-right-radius(0);
-                &:before {
-                    text-align: right;
-                    content:'\3c';
-                    right: $iconInnerLR;
-                }
-                &:hover:before { right: $arwAnimOffsetX; }
-            }
-        }
-    }
-}
-
-.mini-tab-icon {
-    // Meant to be used as pane hide/show control elements in concert with mct-splitter
-    //@extend .ui-symbol;
-    @include desktop {
-        $d: $uePaneMiniTabW;
-        //@include trans-prop-nice(transform, 150ms);
-        color: pullForward($colorBodyBg, 15%);
-        cursor: pointer;
-        display: block;
-        font-family: symbolsfont;
-        font-size: $d;
-        position: absolute;
-        height: $d; width: $d;
-        line-height: $d;
-        overflow: hidden;
-        word-break: break-all;
-
-        &:before,
-        &:after {
-            position: absolute;
-            display: inherit;
-        }
-
-        &:before {
-            content: '\78'; // X icon
-        }
-
-        &:hover {
-            color: $colorKey;
-            //@include transform(scale(1.2));
-        }
-    }
-}
-
 .l-btn-set {
    // Buttons that have a very tight conceptual grouping - no internal space between them.
    // Structure: .btn-set > mct-representation class=first|last > .s-btn
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -19,507 +19,356 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
+/*.control {
+	// UNUSED?
+	&.view-control {
+		.icon {
+			display: inline-block;
+			margin: -1px 5px 1px 2px;
+			vertical-align: middle;
+			&.triangle-down {
+				margin: 2px 2px -2px 0px;
+			}
+		}
+
+		.label {
+			display: inline-block;
+			font-size: 11px;
+			vertical-align: middle;
+		}
+
+		.toggle {
+			@include border-radius(3px);
+			display: inline-block;
+			padding: 1px 6px 4px 4px;
+			&:hover {
+				background: rgba(white, 0.1);
+			}
+		}
+	}
+}*/

 .accordion {
-    $accordionHeadH: 18px;
-    margin-top: $interiorMargin;
-    &:first-child {
-        margin-top: 0;
-    }
-    .accordion-head {
-        $op: 0.2;
-        @include border-radius($basicCr * 0.75);
-        @include box-sizing("border-box");
-        background: rgba($colorBodyFg, $op);
-        cursor: pointer;
-        font-size: 0.75em;
-        line-height: $accordionHeadH;
-        margin-bottom: $interiorMargin;
-        padding: 0 $interiorMargin;
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: auto;
-        left: 0;
-        width: auto;
-        height: $accordionHeadH;
-        text-transform: uppercase;
-        &:hover {
-            background: rgba($colorBodyFg, $op * 2);
-        }
-        &:after {
-            content: "^";
-            display: block;
-            font-family: 'symbolsfont';
-            font-size: 0.9em;
-            position: absolute;
-            right: $interiorMargin;
-            text-transform: none;
-            top: 0;
-        }
-        &:not(.expanded):after {
-            content: "v";
-        }
-    }
-    .accordion-contents {
-        position: absolute;
-        top: $accordionHeadH + $interiorMargin;
-        right: 0;
-        bottom: 0;
-        left: 0;
-        overflow-y: auto;
-        overflow-x: hidden;
-    }
+	$accordionHeadH: 18px;
+	margin-top: $interiorMargin;
+	&:first-child {
+		margin-top: 0;
+	}
+	.accordion-head {
+		$op: 0.2;
+		@include border-radius($basicCr * 0.75);
+		@include box-sizing("border-box");
+		background: rgba($colorBodyFg, $op);
+		cursor: pointer;
+		font-size: 0.75em;
+		line-height: $accordionHeadH;
+		margin-bottom: $interiorMargin;
+		padding: 0 $interiorMargin;
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: auto;
+		left: 0;
+		width: auto;
+		height: $accordionHeadH;
+		text-transform: uppercase;
+		&:hover {
+			background: rgba($colorBodyFg, $op * 2);
+		}
+		&:after {
+			content: "^";
+			display: block;
+			font-family: 'symbolsfont';
+			font-size: 0.9em;
+			position: absolute;
+			right: $interiorMargin;
+			text-transform: none;
+			top: 0;
+		}
+		&:not(.expanded):after {
+			content: "v";
+		}
+	}
+	.accordion-contents {
+		position: absolute;
+		top: $accordionHeadH + $interiorMargin;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		overflow-y: auto;
+		overflow-x: hidden;
+	}
 }

 .l-composite-control {
-    vertical-align: middle;
-    &.l-checkbox {
-        .composite-control-label {
-            line-height: 18px;
-        }
-    }
+	vertical-align: middle;
+	&.l-checkbox {
+		.composite-control-label {
+			line-height: 18px;
+		}
+	}
 }

 .l-control-group {
-    // Buttons that have a conceptual grouping - internal space between, and a divider between groups.
-    //    @include test();
-    @include box-sizing(border-box);
-    border-left: 1px solid $colorInteriorBorder;
-    display: inline-block;
-    padding: 0 $interiorMargin;
-    position: relative;
-    &:first-child {
-        border-left: none;
-        padding-left: 0;
-    }
+	// Buttons that have a conceptual grouping - internal space between, and a divider between groups.
+	//	@include test();
+	@include box-sizing(border-box);
+	border-left: 1px solid $colorInteriorBorder;
+	display: inline-block;
+	padding: 0 $interiorMargin;
+	position: relative;
+	&:first-child {
+		border-left: none;
+		padding-left: 0;
+	}
 }

 .l-local-controls {
-    // Control shown when hovering over an object, like plots and imagery
-    // Default position is upper right
-    $p: $interiorMargin;
-    position: absolute;
-    top: $p;
-    right: $p;
-    z-index: 5;
+	// Control shown when hovering over an object, like plots and imagery
+	// Default position is upper right
+	$p: $interiorMargin;
+	position: absolute;
+	top: $p;
+	right: $p;
+	z-index: 5;
 }

 .s-local-controls {
-    font-size: 0.7rem;
+	font-size: 0.7rem;
 }

 label.checkbox.custom {
-    $bg: pullForward($colorBodyBg, 10%);
-    $d: $formRowCtrlsH;
-    cursor: pointer;
-    display: inline-block;
-    line-height: $d;
-    margin-right: $interiorMargin * 4;
-    padding-left: $d + $interiorMargin;
-    position: relative;
-    vertical-align: middle; // was top
-    em {
-        color: $colorBodyFg;
-        display: inline-block;
-        height: $d;
-        min-width: $d;
-        &:before {
-            @include border-radius($basicCr * .75);
-            background: $bg;
-            //border-bottom: 1px solid lighten($bg, 10%);
-            @include box-shadow(inset rgba(black, 0.4) 0 1px 2px);
-            box-sizing: border-box;
-            content: " ";
-            font-family: 'symbolsfont';
-            font-size: 0.8em;
-            display: inline-block;
-            margin-right: $interiorMargin;
-            height: $d;
-            width: $d;
-            left: 0;
-            top: 0;
-            position: absolute;
-            text-align: center;
-        }
-    }
-    &.no-text {
-        overflow: hidden;
-        margin-right: 0;
-        padding-left: 0;
-        height: $d;
-        width: $d;
-        em {
-            overflow: hidden;
-        }
-    }
-    input {
-        display: none;
-        &:checked ~ em:before {
-            background: $colorCheck;
-            color: lighten($colorCheck, 50%);
-            content: "2";
-        }
-    }
+	$bg: pullForward($colorBodyBg, 10%);
+	$d: $formRowCtrlsH;
+	cursor: pointer;
+	display: inline-block;
+	line-height: $d;
+	margin-right: $interiorMargin * 4;
+	padding-left: $d + $interiorMargin;
+	position: relative;
+	vertical-align: middle; // was top
+	em {
+		color: $colorBodyFg;
+		display: inline-block;
+		height: $d;
+		min-width: $d;
+		&:before {
+			@include border-radius($basicCr * .75);
+			background: $bg;
+			//border-bottom: 1px solid lighten($bg, 10%);
+			@include box-shadow(inset rgba(black, 0.4) 0 1px 2px);
+			box-sizing: border-box;
+			content: " ";
+			font-family: 'symbolsfont';
+			font-size: 0.8em;
+			display: inline-block;
+			margin-right: $interiorMargin;
+			height: $d;
+			width: $d;
+			left: 0;
+			top: 0;
+			position: absolute;
+			text-align: center;
+		}
+	}
+	&.no-text {
+		overflow: hidden;
+		margin-right: 0;
+		padding-left: 0;
+		height: $d;
+		width: $d;
+		em {
+			overflow: hidden;
+		}
+	}
+	input {
+		display: none;
+		&:checked ~ em:before {
+			background: $colorCheck;
+			color: lighten($colorCheck, 50%);
+			content: "2";
+		}
+	}
 }

 .input-labeled {
-    margin-left: $interiorMargin;
-    label {
-        display: inline-block;
-        margin-right: $interiorMarginSm;
-    }
-    &.inline {
-        display: inline-block;
-    }
-    &:first-child {
-        margin-left: 0;
-    }
+	margin-left: $interiorMargin;
+	label {
+		display: inline-block;
+		margin-right: $interiorMarginSm;
+	}
+	&.inline {
+		display: inline-block;
+	}
+	&:first-child {
+		margin-left: 0;
+	}
 }

-.s-menu-btn label.checkbox.custom {
-    margin-left: 5px;
+.s-menu label.checkbox.custom {
+	margin-left: 5px;
 }

 .item .checkbox {
-    &.checked label {
-        @include box-shadow(none);
-        border-bottom: none;
-    }
+	&.checked label {
+		@include box-shadow(none);
+		border-bottom: none;
+	}
 }

 .context-available {
-    $c: $colorKey;
-    color: $c;
-    &:hover {
-        color: lighten($c, 10%);
-    }
+	$c: $colorKey;
+	color: $c;
+	&:hover {
+		color: lighten($c, 10%);
+	}
 }

 .view-switcher {
-    @include trans-prop-nice-fade($controlFadeMs);
+	@include trans-prop-nice-fade($controlFadeMs);
 }

 /******************************************************** OBJECT-HEADER */
 .object-header {
-    //@include test();
-    font-size: 1em;
+	//@include test();
+	font-size: 1em;

-    > .type-icon {
-        color: $colorObjHdrIc;
-        font-size: 120%;
-        float: left;
-        margin-right: $interiorMargin;
-    }
+	//> .title-label,
+	//> .type-icon,
+	//> .context-available {
+	//	//@include tmpBorder(#6666ff);
+	//	//vertical-align: middle;
+	//}

-    .l-elem-wrapper {
-        //@include test(#66f, 0.2);
-        @include justify-content(flex-start);
-        mct-representation {
-            // Holds the context-available item
-            // Must have min-width to make flex work properly
-            // in Safari
-            min-width: 0.7em;
-        }
-    }
+	> .type-icon {
+		color: $colorObjHdrIc;
+		font-size: 120%;
+		float: left;
+		margin-right: $interiorMargin;
+	}

-    .action {
-        margin-right: $interiorMargin;
-    }
+	.l-elem-wrapper {
+		//@include test(#66f, 0.2);
+		@include webkitProp(justify-content, flex-start);
+		mct-representation {
+			// Holds the context-available item
+			// Must have min-width to make flex work properly
+			// in Safari
+			min-width: 0.7em;
+		}
+	}

-    .title-label {
-        //@include test(green, 0.9);
-        color: $colorObjHdrTxt;
-        @include ellipsize();
-        //color: pushBack($colorBodyFg, 40%);
-        @include webkitProp(flex, '0 1 auto');
-        padding-right: 0.35em; // For context arrow. Done with em's so pad is relative to the scale of the text.
-        //position: relative;
-    }
+	.action {
+		margin-right: $interiorMargin;
+	}

-    .context-available {
-        font-size: 0.7em;
-        @include webkitProp(flex, '0 0 1');
-        //margin-right: $interiorMargin;
-    }
+	.title-label {
+		//@include test(green, 0.9);
+		color: $colorObjHdrTxt;
+		@include ellipsize();
+		//color: pushBack($colorBodyFg, 40%);
+		@include webkitProp(flex, '0 1 auto');
+		padding-right: 0.35em; // For context arrow. Done with em's so pad is relative to the scale of the text.
+		//position: relative;
+	}

-    @include desktop {
-        .context-available {
-            @include trans-prop-nice(opacity, 0.25s);
-            opacity: 0;
-        }
-        &:hover {
-            .context-available {
-                opacity: 1;
-            }
-        }
-    }
-}
+	.context-available {
+		font-size: 0.7em;
+		@include webkitProp(flex, '0 0 1');
+		//margin-right: $interiorMargin;
+	}

-/******************************************************** PROGRESS BAR */
-@include keyframes(progress) {
-    100% { background-position: $progressBarStripeW center; }
-}
-
-@mixin bgProgressAnim($c: yellow, $a: 0.1, $d: 20px) {
-    @include background-image(linear-gradient(-90deg,
-        rgba($c, $a) 0%, transparent 50%,
-        transparent 50%, rgba($c, $a) 100%
-    ));
-    background-position: 0 center;
-    background-repeat: repeat-x;
-    background-size: $d 40%;
-}
-
-.l-progress-bar {
-    // Assume will be determinate by default
-    display: inline-block;
-    overflow: hidden;
-    position: relative;
-
-    .progress-amt-holder {
-        @include absPosDefault(1px);
-    }
-    .progress-amt,
-    .progress-amt:before,
-    .progress-amt:after {
-        @include absPosDefault();
-        display: block;
-        content: '';
-    }
-
-    .progress-amt {
-        right: auto; // Allow inline width to control }
-    }
-
-    &.indeterminate {
-        .progress-amt {
-            width: 100% !important;
-        }
-    }
-}
-
-.s-progress-bar {
-    @include border-radius($basicCr);
-    @include boxIncised(0.3, 4px);
-    background: $colorProgressBarOuter;
-    //border:1px solid $colorProgressBarOuter;
-    .progress-amt {
-        @include border-radius($basicCr);
-        @include boxShdw();
-        @include border-radius($basicCr - 1);
-        @include trans-prop-nice(width);
-        &:before {
-            background-color: $colorProgressBarAmt;
-        }
-        &:after {
-            // Sheen
-            @include background-image(linear-gradient(
-                    transparent 5%, rgba(#fff,0.25) 30%, transparent 100%
-            ));
-        }
-    }
-
-    &:not(.indeterminate) {
-        .progress-amt:before {
-            // More subtle anim for determinate progress
-            @include animation(progress .4s linear infinite);
-            @include bgProgressAnim(#fff, 0.1, $progressBarStripeW);
-        }
-    }
-
-    &.indeterminate .progress-amt {
-        &:before {
-            // More visible std diag stripe anim for indeterminate progress
-            @include animation(progress .6s linear infinite);
-            @include bgDiagonalStripes(#fff, 0.2, $progressBarStripeW);
-        }
-        &:after { display: none; }
-    }
+	@include desktop {
+		.context-available {
+			@include trans-prop-nice(opacity, 0.25s);
+			opacity: 0;
+		}
+		&:hover {
+			.context-available {
+				opacity: 1;
+			}
+		}
+	}
 }

 /******************************************************** SLIDERS */

 .slider {
-    $knobH: 100%; //14px;
-    .slot {
-        //        @include border-radius($basicCr * .75);
-        //@include sliderTrack();
-        width: auto;
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-    }
-    .knob {
-        @include trans-prop-nice-fade(.25s);
-        background-color: $sliderColorKnob;
-        &:hover {
-            background-color: $sliderColorKnobHov;
-        }
-        position: absolute;
-        height: $knobH;
-        width: $sliderKnobW;
-        top: 0;
-        auto: 0;
-        bottom: auto;
-        left: auto;
-    }
-    .knob-l {
-        @include border-left-radius($sliderKnobW);
-        cursor: w-resize;
-    }
-    .knob-r {
-        @include border-right-radius($sliderKnobW);
-        cursor: e-resize;
-    }
-    .range {
-        @include trans-prop-nice-fade(.25s);
-        background-color: $sliderColorRange;
-        cursor: ew-resize;
-        position: absolute;
-        top: 0; //$tbOffset;
-        right: auto;
-        bottom: 0;
-        left: auto;
-        height: auto;
-        width: auto;
-        &:hover {
-            background-color: $sliderColorRangeHov;
-        }
-    }
-}
+	$knobH: 100%; //14px;
+	$knobW: 12px;
+	$slotH: 50%;
+	.slot {
+		//		@include border-radius($basicCr * .75);
+		@include sliderTrack();
+		height: $slotH;
+		width: auto;
+		position: absolute;
+		top: ($knobH - $slotH) / 2;
+		right: 0;
+		bottom: auto;
+		left: 0;
+	}
+	.knob {
+		@include btnSubtle();
+		@include controlGrippy(rgba(black, 0.3), vertical, 1px, solid);
+		cursor: ew-resize;
+		position: absolute;
+		height: $knobH;
+		width: $knobW;
+		top: 0;
+		auto: 0;
+		bottom: auto;
+		left: auto;
+		&:before {
+			top: 1px;
+			bottom: 3px;
+			left: ($knobW / 2) - 1;
+		}

-/******************************************************** DATETIME PICKER */
-.l-datetime-picker {
-    $r1H: 15px;
-    @include user-select(none);
-    font-size: 0.8rem;
-    padding: $interiorMarginLg !important;
-    width: 230px;
-    .l-month-year-pager {
-        $pagerW: 20px;
-        //@include test();
-        //font-size: 0.8rem;
-        height: $r1H;
-        margin-bottom: $interiorMargin;
-        position: relative;
-        .pager,
-        .val {
-            //@include test(red);
-            @extend .abs;
-        }
-        .pager {
-            width: $pagerW;
-            @extend .ui-symbol;
-            &.prev {
-                right: auto;
-                &:before {
-                    content: "\3c";
-                }
-            }
-            &.next {
-                left: auto;
-                text-align: right;
-                &:before {
-                    content: "\3e";
-                }
-            }
-        }
-        .val {
-            text-align: center;
-            left: $pagerW + $interiorMargin;
-            right: $pagerW + $interiorMargin;
-        }
-    }
-    .l-calendar,
-    .l-time-selects {
-        border-top: 1px solid $colorInteriorBorder
-    }
-    .l-time-selects {
-        line-height: $formInputH;
-    }
-}
-
-/******************************************************** CALENDAR */
-.l-calendar {
-    $colorMuted: pushBack($colorMenuFg, 30%);
-    ul.l-cal-row {
-        @include display-flex;
-        @include flex-flow(row nowrap);
-        margin-top: 1px;
-        &:first-child {
-            margin-top: 0;
-        }
-        li {
-            @include flex(1 0);
-            //@include test();
-            margin-left: 1px;
-            padding: $interiorMargin;
-            text-align: center;
-            &:first-child {
-                margin-left: 0;
-            }
-        }
-        &.l-header li {
-            color: $colorMuted;
-        }
-        &.l-body li {
-            @include trans-prop-nice(background-color, .25s);
-            cursor: pointer;
-            &.in-month {
-                background-color: $colorCalCellInMonthBg;
-            }
-            .sub {
-                color: $colorMuted;
-                font-size: 0.8em;
-            }
-            &.selected {
-                background: $colorCalCellSelectedBg;
-                color: $colorCalCellSelectedFg;
-                .sub {
-                    color: inherit;
-                }
-            }
-            &:hover {
-                background-color: $colorCalCellHovBg;
-                color: $colorCalCellHovFg;
-                .sub {
-                    color: inherit;
-                }
-            }
-        }
-    }
+	}
+	.range {
+		background: rgba($colorKey, 0.6);
+		cursor: ew-resize;
+		position: absolute;
+		top: 0;
+		right: auto;
+		bottom: 0;
+		left: auto;
+		height: auto;
+		width: auto;
+		&:hover {
+			background: rgba($colorKey, 0.7);
+		}
+	}
 }

 /******************************************************** BROWSER ELEMENTS */

@include desktop {
-    ::-webkit-scrollbar {
-        @include border-radius(2px);
-        @include box-sizing(border-box);
-        @include box-shadow(inset $scrollbarTrackShdw);
-        background-color: $scrollbarTrackColorBg;
-        height: $scrollbarTrackSize;
-        width: $scrollbarTrackSize;
-    }
+	::-webkit-scrollbar {
+		@include border-radius(2px);
+		@include box-sizing(border-box);
+		@include box-shadow(inset $scrollbarTrackShdw);
+		background-color: $scrollbarTrackColorBg;
+		height: $scrollbarTrackSize;
+		width: $scrollbarTrackSize;
+	}

-    ::-webkit-scrollbar-thumb {
-        $bg: $scrollbarThumbColor;
-        $hc: $scrollbarThumbColorHov;
-        $gr: 5%;
-        @include background-image(linear-gradient(lighten($bg, $gr), $bg 20px));
-        @include border-radius(2px);
-        @include box-sizing(border-box);
-        //@include boxShdwSubtle();
-        //border-top: 1px solid lighten($bg, 20%);
-        &:hover {
-            @include background-image(linear-gradient(lighten($hc, $gr), $hc 20px));
-        }
-    }
+	::-webkit-scrollbar-thumb {
+		$bg: $scrollbarThumbColor;
+		$hc: $scrollbarThumbColorHov;
+		$gr: 5%;
+		@include background-image(linear-gradient(lighten($bg, $gr), $bg 20px));
+		@include border-radius(2px);
+		@include box-sizing(border-box);
+		//@include boxShdwSubtle();
+		//border-top: 1px solid lighten($bg, 20%);
+		&:hover {
+			@include background-image(linear-gradient(lighten($hc, $gr), $hc 20px));
+		}
+	}

-    ::-webkit-scrollbar-corner {
-        background: $scrollbarTrackColorBg;
-    }
-}
+	::-webkit-scrollbar-corner {
+		background: $scrollbarTrackColorBg;
+	}
+}
--- a/platform/commonUI/general/res/sass/controls/_lists.scss
+++ b/platform/commonUI/general/res/sass/controls/_lists.scss
@@ -32,7 +32,7 @@
 .l-tree-item-flat-list {
 	// For lists of tree-items that are flat. Remove margin, etc. normally needed for the expansion arrow.
 	.tree-item {
-		.t-object-label {
+		.label {
 			left: $interiorMargin !important;
 		}
 	}
--- a/platform/commonUI/general/res/sass/controls/_menus.scss
+++ b/platform/commonUI/general/res/sass/controls/_menus.scss
@@ -20,7 +20,7 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
 /******************************************************** MENU BUTTONS */
-.s-menu-btn {
+.s-menu {
 	// Formerly .btn-menu
 	@extend .s-btn;
 	span.l-click-area {
@@ -43,11 +43,6 @@
 	}

 	&.create-btn {
-		&:before {
-			content:'\2b';
-			display: inline;
-			font-family: symbolsfont;
-		}
 		.title-label {
 			font-size: 1rem;
 		}
@@ -67,190 +62,184 @@

 /******************************************************** MENUS THEMSELVES */
 .menu-element {
+	$bg: $colorMenuBg;
+	$fg: $colorMenuFg;
+	$ic: $colorMenuIc;
 	cursor: pointer;
 	position: relative;
-}
-
-.s-menu {
-	@include border-radius($basicCr);
-	@include containerSubtle($colorMenuBg, $colorMenuFg);
-	@include boxShdw($shdwMenu);
-	@include txtShdw($shdwMenuText);
-	padding: $interiorMarginSm 0;
-}
-
-.menu {
-	@extend .s-menu;
-	display: block;
-	position: absolute;
-	z-index: 10;
-	ul {
-		@include menuUlReset();
-		li {
-			@include box-sizing(border-box);
-			border-top: 1px solid pullForward($colorMenuBg, 10%);
-			color: pullForward($colorMenuBg, 60%);
-			line-height: $menuLineH;
-			padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW;
-			position: relative;
-			white-space: nowrap;
-			&:first-child {
-				border: none;
+	.menu {
+		@include border-radius($basicCr);
+		@include containerSubtle($bg, $fg);
+		@include boxShdw($shdwMenu);
+		@include txtShdw($shdwMenuText);
+		display: block; // set to block via jQuery
+		padding: $interiorMarginSm 0;
+		position: absolute;
+		z-index: 10;
+		ul {
+			@include menuUlReset();
+			li {
+				@include box-sizing(border-box);
+				border-top: 1px solid lighten($bg, 20%);
+				color: pullForward($bg, 60%);
+				line-height: $menuLineH;
+				padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW;
+				position: relative;
+				white-space: nowrap;
+				&:first-child {
+					border: none;
+				}
+				&:hover {
+					background: $colorMenuHovBg;
+					color: $colorMenuHovFg;
+					.icon {
+						color: $colorMenuHovIc;
+					}
+				}
+				.type-icon {
+					left: $interiorMargin * 2;
+				}
 			}
-			&:hover {
-				background: $colorMenuHovBg;
-				color: $colorMenuHovFg;
-				.icon {
-					color: $colorMenuHovIc;
+		}
+	}
+
+	.menu,
+	.context-menu,
+	.super-menu {
+		pointer-events: auto;
+		ul li {
+			//padding-left: 25px;
+			a {
+				color: $fg;
+			}
+			.icon {
+				color: $ic;
+			}
+			.type-icon {
+				left: $interiorMargin;
+			}
+			&:hover .icon {
+				//color: lighten($ic, 5%);
+			}
+		}
+	}
+
+	.checkbox-menu {
+		// Used in search dropdown in tree
+		@extend .context-menu;
+		ul li {
+			padding-left: 50px;
+			.checkbox {
+				$d: 0.7rem;
+				position: absolute;
+				left: $interiorMargin;
+				top: ($menuLineH - $d) / 1.5;
+				em {
+					height: $d;
+					width: $d;
+					&:before {
+						font-size: 7px !important;// $d/2;
+						height: $d;
+						width: $d;
+						line-height: $d;
+					}
 				}
 			}
 			.type-icon {
-				left: $interiorMargin * 2;
+				left: 25px;
 			}
 		}
 	}
-}

-.menu,
-.context-menu,
-.super-menu {
-	pointer-events: auto;
-	ul li {
-		//padding-left: 25px;
-		a {
-			color: $colorMenuFg;
+	.super-menu {
+		$w: 500px;
+		$h: $w - 20;
+		$plw: 50%;
+		$prw: 50%;
+		display: block;
+		width: $w;
+		height: $h;
+		.contents {
+			@include absPosDefault($interiorMargin);
 		}
-		.icon {
-			color: $colorMenuIc;
-		}
-		.type-icon {
-			left: $interiorMargin;
-		}
-		&:hover .icon {
-			//color: lighten($colorMenuIc, 5%);
-		}
-	}
-}
-
-.checkbox-menu {
-	// Used in search dropdown in tree
-	@extend .context-menu;
-	ul li {
-		padding-left: 50px;
-		.checkbox {
-			$d: 0.7rem;
-			position: absolute;
-			left: $interiorMargin;
-			top: ($menuLineH - $d) / 1.5;
-			em {
-				height: $d;
-				width: $d;
-				&:before {
-					font-size: 7px !important;// $d/2;
-					height: $d;
-					width: $d;
-					line-height: $d;
-				}
-			}
-		}
-		.type-icon {
-			left: 25px;
-		}
-	}
-}
-
-.super-menu {
-	$w: 500px;
-	$h: $w - 20;
-	$plw: 50%;
-	$prw: 50%;
-	display: block;
-	width: $w;
-	height: $h;
-	.contents {
-		@include absPosDefault($interiorMargin);
-	}
-	.pane {
-		@include box-sizing(border-box);
-		&.left {
-			//@include test();
-			border-right: 1px solid pullForward($colorMenuBg, 10%);
-			left: 0;
-			padding-right: $interiorMargin;
-			right: auto;
-			width: $plw;
-			overflow-x: hidden;
-			overflow-y: auto;
-			ul {
-				li {
-					@include border-radius($controlCr);
-					padding-left: 30px;
-					border-top: none;
-				}
-			}
-		}
-		&.right {
-			//@include test(red);
-			left: auto;
-			right: 0;
-			padding: $interiorMargin * 5;
-			width: $prw;
-		}
-	}
-	.menu-item-description {
-		.desc-area {
-			&.icon {
-				$h: 150px;
-				color: $colorCreateMenuLgIcon;
-				position: relative;
-				font-size: 8em;
+		.pane {
+			@include box-sizing(border-box);
+			&.left {
+				//@include test();
+				border-right: 1px solid pullForward($colorMenuBg, 10%);
 				left: 0;
-				height: $h;
-				line-height: $h;
-				margin-bottom: $interiorMargin * 5;
-				text-align: center;
+				padding-right: $interiorMargin;
+				right: auto;
+				width: $plw;
+				overflow-x: hidden;
+				overflow-y: auto;
+				ul {
+					li {
+						@include border-radius($controlCr);
+						padding-left: 30px;
+						border-top: none;
+					}
+				}
 			}
-			&.title {
-				color: $colorCreateMenuText;
-				font-size: 1.2em;
-				margin-bottom: 0.5em;
+			&.right {
+				//@include test(red);
+				left: auto;
+				right: 0;
+				padding: $interiorMargin * 5;
+				width: $prw;
 			}
-			&.description {
-				//color: lighten($colorMenuBg, 30%);
-				color: $colorCreateMenuText;
-				font-size: 0.8em;
-				line-height: 1.5em;
+		}
+		.menu-item-description {
+			.desc-area {
+				&.icon {
+					$h: 150px;
+					color: $colorCreateMenuLgIcon;
+					position: relative;
+					font-size: 8em;
+					left: 0;
+					height: $h;
+					line-height: $h;
+					margin-bottom: $interiorMargin * 5;
+					text-align: center;
+				}
+				&.title {
+					color: $colorCreateMenuText;
+					font-size: 1.2em;
+					margin-bottom: 0.5em;
+				}
+				&.description {
+					//color: lighten($bg, 30%);
+					color: $colorCreateMenuText;
+					font-size: 0.8em;
+					line-height: 1.5em;
+				}
 			}
 		}
 	}
-}
-.context-menu {
-	font-size: 0.80rem;
-}
-
-.context-menu-holder,
-.menu-holder {
-	position: absolute;
-	z-index: 70;
-	.context-menu-wrapper {
-		position: absolute;
-		height: 100%;
-		width: 100%;
-	}
-	&.go-left .context-menu,
-	&.go-left .menu {
-		right: 0;
-	}
-	&.go-up .context-menu,
-	&.go-up .menu {
-		bottom: 0;
+	.context-menu {
+		font-size: 0.80rem;
 	}
 }

 .context-menu-holder {
 	pointer-events: none;
+	position: absolute;
 	height: 200px;
 	width: 170px;
+	z-index: 70;
+	.context-menu-wrapper {
+		position: absolute;
+		height: 100%;
+		width: 100%;
+		.context-menu {
+		}
+	}
+	&.go-left .context-menu {
+		right: 0;
+	}
+	&.go-up .context-menu {
+		bottom: 0;
+	}
 }

 .btn-bar.right .menu,
--- a/platform/commonUI/general/res/sass/controls/_messages.scss
+++ b/platform/commonUI/general/res/sass/controls/_messages.scss
@@ -1,306 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-@mixin statusBannerColors($bg, $fg: $colorStatusFg) {
-	$bgPb: 30%;
-	$bgPbD: 10%;
-	background-color: darken($bg, $bgPb);
-	color: $fg;
-	&:hover {
-		background-color: darken($bg, $bgPb - $bgPbD);
-	}
-	.s-action {
-		background-color: darken($bg, $bgPb + $bgPbD);
-		&:hover {
-			background-color: darken($bg, $bgPb);
-		}
-	}
-}
-
-.status.block {
-	color: $colorStatusDefault;
-	cursor: default;
-	display: inline-block;
-	margin-right: $interiorMargin;
-	.status-indicator,
-	.label,
-	.count {
-		//@include test(#00ff00);
-		display: inline-block;
-		vertical-align: top;
-	}
-	.status-indicator {
-		margin-right: $interiorMarginSm;
-	}
-	&.ok .status-indicator,
-    &.info .status-indicator {
-		color: $colorStatusInfo;
-	}
-    &.alert .status-indicator,
-	&.warning .status-indicator,
-	&.caution .status-indicator {
-		color: $colorStatusAlert;
-	}
-	&.error .status-indicator {
-		color: $colorStatusError;
-	}
-	.label {
-		// Max-width silliness is necessary for width transition
-		@include trans-prop-nice(max-width, .25s);
-		overflow: hidden;
-		max-width: 0px;
-	}
-	.count {
-		@include trans-prop-nice(opacity, .25s);
-		font-weight: bold;
-		opacity: 1;
-	}
-	&:hover {
-		.label {
-			max-width: 450px;
-			width: auto;
-		}
-		.count {
-			opacity: 0;
-		}
-	}
-}
-
-/* Styles for messages and message banners */
-.message {
-	&.block {
-		@include border-radius($basicCr);
-		padding: $interiorMarginLg;
-	}
-	&.error {
-		background-color: rgba($colorAlert,0.3);
-		color: lighten($colorAlert, 20%);
-	}
-}
-
-.l-message-banner {
-	$m: $interiorMarginSm;
-	$lh: $ueFooterH - ($m*2) - 1;
-	@include box-sizing(border-box);
-	@include ellipsize();
-	@include display-flex;
-	@include flex-direction(row);
-	@include align-items(center);
-	position: absolute;
-	top: $m; right: auto; bottom: $m; left: 50%;
-	height: auto; width: auto;
-	line-height: $lh;
-	max-width: 300px;
-	padding: 0 $interiorMargin 0 $interiorMargin;
-	@include transform(translateX(-50%));
-
-	&.minimized {
-        @include transition-property(left, opacity);
-        @include transition-duration(0.3s);
-        @include transition-timing-function(ease-in-out);
-		left: 0;
-        opacity: 0;
-	}
-
-    &.new {
-        left: 50%;
-        opacity: 1;
-        &:not(.info) {
-            @include pulse(100ms, 10);
-        }
-    }
-
-	.banner-elem {
-		@include flex(0 1 auto);
-		margin-left: $interiorMargin;
-	}
-	a {
-		display: inline-block;
-	}
-	.l-action {
-		line-height: $lh - 3;
-		padding: 0 $interiorMargin;
-	}
-    .close {
-		//@include test(red, 0.7);
-		cursor: pointer;
-        font-size: 7px;
-		width: 8px;
-    }
-	.l-progress-bar {
-		$h: $lh - 10;
-		height: $h;
-		line-height: $h;
-		width: 100px;
-	}
-    .progress-info { display: none; }
-	z-index: 10;
-}
-
-.s-message-banner {
-    //@include transition-property(left, opacity);
-    //@include transition-duration(0.35s);
-    //@include transition-timing-function(ease-in-out);
-}
-
-.s-message-banner {
-	@include border-radius($controlCr);
-	@include statusBannerColors($colorStatusDefault, $colorStatusFg);
-	cursor: pointer;
-	a { color: inherit; }
-	.s-action {
-		@include border-radius($basicCr);
-        @include trans-prop-nice(background-color);
-	}
-	.close {
-		opacity: 0.5;
-		&:hover {
-			opacity: 1;
-		}
-	}
-	&.ok,
-    &.info {
-		@include statusBannerColors($colorStatusInfo);
-	}
-	&.caution,
-    &.warning,
-    &.alert {
-		@include statusBannerColors($colorStatusAlert);
-	}
-    &.error {
-        @include statusBannerColors($colorStatusError);
-    }
-}
-
-@mixin messageBlock($iconW: 32px) {
-    .type-icon.message-type {
-        @include txtShdw($shdwStatusIc);
-        &:before { content:"\e608"; }
-        color: $colorStatusDefault;
-        font-size: $iconW;
-        padding: 1px;
-        width: $iconW + 2;
-    }
-
-    .message-severity-info .type-icon.message-type {
-        &:before { content:"\e608"; }
-        color: $colorStatusInfo;
-    }
-    .message-severity-alert .type-icon.message-type {
-        &:before { content:"\e610"; }
-        color: $colorStatusAlert;
-    }
-    .message-severity-error .type-icon.message-type {
-        &:before { content:"\21"; }
-        color: $colorStatusError;
-    }
-}
-/* Paths:
-    t-dialog | t-dialog-sm > t-message-single | t-message-list > overlay > holder > contents > l-message >
-        message-type > (icon)
-        message-contents >
-        top-bar >
-            title
-            hint
-        editor >
-            (if displaying list of messages)
-            ul > li > l-message >
-                ... same as above
-        bottom-bar
-*/
-
-.l-message {
-    @include display-flex;
-    @include flex-direction(row);
-    @include align-items(stretch);
-    .type-icon.message-type {
-        //@include test(red);
-        @include flex(0 1 auto);
-        position: relative;
-    }
-    .message-contents {
-        //@include test(blue);
-        @include flex(1 1 auto);
-        margin-left: $overlayMargin;
-        position: relative;
-
-        .top-bar,
-        .message-body {
-            margin-bottom: $interiorMarginLg * 2;
-        }
-    }
-}
-
-
-// Message as singleton
-.t-message-single {
-    @include messageBlock(80px);
-
-    @include desktop {
-        .l-message,
-        .bottom-bar {
-            @include absPosDefault();
-        }
-
-        .bottom-bar {
-            top: auto;
-            height: $ovrFooterH;
-        }
-    }
-}
-
-// Messages in list
-.t-message-list {
-    @include messageBlock(32px);
-
-    .message-contents {
-        .l-message {
-            //border-bottom: 1px solid pullForward($colorOvrBg, 20%);
-            @include border-radius($controlCr);
-            background: rgba($colorOvrFg, 0.1);
-            margin-bottom: $interiorMargin;
-            padding: $interiorMarginLg;
-
-            .message-contents,
-            .bottom-bar {
-                //@include test(green);
-                position: relative;
-            }
-
-            .message-contents {
-                font-size: 0.9em;
-                margin-left: $interiorMarginLg;
-                .message-action { color: pushBack($colorOvrFg, 20%); }
-                .bottom-bar { text-align: left; }
-            }
-
-            .top-bar,
-            .message-body {
-                margin-bottom: $interiorMarginLg;
-            }
-        }
-    }
-
-    @include desktop {
-        .message-contents .l-message { margin-right: $interiorMarginLg; }
-    }
-}
--- a/platform/commonUI/general/res/sass/controls/_time-controller.scss
+++ b/platform/commonUI/general/res/sass/controls/_time-controller.scss
@@ -1,155 +1,72 @@
-@mixin toiLineHovEffects() {
-	//@include pulse(.25s);
-	&:before,
-	&:after {
-		background-color: $timeControllerToiLineColorHov;
-	}
-}
+.l-time-controller {
+	$inputTxtW: 90px;
+	$knobW: 9px;
+	$r1H: 20px;
+	$r2H: 30px;
+	$r3H: 10px;

-.l-time-controller-visible {
-
-}
-
-mct-include.l-time-controller {
-	$minW: 500px;
-	$knobHOffset: 0px;
-	$knobM: ($sliderKnobW + $knobHOffset) * -1;
-	$rangeValPad: $interiorMargin;
-	$rangeValOffset: $sliderKnobW;
-	//$knobCr: $sliderKnobW;
-	$timeRangeSliderLROffset: 130px + $sliderKnobW + $rangeValOffset;
-	$r1H: nth($ueTimeControlH,1);
-	$r2H: nth($ueTimeControlH,2);
-	$r3H: nth($ueTimeControlH,3);
-
-    @include absPosDefault();
-    //@include test();
-    display: block;
-    top: auto;
-	height: $r1H + $r2H + $r3H + ($interiorMargin * 2);
-    min-width: $minW;
-    font-size: 0.8rem;
+	position: relative;
+	margin: $interiorMarginLg 0;
+	min-width: 400px;

 	.l-time-range-inputs-holder,
 	.l-time-range-slider {
-		//font-size: 0.8em;
+		font-size: 0.8em;
 	}

 	.l-time-range-inputs-holder,
 	.l-time-range-slider-holder,
 	.l-time-range-ticks-holder
 	{
-		//@include test();
-		@include absPosDefault(0, visible);
-		@include box-sizing(border-box);
-		top: auto;
+		margin-bottom: $interiorMargin;
+		position: relative;
 	}
 	.l-time-range-slider,
 	.l-time-range-ticks {
 		//@include test(red, 0.1);
 		@include absPosDefault(0, visible);
-		left: $timeRangeSliderLROffset; right: $timeRangeSliderLROffset;
 	}

 	.l-time-range-inputs-holder {
-		//@include test(red);
-		height: $r1H; bottom: $r2H + $r3H + ($interiorMarginSm * 2);
-		padding-top: $interiorMargin;
-		border-top: 1px solid $colorInteriorBorder;
-		.type-icon {
-			font-size: 120%;
-			vertical-align: middle;
-		}
-		.l-time-range-input,
-		.l-time-range-inputs-elem {
-			margin-right: $interiorMargin;
-			.lbl {
-				color: $colorPlotLabelFg;
-			}
-			.ui-symbol.icon {
-				font-size: 11px;
-				width: 11px;
-			}
-		}
+		height: $r1H;
+	}
+
+	.l-time-range-slider,
+	.l-time-range-ticks {
+		left: $inputTxtW; right: $inputTxtW;
+
 	}

 	.l-time-range-slider-holder {
-		//@include test(green);
-		height: $r2H; bottom: $r3H + ($interiorMarginSm * 1);
+		height: $r2H;
 		.range-holder {
 			@include box-shadow(none);
 			background: none;
 			border: none;
-			.range {
-				.toi-line {
-					$myC: $timeControllerToiLineColor;
-					$myW: 8px;
-					@include transform(translateX(50%));
-					position: absolute;
-					//@include test();
-					top: 0; right: 0; bottom: 0px; left: auto;
-					width: $myW;
-					height: auto;
-					z-index: 2;
-					&:before,
-					&:after {
-						background-color: $myC;
-						content: "";
-						position: absolute;
-					}
-					&:before {
-						// Vert line
-						top: 0; right: auto; bottom: -10px; left: floor($myW/2) - 1;
-						width: 2px;
-						//top: 0; right: 3px; bottom: 0; left: 3px;
-					}
-					&:after {
-						// Circle element
-						@include border-radius($myW);
-						@include transform(translateY(-50%));
-						top: 50%; right: 0; bottom: auto; left: 0;
-						width: auto;
-						height: $myW;
-					}
-				}
-				&:hover .toi-line {
-					@include toiLineHovEffects;
-				}
-			}
-		}
-		&:not(:active) {
-			//@include test(#ff00cc);
-			.knob,
-			.range {
-				@include transition-property(left, right);
-				@include transition-duration(500ms);
-				@include transition-timing-function(ease-in-out);
-			}
+			height: 75%;
 		}
 	}

 	.l-time-range-ticks-holder {
 		height: $r3H;
 		.l-time-range-ticks {
-			border-top: 1px solid $colorTick;
+			border-top: 1px solid $colorInteriorBorder;
 			.tick {
-				background-color: $colorTick;
+				background-color: $colorInteriorBorder;
 				border:none;
-				height: 5px;
 				width: 1px;
 				margin-left: -1px;
-				position: absolute;
 				&:first-child {
 					margin-left: 0;
 				}
 				.l-time-range-tick-label {
-					@include webkitProp(transform, translateX(-50%));
-					color: $colorPlotLabelFg;
-					display: inline-block;
-					font-size: 0.9em;
+					color: lighten($colorInteriorBorder, 20%);
+					font-size: 0.7em;
 					position: absolute;
-					top: 8px;
-					white-space: nowrap;
+					margin-left: -0.5 * $tickLblW;
+					text-align: center;
+					top: $r3H;
+					width: $tickLblW;
 					z-index: 2;
 				}
 			}
@@ -157,47 +74,31 @@ mct-include.l-time-controller {
 	}

 	.knob {
-		z-index: 2;
+		width: $knobW;
 		.range-value {
-			//@include test($sliderColorRange);
-			@include trans-prop-nice-fade(.25s);
-			padding: 0 $rangeValOffset;
+			$w: 75px;
+			//@include test();
 			position: absolute;
-			height: $r2H;
-			line-height: $r2H;
+			top: 50%;
+			margin-top: -7px; // Label is 13px high
 			white-space: nowrap;
+			width: $w;
 		}
 		&:hover .range-value {
-			color: $sliderColorKnobHov;
+			color: $colorKey;
 		}
 		&.knob-l {
-			//@include border-bottom-left-radius($knobCr); // MOVED TO _CONTROLS.SCSS
-			margin-left: $knobM;
+			margin-left: $knobW / -2;
 			.range-value {
 				text-align: right;
-				right: $rangeValOffset;
+				right: $knobW + $interiorMargin;
 			}
 		}
 		&.knob-r {
-			//@include border-bottom-right-radius($knobCr);
-			margin-right: $knobM;
+			margin-right: $knobW / -2;
 			.range-value {
-				left: $rangeValOffset;
-			}
-			&:hover + .range-holder .range .toi-line {
-				@include toiLineHovEffects;
+				left: $knobW + $interiorMargin;
 			}
 		}
 	}
-}
-
-//.slot.range-holder {
-//	background-color: $sliderColorRangeHolder;
-//}
-
-.s-time-range-val {
-	//@include test();
-	@include border-radius($controlCr);
-	background-color: $colorInputBg;
-	padding: 1px 1px 0 $interiorMargin;
 }
--- a/platform/commonUI/general/res/sass/forms/_datetime.scss
+++ b/platform/commonUI/general/res/sass/forms/_datetime.scss
@@ -19,44 +19,39 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-@mixin complexFieldHolder($myW) {
-	width: $myW + $interiorMargin;
-	input[type="text"] {
-		width: $myW;
-	}
-}
-
 .complex.datetime {
 	span {
 		display: inline-block;
 		margin-right: $interiorMargin;
 	}
-
-/*
+	
 	.field-hints,
 	.fields {
 	}
-
 	
 	.field-hints {
-
+		
 	}
-	*/
-
+	
 	.fields {
 		margin-top: $interiorMarginSm 0;
 		padding: $interiorMarginSm 0;
 	}
 	
 	.date {
-		@include complexFieldHolder(80px);
-	}
-
-	.time.md {
-		@include complexFieldHolder(60px);
+		$myW: 80px;
+		width: $myW + $interiorMargin;
+		input {
+			width: $myW;
+		}
+		
 	}
 	
 	.time.sm {
-		@include complexFieldHolder(40px);
+		$myW: 40px;
+		width: $myW + $interiorMargin;
+		input {
+			width: $myW;
+		}
 	}
 }
--- a/platform/commonUI/general/res/sass/forms/_selects.scss
+++ b/platform/commonUI/general/res/sass/forms/_selects.scss
@@ -21,13 +21,10 @@
 *****************************************************************************/
 .select {
 	@include btnSubtle($colorSelectBg);
-    @if $shdwBtns != none {
-	    margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers
-    }
+	margin: 0 0 2px 2px; // Needed to avoid dropshadow from being clipped by parent containers
 	padding: 0 $interiorMargin;
    overflow: hidden;
 	position: relative;
-    line-height: $formInputH;
 	select {
 		@include appearance(none);
 		@include box-sizing(border-box);
@@ -43,8 +40,11 @@
 	}
 	&:after {
 		@include contextArrow();
-		pointer-events: none;
 		color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent));
+		//content:"v";
+		//display: block;
+		//font-family: 'symbolsfont';
+		//pointer-events: none;
 		position: absolute;
 		right: $interiorMargin; top: 0;
 	}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Victor Woeltjen	1ea23e53e7	[CLI] Auto-focus	2015-10-08 15:06:35 -07:00
Victor Woeltjen	f6c66248c8	[CLI] Add license header	2015-10-08 15:03:19 -07:00
Victor Woeltjen	9bffd0c5d5	Merge remote-tracking branch 'origin/open147' into cli	2015-10-08 14:56:24 -07:00
Victor Woeltjen	1ddfa671c7	[CLI] Visually distinguish user input	2015-10-08 14:52:22 -07:00
Victor Woeltjen	886ac8e859	[CLI] Distinguish links	2015-10-08 14:48:50 -07:00
Victor Woeltjen	7e121dc647	[CLI] Clean up command formats	2015-10-08 14:35:43 -07:00
Victor Woeltjen	83ce018bef	[Common UI] Avoid infinite digest	2015-10-08 14:35:21 -07:00
Victor Woeltjen	3b6b4a5694	[Browse] Separate out 'back' as an action.	2015-10-08 14:18:01 -07:00
Victor Woeltjen	f8e0dbd5b7	[Create] Add category for create actions	2015-10-08 14:12:36 -07:00
Victor Woeltjen	af5449b78f	[CLI] Hide missing descriptions	2015-10-08 14:01:25 -07:00
Victor Woeltjen	c9df2db962	[CLI] Add some shadowing	2015-10-08 13:58:58 -07:00
Victor Woeltjen	bc757c09d4	[Browse] Add key to Fullscreen action	2015-10-08 13:58:49 -07:00
Victor Woeltjen	7b3fe0e1dc	[CLI] Autoscroll, re-echo objects on empty input	2015-10-08 13:49:02 -07:00
Victor Woeltjen	0609c7e0ac	[Common UI] Handle out-of-range scroll values When user code specifies an out-of-range scroll value, this will get clamped to scrollWidth or scrollHeight; so, publish this value back into scope if that occurs.	2015-10-08 13:48:40 -07:00
Victor Woeltjen	1a802d1e7f	[CLI] Hide irrelevant info	2015-10-08 12:58:57 -07:00
Victor Woeltjen	efd2c47a3f	[CLI] Begin supporting commands	2015-10-08 12:55:06 -07:00
Victor Woeltjen	45fb644658	[CLI] Add some styles	2015-10-08 11:21:37 -07:00
Victor Woeltjen	b0d72c49bc	[CLI] Show navigated object	2015-10-08 11:10:24 -07:00
Victor Woeltjen	e2b4c87c03	[CLI] Receive input	2015-10-08 10:55:27 -07:00
Victor Woeltjen	f1f8439726	[CLI] Initial commit; add bundle	2015-10-08 10:47:52 -07:00