[Edit Mode] Refactor edit concerns out of browse controllers

Fixed jslint errors

Removed commented code and added line breaks

.gitignore

@@ -4,11 +4,8 @@
 *.tgz
 *.DS_Store
 
-# Compiled CSS, unless directly added
 *.sass-cache
 *COMPILE.css
-*.css
-*.css.map
 
 # Intellij project configuration files
 *.idea
@@ -18,7 +15,6 @@
 
 # Build output
 target
-dist
 
 # Mac OS X Finder
 .DS_Store
@@ -26,9 +22,8 @@ dist
 # Closed source libraries
 closed-lib
 
-# Node, Bower dependencies
+# Node dependencies
 node_modules
-bower_components
 
 # Protractor logs
 protractor/logs

.jscsrc

@@ -1,3 +0,0 @@
-{
-    "preset": "crockford"
-}

.jshintrc

@@ -1,4 +0,0 @@
-{
-    "validthis": true,
-    "laxbreak": true
-}

.npmignore

@@ -1,35 +0,0 @@
-*.scssc
-*.zip
-*.gzip
-*.tgz
-*.DS_Store
-
-*.sass-cache
-*COMPILE.css
-
-# Intellij project configuration files
-*.idea
-*.iml
-
-# External dependencies
-
-# Build output
-target
-
-# Mac OS X Finder
-.DS_Store
-
-# Closed source libraries
-closed-lib
-
-# Node, Bower dependencies
-node_modules
-bower_components
-
-Procfile
-
-# Protractor logs
-protractor/logs
-
-# npm-debug log
-npm-debug.log

LICENSES.md

@@ -135,7 +135,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 * Link: http://requirejs.org/
 
-* Version: 2.1.22
+* Version: 2.1.9
 
 * Author: The Dojo Foundation
 
@@ -153,49 +153,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---
 
-### requirejs-text
-
-#### Info
-
-* Link: https://github.com/requirejs/text
-
-* Version: 2.0.14
-
-* Author: The Dojo Foundation
-
-* Description: Text loading plugin for RequireJS
-
-#### License
-
-Copyright (c) 2010-2014, The Dojo Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
 ### AngularJS
 
 #### Info
 
 * Link: http://angularjs.org/
 
-* Version: 1.4.4
+* Version: 1.2.26
 
 * Author: Google
 
@@ -203,7 +167,7 @@ THE SOFTWARE.
 
 #### License
 
-Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -219,7 +183,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 * Link: http://angularjs.org/
 
-* Version: 1.4.4
+* Version: 1.2.26
 
 * Author: Google
 
@@ -227,7 +191,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #### License
 
-Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -243,7 +207,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 * Link: https://github.com/jakearchibald/es6-promise
 
-* Version: 3.0.2
+* Version: 2.0.0
 
 * Authors: Yehuda Katz, Tom Dale, Stefan Penner and contributors
 
@@ -267,7 +231,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 * Link: https://github.com/sindresorhus/screenfull.js/
 
-* Version: 3.0.0
+* Version: 1.2.0
 
 * Author: Sindre Sorhus
 
@@ -291,15 +255,39 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 * Link: https://github.com/broofa/node-uuid
 
-* Version: 1.4.7
+* Version: 1.4
 
 * Author: Robert Kieffer
 
-* Description: Unique identifer generation.
+* Description: Unique identifer generation (code adapted.)
 
 #### License
 
-Copyright (c) 2010-2012 Robert Kieffer
+Copyright (c) 2010 Robert Kieffer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Modernizr
+
+#### Info
+
+* Link: http://modernizr.com
+
+* Version: 2.6.2
+
+* Author: Faruk Ateş
+
+* Description: Browser/device capability finding
+
+#### License
+
+Copyright (c) 2009–2015
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -339,7 +327,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 * Link: http://momentjs.com
 
-* Version: 2.11.1
+* Version: 2.7.0
 
 * Authors: Tim Wood, Iskren Chernev, Moment.js contributors
 
@@ -392,104 +380,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-### CSV.js
-
-#### Info
-
-* Link: https://github.com/knrz/CSV.js
-
-* Version: 3.6.4
-
-* Authors: Kash Nouroozi
-
-* Description: Encoder for CSV (comma separated values) export
-
-#### License
-
-Copyright (c) 2014 Kash Nouroozi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-### FileSaver.js
-
-#### Info
-
-* Link: https://github.com/eligrey/FileSaver.js/
-
-* Version: 0.0.2
-
-* Authors: Eli Grey
-
-* Description: File download initiator (for file exports)
-
-#### License
-
-Copyright © 2015 Eli Grey.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-### Zepto
-
-#### Info
-
-* Link: http://zeptojs.com/
-
-* Version: 1.1.6
-
-* Authors: Thomas Fuchs
-
-* Description: DOM manipulation
-
-#### License
-
-Copyright (c) 2010-2016 Thomas Fuchs
-http://zeptojs.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
 ### Json.NET
 
 #### Info

README.md

@@ -20,6 +20,27 @@ directory names) to include in a running instance of Open MCT Web. Adding or
 removing paths from this list will add or remove bundles from the running
 application.
 
+### Bundle Contents
+
+A bundle directory will contain:
+
+* `bundle.json`, the declaration of the bundles contents.
+* A source code directory, named `src` by convention. This contains all
+  JavaScript sources exposed by the bundle. These are declared as
+  AMD modules.
+* A directory for other resources, named `res` by convention. This
+  contains all HTML templates, CSS files, images, and so forth to be
+  used within a given bundle.
+* A library directory, named `lib` by convention. This contains all
+  external libraries used and/or exposed by the bundle.
+* A test directory, named `test` by convention. This contains all unit
+  tests declared for the bundle, as well as a `suite.json` that acts
+  as a listing of these dependencies. See the section on unit testing
+  below.
+
+Following these bundle conventions is required, at present, to ensure
+that Open MCT Web (and its build and tests) execute correctly.
+
 ## Tests
 
 Tests are written for [Jasmine 1.3](http://jasmine.github.io/1.3/introduction.html)
@@ -45,7 +66,7 @@ When `npm test` is run, test results will be written as HTML to
 
 The tests described above are all at the unit-level; an additional
 test suite using [Protractor](https://angular.github.io/protractor/)
-is under development, in the `protractor` folder.
+us under development, in the `protractor` folder.
 
 To run:
 
@@ -56,22 +77,24 @@ To run:
 
 ## Build
 
-Open MCT Web is built using [`npm`](http://npmjs.com/)
-and [`gulp`](http://gulpjs.com/).
+Open MCT Web includes a Maven command line build. Although Open MCT Web
+can be run as-is using the repository contents (that is, by viewing
+`index.html` in a web browser), the command
+line build allows machine-driven verification and packaging.
 
-To build:
+This build will:
 
-`npm run prepublish`
+* Check all sources (excluding those in directories named `lib`) with
+  JSLint for code style compliance. The build will fail if any sources
+  do not satisfy JSLint.
+* Run the [unit test suite](#tests).
+* Package the application as a `war` (web archive) file. This is
+  convenient for deployment on Tomcat or similar. This archive will
+  include sources, resources, and libraries for bundles, as well
+  as the top-level files used to initiate running of the application
+  (`index.html` and `bundles.json`).
 
-This will compile and minify JavaScript sources, as well as copy over assets.
-The contents of the `dist` folder will contain a runnable Open MCT Web
-instance (e.g. by starting an HTTP server in that directory), including:
-
-* A `main.js` file containing Open MCT Web source code.
-* Various assets in the `example` and `platform` directories.
-* An `index.html` that runs Open MCT Web in its default configuration.
-
-Additional `gulp` tasks are defined in [the gulpfile](gulpfile.js).
+Run as `mvn clean install`.
 
 ### Building Documentation
 

app.js

@@ -14,8 +14,7 @@
         options = require('minimist')(process.argv.slice(2)),
         express = require('express'),
         app = express(),
-        fs = require('fs'),
-        request = require('request');
+        fs = require('fs');
 
     // Defaults
     options.port = options.port || options.p || 8080;
@@ -62,14 +61,6 @@
         res.send(JSON.stringify(bundles));
     });
 
-    app.use('/proxyUrl', function proxyRequest(req, res, next) {
-        console.log('Proxying request to: ', req.query.url);
-        req.pipe(request({
-            url: req.query.url,
-            strictSSL: false
-        }).on('error', next)).pipe(res);
-    });
-
     // Expose everything else as static files
     app.use(express['static']('.'));
 

bower.json

@@ -1,23 +0,0 @@
-{
-  "name": "openmctweb",
-  "description": "The OpenMCTWeb core platform",
-  "main": "",
-  "license": "Apache-2.0",
-  "moduleType": [],
-  "homepage": "http://nasa.github.io/openmctweb/",
-  "private": true,
-  "dependencies": {
-    "angular": "1.4.4",
-    "angular-route": "1.4.4",
-    "moment": "^2.11.1",
-    "moment-duration-format": "^1.3.0",
-    "requirejs": "~2.1.22",
-    "text": "requirejs-text#^2.0.14",
-    "es6-promise": "^3.0.2",
-    "screenfull": "^3.0.0",
-    "node-uuid": "^1.4.7",
-    "comma-separated-values": "^3.6.4",
-    "FileSaver.js": "^0.0.2",
-    "zepto": "^1.1.6"
-  }
-}

circle.yml

@@ -13,6 +13,3 @@ deployment:
     branch: mobile
     heroku:
       appname: openmctweb-staging-deux
-test:
-  post:
-    - npm run jshint --silent

docs/src/guide/index.md

@@ -6,13 +6,12 @@ Victor Woeltjen
 September 23, 2015  
 Document Version 1.1  
 
-Date                | Version   | Summary of Changes        | Author
-------------------- | --------- | ------------------------- | ---------------
-April 29, 2015      | 0         | Initial Draft             | Victor Woeltjen
-May 12, 2015        | 0.1       |                           | Victor Woeltjen
-June 4, 2015        | 1.0       | Name Changes              | Victor Woeltjen
-October 4, 2015     | 1.1       | Conversion to MarkDown    | Andrew Henry
-April 5, 2016       | 1.2       | Added Mct-table directive | Andrew Henry
+Date                | Version   | Summary of Changes      | Author
+------------------- | --------- | ----------------------- | ---------------
+April 29, 2015      | 0         | Initial Draft           | Victor Woeltjen
+May 12, 2015        | 0.1       |                         | Victor Woeltjen
+June 4, 2015        | 1.0       | Name Changes            | Victor Woeltjen
+October 4, 2015     | 1.1       | Conversion to MarkDown  | Andrew Henry
 
 # Introduction
 The purpose of this guide is to familiarize software developers with the Open
@@ -911,24 +910,7 @@ A capability's implementation may also expose a static method `appliesTo(model)`
 which should return a boolean value, and will be used by the platform to filter 
 down capabilities to those which should be exposed by specific domain objects, 
 based on their domain object models. 
-
-## Containers Category
-
-Containers provide options for the `mct-container` directive.
-
-The definition for an extension in the `containers` category should include:
-
-* `key`: An identifier for the container.
-* `template`: An Angular template for the container, including an
-  `ng-transclude` where contained content should go.
-* `attributes`: An array of attribute names. The values associated with
-   these attributes will be exposed in the template's scope under the
-   name provided by the `alias` property.
-* `alias`: The property name in scope under which attributes will be
-  exposed. Optional; defaults to "container".
-
-Note that `templateUrl` is not supported for `containers`.
-
+ 
 ## Controls Category
 
 Controls provide options for the `mct-control` directive. 
@@ -1601,61 +1583,6 @@ there are items .
         ] 
     }
 
-## Table
-
-The `mct-table` directive provides a generic table component, with optional 
-sorting and filtering capabilities. The table can be pre-populated with data 
-by setting the `rows` parameter, and it can be updated in real-time using the
-`add:row` and `remove:row` broadcast events. The table will expand to occupy 
-100% of the size of its containing element. The table is highly optimized for 
-very large data sets.
-
-### Events
-
-The table supports two events for notifying that the rows have changed. For 
-performance reasons, the table does not monitor the content of `rows` 
-constantly. 
-
-* `add:row`: A `$broadcast` event that will notify the table that a new row 
-has been added to the table.
-
-eg. The code below adds a new row, and alerts the table using the `add:row` 
-event. Sorting and filtering will be applied automatically by the table component.
-
-```
-$scope.rows.push(newRow);
-$scope.$broadcast('add:row', $scope.rows.length-1);
-```
-
-* `remove:row`: A `$broadcast` event that will notify the table that a row 
-should be removed from the table.
-
-eg. The code below removes a row from the rows array, and then alerts the table 
-to its removal.
-    
-```
-$scope.rows.slice(5, 1);
-$scope.$broadcast('remove:row', 5);
-```
-
-### Parameters
-
-* `headers`: An array of string values which will constitute the column titles
- that appear at the top of the table. Corresponding values are specified in 
- the rows using the header title provided here.
-* `rows`: An array of objects containing row values. Each element in the 
-array must be an associative array, where the key corresponds to a column header. 
-* `enableFilter`: A boolean that if true, will enable searching and result 
-filtering. When enabled, each column will have a text input field that can be
-used to filter the table rows in real time.
-* `enableSort`: A boolean determining whether rows can be sorted. If true, 
-sorting will be enabled allowing sorting by clicking on column headers. Only 
-one column may be sorted at a time.
-* `autoScroll`: A boolean value that if true, will cause the table to automatically 
-scroll to the bottom as new data arrives. Auto-scroll can be disengaged manually 
-by scrolling away from the bottom of the table, and can also be enabled manually 
-by scrolling to the bottom of the table rows.
-
 # Services 
 
 The Open MCT Web platform provides a variety of services which can be retrieved 
@@ -2318,27 +2245,18 @@ options. The sources can be deployed in the same directory structure used during
 development. A few utilities are included to support development processes.
 
 ## Command-line Build
+Open MCT Web includes a script for building via command line using Maven 3.3.9 
+https://maven.apache.org/ .
+        
+Invoking mvn clean install will:
 
-Open MCT Web is built using [`npm`](http://npmjs.com/)
-and [`gulp`](http://gulpjs.com/).
+* Check code style using JSLint. The build will fail if JSLint raises any warnings.
+* Run the test suite (see below.) The build will fail if any tests fail.
+* Populate version info (e.g. commit hash, build time.)
+* Produce a web archive (`.war`) artifact in the `target` directory.
 
-To install build dependencies (only needs to be run once):
-
-`npm install`
-
-To build:
-
-`npm run prepublish`
-
-This will compile and minify JavaScript sources, as well as copy over assets.
-The contents of the `dist` folder will contain a runnable Open MCT Web
-instance (e.g. by starting an HTTP server in that directory), including:
-
-* A `main.js` file containing Open MCT Web source code.
-* Various assets in the `example` and `platform` directories.
-* An `index.html` that runs Open MCT Web in its default configuration.
-
-Additional `gulp` tasks are defined in [the gulpfile](gulpfile.js).
+The produced artifact contains a subset of the repository's own folder 
+hierarchy, omitting tests and example bundles.        
 
 Note that an internet connection is required to run this build, in order to 
 download build dependencies.

example/eventGenerator/bundle.js

@@ -32,7 +32,7 @@ define([
 
     legacyRegistry.register("example/eventGenerator", {
         "name": "Event Message Generator",
-        "description": "For development use. Creates sample event message data that mimics a live data stream.",
+        "description": "Example of a component that produces event data.",
         "extensions": {
             "components": [
                 {
@@ -49,26 +49,16 @@ define([
                 {
                     "key": "eventGenerator",
                     "name": "Event Message Generator",
-                    "glyph": "\u0066",
-                    "description": "For development use. Creates sample event message data that mimics a live data stream.",
-                    "priority": 10,
+                    "glyph": "f",
+                    "description": "An event message generator",
                     "features": "creation",
                     "model": {
                         "telemetry": {}
                     },
                     "telemetry": {
                         "source": "eventGenerator",
-                        "domains": [
-                            {
-                                "key": "time",
-                                "name": "Time",
-                                "format": "utc"
-                            }
-                        ],
                         "ranges": [
                             {
-                                "key": "message",
-                                "name": "Message",
                                 "format": "string"
                             }
                         ]

example/eventGenerator/src/EventTelemetryProvider.js

@@ -37,8 +37,7 @@ define(
             var
 	            subscriptions = [],
 	            genInterval = 1000,
-                generating = false,
-                id = Math.random() * 100000;
+	            startTime = Date.now();
 
             //
             function matchesSource(request) {
@@ -80,13 +79,11 @@ define(
             }
 
             function startGenerating() {
-                generating = true;
                 $timeout(function () {
+	                //console.log("startGenerating... " + Date.now());
                     handleSubscriptions();
-                    if (generating && subscriptions.length > 0) {
+                    if (subscriptions.length > 0) {
                         startGenerating();
-                    } else {
-                        generating = false;
                     }
                 }, genInterval);
             }
@@ -96,6 +93,7 @@ define(
                     callback: callback,
                     requests: requests
                 };
+
                 function unsubscribe() {
                     subscriptions = subscriptions.filter(function (s) {
                         return s !== subscription;
@@ -103,7 +101,8 @@ define(
                 }
 
                 subscriptions.push(subscription);
-                if (!generating) {
+
+                if (subscriptions.length === 1) {
                     startGenerating();
                 }
 

example/export/ExportTelemetryAsCSVAction.js

@@ -1,89 +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 example of using the `exportService`; queries for telemetry
-     * and provides the results as a CSV file.
-     * @param {platform/exporters.ExportService} exportService the
-     *        service which will handle the CSV export
-     * @param {ActionContext} context the action's context
-     * @constructor
-     * @memberof example/export
-     * @implements {Action}
-     */
-    function ExportTelemetryAsCSVAction(exportService, context) {
-        this.exportService = exportService;
-        this.context = context;
-    }
-
-    ExportTelemetryAsCSVAction.prototype.perform = function () {
-        var context = this.context,
-            domainObject = context.domainObject,
-            telemetry = domainObject.getCapability("telemetry"),
-            metadata = telemetry.getMetadata(),
-            domains = metadata.domains,
-            ranges = metadata.ranges,
-            exportService = this.exportService;
-
-        function getName(domainOrRange) {
-            return domainOrRange.name;
-        }
-
-        telemetry.requestData({}).then(function (series) {
-            var headers = domains.map(getName).concat(ranges.map(getName)),
-                rows = [],
-                row,
-                i;
-
-            function copyDomainsToRow(row, index) {
-                domains.forEach(function (domain) {
-                    row[domain.name] = series.getDomainValue(index, domain.key);
-                });
-            }
-
-            function copyRangesToRow(row, index) {
-                ranges.forEach(function (range) {
-                    row[range.name] = series.getRangeValue(index, range.key);
-                });
-            }
-
-            for (i = 0; i < series.getPointCount(); i += 1) {
-                row = {};
-                copyDomainsToRow(row, i);
-                copyRangesToRow(row, i);
-                rows.push(row);
-            }
-            exportService.exportCSV(rows, { headers: headers });
-        });
-    };
-
-    ExportTelemetryAsCSVAction.appliesTo = function (context) {
-        return context.domainObject &&
-            context.domainObject.hasCapability("telemetry");
-    };
-
-    return ExportTelemetryAsCSVAction;
-});

example/generator/bundle.js

@@ -36,7 +36,7 @@ define([
 
     legacyRegistry.register("example/generator", {
         "name": "Sine Wave Generator",
-        "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
+        "description": "Example of a component that produces dataa.",
         "extensions": {
             "components": [
                 {
@@ -86,9 +86,8 @@ define([
                 {
                     "key": "generator",
                     "name": "Sine Wave Generator",
-                    "glyph": "\u0054",
-                    "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
-                    "priority": 10,
+                    "glyph": "T",
+                    "description": "A sine wave generator",
                     "features": "creation",
                     "model": {
                         "telemetry": {
@@ -127,7 +126,7 @@ define([
                         {
                             "name": "Period",
                             "control": "textfield",
-                            "cssclass": "l-input-sm l-numeric",
+                            "cssclass": "l-small l-numeric",
                             "key": "period",
                             "required": true,
                             "property": [

example/generator/src/SinewaveTelemetryProvider.js

@@ -34,8 +34,7 @@ define(
          * @constructor
          */
         function SinewaveTelemetryProvider($q, $timeout) {
-            var subscriptions = [],
-                generating = false;
+            var subscriptions = [];
 
             //
             function matchesSource(request) {
@@ -76,13 +75,10 @@ define(
             }
 
             function startGenerating() {
-                generating = true;
                 $timeout(function () {
                     handleSubscriptions();
-                    if (generating && subscriptions.length > 0) {
+                    if (subscriptions.length > 0) {
                         startGenerating();
-                    } else {
-                        generating = false;
                     }
                 }, 1000);
             }
@@ -101,7 +97,7 @@ define(
 
                 subscriptions.push(subscription);
 
-                if (!generating) {
+                if (subscriptions.length === 1) {
                     startGenerating();
                 }
 

example/imagery/bundle.js

@@ -49,10 +49,8 @@ define([
                 {
                     "key": "imagery",
                     "name": "Example Imagery",
-                    "glyph": "\u00e3",
+                    "glyph": "T",
                     "features": "creation",
-                    "description": "For development use. Creates example imagery data that mimics a live imagery stream.",
-                    "priority": 10,
                     "model": {
                         "telemetry": {}
                     },
@@ -62,7 +60,7 @@ define([
                             {
                                 "name": "Time",
                                 "key": "time",
-                                "format": "utc"
+                                "format": "timestamp"
                             }
                         ],
                         "ranges": [

example/mobile/res/config.rb

@@ -0,0 +1,26 @@
+# Require any additional compass plugins here.
+# require "compass-growl"
+
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "css"
+sass_dir = "sass"
+images_dir = "images"
+javascripts_dir = "js"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# :expanded, :compressed, :nested
+output_style = :nested
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass vfn_platform/static/sass scss && rm -rf sass && mv scss sass

example/mobile/res/css/mobile-example.css

@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/************************** FEATURES */
+/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */
+/************************** RATIOS */
+/************************** LAYOUT */
+/************************** CONTROLS */
+/************************** PATHS */
+/************************** TIMINGS */
+/************************** LIMITS */
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/************************** MOBILE REPRESENTATION ITEMS DIMENSIONS */
+/************************** MOBILE TREE MENU DIMENSIONS */
+/************************** WINDOW DIMENSIONS FOR RWD */
+/************************** MEDIA QUERIES: WINDOW CHECKS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */
+/************************** MEDIA QUERIES: WINDOWS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */
+/************************** DEVICE PARAMETERS FOR MENUS/REPRESENTATIONS */
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/* REQUIRES mobile/_constants */
+@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
+  /* line 28, ../sass/mobile-example.scss */
+  .create-btn-holder {
+    display: block !important; } }

example/msl/README.md

@@ -1,20 +0,0 @@
-To use this bundle, add the following paths to /main.js -
-'./platform/features/conductor/bundle',
-'./example/msl/bundle',
-
-An example plugin that integrates with public data from the Curiosity rover. 
-The data shown used by this plugin is published by the Centro de 
-Astrobiología (CSIC-INTA) at http://cab.inta-csic.es/rems/
-
-Fetching data from this source requires a cross-origin request which will 
-fail on most modern browsers due to restrictions on such requests. As such, 
-it is proxied through a local proxy defined in app.js. In order to use this 
-example you will need to run app.js locally.
-
-This example shows integration with an historical telemetry source, as 
-opposed to a real-time data source that is streaming back current information 
-about the state of a system. This example is atypical of a historical data 
-source in that it fetches all data in one request. The server infrastructure 
-of an historical telemetry source should ideally allow queries bounded by 
-time and other data attributes.
-

example/msl/bundle.js

@@ -1,118 +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([
-    "./src/RemsTelemetryServerAdapter",
-    "./src/RemsTelemetryInitializer",
-    "./src/RemsTelemetryModelProvider",
-    "./src/RemsTelemetryProvider",
-    'legacyRegistry',
-    "module"
-], function (
-    RemsTelemetryServerAdapter,
-    RemsTelemetryInitializer,
-    RemsTelemetryModelProvider,
-    RemsTelemetryProvider,
-    legacyRegistry
-) {
-    "use strict";
-    legacyRegistry.register("example/notifications", {
-        "name" : "Mars Science Laboratory Data Adapter",
-        "extensions" : {
-        "types": [
-            {
-                "name":"Mars Science Laboratory",
-                "key": "msl.curiosity",
-                "glyph": "o"
-            },
-            {
-                "name": "Instrument",
-                "key": "msl.instrument",
-                "glyph": "o",
-                "model": {"composition": []}
-            },
-            {
-                "name": "Measurement",
-                "key": "msl.measurement",
-                "glyph": "\u0054",
-                "model": {"telemetry": {}},
-                "telemetry": {
-                    "source": "rems.source",
-                    "domains": [
-                        {
-                            "name": "Time",
-                            "key": "timestamp",
-                            "format": "utc"
-                        }
-                    ]
-                }
-            }
-        ],
-        "constants": [
-            {
-                "key": "REMS_WS_URL",
-                "value": "/proxyUrl?url=http://cab.inta-csic.es/rems/wp-content/plugins/marsweather-widget/api.php"
-            }
-        ],
-        "roots": [
-            {
-                "id": "msl:curiosity",
-                "priority" : "preferred",
-                "model": {
-                    "type": "msl.curiosity",
-                    "name": "Mars Science Laboratory",
-                    "composition": []
-                }
-            }
-        ],
-        "services": [
-            {
-                "key":"rems.adapter",
-                "implementation": RemsTelemetryServerAdapter,
-                "depends": ["$q", "$http", "$log", "REMS_WS_URL"]
-            }
-        ],
-        "runs": [
-            {
-                "implementation": RemsTelemetryInitializer,
-                "depends": ["rems.adapter", "objectService"]
-            }
-        ],
-        "components": [
-            {
-                "provides": "modelService",
-                "type": "provider",
-                "implementation": RemsTelemetryModelProvider,
-                "depends": ["rems.adapter"]
-            },
-            {
-                "provides": "telemetryService",
-                "type": "provider",
-                "implementation": RemsTelemetryProvider,
-                "depends": ["rems.adapter", "$q"]
-            }
-        ]
-    }
-    });
-});
-

example/msl/src/MSLDataDictionary.js

@@ -1,79 +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(
-    [],
-    /**
-     * A data dictionary describes the telemetry available from a data
-     * source and its data types. The data dictionary will be parsed by a custom
-     * server provider for this data source (in this case
-     * {@link RemsTelemetryServerAdapter}).
-     *
-     * Typically a data dictionary would be made available alongside the
-     * telemetry data source itself.
-     */
-    function () {
-        return {
-            "name": "Mars Science Laboratory",
-            "identifier": "msl",
-            "instruments": [
-                {
-                    "name":"rems",
-                    "identifier": "rems",
-                    "measurements": [
-                        {
-                            "name": "Min. Air Temperature",
-                            "identifier": "min_temp",
-                            "units": "degrees",
-                            "type": "float"
-                        },
-                        {
-                            "name": "Max. Air Temperature",
-                            "identifier": "max_temp",
-                            "units": "degrees",
-                            "type": "float"
-                        },
-                        {
-                            "name": "Atmospheric Pressure",
-                            "identifier": "pressure",
-                            "units": "pascals",
-                            "type": "float"
-                        },
-                        {
-                            "name": "Min. Ground Temperature",
-                            "identifier": "min_gts_temp",
-                            "units": "degrees",
-                            "type": "float"
-                        },
-                        {
-                            "name": "Max. Ground Temperature",
-                            "identifier": "max_gts_temp",
-                            "units": "degrees",
-                            "type": "float"
-                        }
-                    ]
-                }
-            ]
-        };
-    }
-);

example/msl/src/RemsTelemetryInitializer.js

@@ -1,71 +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";
-
-        var TAXONOMY_ID = "msl:curiosity",
-            PREFIX = "msl_tlm:";
-
-        /**
-         * Function that is executed on application startup and populates
-         * the navigation tree with objects representing the MSL REMS
-         * telemetry points. The tree is populated based on the data
-         * dictionary on the provider.
-         *
-         * @param {RemsTelemetryServerAdapter} adapter The server adapter
-         * (necessary in order to retrieve data dictionary)
-         * @param objectService the ObjectService which allows for lookup of
-         * objects by ID
-         * @constructor
-         */
-        function RemsTelemetryInitializer(adapter, objectService) {
-            function makeId(element) {
-                return PREFIX + element.identifier;
-            }
-
-            function initializeTaxonomy(dictionary) {
-                function getTaxonomyObject(domainObjects) {
-                    return domainObjects[TAXONOMY_ID];
-                }
-
-                function populateModel (taxonomyObject) {
-                    return taxonomyObject.useCapability(
-                        "mutation",
-                        function (model) {
-                            model.name = dictionary.name;
-                            model.composition = dictionary.instruments.map(makeId);
-                        }
-                    );
-                }
-
-                objectService.getObjects([TAXONOMY_ID])
-                    .then(getTaxonomyObject)
-                    .then(populateModel);
-            }
-            initializeTaxonomy(adapter.dictionary);
-        }
-        return RemsTelemetryInitializer;
-    }
-);

example/msl/src/RemsTelemetryModelProvider.js

@@ -1,87 +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";
-
-        var PREFIX = "msl_tlm:",
-            FORMAT_MAPPINGS = {
-                float: "number",
-                integer: "number",
-                string: "string"
-            };
-
-        function RemsTelemetryModelProvider(adapter){
-
-            function isRelevant(id) {
-                return id.indexOf(PREFIX) === 0;
-            }
-
-            function makeId(element){
-                return PREFIX + element.identifier;
-            }
-
-            function buildTaxonomy(dictionary){
-                var models = {};
-
-                function addMeasurement(measurement){
-                    var format = FORMAT_MAPPINGS[measurement.type];
-                    models[makeId(measurement)] = {
-                        type: "msl.measurement",
-                        name: measurement.name,
-                        telemetry: {
-                            key: measurement.identifier,
-                            ranges: [{
-                                key: "value",
-                                name: measurement.units,
-                                units: measurement.units,
-                                format: format
-                            }]
-                        }
-                    };
-                }
-
-                function addInstrument(subsystem) {
-                    var measurements = (subsystem.measurements || []);
-                    models[makeId(subsystem)] = {
-                        type: "msl.instrument",
-                        name: subsystem.name,
-                        composition: measurements.map(makeId)
-                    };
-                    measurements.forEach(addMeasurement);
-                }
-
-                (dictionary.instruments || []).forEach(addInstrument);
-                return models;
-            }
-
-            return {
-                getModels: function (ids) {
-                    return ids.some(isRelevant) ? buildTaxonomy(adapter.dictionary) : {};
-                }
-            };
-        }
-        return RemsTelemetryModelProvider;
-    }
-);

example/msl/src/RemsTelemetryProvider.js

@@ -1,83 +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 (
-    ['./RemsTelemetrySeries'],
-    function (RemsTelemetrySeries) {
-        "use strict";
-
-        var SOURCE = "rems.source";
-
-        function RemsTelemetryProvider(adapter, $q) {
-            this.adapter = adapter;
-            this.$q = $q;
-        }
-
-        /**
-         * Retrieve telemetry from this telemetry source.
-         * @memberOf example/msl
-         * @param {Array<TelemetryRequest>} requests An array of all request
-         * objects (which needs to be filtered to only those relevant to this
-         * source)
-         * @returns {Promise} A {@link Promise} resolved with a {@link RemsTelemetrySeries}
-         * object that wraps the telemetry returned from the telemetry source.
-         */
-        RemsTelemetryProvider.prototype.requestTelemetry = function (requests) {
-            var packaged = {},
-                relevantReqs,
-                adapter = this.adapter;
-
-            function matchesSource(request) {
-                return (request.source === SOURCE);
-            }
-
-            function addToPackage(history) {
-                packaged[SOURCE][history.id] =
-                    new RemsTelemetrySeries(history.values);
-            }
-
-            function handleRequest(request) {
-                return adapter.history(request).then(addToPackage);
-            }
-
-            relevantReqs = requests.filter(matchesSource);
-            packaged[SOURCE] = {};
-
-            return this.$q.all(relevantReqs.map(handleRequest))
-                .then(function () {
-                    return packaged;
-                });
-        };
-
-        /**
-         * This data source does not support real-time subscriptions
-         */
-        RemsTelemetryProvider.prototype.subscribe = function (callback, requests) {
-            return function() {};
-        };
-        RemsTelemetryProvider.prototype.unsubscribe = function (callback, requests) {
-            return function() {};
-        };
-
-        return RemsTelemetryProvider;
-    }
-);

example/msl/src/RemsTelemetrySeries.js

@@ -1,84 +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";
-
-        /**
-         * @typedef {Object} RemsTelemetryValue
-         * @memberOf example/msl
-         * @property {number} date The date/time of the telemetry value. Constitutes the domain value of this value pair
-         * @property {number} value The value of this telemetry datum.
-         * A floating point value representing some observable quantity (eg.
-         * temperature, air pressure, etc.)
-         */
-
-        /**
-         * A representation of a collection of telemetry data. The REMS
-         * telemetry data is time ordered, with the 'domain' value
-         * constituting the time stamp of each data value and the
-         * 'range' being the value itself.
-         *
-         * TelemetrySeries will typically wrap an array of telemetry data,
-         * and provide an interface for retrieving individual an telemetry
-         * value.
-         * @memberOf example/msl
-         * @param {Array<RemsTelemetryValue>} data An array of telemetry values
-         * @constructor
-         */
-        function RemsTelemetrySeries(data) {
-            this.data = data;
-        }
-
-        /**
-         * @returns {number} A count of the number of data values available in
-         * this series
-         */
-        RemsTelemetrySeries.prototype.getPointCount = function() {
-                    return this.data.length;
-        };
-        /**
-         * The domain value at the given index. The Rems telemetry data is
-         * time ordered, so the domain value is the time stamp of each data
-         * value.
-         * @param index
-         * @returns {number} the time value in ms since 1 January 1970
-         */
-        RemsTelemetrySeries.prototype.getDomainValue = function(index) {
-                    return this.data[index].date;
-        };
-
-        /**
-         * The range value of the REMS data set is the value of the thing
-         * being measured, be it temperature, air pressure, etc.
-         * @param index The datum in the data series to return the range
-         * value of.
-         * @returns {number} A floating point number
-         */
-        RemsTelemetrySeries.prototype.getRangeValue = function(index) {
-                    return this.data[index].value;
-        };
-
-        return RemsTelemetrySeries;
-    }
-);

example/msl/src/RemsTelemetryServerAdapter.js

@@ -1,142 +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*/
-/*jslint es5: true */
-
-define(
-    [
-        "./MSLDataDictionary",
-        "module"
-    ],
-    function (MSLDataDictionary, module) {
-        "use strict";
-
-        var TERRESTRIAL_DATE = "terrestrial_date",
-            LOCAL_DATA = "../data/rems.json";
-
-        /**
-         * Fetches historical data from the REMS instrument on the Curiosity
-         * Rover.
-         * @memberOf example/msl
-         * @param $q
-         * @param $http
-         * @param REMS_WS_URL The location of the REMS telemetry data.
-         * @constructor
-         */
-        function RemsTelemetryServerAdapter($q, $http, $log, REMS_WS_URL) {
-            this.localDataURI = module.uri.substring(0, module.uri.lastIndexOf('/') + 1) + LOCAL_DATA;
-            this.deferreds = {};
-            this.REMS_WS_URL = REMS_WS_URL;
-            this.$q = $q;
-            this.$http = $http;
-            this.$log = $log;
-            this.cache = undefined;
-        }
-
-        /**
-         * The data dictionary for this data source.
-         * @type {MSLDataDictionary}
-         */
-        RemsTelemetryServerAdapter.prototype.dictionary = MSLDataDictionary;
-
-        /**
-         * Fetches historical data from source, and associates it with the
-         * given request ID.
-         * @private
-         */
-        RemsTelemetryServerAdapter.prototype.requestHistory = function(request) {
-            var self = this,
-                id = request.key,
-                deferred = this.$q.defer();
-
-            function processResponse(response){
-                var data = [];
-                /*
-                 * Currently all data is returned for entire history of the mission. Cache response to avoid unnecessary re-queries.
-                 */
-                self.cache = response;
-                /*
-                 * History data is organised by Sol. Iterate over sols...
-                 */
-                response.data.soles.forEach(function(solData){
-                    /*
-                     * Check that valid data exists
-                     */
-                    if (!isNaN(solData[id])) {
-                        /*
-                         * Append each data point to the array of values
-                         * for this data point property (min. temp, etc).
-                         */
-                        data.unshift({
-                            date: Date.parse(solData[TERRESTRIAL_DATE]),
-                            value: solData[id]
-                        });
-                    }
-                });
-                return data;
-            }
-
-            function fallbackToLocal() {
-                self.$log.warn("Loading REMS data failed, probably due to" +
-                    " cross origin policy. Falling back to local data");
-                return self.$http.get(self.localDataURI);
-            }
-
-            //Filter results to match request parameters
-            function filterResults(results) {
-                return results.filter(function(result){
-                    return result.date >= (request.start || Number.MIN_VALUE) &&
-                        result.date <= (request.end || Number.MAX_VALUE);
-                });
-            }
-
-            function packageAndResolve(results){
-                deferred.resolve({id: id, values: results});
-            }
-
-
-            this.$q.when(this.cache || this.$http.get(this.REMS_WS_URL))
-                .catch(fallbackToLocal)
-                .then(processResponse)
-                .then(filterResults)
-                .then(packageAndResolve);
-
-            return deferred.promise;
-        };
-
-        /**
-         * Requests historical telemetry for the named data attribute. In
-         * the case of REMS, this data source exposes multiple different
-         * data variables from the REMS instrument, including temperature
-         * and others
-         * @param id The telemetry data point key to be queried.
-         * @returns {Promise | Array<RemsTelemetryValue>} that resolves with an Array of {@link RemsTelemetryValue} objects for the request data key.
-         */
-        RemsTelemetryServerAdapter.prototype.history = function(request) {
-            var id = request.key;
-            return this.requestHistory(request);
-        };
-
-        return RemsTelemetryServerAdapter;
-    }
-);
-

example/notifications/res/dialog-launch.html

@@ -1,9 +1,10 @@
 <span class="status block ok" ng-controller="DialogLaunchController">
-    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <span class="ui-symbol status-indicator">&#xe600;</span><span class="label">
+    <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>
+    <span class="count">Dialogs</span>
 </span>

example/notifications/res/notification-launch.html

@@ -1,9 +1,10 @@
 <span class="status block ok" ng-controller="NotificationLaunchController">
-    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <span class="ui-symbol status-indicator">&#xe600;</span><span class="label">
+    <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>
+    <span class="count">Notifications</span>
 </span>

example/plotOptions/bundle.js

@@ -23,12 +23,10 @@
 
 define([
     'legacyRegistry',
-    '../../platform/commonUI/browse/src/InspectorRegion',
-    '../../platform/commonUI/regions/src/Region'
+    '../../platform/commonUI/browse/src/InspectorRegion'
 ], function (
     legacyRegistry,
-    InspectorRegion,
-    Region
+    InspectorRegion
 ) {
     "use strict";
 
@@ -47,22 +45,22 @@ define([
       * to the same representation, but a different key could be used here to
       * include a customized representation for edit mode.
       */
-        plotOptionsBrowseRegion = new Region({
+        plotOptionsBrowsePart = {
             name: "plot-options",
             title: "Plot Options",
             modes: ['browse'],
             content: {
                 key: "plot-options-browse"
             }
-        }),
-        plotOptionsEditRegion = new Region({
+        },
+        plotOptionsEditPart = {
             name: "plot-options",
             title: "Plot Options",
             modes: ['edit'],
             content: {
                 key: "plot-options-browse"
             }
-        });
+        };
 
     /**
      * Both parts are added, and policies of type 'region' will determine
@@ -70,8 +68,8 @@ define([
      * provided which will check the 'modes' attribute of the region part
      * definition.
      */
-    plotInspector.addRegion(plotOptionsBrowseRegion);
-    plotInspector.addRegion(plotOptionsEditRegion);
+    plotInspector.addPart(plotOptionsBrowsePart);
+    plotInspector.addPart(plotOptionsEditPart);
 
     legacyRegistry.register("example/plotType", {
         "name": "Plot Type",
@@ -80,10 +78,9 @@ define([
             "types": [
                 {
                     "key": "plot",
-                    "name": "Example Telemetry Plot",
-                    "glyph": "\u0074",
-                    "description": "For development use. A plot for displaying telemetry.",
-                    "priority": 10,
+                    "name": "Telemetry Plot",
+                    "glyph": "t",
+                    "description": "A plot for displaying telemetry",
                     "delegates": [
                         "telemetry"
                     ],
@@ -96,7 +93,9 @@ define([
                     "model": {
                         "composition": []
                     },
-                    "inspector": plotInspector,
+                    "regions": {
+                        "inspector": plotInspector
+                    },
                     "telemetry": {
                         "source": "generator",
                         "domains": [

gulpfile.js

@@ -1,141 +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 require,__dirname*/
-var gulp = require('gulp'),
-    requirejsOptimize = require('gulp-requirejs-optimize'),
-    sourcemaps = require('gulp-sourcemaps'),
-    rename = require('gulp-rename'),
-    sass = require('gulp-sass'),
-    bourbon = require('node-bourbon'),
-    jshint = require('gulp-jshint'),
-    jscs = require('gulp-jscs'),
-    replace = require('gulp-replace-task'),
-    karma = require('karma'),
-    path = require('path'),
-    fs = require('fs'),
-    git = require('git-rev-sync'),
-    moment = require('moment'),
-    project = require('./package.json'),
-    paths = {
-        main: 'main.js',
-        dist: 'dist',
-        assets: 'dist/assets',
-        scss: ['./platform/**/*.scss', './example/**/*.scss'],
-        scripts: [ 'main.js', 'platform/**/*.js', 'src/**/*.js' ],
-        static: [
-            'index.html',
-            'platform/**/*',
-            'example/**/*',
-            'bower_components/**/*'
-        ]
-    },
-    options = {
-        requirejsOptimize: {
-            name: paths.main.replace(/\.js$/, ''),
-            mainConfigFile: paths.main,
-            wrapShim: true
-        },
-        karma: {
-            configFile: path.resolve(__dirname, 'karma.conf.js'),
-            singleRun: true
-        },
-        sass: {
-            includePaths: bourbon.includePaths,
-            sourceComments: true
-        },
-        replace: {
-            variables: {
-                version: project.version,
-                timestamp: moment.utc(Date.now()).format(),
-                revision: fs.existsSync('.git') ? git.long() : 'Unknown',
-                branch: fs.existsSync('.git') ? git.branch() : 'Unknown'
-            }
-        }
-    };
-
-gulp.task('scripts', function () {
-    return gulp.src(paths.main)
-        .pipe(sourcemaps.init())
-        .pipe(requirejsOptimize(options.requirejsOptimize))
-        .pipe(sourcemaps.write('.'))
-        .pipe(replace(options.replace))
-        .pipe(gulp.dest(paths.dist));
-});
-
-gulp.task('test', function (done) {
-    new karma.Server(options.karma, done).start();
-});
-
-gulp.task('stylesheets', function () {
-    return gulp.src(paths.scss, {base: '.'})
-        .pipe(sourcemaps.init())
-        .pipe(sass(options.sass).on('error', sass.logError))
-        .pipe(rename(function (file) {
-            file.dirname = file.dirname.replace('/sass', '/css');
-            return file;
-        }))
-        .pipe(sourcemaps.write('.'))
-        .pipe(gulp.dest(__dirname));
-});
-
-gulp.task('lint', function () {
-    return gulp.src(paths.scripts)
-        .pipe(jshint())
-        .pipe(jshint.reporter('default'))
-        .pipe(jshint.reporter('fail'));
-});
-
-gulp.task('checkstyle', function () {
-    return gulp.src(paths.scripts)
-        .pipe(jscs())
-        .pipe(jscs.reporter())
-        .pipe(jscs.reporter('fail'));
-});
-
-gulp.task('fixstyle', function () {
-    return gulp.src(paths.scripts, { base: '.' })
-        .pipe(jscs({ fix: true }))
-        .pipe(gulp.dest('.'));
-});
-
-gulp.task('static', ['stylesheets'], function () {
-    return gulp.src(paths.static, { base: '.' })
-        .pipe(gulp.dest(paths.dist));
-});
-
-gulp.task('watch', function () {
-    gulp.watch(paths.scss, ['stylesheets']);
-});
-
-gulp.task('serve', function () {
-    console.log('Running development server with all defaults');
-    var app = require('./app.js');
-});
-
-gulp.task('develop', ['serve', 'stylesheets', 'watch']);
-
-gulp.task('install', [ 'static', 'scripts' ]);
-
-gulp.task('verify', [ 'lint', 'test' ]);
-
-gulp.task('build', [ 'verify', 'install' ]);

index.html

@@ -26,25 +26,16 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title></title>
     <script type="text/javascript"
-            src="bower_components/requirejs/require.js">
+            src="platform/framework/lib/require.js"
+            data-main="main.js">
     </script>
-    <script type="text/javascript">
-        require(['main'], function (mct) {
-            mct.run();
-        });
-    </script>
-    <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
-    <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
 	<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
 	<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
 	<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
 	<link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
 </head>
-<body class="user-environ">
-    <div class="l-splash-holder s-splash-holder">
-        <div class="l-splash s-splash"></div>
-    </div>
+<body class="user-environ" ng-view>
+
 
-    <div ng-view></div>
 </body>
 </html>

karma.conf.js

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global module,process*/
+/*global module*/
 module.exports = function(config) {
     config.set({
 
@@ -34,12 +34,10 @@ module.exports = function(config) {
         // List of files / patterns to load in the browser.
         // By default, files are also included in a script tag.
         files: [
-            {pattern: 'bower_components/**/*.js', included: false},
             {pattern: 'src/**/*.js', included: false},
             {pattern: 'example/**/*.js', included: false},
             {pattern: 'platform/**/*.js', included: false},
             {pattern: 'warp/**/*.js', included: false},
-            {pattern: 'platform/**/*.html', included: false},
             'test-main.js'
         ],
 
@@ -51,14 +49,13 @@ module.exports = function(config) {
         // Preprocess matching files before serving them to the browser.
         // https://npmjs.org/browse/keyword/karma-preprocessor
         preprocessors: {
-            'src/**/src/**/!(*Spec).js': [ 'coverage' ],
-            'platform/**/src/**/!(*Spec).js': [ 'coverage' ]
+            '**/src/**/!(*Spec).js': [ 'coverage' ]
         },
 
         // Test results reporter to use
         // Possible values: 'dots', 'progress'
         // Available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['progress', 'coverage', 'html', 'junit'],
+        reporters: ['progress', 'coverage', 'html'],
 
         // Web server port.
         port: 9876,
@@ -79,14 +76,7 @@ module.exports = function(config) {
 
         // Code coverage reporting.
         coverageReporter: {
-            dir: process.env.CIRCLE_ARTIFACTS ?
-                process.env.CIRCLE_ARTIFACTS + '/coverage' :
-                "dist/coverage",
-            check: {
-                global: {
-                    lines: 80
-                }
-            }
+            dir: "target/coverage"
         },
 
         // HTML test reporting.
@@ -96,10 +86,6 @@ module.exports = function(config) {
             foldAll: false
         },
 
-        junitReporter: {
-            outputDir: process.env.CIRCLE_TEST_REPORTS || 'target/junit'
-        },
-
         // Continuous Integration mode.
         // If true, Karma captures browsers, runs the tests and exits.
         singleRun: true

main.js

@@ -24,30 +24,12 @@
 requirejs.config({
     "paths": {
         "legacyRegistry": "src/legacyRegistry",
-        "angular": "bower_components/angular/angular.min",
-        "angular-route": "bower_components/angular-route/angular-route.min",
-        "csv": "bower_components/comma-separated-values/csv.min",
-        "es6-promise": "bower_components/es6-promise/promise.min",
-        "moment": "bower_components/moment/moment",
-        "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
-        "saveAs": "bower_components/FileSaver.js/FileSaver.min",
-        "screenfull": "bower_components/screenfull/dist/screenfull.min",
-        "text": "bower_components/text/text",
-        "uuid": "bower_components/node-uuid/uuid",
-        "zepto": "bower_components/zepto/zepto.min"
+        "angular": "platform/framework/lib/angular.min",
+        "moment": 'platform/telemetry/lib/moment.min'
     },
     "shim": {
         "angular": {
             "exports": "angular"
-        },
-        "angular-route": {
-            "deps": [ "angular" ]
-        },
-        "moment-duration-format": {
-            "deps": [ "moment" ]
-        },
-        "zepto": {
-            "exports": "Zepto"
         }
     }
 });
@@ -71,15 +53,15 @@ define([
     './platform/commonUI/notification/bundle',
     './platform/containment/bundle',
     './platform/execution/bundle',
-    './platform/exporters/bundle',
     './platform/telemetry/bundle',
     './platform/features/clock/bundle',
+    './platform/features/events/bundle',
     './platform/features/imagery/bundle',
     './platform/features/layout/bundle',
     './platform/features/pages/bundle',
     './platform/features/plot/bundle',
+    './platform/features/scrolling/bundle',
     './platform/features/timeline/bundle',
-    './platform/features/table/bundle',
     './platform/forms/bundle',
     './platform/identity/bundle',
     './platform/persistence/aggregator/bundle',
@@ -96,11 +78,5 @@ define([
     './example/generator/bundle'
 ], function (Main, legacyRegistry) {
     'use strict';
-
-    return {
-        legacyRegistry: legacyRegistry,
-        run: function () {
-            return new Main().run(legacyRegistry);
-        }
-    };
+    new Main().run(legacyRegistry);
 });

package.json

@@ -1,61 +1,45 @@
 {
-  "name": "openmctweb",
-  "version": "0.10.0-SNAPSHOT",
-  "description": "The Open MCT core platform",
+  "name": "open-mct-web",
+  "version": "0.7.2",
+  "description": "The OpenMCTWeb core platform",
   "dependencies": {
     "express": "^4.13.1",
-    "minimist": "^1.1.1",
-    "request": "^2.69.0"
+    "minimist": "^1.1.1"
   },
   "devDependencies": {
-    "bower": "^1.7.7",
-    "git-rev-sync": "^1.4.0",
     "glob": ">= 3.0.0",
-    "gulp": "^3.9.0",
-    "gulp-jscs": "^3.0.2",
-    "gulp-jshint": "^2.0.0",
-    "gulp-rename": "^1.2.2",
-    "gulp-replace-task": "^0.11.0",
-    "gulp-requirejs-optimize": "^0.3.1",
-    "gulp-sass": "^2.2.0",
-    "gulp-sourcemaps": "^1.6.0",
     "jasmine-core": "^2.3.0",
     "jsdoc": "^3.3.2",
     "jshint": "^2.7.0",
-    "karma": "^0.13.3",
+    "karma": "^0.12.31",
     "karma-chrome-launcher": "^0.1.8",
     "karma-cli": "0.0.4",
     "karma-coverage": "^0.5.3",
     "karma-html-reporter": "^0.2.7",
     "karma-jasmine": "^0.1.5",
-    "karma-junit-reporter": "^0.3.8",
-    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-phantomjs-launcher": "^0.2.3",
     "karma-requirejs": "^0.2.2",
     "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
     "mkdirp": "^0.5.1",
-    "moment": "^2.11.1",
-    "node-bourbon": "^4.2.3",
-    "phantomjs-prebuilt": "^2.1.0",
-    "requirejs": "2.1.x",
+    "phantomjs": "^1.9.19",
+    "requirejs": "^2.1.17",
     "split": "^1.0.0"
   },
   "scripts": {
     "start": "node app.js",
     "test": "karma start --single-run",
-    "jshint": "jshint platform example",
+    "jshint": "jshint platform example || exit 0",
     "watch": "karma start",
     "jsdoc": "jsdoc -c jsdoc.json -r -d target/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out target/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
-    "docs": "npm run jsdoc ; npm run otherdoc",
-    "prepublish": "./node_modules/bower/bin/bower install && ./node_modules/gulp/bin/gulp.js install"
+    "docs": "npm run jsdoc ; npm run otherdoc"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/nasa/openmctweb.git"
   },
   "author": "",
-  "license": "Apache-2.0",
-  "private": true
+  "license": "Apache-2.0"
 }

platform/commonUI/about/bundle.js

@@ -22,30 +22,14 @@
 /*global define*/
 
 define([
-    "text!./res/templates/about-dialog.html",
     "./src/LogoController",
     "./src/AboutController",
     "./src/LicenseController",
-    "text!./res/templates/app-logo.html",
-    "text!./res/templates/about-logo.html",
-    "text!./res/templates/overlay-about.html",
-    "text!./res/templates/license-apache.html",
-    "text!./res/templates/license-mit.html",
-    "text!./res/templates/licenses.html",
-    "text!./res/templates/licenses-export-md.html",
     'legacyRegistry'
 ], function (
-    aboutDialogTemplate,
     LogoController,
     AboutController,
     LicenseController,
-    appLogoTemplate,
-    aboutLogoTemplate,
-    overlayAboutTemplate,
-    licenseApacheTemplate,
-    licenseMitTemplate,
-    licensesTemplate,
-    licensesExportMdTemplate,
     legacyRegistry
 ) {
     "use strict";
@@ -57,28 +41,28 @@ define([
                 {
                     "key": "app-logo",
                     "priority": "optional",
-                    "template": appLogoTemplate
+                    "templateUrl": "templates/app-logo.html"
                 },
                 {
                     "key": "about-logo",
                     "priority": "preferred",
-                    "template": aboutLogoTemplate
+                    "templateUrl": "templates/about-logo.html"
                 },
                 {
                     "key": "about-dialog",
-                    "template": aboutDialogTemplate
+                    "templateUrl": "templates/about-dialog.html"
                 },
                 {
                     "key": "overlay-about",
-                    "template": overlayAboutTemplate
+                    "templateUrl": "templates/overlay-about.html"
                 },
                 {
                     "key": "license-apache",
-                    "template": licenseApacheTemplate
+                    "templateUrl": "templates/license-apache.html"
                 },
                 {
                     "key": "license-mit",
-                    "template": licenseMitTemplate
+                    "templateUrl": "templates/license-mit.html"
                 }
             ],
             "controllers": [
@@ -170,11 +154,11 @@ define([
             "routes": [
                 {
                     "when": "/licenses",
-                    "template": licensesTemplate
+                    "templateUrl": "templates/licenses.html"
                 },
                 {
                     "when": "/licenses-md",
-                    "template": licensesExportMdTemplate
+                    "templateUrl": "templates/licenses-export-md.html"
                 }
             ]
         }

platform/commonUI/about/res/templates/about-dialog.html

@@ -20,7 +20,11 @@
  at runtime from the About dialog for additional information.
 -->
 <div class="abs t-about l-about t-about-openmctweb s-about" ng-controller = "AboutController as about">
-    <div class="l-splash s-splash"></div>
+    <div class="l-logo-holder s-logo-holder">
+        <div class="l-logo s-logo s-logo-nasa"></div>
+        <div class="l-logo l-logo-app s-logo s-logo-openmctweb"></div>
+    </div>
+
     <div class="s-text l-content">
         <h1 class="l-title s-title">OpenMCT Web</h1>
         <div class="l-description s-description">

platform/commonUI/browse/bundle.js

@@ -34,21 +34,9 @@ define([
     "./src/windowing/NewTabAction",
     "./src/windowing/FullscreenAction",
     "./src/creation/CreateActionProvider",
-    "./src/creation/AddActionProvider",
     "./src/creation/CreationService",
     "./src/windowing/WindowTitler",
-    "text!./res/templates/browse.html",
-    "text!./res/templates/create/locator.html",
-    "text!./res/templates/browse-object.html",
-    "text!./res/templates/create/create-button.html",
-    "text!./res/templates/create/create-menu.html",
-    "text!./res/templates/items/grid-item.html",
-    "text!./res/templates/browse/object-header.html",
-    "text!./res/templates/menu-arrow.html",
-    "text!./res/templates/back-arrow.html",
-    "text!./res/templates/items/items.html",
-    "text!./res/templates/browse/object-properties.html",
-    "text!./res/templates/browse/inspector-region.html",
+    "./src/TypeRegionDecorator",
     'legacyRegistry'
 ], function (
     BrowseController,
@@ -63,21 +51,9 @@ define([
     NewTabAction,
     FullscreenAction,
     CreateActionProvider,
-    AddActionProvider,
     CreationService,
     WindowTitler,
-    browseTemplate,
-    locatorTemplate,
-    browseObjectTemplate,
-    createButtonTemplate,
-    createMenuTemplate,
-    gridItemTemplate,
-    objectHeaderTemplate,
-    menuArrowTemplate,
-    backArrowTemplate,
-    itemsTemplate,
-    objectPropertiesTemplate,
-    inspectorRegionTemplate,
+    TypeRegionDecorator,
     legacyRegistry
 ) {
     "use strict";
@@ -87,22 +63,15 @@ define([
             "routes": [
                 {
                     "when": "/browse/:ids*",
-                    "template": browseTemplate,
+                    "templateUrl": "templates/browse.html",
                     "reloadOnSearch": false
                 },
                 {
                     "when": "",
-                    "template": browseTemplate,
+                    "templateUrl": "templates/browse.html",
                     "reloadOnSearch": false
                 }
             ],
-            "constants": [
-                {
-                    "key": "DEFAULT_PATH",
-                    "value": "mine",
-                    "priority": "fallback"
-                }
-            ],
             "controllers": [
                 {
                     "key": "BrowseController",
@@ -111,12 +80,9 @@ define([
                         "$scope",
                         "$route",
                         "$location",
-                        "$window",
                         "objectService",
                         "navigationService",
-                        "urlService",
-                        "policyService",
-                        "DEFAULT_PATH"
+                        "urlService"
                     ]
                 },
                 {
@@ -135,7 +101,9 @@ define([
                     "depends": [
                         "$scope",
                         "$location",
-                        "$route"
+                        "$route",
+                        "$q",
+                        "navigationService"
                     ]
                 },
                 {
@@ -150,8 +118,7 @@ define([
                     "implementation": LocatorController,
                     "depends": [
                         "$scope",
-                        "$timeout",
-                        "objectService"
+                        "$timeout"
                     ]
                 },
                 {
@@ -165,17 +132,13 @@ define([
             "controls": [
                 {
                     "key": "locator",
-                    "template": locatorTemplate
+                    "templateUrl": "templates/create/locator.html"
                 }
             ],
             "representations": [
-                {
-                    "key": "view-object",
-                    "templateUrl": "templates/view-object.html"
-                },
                 {
                     "key": "browse-object",
-                    "template": browseObjectTemplate,
+                    "templateUrl": "templates/browse-object.html",
                     "gestures": [
                         "drop"
                     ],
@@ -185,18 +148,18 @@ define([
                 },
                 {
                     "key": "create-button",
-                    "template": createButtonTemplate
+                    "templateUrl": "templates/create/create-button.html"
                 },
                 {
                     "key": "create-menu",
-                    "template": createMenuTemplate,
+                    "templateUrl": "templates/create/create-menu.html",
                     "uses": [
                         "action"
                     ]
                 },
                 {
                     "key": "grid-item",
-                    "template": gridItemTemplate,
+                    "templateUrl": "templates/items/grid-item.html",
                     "uses": [
                         "type",
                         "action",
@@ -209,14 +172,14 @@ define([
                 },
                 {
                     "key": "object-header",
-                    "template": objectHeaderTemplate,
+                    "templateUrl": "templates/browse/object-header.html",
                     "uses": [
                         "type"
                     ]
                 },
                 {
                     "key": "menu-arrow",
-                    "template": menuArrowTemplate,
+                    "templateUrl": "templates/menu-arrow.html",
                     "uses": [
                         "action"
                     ],
@@ -229,15 +192,19 @@ define([
                     "uses": [
                         "context"
                     ],
-                    "template": backArrowTemplate
+                    "templateUrl": "templates/back-arrow.html"
                 },
                 {
                     "key": "object-properties",
-                    "template": objectPropertiesTemplate
+                    "templateUrl": "templates/browse/object-properties.html"
                 },
                 {
                     "key": "inspector-region",
-                    "template": inspectorRegionTemplate
+                    "templateUrl": "templates/browse/inspector-region.html"
+                },
+                {
+                    "key": "view-region",
+                    "templateUrl": "templates/view-region.html"
                 }
             ],
             "services": [
@@ -293,7 +260,7 @@ define([
                     "name": "Items",
                     "glyph": "9",
                     "description": "Grid of available items",
-                    "template": itemsTemplate,
+                    "templateUrl": "templates/items/items.html",
                     "uses": [
                         "composition"
                     ],
@@ -317,18 +284,6 @@ define([
                         "policyService"
                     ]
                 },
-                {
-                    "key": "AddActionProvider",
-                    "provides": "actionService",
-                    "type": "provider",
-                    "implementation": AddActionProvider,
-                    "depends": [
-                        "$q",
-                        "typeService",
-                        "dialogService",
-                        "policyService"
-                    ]
-                },
                 {
                     "key": "CreationService",
                     "provides": "creationService",
@@ -338,6 +293,11 @@ define([
                         "$q",
                         "$log"
                     ]
+                },
+                {
+                    "provides": "typeService",
+                    "type": "decorator",
+                    "implementation": TypeRegionDecorator
                 }
             ],
             "runs": [

platform/commonUI/browse/lib/screenfull.min.js

@@ -0,0 +1,6 @@
+/*!
+* screenfull
+* v1.2.0 - 2014-04-29
+* (c) Sindre Sorhus; MIT License
+*/
+!function(){"use strict";var a="undefined"!=typeof module&&module.exports,b="undefined"!=typeof Element&&"ALLOW_KEYBOARD_INPUT"in Element,c=function(){for(var a,b,c=[["requestFullscreen","exitFullscreen","fullscreenElement","fullscreenEnabled","fullscreenchange","fullscreenerror"],["webkitRequestFullscreen","webkitExitFullscreen","webkitFullscreenElement","webkitFullscreenEnabled","webkitfullscreenchange","webkitfullscreenerror"],["webkitRequestFullScreen","webkitCancelFullScreen","webkitCurrentFullScreenElement","webkitCancelFullScreen","webkitfullscreenchange","webkitfullscreenerror"],["mozRequestFullScreen","mozCancelFullScreen","mozFullScreenElement","mozFullScreenEnabled","mozfullscreenchange","mozfullscreenerror"],["msRequestFullscreen","msExitFullscreen","msFullscreenElement","msFullscreenEnabled","MSFullscreenChange","MSFullscreenError"]],d=0,e=c.length,f={};e>d;d++)if(a=c[d],a&&a[1]in document){for(d=0,b=a.length;b>d;d++)f[c[0][d]]=a[d];return f}return!1}(),d={request:function(a){var d=c.requestFullscreen;a=a||document.documentElement,/5\.1[\.\d]* Safari/.test(navigator.userAgent)?a[d]():a[d](b&&Element.ALLOW_KEYBOARD_INPUT)},exit:function(){document[c.exitFullscreen]()},toggle:function(a){this.isFullscreen?this.exit():this.request(a)},onchange:function(){},onerror:function(){},raw:c};return c?(Object.defineProperties(d,{isFullscreen:{get:function(){return!!document[c.fullscreenElement]}},element:{enumerable:!0,get:function(){return document[c.fullscreenElement]}},enabled:{enumerable:!0,get:function(){return!!document[c.fullscreenEnabled]}}}),document.addEventListener(c.fullscreenchange,function(a){d.onchange.call(d,a)}),document.addEventListener(c.fullscreenerror,function(a){d.onerror.call(d,a)}),void(a?module.exports=d:window.screenfull=d)):void(a?module.exports=!1:window.screenfull=!1)}();

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

@@ -55,8 +55,9 @@
             </div>
             <mct-representation key="representation.selected.key"
                                 mct-object="representation.selected.key && domainObject"
-                                class="abs flex-elem grows object-holder-main scroll">
+                                class="abs flex-elem grows object-holder-main scroll"
+                                toolbar="toolbar">
             </mct-representation>
-        </div>
+        </div><!--/ l-object-wrapper-inner -->
     </div>
 </div>

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

@@ -63,7 +63,7 @@
                     <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="'view-object'"
+                                                key="'view-region'"
                                                 class="abs holder holder-object">
                             </mct-representation>
                         </div>
@@ -87,4 +87,3 @@
     </div>
     <mct-include key="'bottombar'"></mct-include>
 </div>
-

platform/commonUI/browse/res/templates/browse/inspector-region.html

@@ -19,12 +19,12 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="InspectorController">
-    <div ng-repeat="region in regions">
+<div ng-controller="RegionController as regionController">
+    <div ng-repeat="part in regions.inspector.parts">
         <mct-representation
-                key="region.content.key"
+                key="part.content.key"
                 mct-object="domainObject"
                 ng-model="ngModel">
         </mct-representation>
     </div>
-</div>
+</div><!--/ PaneController -->

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

@@ -32,7 +32,6 @@
         </li>
         <li ng-if="contextutalParents.length > 0">
             <em class="t-inspector-part-header" title="The location of this linked object.">Location</em>
-            <div ng-if="primaryParents.length > 0" class="section-header">This Object</div>
             <span class="inspector-location"
                   ng-repeat="parent in contextutalParents"
                   ng-class="{ last:($index + 1) === contextualParents.length }">
@@ -45,7 +44,7 @@
             </span>
         </li>
         <li ng-if="primaryParents.length > 0">
-            <div class="section-header">Object's Original</div>
+            <em class="t-inspector-part-header" title="The location of the original object that this was linked from.">Original Location</em>
             <span class="inspector-location"
                   ng-repeat="parent in primaryParents"
                   ng-class="{ last:($index + 1) === primaryParents.length }">
@@ -58,4 +57,4 @@
             </span>
         </li>
     </ul>
-</div>
+</div><!--/ holder-inspector -->

platform/commonUI/browse/res/templates/view-region.html

@@ -19,12 +19,12 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="TableOptionsController" class="l-controls-first flex-elem grows l-inspector-part">
-    <em class="t-inspector-part-header" title="Display properties for this object">Table Options</em>
-    <mct-form
-            ng-model="configuration.table.columns"
-            structure="columnsForm"
-            name="columnsFormState"
-            class="flex-elem l-flex-row no-validate no-margin">
-    </mct-form>
-</div>
+<div ng-controller="RegionController as regionController">
+    <div ng-repeat="part in regions.view.parts">
+        <mct-representation
+                key="part.content.key"
+                mct-object="domainObject"
+                ng-model="ngModel">
+        </mct-representation>
+    </div>
+</div><!--/ PaneController -->

platform/commonUI/browse/src/BrowseController.js

@@ -32,7 +32,9 @@ define(
     function (GestureConstants) {
         "use strict";
 
-        var ROOT_ID = "ROOT";
+        var ROOT_ID = "ROOT",
+            DEFAULT_PATH = "mine",
+            CONFIRM_MSG = "Unsaved changes will be lost if you leave this page.";
 
         /**
          * The BrowseController is used to populate the initial scope in Browse
@@ -44,19 +46,9 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function BrowseController(
-            $scope, 
-            $route, 
-            $location, 
-            $window, 
-            objectService, 
-            navigationService, 
-            urlService, 
-            policyService,
-            defaultPath
-        ) {
+        function BrowseController($scope, $route, $location, objectService, navigationService, urlService) {
             var path = [ROOT_ID].concat(
-                ($route.current.params.ids || defaultPath).split("/")
+                ($route.current.params.ids || DEFAULT_PATH).split("/")
             );
 
             function updateRoute(domainObject) {
@@ -82,22 +74,14 @@ define(
             // Callback for updating the in-scope reference to the object
             // that is currently navigated-to.
             function setNavigation(domainObject) {
-                var navigationAllowed = true;
-
                 if (domainObject === $scope.navigatedObject){
                     //do nothing;
                     return;
                 }
 
-                policyService.allow("navigation", $scope.navigatedObject, domainObject, function(message){
-                    navigationAllowed = $window.confirm(message + "\r\n\r\n" +
-                        " Are you sure you want to continue?");
-                });
-
-                if (navigationAllowed) {
+                if (navigationService.setNavigation(domainObject)) {
                     $scope.navigatedObject = domainObject;
                     $scope.treeModel.selectedObject = domainObject;
-                    navigationService.setNavigation(domainObject);
                     updateRoute(domainObject);
                 } else {
                     //If navigation was unsuccessful (ie. blocked), reset
@@ -147,12 +131,6 @@ define(
                             } else {
                                 doNavigate(nextObject, index + 1);
                             }
-                        } else if (index === 1 && c.length > 0) {
-                            // Roots are in a top-level container that we don't
-                            // want to be selected, so if we couldn't find an
-                            // object at the path we wanted, at least select
-                            // one of its children.
-                            navigateTo(c[c.length - 1]);
                         } else {
                             // Couldn't find the next element of the path
                             // so navigate to the last path object we did find
@@ -196,4 +174,3 @@ define(
         return BrowseController;
     }
 );
-

platform/commonUI/browse/src/BrowseObjectController.js

@@ -32,7 +32,7 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function BrowseObjectController($scope, $location, $route) {
+        function BrowseObjectController($scope, $location, $route, $q, navigationService) {
             var navigatedObject;
             function setViewForDomainObject(domainObject) {
                 
@@ -81,4 +81,3 @@ define(
         return BrowseObjectController;
     }
 );
-

platform/commonUI/browse/src/InspectorRegion.js

@@ -36,7 +36,7 @@ define(
          * @constructor
          */
         function InspectorRegion() {
-            Region.call(this, {'name': 'Inspector'});
+            Region.call(this);
 
             this.buildRegion();
         }
@@ -48,9 +48,9 @@ define(
          * @private
          */
         InspectorRegion.prototype.buildRegion = function() {
-            var metadataRegion = {
-                name: 'metadata',
-                title: 'Metadata Region',
+            var metadataPart = {
+                name: 'properties-location',
+                title: 'Properties and Location',
                 // Which modes should the region part be visible in? If
                 // nothing provided here, then assumed that part is visible
                 // in both. The visibility or otherwise of a region part
@@ -61,7 +61,7 @@ define(
                     key: 'object-properties'
                 }
             };
-            this.addRegion(new Region(metadataRegion), 0);
+            this.addPart(metadataPart, 0);
         };
 
         return InspectorRegion;

platform/commonUI/browse/src/TypeRegionDecorator.js

@@ -0,0 +1,92 @@
+/*****************************************************************************
+ * 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(
+    [
+        './InspectorRegion',
+        './ViewRegion'
+    ],
+    function (InspectorRegion, ViewRegion) {
+        "use strict";
+
+        /**
+         * Adds default browse screen regions to Type definitions. Screen
+         * regions are sections of the browse and edit view of an object
+         * that can be customized on a per-type basis. Within
+         * {@link Region}s are {@link RegionPart}s. Policies can be used to
+         * decide which parts are visible or not based on object state.
+         * @memberOf platform/commonUI/regions
+         * @see {@link Region}, {@link RegionPart}, {@link EditableRegionPolicy}
+         * @constructor
+         */
+        function TypeRegionDecorator(typeService) {
+            this.typeService = typeService;
+        }
+
+        /**
+         * Read Type bundle definition, and add default region definitions
+         * if none provided.
+         * @private
+         * @param type
+         * @returns {*}
+         */
+        TypeRegionDecorator.prototype.decorateType = function (type) {
+            var regions = type.getDefinition().regions || {};
+
+            regions.inspector = regions.inspector || new InspectorRegion();
+            regions.view = regions.view || new ViewRegion();
+
+            type.getDefinition().regions = regions;
+
+            return type;
+        };
+
+        /**
+         * Override the provider functions in order to return decorated Type
+         * objects.
+         * @returns {Array|*}
+         */
+        TypeRegionDecorator.prototype.listTypes = function() {
+            var self = this,
+                types = this.typeService.listTypes();
+
+            return types.map(function (type) {
+                return self.decorateType(type);
+            });
+        };
+
+        /**
+         * Override the provider function in order to return decorated Type
+         * objects.
+         * @param key
+         */
+        TypeRegionDecorator.prototype.getType = function(key) {
+            var self = this,
+                type = this.typeService.getType(key);
+
+            return self.decorateType(type);
+        };
+
+        return TypeRegionDecorator;
+    }
+);

platform/commonUI/browse/src/ViewRegion.js

@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * 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(
+    [
+        '../../regions/src/Region'
+    ],
+    function (Region) {
+        "use strict";
+
+        /**
+         * Defines the default View region. Captured in a class to
+         * allow for modular extension and customization of regions based on
+         * the typical case.
+         * @memberOf platform/commonUI/regions
+         * @constructor
+         */
+        function ViewRegion() {
+            Region.call(this);
+
+            this.buildRegion();
+        }
+
+        ViewRegion.prototype = Object.create(Region.prototype);
+        ViewRegion.prototype.constructor = Region;
+
+        /**
+         * @private
+         */
+        ViewRegion.prototype.buildRegion = function() {
+            var browseViewPart = {
+                    name: 'browse-view',
+                    title: 'Browse Object View',
+                    modes: ['browse'],
+                    content: {
+                        key: 'browse-object'
+                    }
+                },
+                editViewPart = {
+                    name: 'edit-view',
+                    title: 'Edit Object View',
+                    modes: ['edit'],
+                    content: {
+                        key: 'edit-object'
+                    }
+                };
+            this.addPart(browseViewPart);
+            this.addPart(editViewPart);
+        };
+
+        return ViewRegion;
+    }
+);

platform/commonUI/browse/src/creation/AddAction.js

@@ -1,135 +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 AddAction. Created by ahenry on 01/21/16.
- */
-define(
-    [
-        './CreateWizard'
-    ],
-    function (CreateWizard) {
-        "use strict";
-
-        /**
-         * The Add Action is performed to create new instances of
-         * domain objects of a specific type that are subobjects of an
-         * object being edited. This is the action that is performed when a
-         * user uses the Add menu option.
-         *
-         * @memberof platform/commonUI/browse
-         * @implements {Action}
-         * @constructor
-         *
-         * @param {Type} type the type of domain object to create
-         * @param {DomainObject} parent the domain object that should
-         *        act as a container for the newly-created object
-         *        (note that the user will have an opportunity to
-         *        override this)
-         * @param {ActionContext} context the context in which the
-         *        action is being performed
-         * @param {DialogService} dialogService
-         */
-        function AddAction(type, parent, context, $q, dialogService, policyService) {
-            this.metadata = {
-                key: 'add',
-                glyph: type.getGlyph(),
-                name: type.getName(),
-                type: type.getKey(),
-                description: type.getDescription(),
-                context: context
-            };
-
-            this.type = type;
-            this.parent = parent;
-            this.$q = $q;
-            this.dialogService = dialogService;
-            this.policyService = policyService;
-        }
-
-        /**
-         *
-         * Create a new object of the given type.
-         * This will prompt for user input first.
-         *
-         * @returns {Promise} that will be resolved with the object that the
-         * action was originally invoked on (ie. the 'parent')
-         */
-        AddAction.prototype.perform = function () {
-            var newModel = this.type.getInitialModel(),
-                newObject,
-                parentObject = this.parent,
-                wizard;
-
-            newModel.type = this.type.getKey();
-            newObject = parentObject.getCapability('instantiation').instantiate(newModel);
-            newObject.useCapability('mutation', function(model){
-                model.location = parentObject.getId();
-            });
-
-            wizard = new CreateWizard(newObject, this.parent, this.policyService);
-
-            function populateObjectFromInput (formValue) {
-                return wizard.populateObjectFromInput(formValue, newObject);
-            }
-
-            function persistAndReturn(domainObject) {
-                return domainObject.getCapability('persistence')
-                    .persist()
-                    .then(function () {
-                        return domainObject;
-                    });
-            }
-
-            function addToParent (populatedObject) {
-                parentObject.getCapability('composition').add(populatedObject);
-                return persistAndReturn(parentObject);
-            }
-
-            return this.dialogService
-                .getUserInput(wizard.getFormStructure(false), wizard.getInitialFormValue())
-                .then(populateObjectFromInput)
-                .then(persistAndReturn)
-                .then(addToParent);
-
-        };
-
-
-        /**
-         * Metadata associated with a Add action.
-         * @typedef {ActionMetadata} AddActionMetadata
-         * @property {string} type the key for the type of domain object
-         *           to be created
-         */
-
-        /**
-         * Get metadata about this action.
-         * @returns {AddActionMetadata} metadata about this action
-         */
-        AddAction.prototype.getMetadata = function () {
-           return this.metadata;
-        };
-
-        return AddAction;
-    }
-);

platform/commonUI/browse/src/creation/AddActionProvider.js

@@ -1,87 +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 AddActionProvider.js. Created by ahenry on 01/21/16.
- */
-define(
-    ["./AddAction"],
-    function (AddAction) {
-        "use strict";
-
-        /**
-         * The AddActionProvider is an ActionProvider which introduces
-         * an Add action for creating sub objects.
-         *
-         * @memberof platform/commonUI/browse
-         * @constructor
-         * @implements {ActionService}
-         *
-         * @param {TypeService} typeService the type service, used to discover
-         *        available types
-         * @param {DialogService} dialogService the dialog service, used by
-         *        specific Create actions to get user input to populate the
-         *        model of the newly-created domain object.
-         * @param {CreationService} creationService the creation service (also
-         *        introduced in this bundle), responsible for handling actual
-         *        object creation.
-         */
-        function AddActionProvider($q, typeService, dialogService, policyService) {
-            this.typeService = typeService;
-            this.dialogService = dialogService;
-            this.$q = $q;
-            this.policyService = policyService;
-        }
-
-        AddActionProvider.prototype.getActions = function (actionContext) {
-            var context = actionContext || {},
-                key = context.key,
-                destination = context.domainObject,
-                self = this;
-
-            // We only provide Add actions, and we need a
-            // domain object to serve as the container for the
-            // newly-created object (although the user may later
-            // make a different selection)
-            if (key !== 'add' || !destination) {
-                return [];
-            }
-
-            // Introduce one create action per type
-            return this.typeService.listTypes().filter(function (type) {
-                return self.policyService.allow("creation", type) && self.policyService.allow("composition", destination.getCapability('type'), type);
-            }).map(function (type) {
-                return new AddAction(
-                    type,
-                    destination,
-                    context,
-                    self.$q,
-                    self.dialogService,
-                    self.policyService
-                );
-            });
-        };
-
-        return AddActionProvider;
-    }
-);

platform/commonUI/browse/src/creation/CreateWizard.js

@@ -26,21 +26,18 @@ define(
         'use strict';
 
         /**
-         * A class for capturing user input data from an object creation
-         * dialog, and populating a domain object with that data.
+         * Construct a new CreateWizard.
          *
-         * @param {DomainObject} domainObject the newly created object to
-         * populate with user input
+         * @param {TypeImpl} type the type of domain object to be created
          * @param {DomainObject} parent the domain object to serve as
          *        the initial parent for the created object, in the dialog
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function CreateWizard(domainObject, parent, policyService) {
-            this.type = domainObject.getCapability('type');
-            this.model = domainObject.getModel();
-            this.domainObject = domainObject;
-            this.properties = this.type.getProperties();
+        function CreateWizard(type, parent, policyService, initialModel) {
+            this.type = type;
+            this.model = initialModel || type.getInitialModel();
+            this.properties = type.getProperties();
             this.parent = parent;
             this.policyService = policyService;
         }
@@ -49,14 +46,11 @@ define(
          * Get the form model for this wizard; this is a description
          * that will be rendered to an HTML form. See the
          * platform/forms bundle
-         * @param {boolean} includeLocation if true, a 'location' section
-         * will be included that will allow the user to select the location
-         * of the newly created object, otherwise the .location property of
-         * the model will be used.
+         *
          * @return {FormModel} formModel the form model to
          *         show in the create dialog
          */
-        CreateWizard.prototype.getFormStructure = function (includeLocation) {
+        CreateWizard.prototype.getFormStructure = function () {
             var sections = [],
                 type = this.type,
                 policyService = this.policyService;
@@ -90,16 +84,12 @@ define(
             });
 
             // Ensure there is always a "save in" section
-            if (includeLocation) {
-                sections.push({
-                    name: 'Location', rows: [{
-                        name: "Save In",
-                        control: "locator",
-                        validate: validateLocation,
-                        key: "createParent"
-                    }]
-                });
-            }
+            sections.push({ name: 'Location', rows: [{
+                name: "Save In",
+                control: "locator",
+                validate: validateLocation,
+                key: "createParent"
+            }]});
 
             return {
                 sections: sections,
@@ -107,23 +97,6 @@ define(
             };
         };
 
-        /**
-         * Given some form input values and a domain object, populate the
-         * domain object used to create this wizard from the given form values.
-         * @param formValue
-         * @returns {DomainObject}
-         */
-        CreateWizard.prototype.populateObjectFromInput = function(formValue) {
-            var parent = this.getLocation(formValue),
-                formModel = this.createModel(formValue);
-
-            formModel.location = parent.getId();
-            this.domainObject.useCapability("mutation", function(){
-                return formModel;
-            });
-            return this.domainObject;
-        };
-
         /**
          * Get the initial value for the form being described.
          * This will include the values for all properties described
@@ -147,7 +120,6 @@ define(
         /**
          * Based on a populated form, get the domain object which
          * should be used as a parent for the newly-created object.
-         * @private
          * @return {DomainObject}
          */
         CreateWizard.prototype.getLocation = function (formValue) {
@@ -157,7 +129,6 @@ define(
         /**
          * Create the domain object model for a newly-created object,
          * based on user input read from a formModel.
-         * @private
          * @return {object} the domain object model
          */
         CreateWizard.prototype.createModel = function (formValue) {

platform/commonUI/browse/src/creation/LocatorController.js

@@ -33,7 +33,7 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function LocatorController($scope, $timeout, objectService) {
+        function LocatorController($scope, $timeout) {
             // Populate values needed by the locator control. These are:
             // * rootObject: The top-level object, since we want to show
             //               the full tree
@@ -52,18 +52,6 @@ define(
                         $scope.rootObject =
                             (context && context.getRoot()) || $scope.rootObject;
                     }, 0);
-                } else if (!contextRoot){
-                    //If no context root is available, default to the root
-                    // object
-                    $scope.rootObject = undefined;
-                    // Update the displayed tree on a timeout to avoid
-                    // an infinite digest exception.
-                    objectService.getObjects(['ROOT'])
-                        .then(function(objects){
-                            $timeout(function () {
-                                $scope.rootObject = objects.ROOT;
-                            }, 0);
-                        });
                 }
 
                 $scope.treeModel.selectedObject = domainObject;

platform/commonUI/browse/src/navigation/NavigationService.js

@@ -37,7 +37,7 @@ define(
          */
         function NavigationService() {
             this.navigated = undefined;
-            this.callbacks = [];
+            this.callbacks = {};
         }
 
         /**
@@ -50,27 +50,48 @@ define(
 
         /**
          * Set the current navigation state. This will invoke listeners.
+         * Changing the navigation state will be blocked if any of the
+         * 'before' navigation state change listeners return 'false'.
          * @param {DomainObject} domainObject the domain object to navigate to
          */
         NavigationService.prototype.setNavigation = function (value) {
+            var canNavigate = true;
             if (this.navigated !== value) {
-                this.navigated = value;
-                this.callbacks.forEach(function (callback) {
-                    callback(value);
-                });
+                canNavigate = (this.callbacks.before || [])
+                    .reduce(function (previous, callback) {
+                        //Check whether the callback returned a value of
+                        // 'false' indicating that navigation should not
+                        // continue. All other return values will allow
+                        // navigation to continue
+                        return (callback(value)!==false) && previous;
+                    }, true);
+                if (canNavigate) {
+                    this.navigated = value;
+                    (this.callbacks.after || []).forEach(function (callback) {
+                        callback(value);
+                    });
+                }
             }
-            return true;
+            return canNavigate;
         };
 
         /**
          * Listen for changes in navigation. The passed callback will
          * be invoked with the new domain object of navigation when
-         * this changes.
+         * this changes. Callbacks can be registered to listen to pre or
+         * post-navigation events. The event to listen to is specified using
+         * the event parameter. In the case of pre-navigation events
+         * returning a false value will prevent the navigation event from
+         * going ahead.
          * @param {function} callback the callback to invoke when
          *        navigation state changes
+         * @param {string} [event=after] the navigation event to listen to.
+         * One of 'before' or 'after'.
          */
-        NavigationService.prototype.addListener = function (callback) {
-            this.callbacks.push(callback);
+        NavigationService.prototype.addListener = function (callback, event) {
+            event = event || 'after';
+            this.callbacks[event] = this.callbacks[event] || [];
+            this.callbacks[event].push(callback);
         };
 
         /**
@@ -78,9 +99,12 @@ define(
          * @param {function} callback the callback which should
          *        no longer be invoked when navigation state
          *        changes
+         * @param {string} [event=after] the navigation event that the
+         * callback is registered to. One of 'before' or 'after'.
          */
-        NavigationService.prototype.removeListener = function (callback) {
-            this.callbacks = this.callbacks.filter(function (cb) {
+        NavigationService.prototype.removeListener = function (callback, event) {
+            event = event || 'after';
+            this.callbacks[event] = this.callbacks[event].filter(function (cb) {
                 return cb !== callback;
             });
         };

platform/commonUI/browse/src/windowing/FullscreenAction.js

@@ -25,7 +25,7 @@
  * Module defining FullscreenAction. Created by vwoeltje on 11/18/14.
  */
 define(
-    ["screenfull"],
+    ["../../lib/screenfull.min"],
     function () {
         "use strict";
 

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -39,9 +39,6 @@ define(
                 mockUrlService,
                 mockDomainObject,
                 mockNextObject,
-                mockWindow,
-                mockPolicyService,
-                testDefaultRoot,
                 controller;
 
             function mockPromise(value) {
@@ -52,32 +49,7 @@ define(
                 };
             }
 
-            function instantiateController() {
-                controller = new BrowseController(
-                    mockScope,
-                    mockRoute,
-                    mockLocation,
-                    mockWindow,
-                    mockObjectService,
-                    mockNavigationService,
-                    mockUrlService,
-                    mockPolicyService,
-                    testDefaultRoot
-                );
-            }
-
             beforeEach(function () {
-                mockWindow = jasmine.createSpyObj('$window', [
-                   "confirm"
-                ]);
-                mockWindow.confirm.andReturn(true);
-
-                mockPolicyService = jasmine.createSpyObj('policyService', [
-                    'allow'
-                ]);
-
-                testDefaultRoot = "some-root-level-domain-object";
-
                 mockScope = jasmine.createSpyObj(
                     "$scope",
                     [ "$on", "$watch" ]
@@ -128,28 +100,41 @@ define(
                 ]));
                 mockNextObject.useCapability.andReturn(undefined);
                 mockNextObject.getId.andReturn("next");
-                mockDomainObject.getId.andReturn(testDefaultRoot);
+                mockDomainObject.getId.andReturn("mine");
 
-                instantiateController();
+                controller = new BrowseController(
+                    mockScope,
+                    mockRoute,
+                    mockLocation,
+                    mockObjectService,
+                    mockNavigationService,
+                    mockUrlService
+                );
             });
 
             it("uses composition to set the navigated object, if there is none", function () {
-                instantiateController();
-                expect(mockNavigationService.setNavigation)
-                    .toHaveBeenCalledWith(mockDomainObject);
-            });
-
-            it("navigates to a root-level object, even when default path is not found", function () {
-                mockDomainObject.getId
-                    .andReturn("something-other-than-the-" + testDefaultRoot);
-                instantiateController();
+                controller = new BrowseController(
+                    mockScope,
+                    mockRoute,
+                    mockLocation,
+                    mockObjectService,
+                    mockNavigationService,
+                    mockUrlService
+                );
                 expect(mockNavigationService.setNavigation)
                     .toHaveBeenCalledWith(mockDomainObject);
             });
 
             it("does not try to override navigation", function () {
                 mockNavigationService.getNavigation.andReturn(mockDomainObject);
-                instantiateController();
+                controller = new BrowseController(
+                    mockScope,
+                    mockRoute,
+                    mockLocation,
+                    mockObjectService,
+                    mockNavigationService,
+                    mockUrlService
+                );
                 expect(mockScope.navigatedObject).toBe(mockDomainObject);
             });
 
@@ -176,8 +161,14 @@ define(
             });
 
             it("uses route parameters to choose initially-navigated object", function () {
-                mockRoute.current.params.ids = testDefaultRoot + "/next";
-                instantiateController();
+                mockRoute.current.params.ids = "mine/next";
+                controller = new BrowseController(
+                    mockScope,
+                    mockRoute,
+                    mockLocation,
+                    mockObjectService,
+                    mockNavigationService
+                );
                 expect(mockScope.navigatedObject).toBe(mockNextObject);
                 expect(mockNavigationService.setNavigation)
                     .toHaveBeenCalledWith(mockNextObject);
@@ -187,8 +178,14 @@ define(
                 // Idea here is that if we get a bad path of IDs,
                 // browse controller should traverse down it until
                 // it hits an invalid ID.
-                mockRoute.current.params.ids = testDefaultRoot + "/junk";
-                instantiateController();
+                mockRoute.current.params.ids = "mine/junk";
+                controller = new BrowseController(
+                    mockScope,
+                    mockRoute,
+                    mockLocation,
+                    mockObjectService,
+                    mockNavigationService
+                );
                 expect(mockScope.navigatedObject).toBe(mockDomainObject);
                 expect(mockNavigationService.setNavigation)
                     .toHaveBeenCalledWith(mockDomainObject);
@@ -198,8 +195,14 @@ define(
                 // Idea here is that if we get a path which passes
                 // through an object without a composition, browse controller
                 // should stop at it since remaining IDs cannot be loaded.
-                mockRoute.current.params.ids = testDefaultRoot + "/next/junk";
-                instantiateController();
+                mockRoute.current.params.ids = "mine/next/junk";
+                controller = new BrowseController(
+                    mockScope,
+                    mockRoute,
+                    mockLocation,
+                    mockObjectService,
+                    mockNavigationService
+                );
                 expect(mockScope.navigatedObject).toBe(mockNextObject);
                 expect(mockNavigationService.setNavigation)
                     .toHaveBeenCalledWith(mockNextObject);
@@ -256,11 +259,7 @@ define(
             it("after failed navigation event resets the selected tree" +
                 " object", function () {
                 mockScope.navigatedObject = mockDomainObject;
-                mockWindow.confirm.andReturn(false);
-                mockPolicyService.allow.andCallFake(function(category, object, context, callback){
-                    callback("unsaved changes");
-                    return false;
-                });
+                mockNavigationService.setNavigation.andReturn(false);
 
                 //Simulate a change in selected tree object
                 mockScope.treeModel = {selectedObject: mockDomainObject};

platform/commonUI/browse/test/InspectorRegionSpec.js

@@ -37,7 +37,7 @@ define(
             });
 
             it("creates default region parts", function () {
-                expect(inspectorRegion.regions.length).toBe(1);
+                expect(inspectorRegion.parts.length).toBe(1);
             });
 
         });

platform/commonUI/browse/test/TypeRegionDecoratorSpec.js

@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * 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*/
+
+/**
+ * MCTIncudeSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../src/TypeRegionDecorator"],
+    function (TypeRegionDecorator) {
+        "use strict";
+
+        describe("The type region decorator", function () {
+            var typeRegionDecorator,
+                mockTypeService,
+                mockType,
+                mockTypeDefinition;
+
+            beforeEach(function () {
+                mockTypeDefinition = {};
+
+                mockType = jasmine.createSpyObj('type', [
+                    'getDefinition'
+                ]);
+                mockType.getDefinition.andReturn(mockTypeDefinition);
+
+                mockTypeService = jasmine.createSpyObj('typeService', [
+                    'listTypes',
+                    'getType'
+                ]);
+                mockTypeService.getType.andReturn(mockType);
+                mockTypeService.listTypes.andReturn([mockType]);
+
+                typeRegionDecorator = new TypeRegionDecorator(mockTypeService);
+            });
+
+            it("decorates individual type definitions with basic inspector" +
+                " region", function () {
+                typeRegionDecorator.getType('someType');
+                expect(mockTypeDefinition.regions).toBeDefined();
+            });
+
+            it("decorates all type definitions with basic inspector" +
+                " region", function () {
+                typeRegionDecorator.listTypes();
+                expect(mockTypeDefinition.regions).toBeDefined();
+            });
+
+        });
+    }
+);

platform/commonUI/browse/test/creation/AddActionProviderSpec.js

@@ -1,137 +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,xit,xdescribe*/
-
-/**
- * MCTRepresentationSpec. Created by ahenry on 01/21/14.
- */
-define(
-    ["../../src/creation/AddActionProvider"],
-    function (AddActionProvider) {
-        "use strict";
-
-        describe("The add action provider", function () {
-            var mockTypeService,
-                mockDialogService,
-                mockPolicyService,
-                mockCreationPolicy,
-                mockCompositionPolicy,
-                mockPolicyMap = {},
-                mockTypes,
-                mockDomainObject,
-                mockQ,
-                provider;
-
-            function createMockType(name) {
-                var mockType = jasmine.createSpyObj(
-                    "type" + name,
-                    [
-                        "getKey",
-                        "getGlyph",
-                        "getName",
-                        "getDescription",
-                        "getProperties",
-                        "getInitialModel",
-                        "hasFeature"
-                    ]
-                );
-                mockType.hasFeature.andReturn(true);
-                mockType.getName.andReturn(name);
-                return mockType;
-            }
-
-            beforeEach(function () {
-                mockTypeService = jasmine.createSpyObj(
-                    "typeService",
-                    [ "listTypes" ]
-                );
-                mockDialogService = jasmine.createSpyObj(
-                    "dialogService",
-                    [ "getUserInput" ]
-                );
-                mockPolicyService = jasmine.createSpyObj(
-                    "policyService",
-                    [ "allow" ]
-                );
-
-                mockDomainObject = jasmine.createSpyObj(
-                    "domainObject",
-                    [ "getCapability" ]
-                );
-
-                //Mocking getCapability because AddActionProvider uses the
-                // type capability of the destination object.
-                mockDomainObject.getCapability.andReturn({});
-
-                mockTypes = [ "A", "B", "C" ].map(createMockType);
-
-                mockTypes.forEach(function(type){
-                    mockPolicyMap[type.getName()] = true;
-                });
-
-                mockCreationPolicy = function(type){
-                    return mockPolicyMap[type.getName()];
-                };
-
-                mockCompositionPolicy = function(){
-                    return true;
-                };
-
-                mockPolicyService.allow.andReturn(true);
-
-                mockTypeService.listTypes.andReturn(mockTypes);
-
-                provider = new AddActionProvider(
-                    mockQ,
-                    mockTypeService,
-                    mockDialogService,
-                    mockPolicyService
-                );
-            });
-
-            it("checks for creatability", function () {
-                provider.getActions({
-                    key: "add",
-                    domainObject: mockDomainObject
-                });
-                // Make sure it was creation which was used to check
-                expect(mockPolicyService.allow)
-                    .toHaveBeenCalledWith("creation", mockTypes[0]);
-            });
-
-            it("checks for composability of type", function () {
-                provider.getActions({
-                    key: "add",
-                    domainObject: mockDomainObject
-                });
-
-                expect(mockPolicyService.allow).toHaveBeenCalledWith(
-                    "composition",
-                    jasmine.any(Object),
-                    jasmine.any(Object)
-                );
-
-                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('type');
-            });
-        });
-    }
-);

platform/commonUI/browse/test/creation/CreateActionProviderSpec.js

@@ -32,12 +32,11 @@ define(
         describe("The create action provider", function () {
             var mockTypeService,
                 mockDialogService,
-                mockNavigationService,
+                mockCreationService,
                 mockPolicyService,
                 mockCreationPolicy,
                 mockPolicyMap = {},
                 mockTypes,
-                mockQ,
                 provider;
 
             function createMockType(name) {
@@ -67,9 +66,9 @@ define(
                     "dialogService",
                     [ "getUserInput" ]
                 );
-                mockNavigationService = jasmine.createSpyObj(
-                    "navigationService",
-                    [ "setNavigation" ]
+                mockCreationService = jasmine.createSpyObj(
+                    "creationService",
+                    [ "createObject" ]
                 );
                 mockPolicyService = jasmine.createSpyObj(
                     "policyService",
@@ -93,14 +92,15 @@ define(
                 mockTypeService.listTypes.andReturn(mockTypes);
 
                 provider = new CreateActionProvider(
-                    mockQ,
                     mockTypeService,
-                    mockNavigationService,
+                    mockDialogService,
+                    mockCreationService,
                     mockPolicyService
                 );
             });
 
-            it("exposes one create action per type", function () {
+            //TODO: Disabled for NEM Beta
+            xit("exposes one create action per type", function () {
                 expect(provider.getActions({
                     key: "create",
                     domainObject: {}
@@ -114,7 +114,8 @@ define(
                 }).length).toEqual(0);
             });
 
-            it("does not expose non-creatable types", function () {
+            //TODO: Disabled for NEM Beta
+            xit("does not expose non-creatable types", function () {
                 // One of the types won't have the creation feature...
                 mockPolicyMap[mockTypes[0].getName()] = false;
                 // ...so it should have been filtered out.

platform/commonUI/browse/test/creation/CreateWizardSpec.js

@@ -35,7 +35,6 @@ define(
                 mockProperties,
                 mockPolicyService,
                 testModel,
-                mockDomainObject,
                 wizard;
 
             function createMockProperty(name) {
@@ -82,18 +81,8 @@ define(
                 mockType.getInitialModel.andReturn(testModel);
                 mockType.getProperties.andReturn(mockProperties);
 
-                mockDomainObject = jasmine.createSpyObj(
-                    'domainObject',
-                    ['getCapability', 'useCapability', 'getModel']
-                );
-
-                //Mocking the getCapability('type') call
-                mockDomainObject.getCapability.andReturn(mockType);
-                mockDomainObject.useCapability.andReturn();
-                mockDomainObject.getModel.andReturn(testModel);
-
                 wizard = new CreateWizard(
-                    mockDomainObject,
+                    mockType,
                     mockParent,
                     mockPolicyService
                 );
@@ -141,18 +130,6 @@ define(
                 });
             });
 
-            it("populates the model on the associated object", function () {
-                var formValue = {
-                    "A": "ValueA",
-                    "B": "ValueB",
-                    "C": "ValueC"
-                    },
-                    compareModel = wizard.createModel(formValue);
-                wizard.populateObjectFromInput(formValue);
-                expect(mockDomainObject.useCapability).toHaveBeenCalledWith('mutation', jasmine.any(Function));
-                expect(mockDomainObject.useCapability.mostRecentCall.args[1]()).toEqual(compareModel);
-            });
-
             it("validates selection types using policy", function () {
                 var mockDomainObject = jasmine.createSpyObj(
                         'domainObject',
@@ -162,8 +139,7 @@ define(
                         'otherType',
                         ['getKey']
                     ),
-                    //Create a form structure with location
-                    structure = wizard.getFormStructure(true),
+                    structure = wizard.getFormStructure(),
                     sections = structure.sections,
                     rows = structure.sections[sections.length - 1].rows,
                     locationRow = rows[rows.length - 1];
@@ -180,12 +156,6 @@ define(
                 );
             });
 
-            it("creates a form model without a location if not requested", function () {
-                expect(wizard.getFormStructure(false).sections.some(function(section){
-                    return section.name === 'Location';
-                })).toEqual(false);
-            });
-
 
         });
     }

platform/commonUI/browse/test/creation/LocatorControllerSpec.js

@@ -35,8 +35,6 @@ define(
                 mockDomainObject,
                 mockRootObject,
                 mockContext,
-                mockObjectService,
-                getObjectsPromise,
                 controller;
 
             beforeEach(function () {
@@ -57,106 +55,73 @@ define(
                     "context",
                     [ "getRoot" ]
                 );
-                mockObjectService = jasmine.createSpyObj(
-                    "objectService",
-                    ["getObjects"]
-                );
-                getObjectsPromise = jasmine.createSpyObj(
-                    "promise",
-                    ["then"]
-                );
 
                 mockDomainObject.getCapability.andReturn(mockContext);
                 mockContext.getRoot.andReturn(mockRootObject);
-                mockObjectService.getObjects.andReturn(getObjectsPromise);
 
                 mockScope.ngModel = {};
                 mockScope.field = "someField";
 
-                controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
+                controller = new LocatorController(mockScope, mockTimeout);
             });
-                describe("when context is available", function () {
 
-                    beforeEach(function () {
-                        mockContext.getRoot.andReturn(mockRootObject);
-                        controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
-                    });
+            it("adds a treeModel to scope", function () {
+                expect(mockScope.treeModel).toBeDefined();
+            });
 
-                    it("adds a treeModel to scope", function () {
-                        expect(mockScope.treeModel).toBeDefined();
-                    });
+            it("watches for changes to treeModel", function () {
+                // This is what the embedded tree representation
+                // will be modifying.
+                expect(mockScope.$watch).toHaveBeenCalledWith(
+                    "treeModel.selectedObject",
+                    jasmine.any(Function)
+                );
+            });
 
-                    it("watches for changes to treeModel", function () {
-                        // This is what the embedded tree representation
-                        // will be modifying.
-                        expect(mockScope.$watch).toHaveBeenCalledWith(
-                            "treeModel.selectedObject",
-                            jasmine.any(Function)
-                        );
-                    });
+            it("changes its own model on embedded model updates", function () {
+                // Need to pass on selection changes as updates to
+                // the control's value
+                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                mockTimeout.mostRecentCall.args[0]();
+                expect(mockScope.ngModel.someField).toEqual(mockDomainObject);
+                expect(mockScope.rootObject).toEqual(mockRootObject);
 
-                    it("changes its own model on embedded model updates", function () {
-                        // Need to pass on selection changes as updates to
-                        // the control's value
-                        mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
-                        mockTimeout.mostRecentCall.args[0]();
-                        expect(mockScope.ngModel.someField).toEqual(mockDomainObject);
-                        expect(mockScope.rootObject).toEqual(mockRootObject);
+                // Verify that the capability we expect to have been used
+                // was used.
+                expect(mockDomainObject.getCapability)
+                    .toHaveBeenCalledWith("context");
+            });
 
-                        // Verify that the capability we expect to have been used
-                        // was used.
-                        expect(mockDomainObject.getCapability)
-                            .toHaveBeenCalledWith("context");
-                    });
+            it("rejects changes which fail validation", function () {
+                mockScope.structure = { validate: jasmine.createSpy('validate') };
+                mockScope.structure.validate.andReturn(false);
 
-                    it("rejects changes which fail validation", function () {
-                        mockScope.structure = { validate: jasmine.createSpy('validate') };
-                        mockScope.structure.validate.andReturn(false);
+                // Pass selection change
+                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                mockTimeout.mostRecentCall.args[0]();
 
-                        // Pass selection change
-                        mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
-                        mockTimeout.mostRecentCall.args[0]();
+                expect(mockScope.structure.validate).toHaveBeenCalled();
+                // Change should have been rejected
+                expect(mockScope.ngModel.someField).not.toEqual(mockDomainObject);
+            });
 
-                        expect(mockScope.structure.validate).toHaveBeenCalled();
-                        // Change should have been rejected
-                        expect(mockScope.ngModel.someField).not.toEqual(mockDomainObject);
-                    });
+            it("treats a lack of a selection as invalid", function () {
+                mockScope.ngModelController = jasmine.createSpyObj(
+                    'ngModelController',
+                    [ '$setValidity' ]
+                );
 
-                    it("treats a lack of a selection as invalid", function () {
-                        mockScope.ngModelController = jasmine.createSpyObj(
-                            'ngModelController',
-                            [ '$setValidity' ]
-                        );
+                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                mockTimeout.mostRecentCall.args[0]();
+                expect(mockScope.ngModelController.$setValidity)
+                    .toHaveBeenCalledWith(jasmine.any(String), true);
 
-                        mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
-                        mockTimeout.mostRecentCall.args[0]();
-                        expect(mockScope.ngModelController.$setValidity)
-                            .toHaveBeenCalledWith(jasmine.any(String), true);
+                mockScope.$watch.mostRecentCall.args[1](undefined);
+                mockTimeout.mostRecentCall.args[0]();
+                expect(mockScope.ngModelController.$setValidity)
+                    .toHaveBeenCalledWith(jasmine.any(String), false);
+            });
 
-                        mockScope.$watch.mostRecentCall.args[1](undefined);
-                        mockTimeout.mostRecentCall.args[0]();
-                        expect(mockScope.ngModelController.$setValidity)
-                            .toHaveBeenCalledWith(jasmine.any(String), false);
-                    });
-                });
-                describe("when no context is available", function () {
-                    var defaultRoot = "DEFAULT_ROOT";
-
-                    beforeEach(function () {
-                        mockContext.getRoot.andReturn(undefined);
-                        getObjectsPromise.then.andCallFake(function(callback){
-                            callback({'ROOT':defaultRoot});
-                        });
-                        controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
-                    });
-
-                    it("provides a default context where none is available", function () {
-                        mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
-                        mockTimeout.mostRecentCall.args[0]();
-                        expect(mockScope.rootObject).toBe(defaultRoot);
-
-                    });
-                });
         });
     }
 );

platform/commonUI/browse/test/navigation/NavigationServiceSpec.js

@@ -84,6 +84,24 @@ define(
                 expect(callback).not.toHaveBeenCalled();
             });
 
+            it("adds listeners to the 'after' state by default", function(){
+                expect(navigationService.callbacks.after).toBeUndefined();
+                navigationService.addListener(function(){});
+                expect(navigationService.callbacks.after).toBeDefined();
+                expect(navigationService.callbacks.after.length).toBe(1);
+            });
+
+            it("allows navigationService events to be prevented", function(){
+                var callback = jasmine.createSpy("callback"),
+                    navigationResult;
+                callback.andReturn(false);
+                navigationService.addListener(callback, "before");
+                navigationResult = navigationService.setNavigation({});
+                expect(callback).toHaveBeenCalled();
+                expect(navigationResult).toBe(false);
+
+            });
+
         });
     }
 );

platform/commonUI/dialog/bundle.js

@@ -24,24 +24,10 @@
 define([
     "./src/DialogService",
     "./src/OverlayService",
-    "text!./res/templates/overlay-dialog.html",
-    "text!./res/templates/overlay-options.html",
-    "text!./res/templates/dialog.html",
-    "text!./res/templates/overlay-blocking-message.html",
-    "text!./res/templates/message.html",
-    "text!./res/templates/overlay-message-list.html",
-    "text!./res/templates/overlay.html",
     'legacyRegistry'
 ], function (
     DialogService,
     OverlayService,
-    overlayDialogTemplate,
-    overlayOptionsTemplate,
-    dialogTemplate,
-    overlayBlockingMessageTemplate,
-    messageTemplate,
-    overlayMessageListTemplate,
-    overlayTemplate,
     legacyRegistry
 ) {
     "use strict";
@@ -71,33 +57,33 @@ define([
             "templates": [
                 {
                     "key": "overlay-dialog",
-                    "template": overlayDialogTemplate
+                    "templateUrl": "templates/overlay-dialog.html"
                 },
                 {
                     "key": "overlay-options",
-                    "template": overlayOptionsTemplate
+                    "templateUrl": "templates/overlay-options.html"
                 },
                 {
                     "key": "form-dialog",
-                    "template": dialogTemplate
+                    "templateUrl": "templates/dialog.html"
                 },
                 {
                     "key": "overlay-blocking-message",
-                    "template": overlayBlockingMessageTemplate
+                    "templateUrl": "templates/overlay-blocking-message.html"
                 },
                 {
                     "key": "message",
-                    "template": messageTemplate
+                    "templateUrl": "templates/message.html"
                 },
                 {
                     "key": "overlay-message-list",
-                    "template": overlayMessageListTemplate
+                    "templateUrl": "templates/overlay-message-list.html"
                 }
             ],
             "containers": [
                 {
                     "key": "overlay",
-                    "template": overlayTemplate
+                    "templateUrl": "templates/overlay.html"
                 }
             ]
         }

platform/commonUI/dialog/res/templates/overlay-message-list.html

@@ -6,9 +6,7 @@
             </div>
         </div>
         <div class="abs message-body">
-            <mct-include
-                    ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
-                    key="'message'" ng-model="msg.model"></mct-include>
+            <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"

platform/commonUI/edit/bundle.js

@@ -34,16 +34,8 @@ define([
     "./src/actions/SaveAction",
     "./src/actions/CancelAction",
     "./src/policies/EditActionPolicy",
-    "./src/policies/EditableLinkPolicy",
-    "./src/policies/EditableMovePolicy",
-    "./src/policies/EditNavigationPolicy",
     "./src/representers/EditRepresenter",
     "./src/representers/EditToolbarRepresenter",
-    "text!./res/templates/library.html",
-    "text!./res/templates/edit-object.html",
-    "text!./res/templates/edit-action-buttons.html",
-    "text!./res/templates/elements.html",
-    "text!./res/templates/topbar-edit.html",
     'legacyRegistry'
 ], function (
     EditActionController,
@@ -58,16 +50,8 @@ define([
     SaveAction,
     CancelAction,
     EditActionPolicy,
-    EditableLinkPolicy,
-    EditableMovePolicy,
-    EditNavigationPolicy,
     EditRepresenter,
     EditToolbarRepresenter,
-    libraryTemplate,
-    editObjectTemplate,
-    editActionButtonsTemplate,
-    elementsTemplate,
-    topbarEditTemplate,
     legacyRegistry
 ) {
     "use strict";
@@ -101,8 +85,7 @@ define([
                     "implementation": EditObjectController,
                     "depends": [
                         "$scope",
-                        "$location",
-                        "policyService"
+                        "$location"
                     ]
                 }
             ],
@@ -111,7 +94,8 @@ define([
                     "key": "mctBeforeUnload",
                     "implementation": MCTBeforeUnload,
                     "depends": [
-                        "$window"
+                        "$window",
+                        "navigationService"
                     ]
                 }
             ],
@@ -166,11 +150,14 @@ define([
                     "name": "Save",
                     "description": "Save changes made to these objects.",
                     "depends": [
+                        "$q",
+                        "$location",
                         "$injector",
+                        "urlService",
+                        "navigationService",
                         "policyService",
                         "dialogService",
-                        "creationService",
-                        "copyService"
+                        "creationService"
                     ],
                     "priority": "mandatory"
                 },
@@ -190,32 +177,18 @@ define([
                 {
                     "category": "action",
                     "implementation": EditActionPolicy
-                },
-                {
-                    "category": "action",
-                    "implementation": EditableMovePolicy
-                },
-                {
-                    "category": "action",
-                    "implementation": EditableLinkPolicy
-                },
-                {
-                    "category": "navigation",
-                    "message": "There are unsaved changes.",
-                    "implementation": EditNavigationPolicy
                 }
-
             ],
             "templates": [
                 {
                     "key": "edit-library",
-                    "template": libraryTemplate
+                    "templateUrl": "templates/library.html"
                 }
             ],
             "representations": [
                 {
                     "key": "edit-object",
-                    "template": editObjectTemplate,
+                    "templateUrl": "templates/edit-object.html",
                     "uses": [
                         "view"
                     ],
@@ -225,14 +198,14 @@ define([
                 },
                 {
                     "key": "edit-action-buttons",
-                    "template": editActionButtonsTemplate,
+                    "templateUrl": "templates/edit-action-buttons.html",
                     "uses": [
                         "action"
                     ]
                 },
                 {
                     "key": "edit-elements",
-                    "template": elementsTemplate,
+                    "templateUrl": "templates/elements.html",
                     "uses": [
                         "composition"
                     ],
@@ -242,7 +215,7 @@ define([
                 },
                 {
                     "key": "topbar-edit",
-                    "template": topbarEditTemplate
+                    "templateUrl": "templates/topbar-edit.html"
                 }
             ],
             "representers": [

platform/commonUI/edit/res/templates/elements.html

@@ -19,19 +19,16 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="ElementsController" class="flex-elem l-flex-col holder grows">
+<div ng-controller="ElementsController">
     <mct-include key="'input-filter'"
                  class="flex-elem holder"
                  ng-model="filterBy">
     </mct-include>
-    <div class="flex-elem grows vscroll">
+    <div class="current-elements abs" style="height: 100%;">
         <ul class="tree">
             <li ng-repeat="containedObject in composition | filter:searchText">
                 <span class="tree-item">
-                    <mct-representation
-                            class="rep-object-label"
-                            key="'label'"
-                            mct-object="containedObject">
+                    <mct-representation key="'label'" mct-object="containedObject">
                     </mct-representation>
                 </span>
             </li>

platform/commonUI/edit/src/actions/SaveAction.js

@@ -36,22 +36,18 @@ define(
          * @implements {Action}
          * @memberof platform/commonUI/edit
          */
-        function SaveAction(
-            $injector,
-            policyService,
-            dialogService,
-            creationService,
-            copyService,
-            context
-        ) {
+        function SaveAction($q, $location, $injector, urlService, navigationService, policyService, dialogService, creationService, context) {
             this.domainObject = (context || {}).domainObject;
+            this.$location = $location;
             this.injectObjectService = function(){
                 this.objectService = $injector.get("objectService");
             };
+            this.urlService = urlService;
+            this.navigationService = navigationService;
             this.policyService = policyService;
             this.dialogService = dialogService;
             this.creationService = creationService;
-            this.copyService = copyService;
+            this.$q = $q;
         }
 
         SaveAction.prototype.getObjectService = function(){
@@ -71,29 +67,77 @@ define(
          */
         SaveAction.prototype.perform = function () {
             var domainObject = this.domainObject,
-                copyService = this.copyService,
+                $location = this.$location,
+                urlService = this.urlService,
                 self = this;
 
             function resolveWith(object){
-                return function () {
+                return function() {
                     return object;
                 };
             }
 
             function doWizardSave(parent) {
                 var context = domainObject.getCapability("context"),
-                    wizard = new CreateWizard(
-                        domainObject,
-                        parent,
-                        self.policyService
-                    );
+                    wizard = new CreateWizard(domainObject.useCapability('type'), parent, self.policyService, domainObject.getModel());
+
+                function mergeObjects(fromObject, toObject){
+                    Object.keys(fromObject).forEach(function(key) {
+                        toObject[key] = fromObject[key];
+                    });
+                }
+
+                // Create and persist the new object, based on user
+                // input.
+                function buildObjectFromInput(formValue) {
+                    var parent = wizard.getLocation(formValue),
+                        formModel = wizard.createModel(formValue);
+
+                        formModel.location = parent.getId();
+                        //Replace domain object model with model collected
+                        // from user form.
+                        domainObject.useCapability("mutation", function(){
+                            //Replace object model with the model from the form
+                            return formModel;
+                        });
+                        return domainObject;
+                }
+
+                function getAllComposees(domainObject){
+                    return domainObject.useCapability('composition');
+                }
+
+                function addComposeesToObject(object){
+                    return function(composees){
+                        return self.$q.all(composees.map(function (composee) {
+                            return object.getCapability('composition').add(composee);
+                        })).then(resolveWith(object));
+                    };
+                }
+
+                /**
+                 * Add the composees of the 'virtual' object to the
+                 * persisted object
+                 * @param object
+                 * @returns {*}
+                 */
+                function composeNewObject(object){
+                    if (self.$q.when(object.hasCapability('composition') && domainObject.hasCapability('composition'))) {
+                        return getAllComposees(domainObject)
+                            .then(addComposeesToObject(object));
+                    }
+                }
 
                 return self.dialogService
-                    .getUserInput(
-                        wizard.getFormStructure(true),
-                        wizard.getInitialFormValue()
-                    )
-                    .then(wizard.populateObjectFromInput.bind(wizard));
+                    .getUserInput(wizard.getFormStructure(), wizard.getInitialFormValue())
+                    .then(buildObjectFromInput);
+            }
+
+
+            function persistObject(object){
+                return  ((object.hasCapability('editor') && object.getCapability('editor').save(true)) ||
+                        object.getCapability('persistence').persist())
+                        .then(resolveWith(object));
             }
 
             function fetchObject(objectId){
@@ -106,18 +150,14 @@ define(
                 return fetchObject(object.getModel().location);
             }
 
-            function allowClone(objectToClone) {
-                return (objectToClone.getId() === domainObject.getId()) ||
-                    objectToClone.getCapability('location').isOriginal();
+            function locateObjectInParent(parent){
+                parent.getCapability('composition').add(domainObject.getId());
+                return parent;
             }
 
-            function cloneIntoParent(parent) {
-                return copyService.perform(domainObject, parent, allowClone);
-            }
-
-            function cancelEditingAfterClone(clonedObject) {
-                return domainObject.getCapability("editor").cancel()
-                    .then(resolveWith(clonedObject));
+            function doNothing() {
+                // Create cancelled, do nothing
+                return false;
             }
 
             // Invoke any save behavior introduced by the editor capability;
@@ -127,13 +167,18 @@ define(
             function doSave() {
                 //This is a new 'virtual object' that has not been persisted
                 // yet.
-                if (domainObject.getModel().persisted === undefined){
+                if (!domainObject.getModel().persisted){
                     return getParent(domainObject)
-                        .then(doWizardSave)
-                        .then(getParent)
-                        .then(cloneIntoParent)
-                        .then(cancelEditingAfterClone)
-                        .catch(resolveWith(false));
+                            .then(doWizardSave)
+                            .then(persistObject)
+                            .then(getParent)//Parent may have changed based
+                                            // on user selection
+                            .then(locateObjectInParent)
+                            .then(persistObject)
+                            .then(function(){
+                                return fetchObject(domainObject.getId());
+                            })
+                        .catch(doNothing);
                 } else {
                     return domainObject.getCapability("editor").save()
                         .then(resolveWith(domainObject.getOriginalObject()));
@@ -144,7 +189,7 @@ define(
             // UI, which will have been pushed atop the Browse UI.)
             function returnToBrowse(object) {
                 if (object) {
-                    object.getCapability("action").perform("navigate");
+                    self.navigationService.setNavigation(object);
                 }
                 return object;
             }

platform/commonUI/edit/src/capabilities/EditableLookupCapability.js

@@ -45,8 +45,7 @@ define(
             cache,
             idempotent
         ) {
-            var capability = Object.create(contextCapability),
-                method;
+            var capability = Object.create(contextCapability);
 
             // Check for domain object interface. If something has these
             // three methods, we assume it's a domain object.
@@ -115,9 +114,7 @@ define(
             }
 
             // Wrap all methods; return only editable domain objects.
-            for (method in contextCapability) {
-                wrapMethod(method);
-            }
+            Object.keys(contextCapability).forEach(wrapMethod);
 
             return capability;
         };

platform/commonUI/edit/src/capabilities/EditorCapability.js

@@ -81,8 +81,7 @@ define(
             var domainObject = this.domainObject,
                 editableObject = this.editableObject,
                 self = this,
-                cache = this.cache,
-                returnPromise;
+                cache = this.cache;
 
             // Update the underlying, "real" domain object's model
             // with changes made to the copy used for editing.
@@ -100,18 +99,14 @@ define(
             editableObject.getCapability("status").set("editing", false);
 
             if (nonrecursive) {
-                returnPromise = resolvePromise(doMutate())
+                return resolvePromise(doMutate())
                     .then(doPersist)
                     .then(function(){
                         self.cancel();
                     });
             } else {
-                returnPromise = resolvePromise(cache.saveAll());
+                return resolvePromise(cache.saveAll());
             }
-            //Return the original (non-editable) object
-            return returnPromise.then(function() {
-                return domainObject.getOriginalObject ? domainObject.getOriginalObject() : domainObject;
-            });
         };
 
         /**
@@ -124,7 +119,8 @@ define(
          */
         EditorCapability.prototype.cancel = function () {
             this.editableObject.getCapability("status").set("editing", false);
-            this.cache.markClean();
+            //TODO: Reset the cache as well here.
+            this.cache.markClean(this.editableObject);
             return resolvePromise(undefined);
         };
 

platform/commonUI/edit/src/controllers/EditObjectController.js

@@ -36,9 +36,8 @@ define(
          * @memberof platform/commonUI/edit
          * @constructor
          */
-        function EditObjectController($scope, $location, policyService) {
+        function EditObjectController($scope, $location) {
             this.scope = $scope;
-            this.policyService = policyService;
 
             var navigatedObject;
             function setViewForDomainObject(domainObject) {
@@ -74,14 +73,16 @@ define(
          */
         EditObjectController.prototype.getUnloadWarning = function () {
             var navigatedObject = this.scope.domainObject,
-                policyMessage;
-
-            this.policyService.allow("navigation", navigatedObject, undefined, function(message) {
-               policyMessage = message;
-            });
-
-            return policyMessage;
+                editorCapability = navigatedObject &&
+                    navigatedObject.getCapability("editor"),
+                statusCapability = navigatedObject &&
+                    navigatedObject.getCapability("status"),
+                hasChanges = statusCapability && statusCapability.get('editing')
+                    && editorCapability && editorCapability.dirty();
 
+            return hasChanges ?
+                "Unsaved changes will be lost if you leave this page." :
+                undefined;
         };
 
         return EditObjectController;

platform/commonUI/edit/src/directives/MCTBeforeUnload.js

@@ -35,7 +35,7 @@ define(
          * @constructor
          * @param $window the window
          */
-        function MCTBeforeUnload($window) {
+        function MCTBeforeUnload($window, navigationService) {
             var unloads = [],
                 oldBeforeUnload = $window.onbeforeunload;
 
@@ -55,8 +55,23 @@ define(
                     return scope.$eval(attrs.mctBeforeUnload);
                 }
 
+                function shouldAllowNavigation(){
+                    // Get an unload message (if any)
+                    var warning = unload();
+                    // Prompt the user if there's an unload message
+                    return !warning || $window.confirm(warning);
+                }
+
+                // Show a dialog before allowing a location change
+                function checkNavigationEvent(event) {
+                    // Return a false value to the navigationService to
+                    // indicate that the navigation event should be prevented
+                    return shouldAllowNavigation();
+                }
+
                 // Stop using this unload expression
                 function removeUnload() {
+                    navigationService.removeListener(checkNavigationEvent, "before");
                     unloads = unloads.filter(function (callback) {
                         return callback !== unload;
                     });
@@ -67,11 +82,8 @@ define(
 
                 // Show a dialog before allowing a location change
                 function checkLocationChange(event) {
-                    // Get an unload message (if any)
-                    var warning = unload();
-                    // Prompt the user if there's an unload message
-                    if (warning && !$window.confirm(warning)) {
-                        // ...and prevent the route change if it was confirmed
+                    if (!shouldAllowNavigation()) {
+                        // Prevent the route change if it was confirmed
                         event.preventDefault();
                     }
                 }
@@ -90,6 +102,8 @@ define(
 
                 // Also handle route changes
                 scope.$on("$locationChangeStart", checkLocationChange);
+
+                navigationService.addListener(checkNavigationEvent, "before");
             }
 
             return {

platform/commonUI/edit/src/objects/EditableDomainObject.js

@@ -36,7 +36,6 @@ define(
         '../capabilities/EditableContextCapability',
         '../capabilities/EditableCompositionCapability',
         '../capabilities/EditableRelationshipCapability',
-        '../capabilities/EditableInstantiationCapability',
         '../capabilities/EditorCapability',
         '../capabilities/EditableActionCapability',
         './EditableDomainObjectCache'
@@ -46,7 +45,6 @@ define(
         EditableContextCapability,
         EditableCompositionCapability,
         EditableRelationshipCapability,
-        EditableInstantiationCapability,
         EditorCapability,
         EditableActionCapability,
         EditableDomainObjectCache
@@ -58,7 +56,6 @@ define(
             context: EditableContextCapability,
             composition: EditableCompositionCapability,
             relationship: EditableRelationshipCapability,
-            instantiation: EditableInstantiationCapability,
             editor: EditorCapability
         };
 

platform/commonUI/edit/src/objects/EditableDomainObjectCache.js

@@ -126,14 +126,7 @@ define(
          * @param {DomainObject} domainObject the domain object
          */
         EditableDomainObjectCache.prototype.markClean = function (domainObject) {
-            var self = this;
-            if (!domainObject) {
-                Object.keys(this.dirtyObjects).forEach(function(key) {
-                    delete self.dirtyObjects[key];
-                });
-            } else {
-                delete this.dirtyObjects[domainObject.getId()];
-            }
+            delete this.dirtyObjects[domainObject.getId()];
         };
 
         /**

platform/commonUI/edit/src/policies/EditableLinkPolicy.js

@@ -1,52 +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";
-
-    /**
-     * Policy suppressing links when the linked-to domain object is in
-     * edit mode. Domain objects being edited may not have been persisted,
-     * so creating links to these can result in inconsistent state.
-     *
-     * @memberof platform/commonUI/edit
-     * @constructor
-     * @implements {Policy.<View, DomainObject>}
-     */
-    function EditableLinkPolicy() {
-    }
-
-    EditableLinkPolicy.prototype.allow = function (action, context) {
-        var key = action.getMetadata().key;
-
-        if (key === 'link') {
-            return !((context.selectedObject || context.domainObject)
-                .hasCapability('editor'));
-        }
-
-        // Like all policies, allow by default.
-        return true;
-    };
-
-    return EditableLinkPolicy;
-});

platform/commonUI/edit/src/policies/EditableMovePolicy.js

@@ -1,51 +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";
-
-    /**
-     * Policy suppressing move actions among editable and non-editable
-     * domain objects.
-     * @memberof platform/commonUI/edit
-     * @constructor
-     * @implements {Policy.<View, DomainObject>}
-     */
-    function EditableMovePolicy() {
-    }
-
-    EditableMovePolicy.prototype.allow = function (action, context) {
-        var domainObject = context.domainObject,
-            selectedObject = context.selectedObject,
-            key = action.getMetadata().key;
-
-        if (key === 'move' && domainObject.hasCapability('editor')) {
-            return !!selectedObject && selectedObject.hasCapability('editor');
-        }
-
-        // Like all policies, allow by default.
-        return true;
-    };
-
-    return EditableMovePolicy;
-});

platform/commonUI/edit/src/representers/EditRepresenter.js

@@ -49,7 +49,6 @@ define(
             var self = this;
 
             this.scope = scope;
-            this.listenHandle = undefined;
 
             // Mutate and persist a new version of a domain object's model.
             function doPersist(model) {
@@ -101,18 +100,10 @@ define(
             // Place the "commit" method in the scope
             scope.commit = commit;
             scope.setEditable = setEditable;
-
-            // Clean up when the scope is destroyed
-            scope.$on("$destroy", function () {
-                self.destroy();
-            });
-
         }
 
         // Handle a specific representation of a specific domain object
         EditRepresenter.prototype.represent = function represent(representation, representedObject) {
-            var scope = this.scope,
-                self = this;
             // Track the key, to know which view configuration to save to.
             this.key = (representation || {}).key;
             // Track the represented object
@@ -120,32 +111,11 @@ define(
 
             // Ensure existing watches are released
             this.destroy();
-
-            function setEditing(){
-                scope.viewObjectTemplate = 'edit-object';
-            }
-
-            /**
-             * Listen for changes in object state. If the object becomes
-             * editable then change the view and inspector regions
-             * object representation accordingly
-             */
-            this.listenHandle = this.domainObject.getCapability('status').listen(function(statuses){
-                if (statuses.indexOf('editing')!=-1){
-                    setEditing();
-                } else {
-                    delete scope.viewObjectTemplate;
-                }
-            });
-
-            if (representedObject.getCapability('status').get('editing')){
-                setEditing();
-            }
         };
 
         // Respond to the destruction of the current representation.
         EditRepresenter.prototype.destroy = function destroy() {
-            return this.listenHandle && this.listenHandle();
+            // Nothing to clean up
         };
 
         return EditRepresenter;

platform/commonUI/edit/test/capabilities/EditableLookupCapabilitySpec.js

@@ -118,29 +118,6 @@ define(
                 expect(mockContext.getDomainObject.calls.length).toEqual(2);
             });
 
-            it("wraps inherited methods", function () {
-                var CapabilityClass = function(){
-                };
-                CapabilityClass.prototype.inheritedMethod=function () {
-                    return "an inherited method";
-                };
-
-                mockContext = new CapabilityClass();
-
-                capability = new EditableLookupCapability(
-                    mockContext,
-                    mockEditableObject,
-                    mockDomainObject,
-                    factory,
-                    false
-                );
-                expect(capability.inheritedMethod()).toEqual("an inherited method");
-                expect(capability.hasOwnProperty('inheritedMethod')).toBe(true);
-                // The presence of an own property indicates that the method
-                // has been wrapped on the object itself and this is a valid
-                // test that the inherited method has been wrapped.
-            });
-
         });
     }
 );

platform/commonUI/edit/test/controllers/EditControllerSpec.js

@@ -33,7 +33,6 @@ define(
                 mockLocation,
                 mockStatusCapability,
                 mockCapabilities,
-                mockPolicyService,
                 controller;
 
             // Utility function; look for a $watch on scope and fire it
@@ -46,12 +45,6 @@ define(
             }
 
             beforeEach(function () {
-                mockPolicyService = jasmine.createSpyObj(
-                    "policyService",
-                    [
-                        "allow"
-                    ]
-                );
                 mockScope = jasmine.createSpyObj(
                     "$scope",
                     [ "$on", "$watch" ]
@@ -89,25 +82,25 @@ define(
 
                 controller = new EditObjectController(
                     mockScope,
-                    mockLocation,
-                    mockPolicyService
+                    mockLocation
                 );
             });
 
             it("exposes a warning message for unload", function () {
                 var obj = mockObject,
-                    errorMessage = "Unsaved changes";
+                    mockEditor = jasmine.createSpyObj('editor', ['dirty']);
 
                 // Normally, should be undefined
                 expect(controller.getUnloadWarning()).toBeUndefined();
 
-                // Override the policy service to prevent navigation
-                mockPolicyService.allow.andCallFake(function(category, object, context, callback){
-                   callback(errorMessage);
-                });
+                // Override the object's editor capability, make it look
+                // like there are unsaved changes.
+                mockCapabilities.editor = mockEditor;
+                mockEditor.dirty.andReturn(true);
+                mockStatusCapability.get.andReturn(true);
 
                 // Should have some warning message here now
-                expect(controller.getUnloadWarning()).toEqual(errorMessage);
+                expect(controller.getUnloadWarning()).toEqual(jasmine.any(String));
             });
 
 

platform/commonUI/edit/test/directives/MCTBeforeUnloadSpec.js

@@ -31,6 +31,7 @@ define(
                 mockScope,
                 testAttrs,
                 mockEvent,
+                mockNavigationService,
                 directive;
 
             function fireListener(eventType, value) {
@@ -46,7 +47,8 @@ define(
                 mockScope = jasmine.createSpyObj("$scope", ['$eval', '$on']);
                 testAttrs = { mctBeforeUnload: "someExpression" };
                 mockEvent = jasmine.createSpyObj("event", ["preventDefault"]);
-                directive = new MCTBeforeUnload(mockWindow);
+                mockNavigationService = jasmine.createSpyObj("navigationService", ["addListener", "removeListener"]);
+                directive = new MCTBeforeUnload(mockWindow, mockNavigationService);
                 directive.link(mockScope, {}, testAttrs);
             });
 
@@ -65,6 +67,10 @@ define(
                 );
             });
 
+            it("listens for navigation changes", function () {
+                expect(mockNavigationService.addListener).toHaveBeenCalledWith(jasmine.any(Function), "before");
+            });
+
             it("listens for its scope's destroy event", function () {
                 expect(mockScope.$on).toHaveBeenCalledWith(
                     "$destroy",
@@ -108,9 +114,10 @@ define(
             it("cleans up listeners when destroyed", function () {
                 fireListener("$destroy", mockEvent);
                 expect(mockWindow.onbeforeunload).toBeUndefined();
+                expect(mockNavigationService.removeListener).toHaveBeenCalled();
             });
 
 
         });
     }
-);
+);

platform/commonUI/edit/test/representers/EditRepresenterSpec.js

@@ -48,7 +48,7 @@ define(
             beforeEach(function () {
                 mockQ = { when: mockPromise };
                 mockLog = jasmine.createSpyObj("$log", ["info", "debug"]);
-                mockScope = jasmine.createSpyObj("$scope", ["$watch", "$on"]);
+                mockScope = jasmine.createSpyObj("$scope", ["$watch"]);
                 testRepresentation = { key: "test" };
                 mockDomainObject = jasmine.createSpyObj("domainObject", [
                     "getId",
@@ -61,10 +61,10 @@ define(
                     jasmine.createSpyObj("persistence", ["persist"]);
                 mockStatusCapability =
                     jasmine.createSpyObj("statusCapability", ["get", "listen"]);
-                mockStatusCapability.get.andReturn(false);
+
                 mockCapabilities = {
-                    'persistence': mockPersistence,
-                    'status': mockStatusCapability
+                    "persistence": mockPersistence,
+                    "status": mockStatusCapability
                 };
 
                 mockDomainObject.getModel.andReturn({});
@@ -82,17 +82,6 @@ define(
                 expect(mockScope.commit).toEqual(jasmine.any(Function));
             });
 
-            it("Sets edit view template on edit mode", function () {
-                mockStatusCapability.listen.mostRecentCall.args[0](['editing']);
-                expect(mockScope.viewObjectTemplate).toEqual('edit-object');
-            });
-
-            it("Cleans up listeners on scope destroy", function () {
-                representer.listenHandle = jasmine.createSpy('listen');
-                mockScope.$on.mostRecentCall.args[1]();
-                expect(representer.listenHandle).toHaveBeenCalled();
-            });
-
             it("mutates and persists upon observed changes", function () {
                 mockScope.model = { someKey: "some value" };
                 mockScope.configuration = { someConfiguration: "something" };

platform/commonUI/formats/src/UTCTimeFormat.js

@@ -28,10 +28,9 @@ define([
 ) {
     "use strict";
 
-    var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSS",
+    var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss",
         DATE_FORMATS = [
             DATE_FORMAT,
-            "YYYY-MM-DD HH:mm:ss",
             "YYYY-MM-DD HH:mm",
             "YYYY-MM-DD"
         ];
@@ -49,7 +48,7 @@ define([
     }
 
     UTCTimeFormat.prototype.format = function (value) {
-        return moment.utc(value).format(DATE_FORMAT) + "Z";
+        return moment.utc(value).format(DATE_FORMAT);
     };
 
     UTCTimeFormat.prototype.parse = function (text) {

platform/commonUI/formats/test/UTCTimeFormatSpec.js

@@ -40,12 +40,6 @@ define(
                 expect(moment.utc(formatted).valueOf()).toEqual(timestamp);
             });
 
-            it("displays with millisecond precision", function () {
-                var timestamp = 12345670789,
-                    formatted = format.format(timestamp);
-                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);

platform/commonUI/general/bundle.js

@@ -24,7 +24,6 @@
 define([
     "./src/services/UrlService",
     "./src/services/PopupService",
-    "./src/SplashScreenManager",
     "./src/StyleSheetLoader",
     "./src/UnsupportedBrowserWarning",
     "./src/controllers/TimeRangeController",
@@ -49,31 +48,10 @@ define([
     "./src/directives/MCTScroll",
     "./src/directives/MCTSplitPane",
     "./src/directives/MCTSplitter",
-    "./src/directives/MCTTree",
-    "text!./res/templates/bottombar.html",
-    "text!./res/templates/controls/action-button.html",
-    "text!./res/templates/controls/input-filter.html",
-    "text!./res/templates/indicator.html",
-    "text!./res/templates/message-banner.html",
-    "text!./res/templates/progress-bar.html",
-    "text!./res/templates/controls/time-controller.html",
-    "text!./res/templates/containers/accordion.html",
-    "text!./res/templates/subtree.html",
-    "text!./res/templates/tree.html",
-    "text!./res/templates/tree-node.html",
-    "text!./res/templates/label.html",
-    "text!./res/templates/controls/action-group.html",
-    "text!./res/templates/menu/context-menu.html",
-    "text!./res/templates/controls/switcher.html",
-    "text!./res/templates/object-inspector.html",
-    "text!./res/templates/controls/selector.html",
-    "text!./res/templates/controls/datetime-picker.html",
-    "text!./res/templates/controls/datetime-field.html",
     'legacyRegistry'
 ], function (
     UrlService,
     PopupService,
-    SplashScreenManager,
     StyleSheetLoader,
     UnsupportedBrowserWarning,
     TimeRangeController,
@@ -98,26 +76,6 @@ define([
     MCTScroll,
     MCTSplitPane,
     MCTSplitter,
-    MCTTree,
-    bottombarTemplate,
-    actionButtonTemplate,
-    inputFilterTemplate,
-    indicatorTemplate,
-    messageBannerTemplate,
-    progressBarTemplate,
-    timeControllerTemplate,
-    accordionTemplate,
-    subtreeTemplate,
-    treeTemplate,
-    treeNodeTemplate,
-    labelTemplate,
-    actionGroupTemplate,
-    contextMenuTemplate,
-    switcherTemplate,
-    objectInspectorTemplate,
-    selectorTemplate,
-    datetimePickerTemplate,
-    datetimeFieldTemplate,
     legacyRegistry
 ) {
     "use strict";
@@ -159,12 +117,6 @@ define([
                         "notificationService",
                         "agentService"
                     ]
-                },
-                {
-                    "implementation": SplashScreenManager,
-                    "depends": [
-                        "$document"
-                    ]
                 }
             ],
             "filters": [
@@ -182,31 +134,31 @@ define([
             "templates": [
                 {
                     "key": "bottombar",
-                    "template": bottombarTemplate
+                    "templateUrl": "templates/bottombar.html"
                 },
                 {
                     "key": "action-button",
-                    "template": actionButtonTemplate
+                    "templateUrl": "templates/controls/action-button.html"
                 },
                 {
                     "key": "input-filter",
-                    "template": inputFilterTemplate
+                    "templateUrl": "templates/controls/input-filter.html"
                 },
                 {
                     "key": "indicator",
-                    "template": indicatorTemplate
+                    "templateUrl": "templates/indicator.html"
                 },
                 {
                     "key": "message-banner",
-                    "template": messageBannerTemplate
+                    "templateUrl": "templates/message-banner.html"
                 },
                 {
                     "key": "progress-bar",
-                    "template": progressBarTemplate
+                    "templateUrl": "templates/progress-bar.html"
                 },
                 {
                     "key": "time-controller",
-                    "template": timeControllerTemplate
+                    "templateUrl": "templates/controls/time-controller.html"
                 }
             ],
             "controllers": [
@@ -387,11 +339,6 @@ define([
                 {
                     "key": "mctSplitter",
                     "implementation": MCTSplitter
-                },
-                {
-                    "key": "mctTree",
-                    "implementation": MCTTree,
-                    "depends": [ '$parse', 'gestureService' ]
                 }
             ],
             "constants": [
@@ -420,7 +367,7 @@ define([
             "containers": [
                 {
                     "key": "accordion",
-                    "template": accordionTemplate,
+                    "templateUrl": "templates/containers/accordion.html",
                     "attributes": [
                         "label"
                     ]
@@ -429,7 +376,7 @@ define([
             "representations": [
                 {
                     "key": "tree",
-                    "template": subtreeTemplate,
+                    "templateUrl": "templates/subtree.html",
                     "uses": [
                         "composition"
                     ],
@@ -438,25 +385,25 @@ define([
                 },
                 {
                     "key": "tree",
-                    "template": treeTemplate
+                    "templateUrl": "templates/tree.html"
                 },
                 {
                     "key": "subtree",
-                    "template": subtreeTemplate,
+                    "templateUrl": "templates/subtree.html",
                     "uses": [
                         "composition"
                     ]
                 },
                 {
                     "key": "tree-node",
-                    "template": treeNodeTemplate,
+                    "templateUrl": "templates/tree-node.html",
                     "uses": [
                         "action"
                     ]
                 },
                 {
                     "key": "label",
-                    "template": labelTemplate,
+                    "templateUrl": "templates/label.html",
                     "uses": [
                         "type",
                         "location"
@@ -469,7 +416,7 @@ define([
                 },
                 {
                     "key": "node",
-                    "template": labelTemplate,
+                    "templateUrl": "templates/label.html",
                     "uses": [
                         "type"
                     ],
@@ -480,45 +427,55 @@ define([
                 },
                 {
                     "key": "action-group",
-                    "template": actionGroupTemplate,
+                    "templateUrl": "templates/controls/action-group.html",
                     "uses": [
                         "action"
                     ]
                 },
                 {
                     "key": "context-menu",
-                    "template": contextMenuTemplate,
+                    "templateUrl": "templates/menu/context-menu.html",
                     "uses": [
                         "action"
                     ]
                 },
                 {
                     "key": "switcher",
-                    "template": switcherTemplate,
+                    "templateUrl": "templates/controls/switcher.html",
                     "uses": [
                         "view"
                     ]
                 },
                 {
                     "key": "object-inspector",
-                    "template": objectInspectorTemplate
+                    "templateUrl": "templates/object-inspector.html"
                 }
             ],
             "controls": [
                 {
                     "key": "selector",
-                    "template": selectorTemplate
+                    "templateUrl": "templates/controls/selector.html"
                 },
                 {
                     "key": "datetime-picker",
-                    "template": datetimePickerTemplate
+                    "templateUrl": "templates/controls/datetime-picker.html"
                 },
                 {
                     "key": "datetime-field",
-                    "template": datetimeFieldTemplate
+                    "templateUrl": "templates/controls/datetime-field.html"
                 }
             ],
             "licenses": [
+                {
+                    "name": "Modernizr",
+                    "version": "2.6.2",
+                    "description": "Browser/device capability finding",
+                    "author": "Faruk Ateş",
+                    "website": "http://modernizr.com",
+                    "copyright": "Copyright (c) 2009–2015",
+                    "license": "license-mit",
+                    "link": "http://modernizr.com/license/"
+                },
                 {
                     "name": "Normalize.css",
                     "version": "1.1.2",
@@ -528,16 +485,6 @@ define([
                     "copyright": "Copyright (c) Nicolas Gallagher and Jonathan Neal",
                     "license": "license-mit",
                     "link": "https://github.com/necolas/normalize.css/blob/v1.1.2/LICENSE.md"
-                },
-                {
-                    "name": "Zepto",
-                    "version": "1.1.6",
-                    "description": "DOM manipulation",
-                    "author": "Thomas Fuchs",
-                    "website": "http://zeptojs.com/",
-                    "copyright": "Copyright (c) 2010-2016 Thomas Fuchs",
-                    "license": "license-mit",
-                    "link": "https://github.com/madrobby/zepto/blob/master/MIT-LICENSE"
                 }
             ]
         }

platform/commonUI/general/res/config.rb

@@ -0,0 +1,26 @@
+# Require any additional compass plugins here.
+# require "compass-growl"
+
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "css"
+sass_dir = "sass"
+images_dir = "images"
+javascripts_dir = "js"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# :expanded, :compressed, :nested
+output_style = :nested
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass vfn_platform/static/sass scss && rm -rf sass && mv scss sass

platform/commonUI/general/res/css/reset.css

@@ -1,48 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/
-   v2.0 | 20110126
-   License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}

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

@@ -80,7 +80,7 @@
 <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" />
-<glyph unicode="&#xe604;" glyph-name="icon-tabular" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM640 512h-256v192h256v-192zM384 448h256v-192h-256v192zM320 256h-256v192h256v-192zM320 704v-192h-256v192h256zM128 0c-17 0-33 6.6-45.2 18.8s-18.8 28.2-18.8 45.2v128h256v-192h-192zM384 0v192h256v-192h-256zM960 64c0-17-6.6-33-18.8-45.2s-28.2-18.8-45.2-18.8h-192v192h256v-128zM960 256h-256v192h256v-192zM960 512h-256v192h256v-192z" />
+<glyph unicode="&#xe604;" glyph-name="icon-tabular" d="M0 896v-192h448v256h-384c-35.2 0-64-28.8-64-64zM960 960h-384v-256h448v192c0 35.2-28.8 64-64 64zM576 576h448v-256h-448v256zM0 576h448v-256h-448v256zM0 0c0-35.2 28.8-64 64-64h384v256h-448v-192zM576-64h384c35.2 0 64 28.8 64 64v192h-448v-256z" />
 <glyph unicode="&#xe605;" glyph-name="icon-calendar" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM640 512h-256v192h256v-192zM384 448h256v-192h-256v192zM320 256h-256v192h256v-192zM320 704v-192h-256v192h256zM128 0c-17 0-33 6.6-45.2 18.8s-18.8 28.2-18.8 45.2v128h256v-192h-192zM384 0v192h256v-192h-256zM960 64c0-17-6.6-33-18.8-45.2s-28.2-18.8-45.2-18.8h-192v192h256v-128zM960 256h-256v192h256v-192zM960 512h-256v192h256v-192z" />
 <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" />
@@ -94,11 +94,7 @@
 <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-eye-open" d="M512 896c-261 0-480.6-195.4-512-448 31.4-252.6 251-448 512-448s480.6 195.4 512 448c-31.4 252.6-251 448-512 448zM768.2 225.4c-71.4-62.8-162.8-97.4-257.6-97.4s-186.2 34.6-257.6 97.4c-66.6 58.6-110.6 137.2-125 222.6 0 0 0 0.2 0 0.2 76.8 154 220.8 257.6 384 257.6s307.2-103.8 384-257.6c0 0 0-0.2 0-0.2-14.4-85.4-61.2-164-127.8-222.6zM512 672c-123.8 0-224-100.2-224-224s100.2-224 224-224 224 100.2 224 224-100.2 224-224 224z" />
 <glyph unicode="&#xe616;" glyph-name="icon-eye-open-no-gleam" d="M512 896c-261 0-480.6-195.4-512-448 31.4-252.6 251-448 512-448s480.6 195.4 512 448c-31.4 252.6-251 448-512 448zM768.2 225.4c-71.4-62.8-162.8-97.4-257.6-97.4s-186.2 34.6-257.6 97.4c-66.6 58.6-110.6 137.2-125 222.6 0 0 0 0.2 0 0.2 76.8 154 220.8 257.6 384 257.6s307.2-103.8 384-257.6c0 0 0-0.2 0-0.2-14.4-85.4-61.2-164-127.8-222.6zM512 672c-123.8 0-224-100.2-224-224s100.2-224 224-224 224 100.2 224 224-100.2 224-224 224zM576 416c-53 0-96 43-96 96s43 96 96 96 96-43 96-96c0-53-43-96-96-96z" />
-<glyph unicode="&#xe617;" glyph-name="icon-topic" d="M454.36 483.36l86.3 86.3c9.088 8.965 21.577 14.502 35.36 14.502s26.272-5.537 35.366-14.507l86.294-86.294c19.328-19.358 42.832-34.541 69.047-44.082l1.313 171.722-57.64 57.64c-34.407 34.33-81.9 55.558-134.35 55.558s-99.943-21.228-134.354-55.562l-86.296-86.297c-9.088-8.965-21.577-14.502-35.36-14.502s-26.272 5.537-35.366 14.507l-28.674 28.654v-172.14c19.045-7.022 41.040-11.084 63.984-11.084 52.463 0 99.966 21.239 134.379 55.587zM505.64 412.64l-86.3-86.3c-9.088-8.965-21.577-14.502-35.36-14.502s-26.272 5.537-35.366 14.507l-86.294 86.294c-2 2-4.2 4-6.36 6v-197.36c33.664-30.72 78.65-49.537 128.031-49.537 52.44 0 99.923 21.22 134.333 55.541l86.296 86.296c9.088 8.965 21.577 14.502 35.36 14.502s26.272-5.537 35.366-14.507l86.294-86.294c2-2 4.2-4 6.36-6v197.36c-33.664 30.72-78.65 49.537-128.031 49.537-52.44 0-99.923-21.22-134.333-55.541zM832 960h-128v-192h127.66l0.34-0.34v-639.32l-0.34-0.34h-127.66v-192h128c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM320 128h-127.66l-0.34 0.34v639.32l0.34 0.34h127.66v192h-128c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h128v192z" />
-<glyph unicode="&#xe618;" glyph-name="icon-session" d="M635.6 435.6c6.6-4.2 13.2-8.6 19.2-13.6l120.4-96.4c29.6-23.8 83.8-23.8 113.4 0l135.2 108c0.2 4.8 0.2 9.4 0.2 14.2 0 52.2-7.8 102.4-22.2 149.8l-154.8-123.6c-58.2-46.6-140.2-59.2-211.4-38.4zM248.6 325.8l120.4 96.4c58 46.4 140 59.2 211.2 38.4-6.6 4.2-13.2 8.6-19.2 13.6l-120.4 96.4c-29.6 23.8-83.8 23.8-113.4 0l-120.2-96.6c-40-32-91.4-48-143-48-21.6 0-43 2.8-63.8 8.4 0-0.6 0-1.2 0-1.6 5-3.4 10-6.8 14.6-10.6l120.4-96.4c29.8-23.8 83.8-23.8 113.4 0zM120.6 581.8l120.4 96.4c80.2 64.2 205.6 64.2 285.8 0l120.4-96.4c29.6-23.8 83.8-23.8 113.4 0l181 144.8c-91.2 140.4-249.6 233.4-429.6 233.4-238.6 0-439.2-163.2-496-384.2 30.8-17.6 77.8-15.6 104.6 6zM689 218l-120.4 96.4c-29.6 23.8-83.8 23.8-113.4 0l-120.2-96.4c-40-32-91.4-48-143-48-47.8 0-95.4 13.8-134.2 41.4 85.6-163.6 256.8-275.4 454.2-275.4s368.6 111.8 454.2 275.4c-80.4-57.4-199.8-55.2-277.2 6.6z" />
-<glyph unicode="&#xe619;" glyph-name="icon-bullet" d="M832 208c0-44-36-80-80-80h-480c-44 0-80 36-80 80v480c0 44 36 80 80 80h480c44 0 80-36 80-80v-480z" />
-<glyph unicode="&#xe620;" glyph-name="icon-tabular-realtime" d="M896 960h-768c-70.606-0.215-127.785-57.394-128-127.979v-768.021c0.215-70.606 57.394-127.785 127.979-128h768.021c70.606 0.215 127.785 57.394 128 127.979v768.021c-0.215 70.606-57.394 127.785-127.979 128zM448 668l25.060-25.32c7.916-7.922 18.856-12.822 30.94-12.822s23.024 4.9 30.94 12.822l75.5 76.3c29.97 30.338 71.571 49.128 117.56 49.128s87.59-18.79 117.544-49.112l50.456-50.997v-152.2c-24.111 8.83-44.678 22.255-61.542 39.342l-75.518 76.318c-7.916 7.922-18.856 12.822-30.94 12.822s-23.024-4.9-30.94-12.822l-75.5-76.3c-29.971-30.343-71.575-49.137-117.568-49.137-20.084 0-39.331 3.584-57.137 10.146l1.145 151.831zM320 0h-192c-35.26 0.214-63.786 28.74-64 63.98v128.020h256v-192zM320 256h-256v192h256v-192zM320 512h-256v192h256v-192zM640 0h-256v192h256v-192zM448 323.38v174.5c1.88-1.74 3.74-3.5 5.56-5.34l75.5-76.3c7.916-7.922 18.856-12.822 30.94-12.822s23.024 4.9 30.94 12.822l75.5 76.3c29.966 30.333 71.56 49.119 117.542 49.119 43.28 0 82.673-16.644 112.128-43.879l-0.11-174.399c-1.88 1.74-3.74 3.5-5.56 5.34l-75.5 76.3c-7.916 7.922-18.856 12.822-30.94 12.822s-23.024-4.9-30.94-12.822l-75.5-76.3c-29.966-30.333-71.56-49.119-117.542-49.119-43.28 0-82.673 16.644-112.128 43.879zM960 64c-0.214-35.26-28.74-63.786-63.98-64h-192.020v192h256v-128z" />
-<glyph unicode="&#xe621;" glyph-name="icon-tabular-lad" d="M896 960h-768c-70.606-0.215-127.785-57.394-128-127.979v-768.021c0.215-70.606 57.394-127.785 127.979-128h768.021c70.606 0.215 127.785 57.394 128 127.979v768.021c-0.215 70.606-57.394 127.785-127.979 128zM64 704h256v-192h-256v192zM64 448h256v-192h-256v192zM128 0c-35.26 0.214-63.786 28.74-64 63.98v128.020h256v-192h-192zM384 0v192h256v-192h-256zM960 64c-0.214-35.26-28.74-63.786-63.98-64h-192.020v192h256v-128zM960 448v-192h-576v192h64v64h-64v192h576v-192h-64v-64h64zM782.32 412.62l-110.32 55.16v172.22c0 17.673-14.327 32-32 32s-32-14.327-32-32v-211.78l145.68-72.84c4.172-2.133 9.1-3.383 14.32-3.383 17.675 0 32.003 14.328 32.003 32.003 0 12.454-7.114 23.247-17.501 28.536z" />
-<glyph unicode="&#xe622;" glyph-name="icon-tabular-lad-set" d="M128 192v576c-70.606-0.215-127.785-57.394-128-127.979v-576.021c0.215-70.606 57.394-127.785 127.979-128h576.021c70.606 0.215 127.785 57.394 128 127.979l-576 0.021c-70.606 0.215-127.785 57.394-128 127.979zM896 960h-576c-70.606-0.215-127.785-57.394-128-127.979v-576.021c0.215-70.606 57.394-127.785 127.979-128h576.021c70.606 0.215 127.785 57.394 128 127.979v576.021c-0.215 70.606-57.394 127.785-127.979 128zM256 768h192v-128h-192v128zM256 576h192v-192h-192v192zM320 192c-35.26 0.214-63.786 28.74-64 63.98v64.020h192v-128h-128zM512 192v128h192v-128h-192zM960 256c-0.214-35.26-28.74-63.786-63.98-64h-128.020v128h192v-64zM960 384h-448v384h448v-384zM832 480c0.002 0 0.005 0 0.007 0 17.673 0 32 14.327 32 32 0 14.055-9.062 25.994-21.662 30.293l-74.345 24.767v104.94c0 17.673-14.327 32-32 32s-32-14.327-32-32v-151.060l117.88-39.3c3.018-1.040 6.495-1.64 10.113-1.64 0.003 0 0.005 0 0.008 0z" />
+<glyph unicode="&#xe617;" glyph-name="icon-topic" d="M832 960h-128v-192h127.6c0.2 0 0.2-0.2 0.4-0.4v-639.4c0-0.2-0.2-0.2-0.4-0.4h-127.6v-192h128c105.6 0 192 86.4 192 192v640.2c0 105.6-86.4 192-192 192zM192 128.4v639.4c0 0.2 0.2 0.2 0.4 0.4h127.6v191.8h-128c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h128v192h-127.6c-0.2 0-0.4 0.2-0.4 0.4zM686 576c7.2 0 21-7.4 38.6-25.8 11.8 24.8 26.4 52.2 43.4 79v50c-26.4 16.4-53.8 24.6-82 24.6-37.6 0-74.2-14.8-108.8-44.2 27.4-37.8 49.6-78.6 66.2-113.8 19.4 21.6 34.8 30.2 42.6 30.2zM338 320c-7.2 0-21 7.4-38.6 25.8-11.8-24.8-26.4-52.2-43.4-79v-74.8h82c37.6 0 74.2 14.8 108.8 44.2-27.4 37.8-49.6 78.6-66.2 113.8-19.4-21.4-34.8-30-42.6-30zM768 415.8c-38.2-70.6-72.8-95.8-85-95.8-15 0-64.2 38.4-112 152.8-17.4 41.8-46.6 101.6-85.8 149.4-44.8 54.4-93.2 82-144.2 82-29.2 0-57.6-9-85-27v-196.8c38.2 70.6 72.8 95.8 85 95.8 15 0 64.2-38.4 112-152.8 17.4-41.8 46.6-101.6 85.8-149.4 44.8-54.4 93.2-82 144.2-82 29.2 0 57.6 9 85 27v196.8z" />
+<glyph unicode="&#xe618;" glyph-name="icon-session" d="M101.2 672.4c57.2 69.6 118.6 104.8 182.8 104.8s125.6-35.2 182.8-104.8c51.4-62.6 89.8-141.2 112.6-196.2 27.6-65.8 58.8-121 90.6-159.6 10-12 44.2-51.4 69.8-51.4 6.4 0 30.4 3.8 69.8 51.4 31.8 38.6 63.2 93.8 90.6 159.6 23 55 61.2 133.6 112.6 196.2 3.6 4.4 7.2 8.6 10.8 12.8v18.8c0.4 140.8-114.8 256-255.6 256h-512c-140.8 0-256-115.2-256-256v-201c23.4 51.8 57.4 116.4 101.2 169.4zM744 778c54 0 106.4-24.4 156-72.8-31.6-44.6-57.4-92.2-77.6-134.2-33.4 42-61.8 59.4-78.4 59.4-17.4 0-47.8-19.2-83.2-65.8-27 57.6-54 102.4-77.4 136 51 51.2 104.8 77.4 160.6 77.4zM922.8 223.6c-57.2-69.6-118.8-104.8-182.8-104.8s-125.6 35.2-182.8 104.8c-51.4 62.6-89.8 141.2-112.6 196.2-27.6 65.8-58.8 121-90.6 159.6-10 12-44.2 51.4-69.8 51.4-6.4 0-30.4-3.8-69.8-51.4-31.8-38.6-63.2-93.8-90.6-159.6-23-55-61.2-133.6-112.6-196.2-3.6-4.4-7.2-8.6-10.8-12.8v-18.8c0-140.8 115.2-256 256-256h512c140.8 0 256 115.2 256 256v201c-23.8-51.8-57.8-116.4-101.6-169.4zM280 118c-54 0-106.4 24.4-156 72.8 31.6 44.6 57.4 92.2 77.6 134.2 33.4-42 61.8-59.4 78.4-59.4 17.4 0 47.8 19.2 83.2 65.8 27-57.6 54-102.4 77.4-136-51-51.2-104.8-77.4-160.6-77.4z" />
 <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>

platform/commonUI/general/res/images/logo-app-shdw.svg

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="20 0 640 150" enable-background="new 20 0 640 150" xml:space="preserve">
-<filter  height="130%" width="150%" id="AI_Shadow_Custom" x="-15%" filterUnits="objectBoundingBox" y="-15%">
-	<feGaussianBlur  in="SourceAlpha" result="blur" stdDeviation="6"></feGaussianBlur>
-	<feOffset  in="blur" dy="3" result="offsetBlurredAlpha" dx="0"></feOffset>
-	<feMerge>
-		<feMergeNode  in="offsetBlurredAlpha"></feMergeNode>
-		<feMergeNode  in="SourceGraphic"></feMergeNode>
-	</feMerge>
-</filter>
-<g filter="url(#AI_Shadow_Custom)">
-	<path fill="#FFFFFF" d="M90.7,13.2c14.8,0,22.8,8,22.8,22.8v46.3c0,14.8-8,22.8-22.8,22.8H62.8c-14.8,0-22.8-8-22.8-22.8V36
-		c0-14.8,8-22.8,22.8-22.8H90.7z M97.8,36.2c0-5.8-3.1-9.2-9.2-9.2h-24c-5.8,0-9.2,3.2-9.2,9.2v45.9c0,6,3.4,9.2,9.2,9.2h24
-		c6,0,9.2-3.2,9.2-9.2V36.2z"/>
-	<path fill="#FFFFFF" d="M173.2,13.2c14.8,0,22.8,8,22.8,22.8v46.3c0,14.8-8,22.8-22.8,22.8h-9c-11.2,0-19.2-6.6-26.5-13.6v44.2
-		h-15.5V13.2h15.5v13.6c7.3-7,15.3-13.6,26.5-13.6H173.2z M180.3,36.2c0-5.8-3.1-9.2-9.2-9.2h-8.3c-9.4,0-17,3.6-25.2,9.2v45.9
-		c8.2,5.6,15.8,9.2,25.2,9.2h8.3c6.1,0,9.2-3.4,9.2-9.2V36.2z"/>
-	<path fill="#FFFFFF" d="M220.3,82.8c0,6,3.2,9.2,9.2,9.2h23c6,0,9.2-3.4,9.2-9.2V76h15.6v6.3c0,14.8-8,22.8-22.8,22.8h-27
-		c-14.8,0-22.8-8-22.8-22.8V36c0-14.8,8-22.8,22.8-22.8h27c14.8,0,22.8,8,22.8,22.8v26.9h-57V82.8z M229.5,26.3
-		c-6,0-9.2,3.2-9.2,9.2v15.8h41.3V35.5c0-6-3.1-9.2-9.2-9.2H229.5z"/>
-	<path fill="#FFFFFF" d="M285.7,13.2h15.5v13.6c7.3-7,15.3-13.6,26.5-13.6h7.1c14.8,0,22.8,8,22.8,22.8v69.1h-15.5V36.6
-		c0-6-3.2-9.2-9.2-9.2h-6.6c-9.4,0-17,3.4-25.2,9.2v68.5h-15.5V13.2z"/>
-	<path fill="#4F79F7" d="M495.4,105.1c-12.5,0-18.4-6-18.4-18.4V28.7c0-12.5,6.2-18.4,18.7-18.4h42.2c12.5,0,18.1,6,18.1,18.4v17.7
-		h-25.4V33.9c0-1.9-0.5-2.4-2.4-2.4h-23.3c-1.9,0-2.4,0.5-2.4,2.4v47.6c0,1.9,0.5,2.4,2.4,2.4h23.3c1.9,0,2.4-0.5,2.4-2.4V69H556
-		v17.7c0,12.5-6,18.4-18.4,18.4H495.4z"/>
-	<path fill="#4F79F7" d="M613.7,32v73.1h-25.4V32H562V10.3h78V32H613.7z"/>
-	<path fill="#4F79F7" d="M425.3,93.6l17.4-42.4v48.6c0,3,2.4,5.4,5.4,5.4h19V15.7c0-3-2.4-5.4-5.4-5.4h-23.3l-21.2,49.4l-21.2-49.4
-		h-23.3c-3,0-5.4,2.4-5.4,5.4v89.5h19c3,0,5.4-2.4,5.4-5.4V51.2l17.4,42.4H425.3z"/>
-</g>
-</svg>

platform/commonUI/general/res/images/logo-app.svg

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="20 0 640 150" enable-background="new 20 0 640 150" xml:space="preserve">
-<g>
-	<path fill="#FFFFFF" d="M90.7,13.2c14.8,0,22.8,8,22.8,22.8v46.3c0,14.8-8,22.8-22.8,22.8H62.8c-14.8,0-22.8-8-22.8-22.8V36
-		c0-14.8,8-22.8,22.8-22.8H90.7z M97.8,36.2c0-5.8-3.1-9.2-9.2-9.2h-24c-5.8,0-9.2,3.2-9.2,9.2v45.9c0,6,3.4,9.2,9.2,9.2h24
-		c6,0,9.2-3.2,9.2-9.2V36.2z"/>
-	<path fill="#FFFFFF" d="M173.2,13.2c14.8,0,22.8,8,22.8,22.8v46.3c0,14.8-8,22.8-22.8,22.8h-9c-11.2,0-19.2-6.6-26.5-13.6v44.2
-		h-15.5V13.2h15.5v13.6c7.3-7,15.3-13.6,26.5-13.6H173.2z M180.3,36.2c0-5.8-3.1-9.2-9.2-9.2h-8.3c-9.4,0-17,3.6-25.2,9.2v45.9
-		c8.2,5.6,15.8,9.2,25.2,9.2h8.3c6.1,0,9.2-3.4,9.2-9.2V36.2z"/>
-	<path fill="#FFFFFF" d="M220.3,82.8c0,6,3.2,9.2,9.2,9.2h23c6,0,9.2-3.4,9.2-9.2V76h15.6v6.3c0,14.8-8,22.8-22.8,22.8h-27
-		c-14.8,0-22.8-8-22.8-22.8V36c0-14.8,8-22.8,22.8-22.8h27c14.8,0,22.8,8,22.8,22.8v26.9h-57V82.8z M229.5,26.3
-		c-6,0-9.2,3.2-9.2,9.2v15.8h41.3V35.5c0-6-3.1-9.2-9.2-9.2H229.5z"/>
-	<path fill="#FFFFFF" d="M285.7,13.2h15.5v13.6c7.3-7,15.3-13.6,26.5-13.6h7.1c14.8,0,22.8,8,22.8,22.8v69.1h-15.5V36.6
-		c0-6-3.2-9.2-9.2-9.2h-6.6c-9.4,0-17,3.4-25.2,9.2v68.5h-15.5V13.2z"/>
-	<path fill="#4F79F7" d="M495.4,105.1c-12.5,0-18.4-6-18.4-18.4V28.7c0-12.5,6.2-18.4,18.7-18.4h42.2c12.5,0,18.1,6,18.1,18.4v17.7
-		h-25.4V33.9c0-1.9-0.5-2.4-2.4-2.4h-23.3c-1.9,0-2.4,0.5-2.4,2.4v47.6c0,1.9,0.5,2.4,2.4,2.4h23.3c1.9,0,2.4-0.5,2.4-2.4V69H556
-		v17.7c0,12.5-6,18.4-18.4,18.4H495.4z"/>
-	<path fill="#4F79F7" d="M613.7,32v73.1h-25.4V32H562V10.3h78V32H613.7z"/>
-	<path fill="#4F79F7" d="M425.3,93.6l17.4-42.4v48.6c0,3,2.4,5.4,5.4,5.4h19V15.7c0-3-2.4-5.4-5.4-5.4h-23.3l-21.2,49.4l-21.2-49.4
-		h-23.3c-3,0-5.4,2.4-5.4,5.4v89.5h19c3,0,5.4-2.4,5.4-5.4V51.2l17.4,42.4H425.3z"/>
-</g>
-</svg>

platform/commonUI/general/res/images/logo-openmctweb-shdw.svg

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="1040px" height="150px" viewBox="0 0 1040 150" enable-background="new 0 0 1040 150" xml:space="preserve">
+<filter  width="150%" height="130%" x="-15%" y="-15%" filterUnits="objectBoundingBox" id="AI_Shadow_Custom">
+	<feGaussianBlur  in="SourceAlpha" stdDeviation="6" result="blur"></feGaussianBlur>
+	<feOffset  dy="3" dx="0" in="blur" result="offsetBlurredAlpha"></feOffset>
+	<feMerge>
+		<feMergeNode  in="offsetBlurredAlpha"></feMergeNode>
+		<feMergeNode  in="SourceGraphic"></feMergeNode>
+	</feMerge>
+</filter>
+<g filter="url(#AI_Shadow_Custom)">
+	<path fill="#FFFFFF" d="M121.932,76.064c0,5.952-0.992,11.507-3.174,16.665c-1.984,4.96-4.96,9.324-8.531,13.094
+		c-3.769,3.769-7.936,6.547-13.094,8.531c-4.96,1.984-10.515,2.976-16.466,2.976H56.463c-5.952,0-11.507-0.992-16.466-2.976
+		s-9.523-4.96-13.094-8.531c-3.769-3.769-6.547-8.134-8.729-13.094C15.992,87.57,15,82.015,15,76.064V57.217
+		c0-5.952,0.992-11.507,3.174-16.665s4.96-9.523,8.729-13.094c3.571-3.571,7.936-6.547,12.895-8.531s10.515-3.174,16.466-3.174
+		h24.203c5.952,0,11.507,0.992,16.466,3.174c4.96,1.984,9.324,4.96,13.094,8.531s6.547,7.936,8.531,13.094
+		c1.984,5.158,3.174,10.515,3.174,16.665v18.847H121.932z M103.878,57.217c0-3.571-0.595-6.745-1.786-9.523
+		c-1.19-2.777-2.777-5.357-4.761-7.34c-1.984-1.984-4.563-3.571-7.34-4.761c-2.777-1.19-5.952-1.786-9.523-1.786H56.463
+		c-3.571,0-6.745,0.595-9.523,1.786c-2.777,1.19-5.357,2.777-7.34,4.761c-1.984,1.984-3.571,4.563-4.761,7.34
+		c-1.389,2.777-1.984,5.952-1.984,9.523v18.847c0,3.571,0.595,6.745,1.786,9.523c1.19,2.976,2.777,5.357,4.761,7.34
+		s4.563,3.571,7.34,4.761c2.777,1.19,6.15,1.786,9.523,1.786h24.203c3.571,0,6.745-0.595,9.523-1.786
+		c2.777-1.19,5.357-2.777,7.34-4.761s3.571-4.563,4.761-7.34c1.19-2.777,1.786-6.15,1.786-9.523L103.878,57.217z"/>
+	<path fill="#FFFFFF" d="M209.62,90.943c0,3.174-0.397,5.753-1.19,8.332c-0.794,2.381-1.786,4.563-3.174,6.547
+		c-1.19,1.786-2.777,3.373-4.563,4.761c-1.786,1.389-3.571,2.381-5.357,3.174c-1.786,0.794-3.769,1.389-5.555,1.786
+		c-1.984,0.397-3.769,0.595-5.357,0.595h-32.337V98.283h32.337c2.381,0,4.166-0.595,5.357-1.786c1.19-1.19,1.786-2.976,1.786-5.357
+		V66.739c0-2.579-0.595-4.365-1.786-5.555c-1.19-1.19-2.976-1.786-5.357-1.786h-32.139c-2.381,0-4.365,0.595-5.555,1.786
+		c-1.19,1.19-1.786,2.976-1.786,5.357v72.809H127.09V66.541c0-3.174,0.397-5.753,1.19-8.332c0.794-2.381,1.786-4.563,3.174-6.547
+		c1.389-1.786,2.777-3.373,4.563-4.761s3.571-2.381,5.357-3.174s3.769-1.389,5.555-1.786c1.984-0.397,3.769-0.595,5.357-0.595
+		h32.337c3.174,0,5.753,0.397,8.332,1.19c2.381,0.794,4.563,1.786,6.348,3.174c1.786,1.19,3.373,2.777,4.761,4.563
+		s2.381,3.571,3.174,5.357c0.794,1.786,1.389,3.769,1.785,5.555c0.397,1.984,0.595,3.769,0.595,5.357L209.62,90.943L209.62,90.943z"
+		/>
+	<path fill="#FFFFFF" d="M295.126,66.144c0,2.579-0.397,5.158-1.389,7.936c-0.794,2.777-2.381,5.555-4.166,7.936
+		c-1.984,2.381-4.563,4.563-7.737,6.15c-3.174,1.587-6.944,2.579-11.507,2.579H237.99V73.683h32.337
+		c2.381,0,4.365-0.794,5.555-2.182c1.389-1.587,1.984-3.373,1.984-5.555c0-2.381-0.794-4.166-2.182-5.555
+		c-1.587-1.389-3.373-1.984-5.357-1.984H237.99c-2.381,0-4.365,0.794-5.753,2.182c-1.389,1.587-1.984,3.373-1.984,5.555V91.34
+		c0,2.381,0.794,4.166,2.182,5.555c1.587,1.389,3.373,1.984,5.555,1.984h46.82v17.061h-47.018c-2.579,0-5.158-0.397-7.936-1.389
+		c-2.777-0.794-5.555-2.381-7.936-4.166c-2.381-1.984-4.563-4.563-6.15-7.737c-1.587-3.174-2.381-6.944-2.381-11.507V66.144
+		c0-2.579,0.397-5.158,1.389-7.936c0.794-2.777,2.381-5.555,4.166-7.936c1.984-2.381,4.563-4.563,7.737-6.15
+		s6.944-2.579,11.507-2.579h32.337c2.579,0,5.158,0.397,7.936,1.389c2.777,0.794,5.555,2.381,7.936,4.166
+		c2.381,1.984,4.563,4.563,6.15,7.737C294.332,57.812,295.126,61.78,295.126,66.144z"/>
+	<path fill="#FFFFFF" d="M379.838,116.138h-17.855V74.675c0-2.381-0.397-4.365-1.19-6.348c-0.794-1.785-1.984-3.373-3.373-4.761
+		c-1.389-1.389-2.976-2.381-4.96-2.976c-1.785-0.794-3.968-0.992-5.952-0.992h-31.346v56.541h-17.855V50.471
+		c0-1.19,0.198-2.381,0.595-3.571c0.397-0.992,1.19-1.984,1.984-2.777c0.794-0.794,1.785-1.389,2.976-1.984
+		c1.19-0.397,2.182-0.595,3.571-0.595h40.471c2.182,0,4.563,0.198,7.142,0.794c2.579,0.595,4.96,1.389,7.539,2.381
+		c2.381,1.19,4.761,2.579,6.944,4.365c2.182,1.786,4.166,3.769,5.952,6.348c1.785,2.381,3.174,5.357,4.166,8.531
+		c0.992,3.174,1.587,6.944,1.587,10.911v41.265H379.838z"/>
+	<path fill="#FFFFFF" d="M502.839,116.138h-18.053V57.217l-31.742,55.946c-0.794,1.389-1.785,2.579-3.373,3.174
+		c-1.389,0.794-2.976,1.19-4.563,1.19s-2.976-0.397-4.365-1.19c-1.389-0.794-2.381-1.786-3.174-3.174l-31.941-55.946v58.922h-17.855
+		V24.879c0-1.984,0.595-3.968,1.785-5.555c1.19-1.587,2.777-2.777,4.761-3.174c0.992-0.198,1.984-0.397,2.976-0.198
+		c0.992,0,1.984,0.198,2.777,0.595c0.992,0.397,1.785,0.794,2.381,1.389c0.794,0.595,1.389,1.389,1.785,2.182l40.868,71.023
+		l40.868-71.023c0.992-1.786,2.579-2.976,4.365-3.769c1.785-0.794,3.769-0.794,5.753-0.397c1.984,0.595,3.571,1.587,4.761,3.174
+		c1.19,1.587,1.785,3.373,1.785,5.555v91.457H502.839z"/>
+	<path fill="#FFFFFF" d="M595.685,116.138h-62.493c-1.587,0-3.373-0.198-5.357-0.595c-1.984-0.397-3.769-0.992-5.753-1.786
+		c-1.786-0.794-3.571-1.984-5.357-3.174c-1.786-1.389-3.174-2.976-4.563-4.761c-1.389-1.786-2.381-3.968-3.174-6.547
+		c-0.794-2.381-1.19-5.158-1.19-8.332V42.337c0-1.587,0.198-3.373,0.595-5.357c0.397-1.984,0.992-3.769,1.785-5.753
+		c0.794-1.786,1.984-3.571,3.174-5.357c1.389-1.786,2.976-3.174,4.761-4.563c1.786-1.389,3.968-2.381,6.348-3.174
+		c2.381-0.794,5.158-1.19,8.332-1.19h62.493v17.855h-62.493c-2.381,0-4.166,0.595-5.357,1.786c-1.19,1.19-1.785,3.174-1.785,5.555
+		v48.407c0,2.381,0.595,4.166,1.984,5.357c1.19,1.19,2.976,1.984,5.357,1.984h62.493v18.252H595.685z"/>
+	<path fill="#FFFFFF" d="M697.658,35.195h-39.479v80.943h-17.855V35.195h-39.479V17.34h97.012v17.855H697.658z"/>
+	<path fill="#4F79F7" d="M98.125,49.083c-0.992-2.381-2.182-4.166-3.769-5.952c-1.587-1.587-3.571-2.777-5.952-3.769
+		c-2.381-0.992-4.96-1.389-7.936-1.389H65.192c-1.389,7.34-1.389,12.697-0.794,15.474c0.198-0.198,0.397-0.198,0.397-0.397
+		c1.587-1.389,3.571-3.174,6.15-4.166c1.785-0.794,3.769-1.19,5.555-1.19c3.174,0,5.952,1.19,7.936,3.373
+		c2.777,3.174,3.968,8.332,3.174,14.879c-1.984,16.07-11.308,17.26-14.086,17.26c-1.786,0-3.769-0.397-5.555-1.19
+		c-2.579-1.19-4.365-2.976-5.555-4.365l-0.198-0.198c-1.389,2.579-2.976,8.531-3.571,17.26h21.823c2.976,0,5.555-0.397,7.936-1.389
+		c2.381-0.992,4.365-2.182,5.952-3.769c1.587-1.587,2.777-3.571,3.769-5.753c0.992-2.381,1.389-4.96,1.389-7.936V57.018
+		C99.514,54.241,99.117,51.463,98.125,49.083z M61.82,72.096c2.777,0,4.365,4.365,7.936,5.952c4.761,2.182,11.308,0.397,12.895-12.3
+		s-4.761-14.482-9.919-12.3c-3.968,1.587-6.547,5.952-9.324,5.952c-3.571,0-5.158-8.134-2.976-21.426h-4.166
+		c-2.976,0-5.555,0.397-7.936,1.389c-2.381,0.992-4.365,2.182-5.952,3.769c-1.587,1.587-2.976,3.571-3.769,5.952
+		c-0.992,2.381-1.389,4.96-1.389,7.936v18.847c0,2.976,0.397,5.753,1.389,7.936c0.992,2.381,2.182,4.166,3.769,5.753
+		c1.587,1.587,3.571,2.777,5.952,3.769c1.587,0.595,3.373,0.992,5.357,1.19C54.479,80.825,58.249,72.096,61.82,72.096z"/>
+	<path fill="#4F79F7" d="M858.155,17.142l-16.665,93.045c-0.397,1.786-1.19,3.373-2.579,4.761c-1.389,1.389-2.777,2.182-4.761,2.579
+		s-3.769,0.198-5.357-0.595c-1.587-0.794-2.976-1.984-3.968-3.373l-32.933-54.16l-32.933,54.16
+		c-0.794,1.389-1.786,2.381-3.174,3.174c-1.389,0.794-2.777,1.19-4.365,1.19c-2.182,0-4.166-0.595-5.753-1.984
+		s-2.579-3.174-2.976-5.357l-16.665-93.045h18.252l11.903,65.468l28.37-45.233c0.794-1.389,1.786-2.381,3.174-3.174
+		s2.777-1.19,4.365-1.19c1.587,0,2.976,0.397,4.365,1.19c1.389,0.794,2.381,1.786,3.373,3.174l28.171,45.233l11.903-65.468h18.252
+		V17.142z"/>
+	<path fill="#4F79F7" d="M1024.802,91.141c0,1.786-0.198,3.571-0.595,5.357c-0.397,1.984-0.992,3.769-1.786,5.555
+		c-0.794,1.786-1.984,3.571-3.174,5.357c-1.389,1.786-2.976,3.174-4.761,4.563c-1.786,1.389-3.968,2.381-6.547,3.174
+		c-2.381,0.794-5.158,1.19-8.332,1.19H967.07c-1.786,0-3.571-0.198-5.357-0.595c-1.984-0.397-3.769-0.992-5.555-1.786
+		c-1.785-0.794-3.571-1.984-5.357-3.174c-1.786-1.389-3.174-2.976-4.563-4.761c-1.389-1.786-2.381-3.968-3.174-6.547
+		c-0.794-2.381-1.19-5.158-1.19-8.332V10h18.053v81.141c0,2.182,0.595,3.968,1.984,5.357s3.174,1.984,5.158,1.984h32.536
+		c2.182,0,3.968-0.595,5.357-1.984c1.19-1.389,1.984-3.174,1.984-5.357V66.938c0-2.182-0.595-3.968-1.984-5.357
+		c-1.389-1.19-2.976-1.984-5.158-1.984h-32.536V41.544h32.536c1.786,0,3.571,0.198,5.357,0.595c1.984,0.397,3.769,0.992,5.555,1.786
+		c1.786,0.794,3.571,1.984,5.357,3.174c1.785,1.389,3.174,2.976,4.563,4.761s2.381,3.968,3.174,6.547
+		c0.794,2.381,1.19,5.158,1.19,8.332v24.402H1024.802z"/>
+	<path fill="#4F79F7" d="M937.709,66.144c0,2.579-0.397,5.158-1.389,7.936c-0.794,2.777-2.381,5.555-4.166,7.936
+		c-1.984,2.381-4.563,4.563-7.737,6.15c-3.174,1.587-6.944,2.579-11.507,2.579h-32.337V73.683h32.337
+		c2.381,0,4.365-0.794,5.555-2.182c1.389-1.587,1.984-3.373,1.984-5.555c0-2.381-0.794-4.166-2.182-5.555
+		c-1.587-1.389-3.373-1.984-5.357-1.984h-32.337c-2.381,0-4.365,0.794-5.753,2.182c-1.389,1.587-1.984,3.373-1.984,5.555V91.34
+		c0,2.381,0.794,4.166,2.182,5.555c1.587,1.389,3.373,1.984,5.555,1.984h47.018v17.061h-47.018c-2.579,0-5.158-0.397-7.936-1.389
+		c-2.777-0.794-5.555-2.381-7.936-4.166c-2.381-1.984-4.563-4.563-6.15-7.737c-1.587-3.174-2.381-6.944-2.381-11.507V66.144
+		c0-2.579,0.397-5.158,1.389-7.936c0.794-2.777,2.381-5.555,4.166-7.936c1.984-2.381,4.563-4.563,7.737-6.15
+		c3.174-1.587,6.944-2.579,11.507-2.579h32.337c2.579,0,5.158,0.397,7.936,1.389c2.777,0.794,5.555,2.381,7.936,4.166
+		c2.381,1.984,4.563,4.563,6.15,7.737C936.717,57.812,937.709,61.78,937.709,66.144z"/>
+</g>
+</svg>

platform/commonUI/general/res/images/logo-openmctweb.svg

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 509 65.2" enable-background="new 0 0 509 65.2" xml:space="preserve">
+<g id="logo_s3_4_">
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M53.9,33.3c0,3-0.5,5.8-1.6,8.4c-1,2.5-2.5,4.7-4.3,6.6c-1.9,1.9-4,3.3-6.6,4.3c-2.5,1-5.3,1.5-8.3,1.5
+				H20.9c-3,0-5.8-0.5-8.3-1.5c-2.5-1-4.8-2.5-6.6-4.3c-1.9-1.9-3.3-4.1-4.4-6.6C0.5,39.1,0,36.3,0,33.3v-9.5c0-3,0.5-5.8,1.6-8.4
+				c1.1-2.6,2.5-4.8,4.4-6.6C7.8,7,10,5.5,12.5,4.5c2.5-1,5.3-1.6,8.3-1.6h12.2c3,0,5.8,0.5,8.3,1.6c2.5,1,4.7,2.5,6.6,4.3
+				c1.9,1.8,3.3,4,4.3,6.6c1,2.6,1.6,5.3,1.6,8.4V33.3z M44.8,23.8c0-1.8-0.3-3.4-0.9-4.8c-0.6-1.4-1.4-2.7-2.4-3.7
+				c-1-1-2.3-1.8-3.7-2.4c-1.4-0.6-3-0.9-4.8-0.9H20.9c-1.8,0-3.4,0.3-4.8,0.9c-1.4,0.6-2.7,1.4-3.7,2.4c-1,1-1.8,2.3-2.4,3.7
+				C9.3,20.4,9,22,9,23.8v9.5c0,1.8,0.3,3.4,0.9,4.8c0.6,1.5,1.4,2.7,2.4,3.7c1,1,2.3,1.8,3.7,2.4c1.4,0.6,3.1,0.9,4.8,0.9H33
+				c1.8,0,3.4-0.3,4.8-0.9c1.4-0.6,2.7-1.4,3.7-2.4c1-1,1.8-2.3,2.4-3.7c0.6-1.4,0.9-3.1,0.9-4.8V23.8z"/>
+			<path fill="#FFFFFF" d="M98.1,40.8c0,1.6-0.2,2.9-0.6,4.2c-0.4,1.2-0.9,2.3-1.6,3.3c-0.6,0.9-1.4,1.7-2.3,2.4
+				c-0.9,0.7-1.8,1.2-2.7,1.6c-0.9,0.4-1.9,0.7-2.8,0.9c-1,0.2-1.9,0.3-2.7,0.3H69.1v-9h16.3c1.2,0,2.1-0.3,2.7-0.9
+				c0.6-0.6,0.9-1.5,0.9-2.7V28.6c0-1.3-0.3-2.2-0.9-2.8c-0.6-0.6-1.5-0.9-2.7-0.9H69.2c-1.2,0-2.2,0.3-2.8,0.9
+				c-0.6,0.6-0.9,1.5-0.9,2.7v36.7h-9V28.5c0-1.6,0.2-2.9,0.6-4.2c0.4-1.2,0.9-2.3,1.6-3.3c0.7-0.9,1.4-1.7,2.3-2.4
+				c0.9-0.7,1.8-1.2,2.7-1.6c0.9-0.4,1.9-0.7,2.8-0.9c1-0.2,1.9-0.3,2.7-0.3h16.3c1.6,0,2.9,0.2,4.2,0.6c1.2,0.4,2.3,0.9,3.2,1.6
+				c0.9,0.6,1.7,1.4,2.4,2.3c0.7,0.9,1.2,1.8,1.6,2.7c0.4,0.9,0.7,1.9,0.9,2.8c0.2,1,0.3,1.9,0.3,2.7V40.8z"/>
+			<path fill="#FFFFFF" d="M141.2,28.3c0,1.3-0.2,2.6-0.7,4c-0.4,1.4-1.2,2.8-2.1,4c-1,1.2-2.3,2.3-3.9,3.1
+				c-1.6,0.8-3.5,1.3-5.8,1.3h-16.3v-8.6h16.3c1.2,0,2.2-0.4,2.8-1.1c0.7-0.8,1-1.7,1-2.8c0-1.2-0.4-2.1-1.1-2.8
+				c-0.8-0.7-1.7-1-2.7-1h-16.3c-1.2,0-2.2,0.4-2.9,1.1c-0.7,0.8-1,1.7-1,2.8V41c0,1.2,0.4,2.1,1.1,2.8c0.8,0.7,1.7,1,2.8,1h23.6
+				v8.6h-23.7c-1.3,0-2.6-0.2-4-0.7c-1.4-0.4-2.8-1.2-4-2.1c-1.2-1-2.3-2.3-3.1-3.9c-0.8-1.6-1.2-3.5-1.2-5.8V28.3
+				c0-1.3,0.2-2.6,0.7-4c0.4-1.4,1.2-2.8,2.1-4c1-1.2,2.3-2.3,3.9-3.1c1.6-0.8,3.5-1.3,5.8-1.3h16.3c1.3,0,2.6,0.2,4,0.7
+				c1.4,0.4,2.8,1.2,4,2.1c1.2,1,2.3,2.3,3.1,3.9C140.8,24.1,141.2,26.1,141.2,28.3z"/>
+			<path fill="#FFFFFF" d="M183.9,53.5h-9V32.6c0-1.2-0.2-2.2-0.6-3.2c-0.4-0.9-1-1.7-1.7-2.4c-0.7-0.7-1.5-1.2-2.5-1.5
+				c-0.9-0.4-2-0.5-3-0.5h-15.8v28.5h-9V20.4c0-0.6,0.1-1.2,0.3-1.8c0.2-0.5,0.6-1,1-1.4c0.4-0.4,0.9-0.7,1.5-1
+				c0.6-0.2,1.1-0.3,1.8-0.3h20.4c1.1,0,2.3,0.1,3.6,0.4c1.3,0.3,2.5,0.7,3.8,1.2c1.2,0.6,2.4,1.3,3.5,2.2c1.1,0.9,2.1,1.9,3,3.2
+				c0.9,1.2,1.6,2.7,2.1,4.3c0.5,1.6,0.8,3.5,0.8,5.5V53.5z"/>
+			<path fill="#FFFFFF" d="M245.9,53.5h-9.1V23.8l-16,28.2c-0.4,0.7-0.9,1.3-1.7,1.6c-0.7,0.4-1.5,0.6-2.3,0.6
+				c-0.8,0-1.5-0.2-2.2-0.6c-0.7-0.4-1.2-0.9-1.6-1.6l-16.1-28.2v29.7h-9v-46c0-1,0.3-2,0.9-2.8c0.6-0.8,1.4-1.4,2.4-1.6
+				c0.5-0.1,1-0.2,1.5-0.1c0.5,0,1,0.1,1.4,0.3c0.5,0.2,0.9,0.4,1.2,0.7c0.4,0.3,0.7,0.7,0.9,1.1l20.6,35.8l20.6-35.8
+				c0.5-0.9,1.3-1.5,2.2-1.9c0.9-0.4,1.9-0.4,2.9-0.2c1,0.3,1.8,0.8,2.4,1.6c0.6,0.8,0.9,1.7,0.9,2.8V53.5z"/>
+			<path fill="#FFFFFF" d="M292.7,53.5h-31.5c-0.8,0-1.7-0.1-2.7-0.3c-1-0.2-1.9-0.5-2.9-0.9c-0.9-0.4-1.8-1-2.7-1.6
+				c-0.9-0.7-1.6-1.5-2.3-2.4c-0.7-0.9-1.2-2-1.6-3.3c-0.4-1.2-0.6-2.6-0.6-4.2V16.3c0-0.8,0.1-1.7,0.3-2.7c0.2-1,0.5-1.9,0.9-2.9
+				c0.4-0.9,1-1.8,1.6-2.7c0.7-0.9,1.5-1.6,2.4-2.3c0.9-0.7,2-1.2,3.2-1.6c1.2-0.4,2.6-0.6,4.2-0.6h31.5v9h-31.5
+				c-1.2,0-2.1,0.3-2.7,0.9c-0.6,0.6-0.9,1.6-0.9,2.8v24.4c0,1.2,0.3,2.1,1,2.7c0.6,0.6,1.5,1,2.7,1h31.5V53.5z"/>
+			<path fill="#FFFFFF" d="M344.1,12.7h-19.9v40.8h-9V12.7h-19.9v-9h48.9V12.7z"/>
+			<path fill="#4F79F7" d="M41.9,19.7c-0.5-1.2-1.1-2.1-1.9-3c-0.8-0.8-1.8-1.4-3-1.9c-1.2-0.5-2.5-0.7-4-0.7h-7.7
+				c-0.7,3.7-0.7,6.4-0.4,7.8c0.1-0.1,0.2-0.1,0.2-0.2c0.8-0.7,1.8-1.6,3.1-2.1c0.9-0.4,1.9-0.6,2.8-0.6c1.6,0,3,0.6,4,1.7
+				c1.4,1.6,2,4.2,1.6,7.5c-1,8.1-5.7,8.7-7.1,8.7c-0.9,0-1.9-0.2-2.8-0.6c-1.3-0.6-2.2-1.5-2.8-2.2c0,0-0.1-0.1-0.1-0.1
+				c-0.7,1.3-1.5,4.3-1.8,8.7h11c1.5,0,2.8-0.2,4-0.7c1.2-0.5,2.2-1.1,3-1.9c0.8-0.8,1.4-1.8,1.9-2.9c0.5-1.2,0.7-2.5,0.7-4v-9.5
+				C42.6,22.3,42.4,20.9,41.9,19.7z M23.6,31.3c1.4,0,2.2,2.2,4,3c2.4,1.1,5.7,0.2,6.5-6.2c0.8-6.4-2.4-7.3-5-6.2
+				c-2,0.8-3.3,3-4.7,3c-1.8,0-2.6-4.1-1.5-10.8h-2.1c-1.5,0-2.8,0.2-4,0.7c-1.2,0.5-2.2,1.1-3,1.9c-0.8,0.8-1.5,1.8-1.9,3
+				c-0.5,1.2-0.7,2.5-0.7,4v9.5c0,1.5,0.2,2.9,0.7,4c0.5,1.2,1.1,2.1,1.9,2.9c0.8,0.8,1.8,1.4,3,1.9c0.8,0.3,1.7,0.5,2.7,0.6
+				C19.9,35.7,21.8,31.3,23.6,31.3z"/>
+		</g>
+		<g>
+			<path fill="#4F79F7" d="M425,3.6l-8.4,46.9c-0.2,0.9-0.6,1.7-1.3,2.4c-0.7,0.7-1.4,1.1-2.4,1.3c-1,0.2-1.9,0.1-2.7-0.3
+				c-0.8-0.4-1.5-1-2-1.7l-16.6-27.3L375,52.2c-0.4,0.7-0.9,1.2-1.6,1.6s-1.4,0.6-2.2,0.6c-1.1,0-2.1-0.3-2.9-1
+				c-0.8-0.7-1.3-1.6-1.5-2.7l-8.4-46.9h9.2l6,33l14.3-22.8c0.4-0.7,0.9-1.2,1.6-1.6c0.7-0.4,1.4-0.6,2.2-0.6c0.8,0,1.5,0.2,2.2,0.6
+				c0.7,0.4,1.2,0.9,1.7,1.6l14.2,22.8l6-33H425z"/>
+			<path fill="#4F79F7" d="M509,40.9c0,0.9-0.1,1.8-0.3,2.7c-0.2,1-0.5,1.9-0.9,2.8c-0.4,0.9-1,1.8-1.6,2.7
+				c-0.7,0.9-1.5,1.6-2.4,2.3c-0.9,0.7-2,1.2-3.3,1.6c-1.2,0.4-2.6,0.6-4.2,0.6h-16.4c-0.9,0-1.8-0.1-2.7-0.3
+				c-1-0.2-1.9-0.5-2.8-0.9c-0.9-0.4-1.8-1-2.7-1.6c-0.9-0.7-1.6-1.5-2.3-2.4c-0.7-0.9-1.2-2-1.6-3.3c-0.4-1.2-0.6-2.6-0.6-4.2V0
+				h9.1v40.9c0,1.1,0.3,2,1,2.7c0.7,0.7,1.6,1,2.6,1h16.4c1.1,0,2-0.3,2.7-1c0.6-0.7,1-1.6,1-2.7V28.7c0-1.1-0.3-2-1-2.7
+				c-0.7-0.6-1.5-1-2.6-1h-16.4v-9.1h16.4c0.9,0,1.8,0.1,2.7,0.3c1,0.2,1.9,0.5,2.8,0.9c0.9,0.4,1.8,1,2.7,1.6
+				c0.9,0.7,1.6,1.5,2.3,2.4c0.7,0.9,1.2,2,1.6,3.3c0.4,1.2,0.6,2.6,0.6,4.2V40.9z"/>
+			<path fill="#4F79F7" d="M465.1,28.3c0,1.3-0.2,2.6-0.7,4c-0.4,1.4-1.2,2.8-2.1,4c-1,1.2-2.3,2.3-3.9,3.1
+				c-1.6,0.8-3.5,1.3-5.8,1.3h-16.3v-8.6h16.3c1.2,0,2.2-0.4,2.8-1.1c0.7-0.8,1-1.7,1-2.8c0-1.2-0.4-2.1-1.1-2.8
+				c-0.8-0.7-1.7-1-2.7-1h-16.3c-1.2,0-2.2,0.4-2.9,1.1c-0.7,0.8-1,1.7-1,2.8V41c0,1.2,0.4,2.1,1.1,2.8c0.8,0.7,1.7,1,2.8,1H460v8.6
+				h-23.7c-1.3,0-2.6-0.2-4-0.7c-1.4-0.4-2.8-1.2-4-2.1c-1.2-1-2.3-2.3-3.1-3.9c-0.8-1.6-1.2-3.5-1.2-5.8V28.3c0-1.3,0.2-2.6,0.7-4
+				c0.4-1.4,1.2-2.8,2.1-4c1-1.2,2.3-2.3,3.9-3.1c1.6-0.8,3.5-1.3,5.8-1.3h16.3c1.3,0,2.6,0.2,4,0.7c1.4,0.4,2.8,1.2,4,2.1
+				c1.2,1,2.3,2.3,3.1,3.9C464.6,24.1,465.1,26.1,465.1,28.3z"/>
+		</g>
+	</g>
+</g>
+</svg>

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

@@ -20,29 +20,64 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 // General About dialog styling
-// Depends on styles loaded via /platform/commonUI/general/res/sass/startup-base.scss
+
 .l-about {
+	// Layout
 	&.abs {
+//		top: 20px;
 		overflow: auto;
 	}
 	$contentH: 200px;
-	.l-splash {
+	.l-logo-holder {
 		position: relative;
 		height: 45%;
+		.l-logo {
+			$w: 5%;
+			position: absolute;
+			&.l-logo-app {
+//				@include test(blue);
+				top: 0; right: 15%; bottom: 0; left: 15%;
+			}
+			&.s-logo-nasa {
+//				@include test(red);
+				$m: 10px;
+				background-image: url($dirImgs + 'logo-nasa.svg');
+				top: $m; right: auto; bottom: auto; left: $m;
+				width: $w * 2; height: auto; padding-bottom: $w; padding-top: $w;
+			}
+		}
 	}
 	.l-content {
+//		@include test();
 		position: relative;
 		margin-top: $interiorMarginLg;
 	}
 }
 
 .s-about {
+	// Styling
 	line-height: 120%;
 
 	a {
 		color: $colorAboutLink;
 	}
 	.s-description,
+	.s-info {
+//		font-size: 0.8em;
+	}
+	.s-logo-holder {
+		background: url($dirImgs + "bg-about-openmctweb.jpg") no-repeat center; // For OpenMCT Web.
+		background-size: cover;
+	}
+	.s-logo {
+		//		@include txtShdwLarge(); // text-shadow doesn't work for svg
+		background-position: center;
+		background-repeat: no-repeat;
+		background-size: contain;
+	}
+	.s-logo-openmctweb {
+		background-image: url($dirImgs + 'logo-openmctweb-shdw.svg');
+	}
 	.s-btn {
 		line-height: 2em;
 	}
@@ -55,6 +90,10 @@
 			}
 			em {
 				color: pushBack($colorBodyFg, 20%);
+//				margin-left: 2em;
+				&:first-child {
+//					margin-left: 0;
+				}
 			}
 			h3 {
 				font-size: 1.25em;
@@ -65,3 +104,4 @@
 		}
 	}
 }
+

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

@@ -34,7 +34,7 @@
 .cols {
     @include clearfix;
     .col {
-        box-sizing: border-box;
+        @include box-sizing(border-box);
         @include clearfix;
         float: left;
         margin-left: $ueColMargin;
@@ -94,7 +94,7 @@
 /********************************************* FLEX STYLES */
 .l-flex-row,
 .l-flex-col {
-    @include display(flex);
+    @include display-flex;
     @include flex-wrap(nowrap);
     .flex-elem {
         min-height: 0; // Needed to allow element to shrink within parent
@@ -111,7 +111,7 @@
     }
     .flex-container {
         // Apply to wrapping elements, mct-includes, etc.
-        @include display(flex);
+        @include display-flex;
         @include flex-wrap(nowrap);
         @include flex(1 1 auto);
         min-height:0;
@@ -144,4 +144,4 @@
 
 .flex-justify-end {
     @include justify-content(flex-end);
-}
+}

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

@@ -64,7 +64,7 @@
 		white-space: nowrap;
 		.l-autoflow-col {
 //			@include test();
-			box-sizing: border-box;
+			@include box-sizing(border-box);
 			border-left: 1px solid $colorInteriorBorder;
 			display: inline-block;
 //			height: 100%;
@@ -74,7 +74,7 @@
 			width: $colW;
 			.l-autoflow-row {
 				//				@include test(red);
-				box-sizing: border-box;
+				@include box-sizing(border-box);
 				border-bottom: 1px solid rgba(#fff,0.05);
 				display: block;
 				height: $rowH;
@@ -110,7 +110,7 @@
 						width: auto;
 					}
 					&.r {
-						border-radius: $smallCr;
+						@include border-radius($smallCr);
 						float: right;
 						margin-left: $interiorMargin;
 						padding-left: $valPad;

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

@@ -27,7 +27,7 @@
 }
 
 .top-bar .badge {
-    border-radius: $controlCr * 1.5;
+    @include border-radius($controlCr * 1.5);
     $h: $btnStdH; //$ueTopBarBtnH; // - 5px;
     font-size: 1.4em;
     height: $h;
@@ -39,7 +39,7 @@
 
 //.top-bar .btn-browse .badge {
 // Moved to _controls.scss .btn.browse-btn
-//    border-radius: $controlCr * 1.5;
+//    @include border-radius($controlCr * 1.5);
 //    $d: 20px;
 //    display: block;
 //    font-size: 1em;
@@ -53,7 +53,7 @@
 
 .super-menu .badge {
     @include background-image(linear-gradient(lighten($colorCreateBtn, 10%), $colorCreateBtn));
-    border-radius: $controlCr;
+    @include border-radius($controlCr);
     @include boxShdwSubtle();
 //    display: inline-block;
 //    margin-right: 10px !important;