[Front-end] WIP Updates to widget styles

Fixes #1644 Fixes #1668 Getting main layout in order; Renamed *-wrapper classes to *-w; Drag and re-order of rules is broken :(
[Front-end] Better arg naming
2017-09-14 14:55:52 -07:00 · 2017-09-14 14:53:16 -07:00 · 2017-09-14 14:52:13 -07:00 · 2017-08-25 14:23:06 -07:00 · 2017-08-25 14:19:50 -07:00 · 2017-08-25 14:19:43 -07:00
1063 changed files with 12677 additions and 20573 deletions
--- a/.jshintrc
+++ b/.jshintrc
@@ -21,6 +21,5 @@
    "shadow": "outer",
    "strict": "implied",
    "undef": true,
-    "unused": "vars",
-    "latedef": "nofunc"
+    "unused": "vars"
 }
--- a/API.md
+++ b/API.md
@@ -1,57 +1,3 @@
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents** 
-
- [Building Applications With Open MCT](#building-applications-with-open-mct)
-  - [Scope and purpose of this document](#scope-and-purpose-of-this-document)
-  - [Building From Source](#building-from-source)
-  - [Starting an Open MCT application](#starting-an-open-mct-application)
-  - [Plugins](#plugins)
-    - [Defining and Installing a New Plugin](#defining-and-installing-a-new-plugin)
-  - [Domain Objects and Identifiers](#domain-objects-and-identifiers)
-    - [Object Attributes](#object-attributes)
-    - [Domain Object Types](#domain-object-types)
-  - [Root Objects](#root-objects)
-  - [Object Providers](#object-providers)
-  - [Composition Providers](#composition-providers)
-    - [Adding Composition Providers](#adding-composition-providers)
-    - [Default Composition Provider](#default-composition-provider)
-  - [Telemetry API](#telemetry-api)
-    - [Integrating Telemetry Sources](#integrating-telemetry-sources)
-      - [Telemetry Metadata](#telemetry-metadata)
-        - [Values](#values)
-          - [Value Hints](#value-hints)
-        - [The Time Conductor and Telemetry](#the-time-conductor-and-telemetry)
-      - [Telemetry Providers](#telemetry-providers)
-      - [Telemetry Requests and Responses.](#telemetry-requests-and-responses)
-      - [Request Strategies **draft**](#request-strategies-draft)
-        - [`latest` request strategy](#latest-request-strategy)
-        - [`minmax` request strategy](#minmax-request-strategy)
-      - [Telemetry Formats **draft**](#telemetry-formats-draft)
-        - [Registering Formats](#registering-formats)
-      - [Telemetry Data](#telemetry-data)
-        - [Telemetry Datums](#telemetry-datums)
-      - [Limit Evaluators **draft**](#limit-evaluators-draft)
-    - [Telemetry Consumer APIs **draft**](#telemetry-consumer-apis-draft)
-  - [Time API](#time-api)
-    - [Time Systems and Bounds](#time-systems-and-bounds)
-      - [Defining and Registering Time Systems](#defining-and-registering-time-systems)
-      - [Getting and Setting the Active Time System](#getting-and-setting-the-active-time-system)
-    - [Time Bounds](#time-bounds)
-    - [Clocks](#clocks)
-      - [Defining and registering clocks](#defining-and-registering-clocks)
-      - [Getting and setting active clock](#getting-and-setting-active-clock)
-      - [Stopping an active clock](#stopping-an-active-clock)
-      - [Clock Offsets](#clock-offsets)
-    - [Time Events](#time-events)
-      - [List of Time Events](#list-of-time-events)
-    - [The Time Conductor](#the-time-conductor)
-      - [Time Conductor Configuration](#time-conductor-configuration)
-      - [Example conductor configuration](#example-conductor-configuration)
-  - [Included Plugins](#included-plugins)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
 # Building Applications With Open MCT

 ## Scope and purpose of this document
@@ -208,7 +154,7 @@ registry.

 eg.
 ```javascript
-openmct.types.addType('example.my-type', {
+openmct.types.addType('my-type', {
    name: "My Type",
    description: "This is a type that I added!",
    creatable: true
@@ -216,9 +162,8 @@ openmct.types.addType('example.my-type', {
 ```

 The `addType` function accepts two arguments:
-* A `string` key identifying the type. This key is used when specifying a type
-for an object.  We recommend prefixing your types with a namespace to avoid
-conflicts with other plugins.
+* A `string` key identifying the type. This key is used when specifying a type 
+for an object.
 * An object type specification. An object type definition supports the following 
 attributes      
    * `name`: a `string` naming this object type
@@ -249,7 +194,7 @@ To do so, use the `addRoot` method of the object API.
 eg.
 ```javascript
 openmct.objects.addRoot({
-        namespace: "example.namespace",
+        namespace: "my-namespace",
        key: "my-key"
    });
 ```
@@ -290,12 +235,13 @@ It is expected that the `get` function will return a
 [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) 
 that resolves with the object being requested.

-In future, object providers will support other methods to enable other operations with persistence stores, such as creating, updating, and deleting objects.
+In future, object providers will support other methods to enable other operations 
+with persistence stores, such as creating, updating, and deleting objects.

 ## Composition Providers

-The _composition_ of a domain object is the list of objects it contains, as
-shown (for example) in the tree for browsing. Open MCT provides a
+The _composition_ of a domain object is the list of objects it contains, as shown 
+(for example) in the tree for browsing. Open MCT provides a
 [default solution](#default-composition-provider) for composition, but there
 may be cases where you want to provide the composition of a certain object
 (or type of object) dynamically.
@@ -309,7 +255,7 @@ Composition Provider:
 ```javascript
 openmct.composition.addProvider({
    appliesTo: function (domainObject) {
-        return domainObject.type === 'example.my-type';
+        return domainObject.type === 'my-type';
    },
    load: function (domainObject) {
        return Promise.resolve(myDomainObjects);
@@ -327,9 +273,8 @@ These identifiers will be used to fetch Domain Objects from an [Object Provider]

 ### Default Composition Provider

-The default composition provider applies to any domain object with a 
-`composition` property. The value of `composition` should be an array of 
-identifiers, e.g.:
+The default composition provider applies to any domain object with a `composition` 
+property. The value of `composition` should be an array of identifiers, e.g.:

 ```javascript
 var domainObject = {
@@ -350,17 +295,13 @@ var domainObject = {

 ## Telemetry API

-The Open MCT telemetry API provides two main sets of interfaces-- one for
-integrating telemetry data into Open MCT, and another for developing Open MCT
-visualization plugins utilizing the telemetry API.  
+The Open MCT telemetry API provides two main sets of interfaces-- one for integrating telemetry data into Open MCT, and another for developing Open MCT visualization plugins utilizing telemetry API.  

-The APIs for visualization plugins are still a work in progress and docs may
-change at any time.  However, the APIs for integrating telemetry metadata into
-Open MCT are stable and documentation is included below.
+The APIs for visualization plugins are still a work in progress and docs may change at any time.  However, the APIs for integrating telemetry metadata into Open MCT are stable and documentation is included below.

 ### Integrating Telemetry Sources

-There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.  Alternatively, you can register a telemetry metadata provider to provide the necessary telemetry metadata.
+There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.

 For a step-by-step guide to building a telemetry adapter, please see the 
 [Open MCT Tutorials](https://github.com/nasa/openmct-tutorial).
@@ -414,7 +355,7 @@ attribute      | type   | flags    | notes
 ---            |  ---   |  ---     | ---
 `key`          | string | required | unique identifier for this field.  
 `hints`        | object | required | Hints allow views to intelligently select relevant attributes for display, and are required for most views to function.  See section on "Value Hints" below.
-`name`         | string | optional | a human readable label for this field.  If omitted, defaults to `key`.
+`name`         | string | optional | a human readible label for this field.  If omitted, defaults to `key`.
 `source`       | string | optional | identifies the property of a datum where this value is stored.  If omitted, defaults to `key`.
 `format`       | string | optional | a specific format identifier, mapping to a formatter.  If omitted, uses a default formatter.  For enumerations, use `enum`.  For timestamps, use `utc` if you are using utc dates, otherwise use a key mapping to your custom date format.  
 `units`        | string | optional | the units of this value, e.g. `km`, `seconds`, `parsecs`
@@ -442,18 +383,14 @@ In order for the time conductor to work, there will always be an active "time sy

 #### Telemetry Providers

-Telemetry providers are responsible for providing historical and real-time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.
+Telemetry providers are responsible for providing historical and real time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.

 A telemetry provider is a javascript object with up to four methods:

 * `supportsSubscribe(domainObject, callback, options)` optional.  Must be implemented to provide realtime telemetry.  Should return `true` if the provider supports subscriptions for the given domain object (and request options).
 * `subscribe(domainObject, callback, options)` required if `supportsSubscribe` is implemented.  Establish a subscription for realtime data for the given domain object.  Should invoke `callback` with a single telemetry datum every time data is received.  Must return an unsubscribe function.  Multiple views can subscribe to the same telemetry object, so it should always return a new unsubscribe function.
 * `supportsRequest(domainObject, options)` optional.  Must be implemented to provide historical telemetry.  Should return `true` if the provider supports historical requests for the given domain object.
-* `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  See [Telemetry Requests and Responses](#telemetry-requests-and-responses) for more info on how to respond to requests.
-* `supportsMetadata(domainObject)` optional.  Implement and return `true` for objects that you want to provide dynamic metadata for.
-* `getMetadata(domainObject)` required if `supportsMetadata` is implemented.  Must return a valid telemetry metadata definition that includes at least one valueMetadata definition.
-* `supportsLimits(domainObject)` optional.  Implement and return `true` for domain objects that you want to provide a limit evaluator for.
-* `getLimitEvaluator(domainObject)` required if `supportsLimits` is implemented.  Must return a valid LimitEvaluator for a given domain object.
+* `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  For more request properties, see Request Properties below.

 Telemetry providers are registered by calling `openmct.telemetry.addProvider(provider)`, e.g.

@@ -461,15 +398,14 @@ Telemetry providers are registered by calling `openmct.telemetry.addProvider(pro
 openmct.telemetry.addProvider({
    supportsRequest: function (domainObject, options) { /*...*/ },
    request: function (domainObject, options) { /*...*/ },
+    supportsSubscribe: function (domainObject, callback, options) { /*...*/ },
+    subscribe: function (domainObject, callback, options) { /*...*/ }
 })
 ```

-Note: it is not required to implement all of the methods on every provider.  Depending on the complexity of your implementation, it may be helpful to instantiate and register your realtime, historical, and metadata providers separately.
-
-#### Telemetry Requests and Responses.
+#### Telemetry Requests

 Telemetry requests support time bounded queries. A call to a _Telemetry Provider_'s `request` function will include an `options` argument. These are simply javascript objects with attributes for the request parameters. An example of a telemetry request object with a start and end time is included below:
-
 ```javascript
 {
    start: 1487981997240,
@@ -478,53 +414,7 @@ Telemetry requests support time bounded queries. A call to a _Telemetry Provider
 }
 ```

-In this case, the `domain` is the currently selected time-system, and the start and end dates are valid dates in that time system.
-
-A telemetry provider's `request` method should return a promise for an array of telemetry datums.  These datums must be sorted by `domain` in ascending order.
-
-#### Request Strategies **draft**
-
-To improve performance views may request a certain strategy for data reduction.  These are intended to improve visualization performance by reducing the amount of data needed to be sent to the client.  These strategies will be indicated by additional parameters in the request options.  You may choose to handle them or ignore them.  
-
-Note: these strategies are currently being tested in core plugins and may change based on developer feedback.
-
-##### `latest` request strategy
-
-This request is a "depth based" strategy.  When a view is only capable of
-displaying a single value (or perhaps the last ten values), then it can
-use the `latest` request strategy with a `size` parameter that specifies
-the number of results it desires.  The `size` parameter is a hint; views
-must not assume the response will have the exact number of results requested.
-
-example:
-```javascript
-{
-    start: 1487981997240,
-    end: 1487982897240,
-    domain: 'utc',
-    strategy: 'latest',
-    size: 1
-}
-```
-
-This strategy says "I want the lastest data point in this time range".  A provider which recognizes this request should return only one value-- the latest-- in the requested time range.  Depending on your back-end implementation, performing these queries in bulk can be a large performance increase.  These are generally issued by views that are only capable of displaying a single value and only need to show the latest value.
-
-##### `minmax` request strategy
-
-example:
-```javascript
-{
-    start: 1487981997240,
-    end: 1487982897240,
-    domain: 'utc',
-    strategy: 'minmax',
-    size: 720
-}
-```
-
-MinMax queries are issued by plots, and may be issued by other types as well.  The aim is to reduce the amount of data returned but still faithfully represent the full extent of the data.  In order to do this, the view calculates the maximum data resolution it can display (i.e. the number of horizontal pixels in a plot) and sends that as the `size`.  The response should include at least one minimum and one maximum value per point of resolution.
-
-#### Telemetry Formats **draft**
+#### Telemetry Formats

 Telemetry format objects define how to interpret and display telemetry data. 
 They have a simple structure:
@@ -594,17 +484,6 @@ The key-value pairs of this object are described by the telemetry metadata of
 a domain object, as discussed in the [Telemetry Metadata](#telemetry-metadata)
 section.

-#### Limit Evaluators **draft**
-
-Limit evaluators allow a telemetry integrator to define how limits should be 
-applied to telemetry from a given domain object.  For an example of a limit 
-evaluator, take a look at `examples/generator/SinewaveLimitProvider.js`.
-
-### Telemetry Consumer APIs **draft**
-
-The APIs for requesting telemetry from Open MCT -- e.g. for use in custom views -- are currently in draft state and are being revised.  If you'd like to experiement with them before they are finalized, please contact the team via the contact-us link on our website.
-
-
 ## Time API

 Open MCT provides API for managing the temporal state of the application.
@@ -626,7 +505,7 @@ MCT, it will be pre-configured to use the UTC time system, which is installed an

 The time bounds of an Open MCT application are defined as numbers, and a Time 
 System gives meaning and context to these numbers so that they can be correctly 
-interpreted. Time Systems are JavaScript objects that provide some information 
+interpreted. Time Systems are javscript objects that provide some information 
 about the current time reference frame. An example of defining and registering 
 a new time system is given below:

@@ -712,7 +591,7 @@ openmct.time.bounds({start: now - ONE_HOUR, now);
 To respond to bounds change events, listen for the [`'bounds'`](#time-events)
 event.

-### Clocks
+## Clocks

 The Time API can be set to follow a clock source which will cause the bounds
 to be updated automatically whenever the clock source "ticks". A clock is simply
@@ -731,7 +610,7 @@ be defined to tick on some remote timing source.
 The values provided by clocks are simple `number`s, which are interpreted in the
 context of the active [Time System](#defining-and-registering-time-systems).

-#### Defining and registering clocks
+### Defining and registering clocks

 A clock is an object that defines certain required metadata and functions:

@@ -845,7 +724,7 @@ __Note:__ Setting the clock offsets will trigger an immediate bounds change, as
 new bounds will be calculated based on the `currentValue()` of the active clock. 
 Clock offsets are only relevant when a clock source is active.

-### Time Events
+## Time Events

 The Time API is a standard event emitter; you can register callbacks for events using the `on` method and remove callbacks for events with the `off` method.

@@ -887,7 +766,7 @@ The events emitted by the Time API are:
  * `clockOffsets`: The new [clock offsets](#clock-offsets).


-### The Time Conductor
+## The Time Conductor

 The Time Conductor provides a user interface for managing time bounds in Open 
 MCT. It allows a user to select from configured time systems and clocks, and to set bounds and clock offsets.
@@ -1000,21 +879,6 @@ openmct.install(openmct.plugins.CouchDB('http://localhost:9200'))
 * `openmct.plugins.Espresso` and `openmct.plugins.Snow` are two different
  themes (dark and light) available for Open MCT. Note that at least one
  of these themes must be installed for Open MCT to appear correctly.
-* `openmct.plugins.URLIndicatorPlugin` adds an indicator which shows the
-availability of a URL with the following options: 
-  - `url` : URL to indicate the status of
-  - `cssClass`: Icon to show in the status bar, defaults to `icon-database`, [list of all icons](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home?view=items)
-  - `interval`: Interval between checking the connection, defaults to `10000`
-  - `label` Name showing up as text in the status bar, defaults to url
-```javascript
-openmct.install(openmct.plugins.URLIndicatorPlugin({
-  url: 'http://google.com',
-  cssClass: 'check',
-  interval: 10000,
-  label: 'Google'
- })
-);
-```
 * `openmct.plugins.LocalStorage` provides persistence of user-created
  objects in browser-local storage. This is particularly useful in
  development environments.
--- a/README.md
+++ b/README.md
@@ -88,7 +88,7 @@ and [`gulp`](http://gulpjs.com/).

 To build Open MCT for deployment:

-`npm run prepare`
+`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
--- a/bower.json
+++ b/bower.json
@@ -17,8 +17,8 @@
    "screenfull": "^3.0.0",
    "node-uuid": "^1.4.7",
    "comma-separated-values": "^3.6.4",
-    "file-saver": "1.3.3",
-    "zepto": "^1.1.6",
+    "FileSaver.js": "^0.0.2",
+    "zepto": "1.2.0",
    "eventemitter3": "^1.2.0",
    "lodash": "3.10.1",
    "almond": "~0.3.2",
--- a/circle.yml
+++ b/circle.yml
@@ -1,17 +1,15 @@
-machine:
-  node:
-    version: 8.11.0
-
-dependencies:
-  pre:
-    - npm install -g npm@latest
-
 deployment:
  production:
    branch: master
    commands:
        - npm install canvas nomnoml
        - ./build-docs.sh
+        - git fetch --unshallow
+        - git push git@heroku.com:openmctweb-demo.git $CIRCLE_SHA1:refs/heads/master
+  openmct-demo:
+    branch: live_demo
+    heroku:
+      appname: openmct-demo
  openmctweb-staging-deux:
    branch: mobile
    heroku:
--- a/docs/src/guide/index.md
+++ b/docs/src/guide/index.md
@@ -2283,7 +2283,7 @@ To install build dependencies (only needs to be run once):

 To build:

-`npm run prepare`
+`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
--- a/docs/src/guide/security.md
+++ b/docs/src/guide/security.md
@@ -1,121 +0,0 @@
-# Security Guide
-
-Open MCT is a rich client with plugin support that executes as a single page
-web application in a browser environment. Security concerns and
-vulnerabilities associated with the web as a platform should be considered
-before deploying Open MCT (or any other web application) for mission or
-production usage.
-
-This document describes several important points to consider when developing
-for or deploying Open MCT securely. Other resources such as
-[Open Web Application Security Project (OWASP)](https://www.owasp.org)
-provide a deeper and more general overview of security for web applications.
-
-
-## Security Model
-
-Open MCT has been architected assuming the following deployment pattern:
-
-* A tagged, tested Open MCT version will be used.
-* Externally authored plugins will be installed.
-* A server will provide persistent storage, telemetry, and other shared data.
-* Authorization, authentication, and auditing will be handled by a server.
-
-
-## Security Procedures
-
-The Open MCT team secures our code base using a combination of code review,
-dependency review, and periodic security reviews. Static analysis performed 
-during automated verification additionally safeguards against common 
-coding errors which may result in vulnerabilities.
-
-
-### Code Review
-
-All contributions are reviewed by internal team members. External
-contributors receive increased scrutiny for security and quality,
-and must sign a licensing agreement.
-
-### Dependency Review
-
-Before integrating third-party dependencies, they are reviewed for security
-and quality, with consideration given to authors and users of these
-dependencies, as well as review of open source code.
-
-### Periodic Security Reviews
-
-Open MCT's code, design, and architecture are periodically reviewed
-(approximately annually) for common security issues, such as the
-[OWASP Top Ten](https://www.owasp.org/index.php/Category:OWASP_Top_Ten_Project).
-
-
-## Security Concerns
-
-Certain security concerns deserve special attention when deploying Open MCT,
-or when authoring plugins.
-
-### Identity Spoofing
-
-Open MCT issues calls to web services with the privileges of a logged in user.
-Compromised sources (either for Open MCT itself or a plugin) could
-therefore allow malicious code to execute with those privileges.
-
-To avoid this:
-
-* Serve Open MCT and other scripts over SSL (https rather than http)
-  to prevent man-in-the-middle attacks.
-* Exercise precautions such as security reviews for any plugins or
-  applications built for or with Open MCT to reject malicious changes.
-
-### Information Disclosure
-
-If Open MCT is used to handle or display sensitive data, any components
-(such as adapter plugins) must take care to avoid leaking or disclosing
-this information. For example, avoid sending sensitive data to third-party
-servers or insecure APIs.
-
-### Data Tampering
-
-The web application architecture leaves open the possibility that direct
-calls will be made to back-end services, circumventing Open MCT entirely.
-As such, Open MCT assumes that server components will perform any necessary
-data validation during calls issues to the server.
-
-Additionally, plugins which serialize and write data to the server must
-escape that data to avoid database injection attacks, and similar.
-
-### Repudiation
-
-Open MCT assumes that servers log any relevant interactions and associates
-these with a user identity; the specific user actions taken within the
-application are assumed not to be of concern for auditing.
-
-In the absence of server-side logging, users may disclaim (maliciously,
-mistakenly, or otherwise) actions taken within the system without any
-way to prove otherwise.
-
-If keeping client-level interactions is important, this will need to be
-implemented via a plugin.
-
-### Denial-of-service
-
-Open MCT assumes that server-side components will be insulated against
-denial-of-service attacks. Services should only permit resource-intensive
-tasks to be initiated by known or trusted users.
-
-### Elevation of Privilege
-
-Corollary to the assumption that servers guide against identity spoofing,
-Open MCT assumes that services do not allow a user to act with
-inappropriately escalated privileges. Open MCT cannot protect against
-such escalation; in the clearest case, a malicious actor could interact
-with web services directly to exploit such a vulnerability.
-
-## Additional Reading
-
-The following resources have been used as a basis for identifying potential
-security threats to Open MCT deployments in preparation of this document:
-
-* [STRIDE model](https://www.owasp.org/index.php/Threat_Risk_Modeling#STRIDE)
-* [Attack Surface Analysis Cheat Sheet](https://www.owasp.org/index.php/Attack_Surface_Analysis_Cheat_Sheet)
-* [XSS Prevention Cheat Sheet](https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet)
--- a/example/generator/GeneratorMetadataProvider.js
+++ b/example/generator/GeneratorMetadataProvider.js
@@ -1,108 +0,0 @@
-define([
-    'lodash'
-], function (
-    _
-) {
-
-    var METADATA_BY_TYPE = {
-        'generator': {
-            values: [
-                {
-                    key: "name",
-                    name: "Name"
-                },
-                {
-                    key: "utc",
-                    name: "Time",
-                    format: "utc",
-                    hints: {
-                        domain: 1
-                    }
-                },
-                {
-                    key: "yesterday",
-                    name: "Yesterday",
-                    format: "utc",
-                    hints: {
-                        domain: 2
-                    }
-                },
-                {
-                    key: "sin",
-                    name: "Sine",
-                    hints: {
-                        range: 1
-                    }
-                },
-                {
-                    key: "cos",
-                    name: "Cosine",
-                    hints: {
-                        range: 2
-                    }
-                }
-            ]
-        },
-        'example.state-generator': {
-            values: [
-                {
-                    key: "name",
-                    name: "Name"
-                },
-                {
-                    key: "utc",
-                    name: "Time",
-                    format: "utc",
-                    hints: {
-                        domain: 1
-                    }
-                },
-                {
-                    key: "state",
-                    source: "value",
-                    name: "State",
-                    format: "enum",
-                    enumerations: [
-                        {
-                            value: 0,
-                            string: "OFF"
-                        },
-                        {
-                            value: 1,
-                            string: "ON"
-                        }
-                    ],
-                    hints: {
-                        range: 1
-                    }
-                },
-                {
-                    key: "value",
-                    name: "Value",
-                    hints: {
-                        range: 2
-                    }
-                }
-            ]
-        }
-    }
-
-    function GeneratorMetadataProvider() {
-
-    }
-
-    GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
-        return METADATA_BY_TYPE.hasOwnProperty(domainObject.type);
-    };
-
-    GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
-        return _.extend(
-                {},
-                domainObject.telemetry,
-                METADATA_BY_TYPE[domainObject.type]
-            );
-    };
-
-    return GeneratorMetadataProvider;
-
-});
--- a/example/generator/GeneratorProvider.js
+++ b/example/generator/GeneratorProvider.js
@@ -30,8 +30,7 @@ define([
        amplitude: 1,
        period: 10,
        offset: 0,
-        dataRateInHz: 1,
-        phase: 0
+        dataRateInHz: 1
    };

    function GeneratorProvider() {
@@ -51,12 +50,9 @@ define([
            'amplitude',
            'period',
            'offset',
-            'dataRateInHz',
-            'phase',
+            'dataRateInHz'
        ];

-        request = request || {};
-
        var workerRequest = {};

        props.forEach(function (prop) {
@@ -66,12 +62,12 @@ define([
            if (request && request.hasOwnProperty(prop)) {
                workerRequest[prop] = request[prop];
            }
-            if (!workerRequest.hasOwnProperty(prop)) {
+            if (!workerRequest[prop]) {
                workerRequest[prop] = REQUEST_DEFAULTS[prop];
            }
            workerRequest[prop] = Number(workerRequest[prop]);
        });
-        workerRequest.name = domainObject.name;
+
        return workerRequest;
    };

@@ -82,8 +78,8 @@ define([
        return this.workerInterface.request(workerRequest);
    };

-    GeneratorProvider.prototype.subscribe = function (domainObject, callback) {
-        var workerRequest = this.makeWorkerRequest(domainObject, {});
+    GeneratorProvider.prototype.subscribe = function (domainObject, callback, request) {
+        var workerRequest = this.makeWorkerRequest(domainObject, request);
        return this.workerInterface.subscribe(workerRequest, callback);
    };

--- a/example/generator/SinewaveLimitCapability.js
+++ b/example/generator/SinewaveLimitCapability.js
@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT 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 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 RED = 0.9,
+            YELLOW = 0.5,
+            LIMITS = {
+                rh: {
+                    cssClass: "s-limit-upr s-limit-red",
+                    low: RED,
+                    high: Number.POSITIVE_INFINITY,
+                    name: "Red High"
+                },
+                rl: {
+                    cssClass: "s-limit-lwr s-limit-red",
+                    high: -RED,
+                    low: Number.NEGATIVE_INFINITY,
+                    name: "Red Low"
+                },
+                yh: {
+                    cssClass: "s-limit-upr s-limit-yellow",
+                    low: YELLOW,
+                    high: RED,
+                    name: "Yellow High"
+                },
+                yl: {
+                    cssClass: "s-limit-lwr s-limit-yellow",
+                    low: -RED,
+                    high: -YELLOW,
+                    name: "Yellow Low"
+                }
+            };
+
+        function SinewaveLimitCapability(domainObject) {
+            return {
+                limits: function (range) {
+                    return LIMITS;
+                },
+                evaluate: function (datum, range) {
+                    range = range || 'sin';
+                    if (datum[range] > RED) {
+                        return LIMITS.rh;
+                    }
+                    if (datum[range] < -RED) {
+                        return LIMITS.rl;
+                    }
+                    if (datum[range] > YELLOW) {
+                        return LIMITS.yh;
+                    }
+                    if (datum[range] < -YELLOW) {
+                        return LIMITS.yl;
+                    }
+                }
+            };
+        }
+
+        SinewaveLimitCapability.appliesTo = function (model) {
+            return model.type === 'generator';
+        };
+
+        return SinewaveLimitCapability;
+    }
+);
--- a/example/generator/SinewaveLimitProvider.js
+++ b/example/generator/SinewaveLimitProvider.js
@@ -1,88 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT 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 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 (
-
-) {
-
-    var RED = 0.9,
-        YELLOW = 0.5,
-        LIMITS = {
-            rh: {
-                cssClass: "s-limit-upr s-limit-red",
-                low: RED,
-                high: Number.POSITIVE_INFINITY,
-                name: "Red High"
-            },
-            rl: {
-                cssClass: "s-limit-lwr s-limit-red",
-                high: -RED,
-                low: Number.NEGATIVE_INFINITY,
-                name: "Red Low"
-            },
-            yh: {
-                cssClass: "s-limit-upr s-limit-yellow",
-                low: YELLOW,
-                high: RED,
-                name: "Yellow High"
-            },
-            yl: {
-                cssClass: "s-limit-lwr s-limit-yellow",
-                low: -RED,
-                high: -YELLOW,
-                name: "Yellow Low"
-            }
-        };
-
-    function SinewaveLimitProvider() {
-
-    }
-
-    SinewaveLimitProvider.prototype.supportsLimits = function (domainObject) {
-        return domainObject.type === 'generator';
-    };
-
-    SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
-        return {
-            evaluate: function (datum, valueMetadata) {
-                var range = valueMetadata ? valueMetadata.key : 'sin'
-                if (datum[range] > RED) {
-                    return LIMITS.rh;
-                }
-                if (datum[range] < -RED) {
-                    return LIMITS.rl;
-                }
-                if (datum[range] > YELLOW) {
-                    return LIMITS.yh;
-                }
-                if (datum[range] < -YELLOW) {
-                    return LIMITS.yl;
-                }
-            }
-        };
-    };
-
-    return SinewaveLimitProvider;
-});
--- a/example/generator/StateGeneratorProvider.js
+++ b/example/generator/StateGeneratorProvider.js
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT 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 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.
- *****************************************************************************/
-
-define([
-
-], function (
-
-) {
-
-    function StateGeneratorProvider() {
-
-    }
-
-    function pointForTimestamp(timestamp, duration, name) {
-        return {
-            name: name,
-            utc: Math.floor(timestamp / duration) * duration,
-            value: Math.floor(timestamp / duration) % 2
-        };
-    }
-
-    StateGeneratorProvider.prototype.supportsSubscribe = function (domainObject) {
-        return domainObject.type === 'example.state-generator';
-    };
-
-    StateGeneratorProvider.prototype.subscribe = function (domainObject, callback) {
-        var duration = domainObject.telemetry.duration * 1000;
-
-        var interval = setInterval(function () {
-            var now = Date.now();
-            var datum = pointForTimestamp(now, duration, domainObject.name);
-            datum.value += "";
-            callback(datum);
-        }, duration);
-
-        return function () {
-            clearInterval(interval);
-        };
-    };
-
-
-    StateGeneratorProvider.prototype.supportsRequest = function (domainObject, options) {
-        return domainObject.type === 'example.state-generator';
-    };
-
-    StateGeneratorProvider.prototype.request = function (domainObject, options) {
-        var start = options.start;
-        var end = options.end;
-        var duration = domainObject.telemetry.duration * 1000;
-        if (options.strategy === 'latest' || options.size === 1) {
-            start = end;
-        }
-        var data = [];
-        while (start <= end && data.length < 5000) {
-            data.push(pointForTimestamp(start, duration, domainObject.name));
-            start += 5000;
-        }
-        return Promise.resolve(data);
-    };
-
-    return StateGeneratorProvider;
-
-});
--- a/example/generator/WorkerInterface.js
+++ b/example/generator/WorkerInterface.js
@@ -44,7 +44,9 @@ define([
        message = message.data;
        var callback = this.callbacks[message.id];
        if (callback) {
-            callback(message);
+            if (callback(message)) {
+                delete this.callbacks[message.id];
+            }
        }
    };

@@ -70,7 +72,6 @@ define([
            deferred.resolve = resolve;
            deferred.reject = reject;
        });
-        var messageId;

        function callback(message) {
            if (message.error) {
@@ -78,27 +79,33 @@ define([
            } else {
                deferred.resolve(message.data);
            }
-            delete this.callbacks[messageId];
+            return true;
        }

-        messageId = this.dispatch('request', request, callback.bind(this));
+        this.dispatch('request', request, callback);

        return promise;
    };

    WorkerInterface.prototype.subscribe = function (request, cb) {
-        function callback(message) {
+        var isCancelled = false;
+
+        var callback = function (message) {
+            if (isCancelled) {
+                return true;
+            }
            cb(message.data);
        };

-        var messageId = this.dispatch('subscribe', request, callback);
+        var messageId = this.dispatch('subscribe', request, callback)

        return function () {
+            isCancelled = true;
            this.dispatch('unsubscribe', {
                id: messageId
            });
-            delete this.callbacks[messageId];
        }.bind(this);
+
    };


--- a/example/generator/generatorWorker.js
+++ b/example/generator/generatorWorker.js
@@ -62,11 +62,10 @@
                self.postMessage({
                    id: message.id,
                    data: {
-                        name: data.name,
                        utc: nextStep,
                        yesterday: nextStep - 60*60*24*1000,
-                        sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase),
-                        cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase)
+                        sin: sin(nextStep, data.period, data.amplitude, data.offset),
+                        cos: cos(nextStep, data.period, data.amplitude, data.offset)
                    }
                });
                nextStep += step;
@@ -83,22 +82,21 @@
    }

    function onRequest(message) {
-        var request = message.data;
-        if (request.end == undefined) {
-            request.end = Date.now();
+        var data = message.data;
+        if (data.end == undefined) {
+            data.end = Date.now();
        }
-        if (request.start == undefined){
-            request.start = request.end - FIFTEEN_MINUTES;
+        if (data.start == undefined){
+            data.start = data.end - FIFTEEN_MINUTES;
        }

        var now = Date.now();
-        var start = request.start;
-        var end = request.end > now ? now : request.end;
-        var amplitude = request.amplitude;
-        var period = request.period;
-        var offset = request.offset;
-        var dataRateInHz = request.dataRateInHz;
-        var phase = request.phase;
+        var start = data.start;
+        var end = data.end > now ? now : data.end;
+        var amplitude = data.amplitude;
+        var period = data.period;
+        var offset = data.offset;
+        var dataRateInHz = data.dataRateInHz;

        var step = 1000 / dataRateInHz;
        var nextStep = start - (start % step) + step;
@@ -107,11 +105,10 @@

        for (; nextStep < end && data.length < 5000; nextStep += step) {
            data.push({
-                name: request.name,
                utc: nextStep,
                yesterday: nextStep - 60*60*24*1000,
-                sin: sin(nextStep, period, amplitude, offset, phase),
-                cos: cos(nextStep, period, amplitude, offset, phase)
+                sin: sin(nextStep, period, amplitude, offset),
+                cos: cos(nextStep, period, amplitude, offset)
            });
        }
        self.postMessage({
@@ -120,14 +117,14 @@
        });
    }

-    function cos(timestamp, period, amplitude, offset, phase) {
+    function cos(timestamp, period, amplitude, offset) {
        return amplitude *
-            Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + offset;
+            Math.cos(timestamp / period / 1000 * Math.PI * 2) + offset;
    }

-    function sin(timestamp, period, amplitude, offset, phase) {
+    function sin(timestamp, period, amplitude, offset) {
        return amplitude *
-            Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + offset;
+            Math.sin(timestamp / period / 1000 * Math.PI * 2) + offset;
    }

    function sendError(error, message) {
--- a/example/generator/plugin.js
+++ b/example/generator/plugin.js
@@ -23,46 +23,29 @@

 define([
    "./GeneratorProvider",
-    "./SinewaveLimitProvider",
-    "./StateGeneratorProvider",
-    "./GeneratorMetadataProvider"
+    "./SinewaveLimitCapability"
 ], function (
    GeneratorProvider,
-    SinewaveLimitProvider,
-    StateGeneratorProvider,
-    GeneratorMetadataProvider
+    SinewaveLimitCapability
 ) {

-    return function(openmct){
-
-        openmct.types.addType("example.state-generator", {
-            name: "State Generator",
-            description: "For development use.  Generates test enumerated telemetry by cycling through a given set of states",
-            cssClass: "icon-telemetry",
-            creatable: true,
-            form: [
-                {
-                    name: "State Duration (seconds)",
-                    control: "textfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "duration",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "duration"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
-                }
-            ],
-            initialize: function (object) {
-                object.telemetry = {
-                    duration: 5
-                }
+    var legacyExtensions = {
+        "capabilities": [
+            {
+                "key": "limit",
+                "implementation": SinewaveLimitCapability
            }
+        ]
+    };
+
+    return function(openmct){
+        //Register legacy extensions for things not yet supported by the new API
+        Object.keys(legacyExtensions).forEach(function (type){
+            var extensionsOfType = legacyExtensions[type];
+            extensionsOfType.forEach(function (extension) {
+                openmct.legacyExtension(type, extension)
+            })
        });
-
-        openmct.telemetry.addProvider(new StateGeneratorProvider());
-
        openmct.types.addType("generator", {
            name: "Sine Wave Generator",
            description: "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
@@ -71,58 +54,51 @@ define([
            form: [
                {
                    name: "Period",
-                    control: "numberfield",
+                    control: "textfield",
                    cssClass: "l-input-sm l-numeric",
                    key: "period",
                    required: true,
                    property: [
                        "telemetry",
                        "period"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                },
                {
                    name: "Amplitude",
-                    control: "numberfield",
+                    control: "textfield",
                    cssClass: "l-input-sm l-numeric",
                    key: "amplitude",
                    required: true,
                    property: [
                        "telemetry",
                        "amplitude"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                },
                {
                    name: "Offset",
-                    control: "numberfield",
+                    control: "textfield",
                    cssClass: "l-input-sm l-numeric",
                    key: "offset",
                    required: true,
                    property: [
                        "telemetry",
                        "offset"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                },
                {
                    name: "Data Rate (hz)",
-                    control: "numberfield",
+                    control: "textfield",
                    cssClass: "l-input-sm l-numeric",
                    key: "dataRateInHz",
                    required: true,
                    property: [
                        "telemetry",
                        "dataRateInHz"
-                    ]
-                },
-                {
-                    name: "Phase (radians)",
-                    control: "numberfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "phase",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "phase"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                }
            ],
            initialize: function (object) {
@@ -131,14 +107,42 @@ define([
                    amplitude: 1,
                    offset: 0,
                    dataRateInHz: 1,
-                    phase: 0
+                    values: [
+                        {
+                            key: "utc",
+                            name: "Time",
+                            format: "utc",
+                            hints: {
+                                domain: 1
+                            }
+                        },
+                        {
+                            key: "yesterday",
+                            name: "Yesterday",
+                            format: "utc",
+                            hints: {
+                                domain: 2
+                            }
+                        },
+                        {
+                            key: "sin",
+                            name: "Sine",
+                            hints: {
+                                range: 1
+                            }
+                        },
+                        {
+                            key: "cos",
+                            name: "Cosine",
+                            hints: {
+                                range: 2
+                            }
+                        }
+                    ]
                };
            }
        });
-
        openmct.telemetry.addProvider(new GeneratorProvider());
-        openmct.telemetry.addProvider(new GeneratorMetadataProvider());
-        openmct.telemetry.addProvider(new SinewaveLimitProvider());
    };

 });
--- a/example/imagery/plugin.js
+++ b/example/imagery/plugin.js
@@ -48,9 +48,8 @@ define([
                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
            ];

-        function pointForTimestamp(timestamp, name) {
+        function pointForTimestamp(timestamp) {
            return {
-                name: name,
                utc: Math.floor(timestamp / 5000) * 5000,
                url: IMAGE_SAMPLES[Math.floor(timestamp / 5000) % IMAGE_SAMPLES.length]
            };
@@ -62,7 +61,7 @@ define([
            },
            subscribe: function (domainObject, callback) {
                var interval = setInterval(function () {
-                    callback(pointForTimestamp(Date.now(), domainObject.name));
+                    callback(pointForTimestamp(Date.now()));
                }, 5000);

                return function (interval) {
@@ -80,8 +79,8 @@ define([
                var start = options.start;
                var end = options.end;
                var data = [];
-                while (start <= end && data.length < 5000) {
-                    data.push(pointForTimestamp(start, domainObject.name));
+                while (start < end && data.length < 5000) {
+                    data.push(pointForTimestamp(start));
                    start += 5000;
                }
                return Promise.resolve(data);
@@ -94,7 +93,7 @@ define([
                    options.strategy === 'latest';
            },
            request: function (domainObject, options) {
-                return Promise.resolve([pointForTimestamp(Date.now(), domainObject.name)]);
+                return Promise.resolve([pointForTimestamp(Date.now())]);
            }
        };

@@ -110,10 +109,6 @@ define([
                initialize: function (object) {
                    object.telemetry = {
                        values: [
-                            {
-                                name: 'Name',
-                                key: 'name'
-                            },
                            {
                                name: 'Time',
                                key: 'utc',
--- a/example/plotOptions/bundle.js
+++ b/example/plotOptions/bundle.js
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT 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 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([
+    'legacyRegistry',
+    '../../platform/commonUI/browse/src/InspectorRegion',
+    '../../platform/commonUI/regions/src/Region'
+], function (
+    legacyRegistry,
+    InspectorRegion,
+    Region
+) {
+    "use strict";
+
+    /**
+     * Add a 'plot options' region part to the inspector region for the
+     * Telemetry Plot type only. {@link InspectorRegion} is a default region
+     * implementation that is added automatically to all types. In order to
+     * customize what appears in the inspector region, you can start from a
+     * blank slate by using Region, or customize the default inspector
+     * region by using {@link InspectorRegion}.
+     */
+    var plotInspector = new InspectorRegion(),
+     /**
+      * Two region parts are defined here. One that appears only in browse
+      * mode, and one that appears only in edit mode. For not they both point
+      * to the same representation, but a different key could be used here to
+      * include a customized representation for edit mode.
+      */
+        plotOptionsBrowseRegion = new Region({
+            name: "plot-options",
+            title: "Plot Options",
+            modes: ['browse'],
+            content: {
+                key: "plot-options-browse"
+            }
+        }),
+        plotOptionsEditRegion = new Region({
+            name: "plot-options",
+            title: "Plot Options",
+            modes: ['edit'],
+            content: {
+                key: "plot-options-browse"
+            }
+        });
+
+    /**
+     * Both parts are added, and policies of type 'region' will determine
+     * which is shown based on domain object state. A default policy is
+     * provided which will check the 'modes' attribute of the region part
+     * definition.
+     */
+    plotInspector.addRegion(plotOptionsBrowseRegion);
+    plotInspector.addRegion(plotOptionsEditRegion);
+
+    legacyRegistry.register("example/plotType", {
+        "name": "Plot Type",
+        "description": "Example illustrating registration of a new object type",
+        "extensions": {
+            "types": [
+                {
+                    "key": "plot",
+                    "name": "Example Telemetry Plot",
+                    "cssClass": "icon-telemetry-panel",
+                    "description": "For development use. A plot for displaying telemetry.",
+                    "priority": 10,
+                    "delegates": [
+                        "telemetry"
+                    ],
+                    "features": "creation",
+                    "contains": [
+                        {
+                            "has": "telemetry"
+                        }
+                    ],
+                    "model": {
+                        "composition": []
+                    },
+                    "inspector": plotInspector,
+                    "telemetry": {
+                        "source": "generator",
+                        "domains": [
+                            {
+                                "key": "time",
+                                "name": "Time"
+                            },
+                            {
+                                "key": "yesterday",
+                                "name": "Yesterday"
+                            },
+                            {
+                                "key": "delta",
+                                "name": "Delta",
+                                "format": "example.delta"
+                            }
+                        ],
+                        "ranges": [
+                            {
+                                "key": "sin",
+                                "name": "Sine"
+                            },
+                            {
+                                "key": "cos",
+                                "name": "Cosine"
+                            }
+                        ]
+                    },
+                    "properties": [
+                        {
+                            "name": "Period",
+                            "control": "textfield",
+                            "cssClass": "l-input-sm l-numeric",
+                            "key": "period",
+                            "required": true,
+                            "property": [
+                                "telemetry",
+                                "period"
+                            ],
+                            "pattern": "^\\d*(\\.\\d*)?$"
+                        }
+                    ]
+                }
+            ]
+        }
+    });
+});
--- a/example/styleguide/bundle.js
+++ b/example/styleguide/bundle.js
@@ -16,7 +16,6 @@ define([
                { "key": "styleguide.intro", "name": "Introduction", "cssClass": "icon-page", "description": "Introduction and overview to the style guide" },
                { "key": "styleguide.standards", "name": "Standards", "cssClass": "icon-page", "description": "" },
                { "key": "styleguide.colors", "name": "Colors", "cssClass": "icon-page", "description": "" },
-                { "key": "styleguide.status", "name": "status", "cssClass": "icon-page", "description": "Limits, telemetry paused, etc." },
                { "key": "styleguide.glyphs", "name": "Glyphs", "cssClass": "icon-page", "description": "Glyphs overview" },
                { "key": "styleguide.controls", "name": "Controls", "cssClass": "icon-page", "description": "Buttons, selects, HTML controls" },
                { "key": "styleguide.input", "name": "Text Inputs", "cssClass": "icon-page", "description": "Various text inputs" },
@@ -26,7 +25,6 @@ define([
                { "key": "styleguide.intro", "type": "styleguide.intro", "templateUrl": "templates/intro.html", "editable": false },
                { "key": "styleguide.standards", "type": "styleguide.standards", "templateUrl": "templates/standards.html", "editable": false },
                { "key": "styleguide.colors", "type": "styleguide.colors", "templateUrl": "templates/colors.html", "editable": false },
-                { "key": "styleguide.status", "type": "styleguide.status", "templateUrl": "templates/status.html", "editable": false },
                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "templateUrl": "templates/glyphs.html", "editable": false },
                { "key": "styleguide.controls", "type": "styleguide.controls", "templateUrl": "templates/controls.html", "editable": false },
                { "key": "styleguide.input", "type": "styleguide.input", "templateUrl": "templates/input.html", "editable": false },
@@ -49,7 +47,6 @@ define([
                            "intro",
                            "standards",
                            "colors",
-                            "status",
                            "glyphs",
                            "styleguide:ui-elements"
                        ]
--- a/example/styleguide/res/sass/_style-guide-base.scss
+++ b/example/styleguide/res/sass/_style-guide-base.scss
@@ -28,8 +28,8 @@
        color: $colorKey;
    }

-    h1, h2, strong, b {
-        color: pullForward($colorBodyFg, 50%);
+    h1, h2 {
+        color: pullForward($colorBodyFg, 20%);
    }

    h2 {
@@ -45,10 +45,6 @@
        text-transform: uppercase;
    }

-    strong, b {
-        font-weight: normal;
-    }
-
    .w-markup {
        //Wrap markup example "pre" element
        background-color: $colorCode;
@@ -58,8 +54,6 @@
        position: relative;
    }

-    .w-mct-example > div { margin-bottom: $interiorMarginLg; }
-
    code,
    pre {
        font-size: 0.8rem;
@@ -101,11 +95,11 @@
        padding-top: 1em;

        .cols {
-            display: flex;
-            flex-direction: row;
+            @include display(flex);
+            @include flex-direction(row);

            .col {
-                flex: 1 1 auto;
+                @include flex(1 1 auto);
                &:not(:last-child) {
                    $v: $interiorMargin * 4;
                    border-right: 1px solid $colorInteriorBorder;
@@ -199,7 +193,7 @@
                border-radius: 15%;
                position: absolute;
                left: 50%;
-                transform: translateX(-50%);
+                @include transform(translateX(-50%));
            }
        }
    }
--- a/example/styleguide/res/templates/glyphs.html
+++ b/example/styleguide/res/templates/glyphs.html
@@ -127,8 +127,7 @@
 { 'meaning': 'Timer object', 'cssClass': 'icon-timer', 'cssContent': 'e1127', 'htmlEntity': '&amp;#xe1127' },
 { 'meaning': 'Data Topic', 'cssClass': 'icon-topic', 'cssContent': 'e1128', 'htmlEntity': '&amp;#xe1128' },
 { 'meaning': 'Fixed Position object', 'cssClass': 'icon-box-with-dashed-lines', 'cssContent': 'e1129', 'htmlEntity': '&amp;#xe1129' },
-{ 'meaning': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&amp;#xe1130' },
-{ 'meaning': 'Notebook object', 'cssClass': 'icon-notebook', 'cssContent': 'e1131', 'htmlEntity': '&amp;#xe1131' }
+{ 'meaning': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&amp;#xe1130' }
 ];
 "></div>

--- a/example/styleguide/res/templates/mct-example.html
+++ b/example/styleguide/res/templates/mct-example.html
@@ -4,5 +4,5 @@
        <pre></pre>
    </span>
    <h3>Example</h3>
-    <div class="w-mct-example"></div>
+    <div></div>
 </div>
--- a/example/styleguide/res/templates/status.html
+++ b/example/styleguide/res/templates/status.html
@@ -1,142 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2016, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT 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 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.
-->
-<style>
-    .w-mct-example div[class*="s-limit"],
-    .w-mct-example div[class*="s-status"],
-    .w-mct-example div[class*="s-unsynced"],
-    .w-mct-example span[class*="s-limit"] {
-        border-radius: 4px;
-        padding: 3px 7px;
-    }
-    .w-mct-example table {
-        width: 100%;
-    }
-</style>
-<div class="l-style-guide s-text">
-    <p class="doc-title">Open MCT Style Guide</p>
-    <h1>Status Indication</h1>
-
-    <div class="l-section">
-        <h2>Overview</h2>
-        <p>Many elements in Open MCT need to articulate a dynamic status; Open MCT provides the following styles and conventions to handle this:</p>
-        <ul>
-            <li><strong>Limits</strong>: when telemetry values exceed minimum or maximum values, they can be violating limits. Limit styles include both color and iconography; color is used to indicate severity while icons are used to indicate direction, upper or lower.</li>
-            <li><strong>Status</strong>: Open MCT also provides a number or built-in Status styles allowing telemetry or other displayed information to be visually classified by type. Common uses for these classes are to visually denote event records.</li>
-            <li><strong>Synchronization</strong>: When the system is displaying real-time data, it is very important that displays clearly indicate when they are not doing so, such as when a plot if frozen while panning or zooming. Open MCT provides a style for this.</li>
-        </ul>
-    </div>
-
-    <div class="l-section">
-        <h2>Limits</h2>
-        <div class="cols cols1-1">
-            <div class="col">
-                <p>Limit CSS classes can be applied to any block or inline element. Open MCT limit classes set color and optionally an icon, but don't effect other properties. Yellow and red limit classes can be used as is, or allow the application of any custom icon available in Open MCT's glyphs library. &quot;Level&quot; limit classes - upper and lower - always use an icon in addition to a color; Open MCT doesn't support level limits without color.</p>
-                <ul>
-                    <li>Color only</li>
-                    <ul>
-                        <li><code>s-limit-yellow</code>: A yellow limit.</li>
-                        <li><code>s-limit-red</code>: A red limit.</li>
-                    </ul>
-                    <li>Color and icon</li>
-                    <ul>
-                        <li><code>s-limit-yellow-icon</code>: A yellow limit with icon.</li>
-                        <li><code>s-limit-red-icon</code>: A red limit with icon.</li>
-                    </ul>
-                    <li>Upper and lower limit indicators. Must be used with a color limit class to be visible.</li>
-                    <ul>
-                        <li><code>s-limit-upr</code>: Upper limit.
-                        </li>
-                        <li><code>s-limit-lwr</code>: Lower limit.
-                        </li>
-                    </ul>
-                </ul>
-            </div>
-<mct-example><div class="s-limit-yellow">Yellow limit</div>
-<div class="s-limit-red">Red limit</div>
-<div class="s-limit-yellow-icon">Yellow limit with icon</div>
-<div class="s-limit-red-icon">Red limit with icon</div>
-<div class="s-limit-yellow s-limit-lwr">Lower yellow limit</div>
-<div class="s-limit-red s-limit-upr">Upper red limit</div>
-<div class="s-limit-red icon-bell">Red Limit with a custom icon</div>
-<div>Some text with an <span class="s-limit-yellow-icon">inline element</span> showing a yellow limit.</div>
-
-<!-- Limits applied in a table -->
-<table>
-    <tr class='header'><td>Name</td><td>Value 1</td><td>Value 2</td></tr>
-    <tr><td>ENG_PWR 4991</td><td>7.023</td><td class="s-limit-yellow s-limit-upr">70.23</td></tr>
-    <tr><td>ENG_PWR 4992</td><td>49.784</td><td class="s-limit-red s-limit-lwr">-121.22</td></tr>
-    <tr><td>ENG_PWR 4993</td><td class="s-limit-yellow icon-bell">0.451</td><td>1.007</td></tr>
-</table>
-</mct-example>
-        </div>
-    </div>
-
-    <div class="l-section">
-        <h2>Status</h2>
-        <div class="cols cols1-1">
-            <div class="col">
-                <p>Classes here can be applied to elements as needed.</p>
-                <ul>
-                    <li>Color only</li>
-                    <ul>
-                        <li><code>s-status-warning-hi</code></li>
-                        <li><code>s-status-warning-lo</code></li>
-                        <li><code>s-status-diagnostic</code></li>
-                        <li><code>s-status-info</code></li>
-                        <li><code>s-status-ok</code></li>
-                    </ul>
-                    <li>Color and icon</li>
-                    <ul>
-                        <li><code>s-status-warning-hi-icon</code></li>
-                        <li><code>s-status-warning-lo-icon</code></li>
-                        <li><code>s-status-diagnostic-icon</code></li>
-                        <li><code>s-status-info-icon</code></li>
-                        <li><code>s-status-ok-icon</code></li>
-                    </ul>
-                </ul>
-            </div>
-<mct-example><div class="s-status-warning-hi">WARNING HI</div>
-<div class="s-status-warning-lo">WARNING LOW</div>
-<div class="s-status-diagnostic">DIAGNOSTIC</div>
-<div class="s-status-info">INFO</div>
-<div class="s-status-ok">OK</div>
-<div class="s-status-warning-hi-icon">WARNING HI with icon</div>
-<div class="s-status-warning-lo-icon">WARNING LOW with icon</div>
-<div class="s-status-diagnostic-icon">DIAGNOSTIC with icon</div>
-<div class="s-status-info-icon">INFO with icon</div>
-<div class="s-status-ok-icon">OK with icon</div>
-<div class="s-status-warning-hi icon-gear">WARNING HI with custom icon</div>
-</mct-example>
-        </div>
-    </div>
-
-    <div class="l-section">
-        <h2>Synchronization</h2>
-        <div class="cols cols1-1">
-            <div class="col">
-                <p>When the system is operating in real-time streaming mode, it is important for views that display real-time data to clearly articulate when they are not, such as when a user zooms or pans a plot view, freezing that view. In that case, the CSS class <code>s-unsynced</code> should be applied to that view.</p>
-            </div>
-<mct-example><div class="s-unsynced">This element is unsynced</div>
-</mct-example>
-        </div>
-    </div>
-</div>
--- a/example/styleguide/src/ExampleStyleGuideModelProvider.js
+++ b/example/styleguide/src/ExampleStyleGuideModelProvider.js
@@ -34,7 +34,6 @@ define(
            pages['standards'] = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
            pages['colors'] = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
            pages['glyphs'] = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
-            pages['status'] = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
            pages['controls'] = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
            pages['input'] = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
            pages['menus'] = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -22,8 +22,6 @@

 /*global require,__dirname*/

-require("v8-compile-cache");
-
 var gulp = require('gulp'),
    sourcemaps = require('gulp-sourcemaps'),
    path = require('path'),
@@ -48,22 +46,9 @@ var gulp = require('gulp'),
            name: 'bower_components/almond/almond.js',
            include: paths.main.replace('.js', ''),
            wrap: {
-                start: (function () {
-                    var buildVariables = {
-                        version: project.version,
-                        timestamp: moment.utc(Date.now()).format(),
-                        revision: fs.existsSync('.git') ? git.long() : 'Unknown',
-                        branch: fs.existsSync('.git') ? git.branch() : 'Unknown'
-                    };
-                    return fs.readFileSync("src/start.frag", 'utf-8')
-                        .replace(/@@(\w+)/g, function (match, key) {
-                            return buildVariables[key];
-                        });;
-                }()),
+                startFile: "src/start.frag",
                endFile: "src/end.frag"
            },
-            optimize: 'uglify2',
-            uglify2: { output: { comments: /@preserve/ } },
            mainConfigFile: paths.main,
            wrapShim: true
        },
@@ -73,6 +58,14 @@ var gulp = require('gulp'),
        },
        sass: {
            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'
+            }
        }
    };

@@ -83,11 +76,16 @@ if (process.env.NODE_ENV === 'development') {

 gulp.task('scripts', function () {
    var requirejsOptimize = require('gulp-requirejs-optimize');
+    var replace = require('gulp-replace-task');
+    var header = require('gulp-header');
+    var comment = fs.readFileSync('src/about.frag');

    return gulp.src(paths.main)
        .pipe(sourcemaps.init())
        .pipe(requirejsOptimize(options.requirejsOptimize))
        .pipe(sourcemaps.write('.'))
+        .pipe(replace(options.replace))
+        .pipe(header(comment, options.replace.variables))
        .pipe(gulp.dest(paths.dist));
 });

@@ -179,4 +177,4 @@ gulp.task('install', [ 'assets', 'scripts' ]);

 gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);

-gulp.task('build', [ 'verify', 'install' ]);
+gulp.task('build', [ 'verify', 'install' ]);
--- a/index.html
+++ b/index.html
@@ -21,69 +21,64 @@
 -->
 <!doctype html>
 <html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no">
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <title></title>
-        <script src="bower_components/requirejs/require.js"> </script>
-        <script>
-            var THIRTY_MINUTES = 30 * 60 * 1000;
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <title></title>
+    <script src="bower_components/requirejs/require.js"> </script>
+    <script>
+        var THIRTY_MINUTES = 30 * 60 * 1000;

-            require(['openmct'], function (openmct) {
-                [
-                    'example/eventGenerator',
-                    'example/styleguide'
-                ].forEach(
-                    openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
-                );
-                openmct.install(openmct.plugins.MyItems());
-                openmct.install(openmct.plugins.LocalStorage());
-                openmct.install(openmct.plugins.Espresso());
-                openmct.install(openmct.plugins.Generator());
-                openmct.install(openmct.plugins.ExampleImagery());
-                openmct.install(openmct.plugins.UTCTimeSystem());
-                openmct.install(openmct.plugins.ImportExport());
-                openmct.install(openmct.plugins.AutoflowView({
-                    type: "telemetry.panel"
-                }));
-                openmct.install(openmct.plugins.Conductor({
-                    menuOptions: [
-                        {
-                            name: "Fixed",
-                            timeSystem: 'utc',
-                            bounds: {
-                                start: Date.now() - THIRTY_MINUTES,
-                                end: Date.now()
-                            }
-                        },
-                        {
-                            name: "Realtime",
-                            timeSystem: 'utc',
-                            clock: 'local',
-                            clockOffsets: {
-                                start: -25 * 60 * 1000,
-                                end: 5 * 60 * 1000
-                            }
+        require(['openmct'], function (openmct) {
+            [
+                'example/eventGenerator',
+                'example/styleguide'
+            ].forEach(
+                openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
+            );
+            openmct.install(openmct.plugins.MyItems());
+            openmct.install(openmct.plugins.LocalStorage());
+            openmct.install(openmct.plugins.Espresso());
+            openmct.install(openmct.plugins.Generator());
+            openmct.install(openmct.plugins.ExampleImagery());
+            openmct.install(openmct.plugins.UTCTimeSystem());
+            openmct.install(openmct.plugins.Conductor({
+                menuOptions: [
+                    {
+                        name: "Fixed",
+                        timeSystem: 'utc',
+                        bounds: {
+                            start: Date.now() - 30 * 60 * 1000,
+                            end: Date.now()
                        }
-                    ]
-                }));
-                openmct.install(openmct.plugins.SummaryWidget());
-                openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
-                openmct.time.timeSystem('utc');
-                openmct.start();
-            });
-        </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>
-        <div class="l-splash-holder s-splash-holder">
-            <div class="l-splash s-splash"></div>
-        </div>
-    </body>
+                    },
+                    {
+                        name: "Realtime",
+                        timeSystem: 'utc',
+                        clock: 'local',
+                        clockOffsets: {
+                            start: -25 * 60 * 1000,
+                            end: 5 * 60 * 1000
+                        }
+                    }
+                ]
+            }));
+            openmct.install(openmct.plugins.SummaryWidget());
+            openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
+            openmct.time.timeSystem('utc');
+            openmct.start();
+        });
+    </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>
 </html>
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -36,14 +36,14 @@ module.exports = function(config) {
        files: [
            {pattern: 'bower_components/**/*.js', included: false},
            {pattern: 'node_modules/d3-*/**/*.js', included: false},
-            {pattern: 'node_modules/vue/**/*.js', included: false},
-            {pattern: 'src/**/*', included: false},
+            {pattern: 'src/**/*.js', included: false},
            {pattern: 'example/**/*.html', included: false},
            {pattern: 'example/**/*.js', included: false},
            {pattern: 'example/**/*.json', included: false},
            {pattern: 'platform/**/*.js', included: false},
            {pattern: 'warp/**/*.js', included: false},
            {pattern: 'platform/**/*.html', included: false},
+            {pattern: 'src/**/*.html', included: false},
            'test-main.js'
        ],

@@ -88,8 +88,7 @@ module.exports = function(config) {
                "dist/reports/coverage",
            check: {
                global: {
-                    lines: 80,
-                    excludes: ['src/plugins/plot/**/*.js']
+                    lines: 80
                }
            }
        },
--- a/openmct.js
+++ b/openmct.js
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global requirejs,BUILD_CONSTANTS*/
+/*global requirejs*/

 requirejs.config({
    "paths": {
@@ -33,14 +33,13 @@ requirejs.config({
        "moment": "bower_components/moment/moment",
        "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
        "moment-timezone": "bower_components/moment-timezone/builds/moment-timezone-with-data",
-        "saveAs": "bower_components/file-saver/FileSaver.min",
+        "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",
-        "vue": "node_modules/vue/dist/vue.min",
        "zepto": "bower_components/zepto/zepto.min",
        "lodash": "bower_components/lodash/lodash",
-        "d3-selection": "node_modules/d3-selection/dist/d3-selection.min",
+        "d3-selection": "node_modules/d3-selection/build/d3-selection.min",
        "d3-scale": "node_modules/d3-scale/build/d3-scale.min",
        "d3-axis": "node_modules/d3-axis/build/d3-axis.min",
        "d3-array": "node_modules/d3-array/build/d3-array.min",
@@ -67,9 +66,6 @@ requirejs.config({
        "moment-duration-format": {
            "deps": ["moment"]
        },
-        "saveAs": {
-            "exports": "saveAs"
-        },
        "screenfull": {
            "exports": "screenfull"
        },
@@ -95,17 +91,11 @@ requirejs.config({
 define([
    './platform/framework/src/Main',
    './src/defaultRegistry',
-    './src/MCT',
-    './src/plugins/buildInfo/plugin'
-], function (Main, defaultRegistry, MCT, buildInfo) {
+    './src/MCT'
+], function (Main, defaultRegistry, MCT) {
    var openmct = new MCT();

    openmct.legacyRegistry = defaultRegistry;
-    openmct.install(openmct.plugins.Plot());
-
-    if (typeof BUILD_CONSTANTS !== 'undefined') {
-        openmct.install(buildInfo(BUILD_CONSTANTS));
-    }

    openmct.on('start', function () {
        return new Main().run(defaultRegistry);
--- a/package.json
+++ b/package.json
@@ -1,34 +1,35 @@
 {
  "name": "openmct",
-  "version": "0.14.0-SNAPSHOT",
+  "version": "0.12.1-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {
-    "d3-array": "1.2.x",
-    "d3-axis": "1.0.x",
-    "d3-collection": "1.0.x",
-    "d3-color": "1.0.x",
-    "d3-format": "1.2.x",
-    "d3-interpolate": "1.1.x",
-    "d3-scale": "1.0.x",
-    "d3-selection": "1.3.x",
-    "d3-time": "1.0.x",
-    "d3-time-format": "2.1.x",
+    "d3-array": "^1.0.2",
+    "d3-axis": "^1.0.4",
+    "d3-collection": "^1.0.2",
+    "d3-color": "^1.0.2",
+    "d3-format": "^1.0.2",
+    "d3-interpolate": "^1.1.3",
+    "d3-scale": "^1.0.4",
+    "d3-selection": "^1.0.3",
+    "d3-time": "^1.0.4",
+    "d3-time-format": "^2.0.3",
    "express": "^4.13.1",
    "minimist": "^1.1.1",
-    "request": "^2.69.0",
-    "vue": "^2.5.6"
+    "request": "^2.69.0"
  },
  "devDependencies": {
    "bower": "^1.7.7",
    "git-rev-sync": "^1.4.0",
    "glob": ">= 3.0.0",
    "gulp": "^3.9.1",
+    "gulp-header": "^1.8.8",
    "gulp-jscs": "^3.0.2",
    "gulp-jshint": "^2.0.0",
    "gulp-jshint-html-reporter": "^0.1.3",
    "gulp-rename": "^1.2.2",
+    "gulp-replace-task": "^0.11.0",
    "gulp-requirejs-optimize": "^0.3.1",
-    "gulp-sass": "^3.1.0",
+    "gulp-sass": "^2.2.0",
    "gulp-sourcemaps": "^1.6.0",
    "jasmine-core": "^2.3.0",
    "jscs-html-reporter": "^0.1.0",
@@ -50,8 +51,7 @@
    "moment": "^2.11.1",
    "node-bourbon": "^4.2.3",
    "requirejs": "2.1.x",
-    "split": "^1.0.0",
-    "v8-compile-cache": "^1.1.0"
+    "split": "^1.0.0"
  },
  "scripts": {
    "start": "node app.js",
@@ -61,7 +61,7 @@
    "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
    "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
    "docs": "npm run jsdoc ; npm run otherdoc",
-    "prepare": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
+    "prepublish": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
  },
  "repository": {
    "type": "git",
--- a/platform/commonUI/about/bundle.js
+++ b/platform/commonUI/about/bundle.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/res/templates/about-dialog.html
+++ b/platform/commonUI/about/res/templates/about-dialog.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -24,7 +24,7 @@
    <div class="s-text l-content">
        <h1 class="l-title s-title">Open MCT</h1>
        <div class="l-description s-description">
-	        <p>Open MCT, Copyright &copy; 2014-2018, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p>
+	        <p>Open MCT, Copyright &copy; 2014-2017, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p>
 	        <p>Open MCT 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 <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.</p>
 	        <p>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.</p>
 	        <p>Open MCT includes source code licensed under additional open source licenses. See the Open Source Licenses file included with this distribution or <a ng-click="about.openLicenses()">click here for licensing information</a>.</p>
--- a/platform/commonUI/about/res/templates/about-logo.html
+++ b/platform/commonUI/about/res/templates/about-logo.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/app-logo.html
+++ b/platform/commonUI/about/res/templates/app-logo.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/license-apache.html
+++ b/platform/commonUI/about/res/templates/license-apache.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/license-mit.html
+++ b/platform/commonUI/about/res/templates/license-mit.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/licenses-export-md.html
+++ b/platform/commonUI/about/res/templates/licenses-export-md.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/licenses.html
+++ b/platform/commonUI/about/res/templates/licenses.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/overlay-about.html
+++ b/platform/commonUI/about/res/templates/overlay-about.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/src/AboutController.js
+++ b/platform/commonUI/about/src/AboutController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/src/LicenseController.js
+++ b/platform/commonUI/about/src/LicenseController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/src/LogoController.js
+++ b/platform/commonUI/about/src/LogoController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/test/AboutControllerSpec.js
+++ b/platform/commonUI/about/test/AboutControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/test/LicenseControllerSpec.js
+++ b/platform/commonUI/about/test/LicenseControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/test/LogoControllerSpec.js
+++ b/platform/commonUI/about/test/LogoControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -26,7 +26,6 @@ define([
    "./src/InspectorPaneController",
    "./src/BrowseObjectController",
    "./src/MenuArrowController",
-    "./src/ObjectHeaderController",
    "./src/navigation/NavigationService",
    "./src/navigation/NavigateAction",
    "./src/navigation/OrphanNavigationHandler",
@@ -37,7 +36,6 @@ define([
    "text!./res/templates/browse-object.html",
    "text!./res/templates/items/grid-item.html",
    "text!./res/templates/browse/object-header.html",
-    "text!./res/templates/browse/object-header-frame.html",
    "text!./res/templates/menu-arrow.html",
    "text!./res/templates/back-arrow.html",
    "text!./res/templates/items/items.html",
@@ -50,7 +48,6 @@ define([
    InspectorPaneController,
    BrowseObjectController,
    MenuArrowController,
-    ObjectHeaderController,
    NavigationService,
    NavigateAction,
    OrphanNavigationHandler,
@@ -61,7 +58,6 @@ define([
    browseObjectTemplate,
    gridItemTemplate,
    objectHeaderTemplate,
-    objectHeaderFrameTemplate,
    menuArrowTemplate,
    backArrowTemplate,
    itemsTemplate,
@@ -113,8 +109,7 @@ define([
                        "agentService",
                        "$window",
                        "$location",
-                        "$attrs",
-                        "navigationService"
+                        "$attrs"
                    ]
                },
                {
@@ -145,13 +140,6 @@ define([
                        "$location",
                        "$attrs"
                    ]
-                },
-                {
-                    "key": "ObjectHeaderController",
-                    "implementation": ObjectHeaderController,
-                    "depends": [
-                        "$scope"
-                    ]
                }
            ],
            "representations": [
@@ -185,13 +173,6 @@ define([
                        "type"
                    ]
                },
-                {
-                    "key": "object-header-frame",
-                    "template": objectHeaderFrameTemplate,
-                    "uses": [
-                        "type"
-                    ]
-                },
                {
                    "key": "menu-arrow",
                    "template": menuArrowTemplate,
--- a/platform/commonUI/browse/res/templates/back-arrow.html
+++ b/platform/commonUI/browse/res/templates/back-arrow.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse-object.html
+++ b/platform/commonUI/browse/res/templates/browse-object.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -57,12 +57,7 @@
            </div>
            <mct-representation key="representation.selected.key"
                                mct-object="representation.selected.key && domainObject"
-                                class="abs flex-elem grows object-holder-main scroll"
-                                mct-selectable="{
-                                    item: domainObject.useCapability('adapter'),
-                                    oldItem: domainObject
-                                }"
-                                mct-init-select>
+                                class="abs flex-elem grows object-holder-main scroll">
            </mct-representation>
        </div>
    </div>
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse/inspector-region.html
+++ b/platform/commonUI/browse/res/templates/browse/inspector-region.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -19,21 +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 as controller">
+<div ng-controller="InspectorController">
+    <div ng-repeat="region in regions">
        <mct-representation
-                key="'object-properties'"
-                mct-object="controller.selectedItem()"
+                key="region.content.key"
+                mct-object="domainObject"
                ng-model="ngModel">
        </mct-representation>
-
-        <div ng-if="!controller.hasProviderView()">
-            <mct-representation
-                    key="inspectorKey"
-                    mct-object="controller.selectedItem()"
-                    ng-model="ngModel">
-            </mct-representation>
-        </div>
-
-        <div class='inspector-provider-view'>
-        </div>
+    </div>
 </div>
--- a/platform/commonUI/browse/res/templates/browse/object-header-frame.html
+++ b/platform/commonUI/browse/res/templates/browse/object-header-frame.html
@@ -1,31 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2018, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT 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 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.
-->
-<span class='type-icon flex-elem {{type.getCssClass()}}'></span>
-<span class="l-elem-wrapper l-flex-row flex-elem grows" ng-controller="ObjectHeaderController as controller">
-    <span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span>
-    <span class='title-label flex-elem holder flex-can-shrink s-input-inline'>{{model.name}}</span>
-    <span class='t-object-alert t-alert-unsynced flex-elem holder' title='This object is not currently displaying real-time data'></span>
-    <mct-representation
-        key="'menu-arrow'"
-        mct-object='domainObject'
-        class="flex-elem context-available-w"></mct-representation>
-</span>
--- a/platform/commonUI/browse/res/templates/browse/object-header.html
+++ b/platform/commonUI/browse/res/templates/browse/object-header.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -20,13 +20,9 @@
 at runtime from the About dialog for additional information.
 -->
 <span class='type-icon flex-elem {{type.getCssClass()}}'></span>
-<span class="l-elem-wrapper l-flex-row flex-elem grows" ng-controller="ObjectHeaderController as controller">
+<span class="l-elem-wrapper l-flex-row flex-elem grows">
    <span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span>
-    <span ng-attr-contenteditable="{{ controller.editable ? true : undefined }}"
-		class='title-label flex-elem holder flex-can-shrink s-input-inline'
-		ng-click="controller.edit()"
-		ng-blur="controller.updateName($event)"
-		ng-keypress="controller.updateName($event)">{{model.name}}</span>
+    <span class='title-label flex-elem holder flex-can-shrink'>{{model.name}}</span>
    <span class='t-object-alert t-alert-unsynced flex-elem holder' title='This object is not currently displaying real-time data'></span>
    <mct-representation
        key="'menu-arrow'"
--- a/platform/commonUI/browse/res/templates/browse/object-properties.html
+++ b/platform/commonUI/browse/res/templates/browse/object-properties.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -38,7 +38,8 @@
                  ng-class="{ last:($index + 1) === contextualParents.length }">
                <mct-representation key="'label'"
                                    mct-object="parent"
-                                    ng-click="parent.getCapability('action').perform('navigate')"
+                                    ng-model="ngModel"
+                                    ng-click="ngModel.selectedObject = parent"
                                    class="location-item">
                </mct-representation>
            </span>
@@ -50,7 +51,8 @@
                  ng-class="{ last:($index + 1) === primaryParents.length }">
                <mct-representation key="'label'"
                                    mct-object="parent"
-                                    ng-click="parent.getCapability('action').perform('navigate')"
+                                    ng-model="ngModel"
+                                    ng-click="ngModel.selectedObject = parent"
                                    class="location-item">
                </mct-representation>
            </span>
--- a/platform/commonUI/browse/res/templates/items/grid-item.html
+++ b/platform/commonUI/browse/res/templates/items/grid-item.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/items/items.html
+++ b/platform/commonUI/browse/res/templates/items/items.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/menu-arrow.html
+++ b/platform/commonUI/browse/res/templates/menu-arrow.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/BrowseObjectController.js
+++ b/platform/commonUI/browse/src/BrowseObjectController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/InspectorRegion.js
+++ b/platform/commonUI/browse/src/InspectorRegion.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/MenuArrowController.js
+++ b/platform/commonUI/browse/src/MenuArrowController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/ObjectHeaderController.js
+++ b/platform/commonUI/browse/src/ObjectHeaderController.js
@@ -1,92 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT 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 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.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Controller to provide the ability to inline edit an object name.
-         *
-         * @constructor
-         * @memberof platform/commonUI/browse
-         */
-        function ObjectHeaderController($scope) {
-            this.$scope = $scope;
-            this.domainObject = $scope.domainObject;
-            this.editable = this.allowEdit();
-        }
-
-        /**
-         * Updates the object name on blur and enter keypress events.
-         *
-         * @param event the mouse event
-         */
-        ObjectHeaderController.prototype.updateName = function (event) {
-            if (!event || !event.currentTarget) {
-                return;
-            }
-
-            if (event.type === 'blur') {
-                this.updateModel(event);
-            } else if (event.which === 13) {
-                this.updateModel(event);
-                event.currentTarget.blur();
-                window.getSelection().removeAllRanges();
-            }
-        };
-
-        /**
-         * Updates the model.
-         *
-         * @param event the mouse event
-         * @param private
-         */
-        ObjectHeaderController.prototype.updateModel = function (event) {
-            var name = event.currentTarget.textContent.replace(/\n/g, ' ');
-
-            if (name.length === 0) {
-                name = "Unnamed " + this.domainObject.getCapability("type").typeDef.name;
-                event.currentTarget.textContent = name;
-            }
-
-            if (name !== this.domainObject.getModel().name) {
-                this.domainObject.getCapability('mutation').mutate(function (model) {
-                    model.name = name;
-                });
-            }
-        };
-
-        /**
-         * Checks if the domain object is editable.
-         *
-         * @private
-         * @return true if object is editable
-         */
-        ObjectHeaderController.prototype.allowEdit = function () {
-            var type = this.domainObject && this.domainObject.getCapability('type');
-            return !!(type && type.hasFeature('creation'));
-        };
-
-        return ObjectHeaderController;
-    }
-);
--- a/platform/commonUI/browse/src/PaneController.js
+++ b/platform/commonUI/browse/src/PaneController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -24,14 +24,14 @@
 define(
    [],
    function () {
-        var navigationListenerAdded = false;
+
        /**
         * Controller to provide the ability to show/hide the tree in
         * Browse mode.
         * @constructor
         * @memberof platform/commonUI/browse
         */
-        function PaneController($scope, agentService, $window, $location, $attrs, navigationService) {
+        function PaneController($scope, agentService, $window, $location, $attrs) {
            var self = this;
            this.agentService = agentService;
            var hideParameterPresent = $location.search().hasOwnProperty($attrs.hideParameter);
@@ -61,11 +61,6 @@ define(
                    self.state = false;
                }
            };
-
-            if (navigationService && navigationService.addListener && !navigationListenerAdded) {
-                navigationService.addListener(this.callback);
-                navigationListenerAdded = true;
-            }
        }

        /**
--- a/platform/commonUI/browse/src/navigation/NavigateAction.js
+++ b/platform/commonUI/browse/src/navigation/NavigateAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/navigation/NavigationService.js
+++ b/platform/commonUI/browse/src/navigation/NavigationService.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js
+++ b/platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/windowing/FullscreenAction.js
+++ b/platform/commonUI/browse/src/windowing/FullscreenAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/windowing/NewTabAction.js
+++ b/platform/commonUI/browse/src/windowing/NewTabAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/windowing/WindowTitler.js
+++ b/platform/commonUI/browse/src/windowing/WindowTitler.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/BrowseControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/InspectorRegionSpec.js
+++ b/platform/commonUI/browse/test/InspectorRegionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/MenuArrowControllerSpec.js
+++ b/platform/commonUI/browse/test/MenuArrowControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
+++ b/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
@@ -1,137 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT 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 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.
- *****************************************************************************/
-
-define(
-    ["../src/ObjectHeaderController"],
-    function (ObjectHeaderController) {
-
-        describe("The object header controller", function () {
-            var mockScope,
-                mockDomainObject,
-                mockCapabilities,
-                mockMutationCapability,
-                mockTypeCapability,
-                mockEvent,
-                mockCurrentTarget,
-                model,
-                controller;
-
-            beforeEach(function () {
-                mockMutationCapability = jasmine.createSpyObj("mutation", ["mutate"]);
-                mockTypeCapability = jasmine.createSpyObj("type", ["typeDef", "hasFeature"]);
-                mockTypeCapability.typeDef = { name: ""};
-                mockTypeCapability.hasFeature.andCallFake(function (feature) {
-                    return feature === 'creation';
-                });
-
-                mockCapabilities = {
-                    mutation: mockMutationCapability,
-                    type: mockTypeCapability
-                };
-
-                model = {
-                    name: "Test name"
-                };
-                mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "getModel"]);
-                mockDomainObject.getModel.andReturn(model);
-                mockDomainObject.getCapability.andCallFake(function (key) {
-                    return mockCapabilities[key];
-                });
-
-                mockScope = {
-                    domainObject: mockDomainObject
-                };
-
-                mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "textContent"]);
-                mockCurrentTarget.blur.andReturn(mockCurrentTarget);
-
-                mockEvent = {
-                    which: {},
-                    type: {},
-                    currentTarget: mockCurrentTarget
-                };
-
-                controller = new ObjectHeaderController(mockScope);
-            });
-
-            it("updates the model with new name on blur", function () {
-                mockEvent.type = "blur";
-                mockCurrentTarget.textContent = "New name";
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).toHaveBeenCalled();
-            });
-
-            it("updates the model with a default for blank names", function () {
-                mockEvent.type = "blur";
-                mockCurrentTarget.textContent = "";
-                controller.updateName(mockEvent);
-
-                expect(mockCurrentTarget.textContent.length).not.toEqual(0);
-                expect(mockMutationCapability.mutate).toHaveBeenCalled();
-            });
-
-            it("does not update the model if the same name", function () {
-                mockEvent.type = "blur";
-                mockCurrentTarget.textContent = mockDomainObject.getModel().name;
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
-            });
-
-            it("updates the model on enter keypress event only", function () {
-                mockCurrentTarget.textContent = "New name";
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
-
-                mockEvent.which = 13;
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).toHaveBeenCalledWith(jasmine.any(Function));
-
-                mockMutationCapability.mutate.mostRecentCall.args[0](model);
-
-                expect(mockDomainObject.getModel().name).toBe("New name");
-            });
-
-            it("blurs the field on enter key press", function () {
-                mockCurrentTarget.textContent = "New name";
-                mockEvent.which = 13;
-                controller.updateName(mockEvent);
-
-                expect(mockEvent.currentTarget.blur).toHaveBeenCalled();
-            });
-
-            it("allows editting name when object is creatable", function () {
-                expect(controller.allowEdit()).toBe(true);
-            });
-
-            it("disallows editting name when object is non-creatable", function () {
-                mockTypeCapability.hasFeature.andReturn(false);
-
-                expect(controller.allowEdit()).toBe(false);
-
-            });
-        });
-    }
-);
--- a/platform/commonUI/browse/test/PaneControllerSpec.js
+++ b/platform/commonUI/browse/test/PaneControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js
+++ b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js
+++ b/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js
+++ b/platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
-* Open MCT, Copyright (c) 2014-2018, United States Government
+* Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
+++ b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/windowing/NewTabActionSpec.js
+++ b/platform/commonUI/browse/test/windowing/NewTabActionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
+++ b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/bundle.js
+++ b/platform/commonUI/dialog/bundle.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/res/templates/dialog.html
+++ b/platform/commonUI/dialog/res/templates/dialog.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -20,7 +20,7 @@
 at runtime from the About dialog for additional information.
 -->
 <div class="abs top-bar">
-    <div class="dialog-title">{{ngModel.title}}</div>
+    <div class="title">{{ngModel.title}}</div>
    <div class="hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
 </div>
 <div class='abs editor'>
--- a/platform/commonUI/dialog/res/templates/message.html
+++ b/platform/commonUI/dialog/res/templates/message.html
@@ -1,10 +1,11 @@
 <div class="l-message"
     ng-class="'message-severity-' + ngModel.severity">
-    <div class="w-message-contents">
+    <div class="ui-symbol type-icon message-type"></div>
+    <div class="message-contents">
        <div class="top-bar">
            <div class="title">{{ngModel.title}}</div>
+            <div class="hint" ng-hide="ngModel.hint === undefined">{{ngModel.hint}}</div>
        </div>
-        <div class="hint" ng-hide="ngModel.hint === undefined">{{ngModel.hint}}</div>
        <div class="message-body">
            <div class="message-action">
                {{ngModel.actionText}}
@@ -24,6 +25,8 @@
               ng-click="ngModel.primaryOption.callback()">
                {{ngModel.primaryOption.label}}
            </a>
+
        </div>
+
    </div>
 </div>
--- a/platform/commonUI/dialog/res/templates/overlay-blocking-message.html
+++ b/platform/commonUI/dialog/res/templates/overlay-blocking-message.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/res/templates/overlay-dialog.html
+++ b/platform/commonUI/dialog/res/templates/overlay-dialog.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/res/templates/overlay-message-list.html
+++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html
@@ -1,17 +1,17 @@
-<mct-container key="overlay">
-    <div class="t-message-list">
-        <div class="top-bar">
-            <div class="dialog-title">{{ngModel.dialog.title}}</div>
+<mct-container key="overlay" class="t-message-list">
+    <div class="message-contents">
+        <div class="abs top-bar">
+            <div class="title">{{ngModel.dialog.title}}</div>
            <div class="hint">Displaying {{ngModel.dialog.messages.length}} message<span ng-show="ngModel.dialog.messages.length > 1 ||
                                                                                                  ngModel.dialog.messages.length == 0">s</span>
            </div>
        </div>
-        <div class="w-messages">
+        <div class="abs message-body">
            <mct-include
-                ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
-                key="'message'" ng-model="msg.model"></mct-include>
+                    ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
+                    key="'message'" ng-model="msg.model"></mct-include>
        </div>
-        <div class="bottom-bar">
+        <div class="abs bottom-bar">
            <a ng-repeat="dialogAction in ngModel.dialog.actions"
               class="s-button major"
               ng-click="dialogAction.action()">
--- a/platform/commonUI/dialog/res/templates/overlay-options.html
+++ b/platform/commonUI/dialog/res/templates/overlay-options.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -21,7 +21,7 @@
 -->
 <mct-container key="overlay">
    <div class="abs top-bar">
-        <div class="dialog-title">{{ngModel.dialog.title}}</div>
+        <div class="title">{{ngModel.dialog.title}}</div>
        <div class="hint">{{ngModel.dialog.hint}}</div>
    </div>
    <div class='abs editor'>
--- a/platform/commonUI/dialog/res/templates/overlay.html
+++ b/platform/commonUI/dialog/res/templates/overlay.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/src/DialogService.js
+++ b/platform/commonUI/dialog/src/DialogService.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/src/OverlayService.js
+++ b/platform/commonUI/dialog/src/OverlayService.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/test/DialogServiceSpec.js
+++ b/platform/commonUI/dialog/test/DialogServiceSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/test/OverlayServiceSpec.js
+++ b/platform/commonUI/dialog/test/OverlayServiceSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -121,8 +121,7 @@ define([
                    "key": "ElementsController",
                    "implementation": ElementsController,
                    "depends": [
-                        "$scope",
-                        "openmct"
+                        "$scope"
                    ]
                },
                {
@@ -300,6 +299,9 @@ define([
                {
                    "key": "edit-elements",
                    "template": elementsTemplate,
+                    "uses": [
+                        "composition"
+                    ],
                    "gestures": [
                        "drop"
                    ]
@@ -383,10 +385,7 @@ define([
                    ]
                },
                {
-                    "implementation": EditToolbarRepresenter,
-                    "depends": [
-                        "openmct"
-                    ]
+                    "implementation": EditToolbarRepresenter
                }
            ],
            "constants": [
--- a/platform/commonUI/edit/res/templates/create/create-button.html
+++ b/platform/commonUI/edit/res/templates/create/create-button.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -23,7 +23,7 @@
    <div class="s-menu-button major create-button" ng-click="createController.toggle()">
 		<span class="title-label">Create</span>
    </div>
-    <div class="menu super-menu l-create-menu" ng-show="createController.isActive()">
+    <div class="menu super-menu" ng-show="createController.isActive()">
        <mct-representation mct-object="domainObject" key="'create-menu'">
        </mct-representation>
    </div>
--- a/platform/commonUI/edit/res/templates/create/create-menu.html
+++ b/platform/commonUI/edit/res/templates/create/create-menu.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -19,8 +19,8 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<div class="w-menu" ng-controller="CreateMenuController">
-    <div class="col menu-items">
+<div class="contents" ng-controller="CreateMenuController">
+    <div class="pane left menu-items">
        <ul>
            <li ng-repeat="createAction in createActions" ng-click="createAction.perform()">
                <a ng-mouseover="representation.activeMetadata = createAction.getMetadata()"
@@ -31,15 +31,13 @@
            </li>
        </ul>
    </div>
-    <div class="col menu-item-description">
+    <div class="pane right menu-item-description">
        <div class="desc-area icon {{ representation.activeMetadata.cssClass }}"></div>
-        <div class="w-title-desc">
-            <div class="desc-area title">
-                {{representation.activeMetadata.name}}
-            </div>
-            <div class="desc-area description">
-                {{representation.activeMetadata.description}}
-            </div>
+        <div class="desc-area title">
+            {{representation.activeMetadata.name}}
+        </div>
+        <div class="desc-area description">
+            {{representation.activeMetadata.description}}
        </div>
    </div>
 </div>
--- a/platform/commonUI/edit/res/templates/create/locator.html
+++ b/platform/commonUI/edit/res/templates/create/locator.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/edit-action-buttons.html
+++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/edit-object.html
+++ b/platform/commonUI/edit/res/templates/edit-object.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -61,12 +61,7 @@
            <mct-representation key="representation.selected.key"
                                mct-object="representation.selected.key && domainObject"
                                class="abs flex-elem grows object-holder-main scroll"
-                                toolbar="toolbar"
-                                mct-selectable="{
-                                    item: domainObject.useCapability('adapter'),
-                                    oldItem: domainObject
-                                }"
-                                mct-init-select>
+                                toolbar="toolbar">
            </mct-representation>
        </div><!--/ l-object-wrapper-inner -->
    </div>
--- a/platform/commonUI/edit/res/templates/elements.html
+++ b/platform/commonUI/edit/res/templates/elements.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -25,17 +25,9 @@
                 ng-model="filterBy">
    </mct-include>
    <div class="flex-elem grows vscroll">
-        <ul class="tree" id="inspector-elements-tree"
-            ng-if="composition.length > 0">
+        <ul class="tree">
            <li ng-repeat="containedObject in composition | filter:searchElements">
                <span class="tree-item">
-                    <span class="grippy-sm"
-                          ng-if="composition.length > 1"
-                          data-id="{{ containedObject.id }}"
-                          mct-drag-down="dragDown($event)"
-                          mct-drag="drag($event)"
-                          mct-drag-up="dragUp($event)">
-                    </span>
                    <mct-representation
                            class="rep-object-label"
                            key="'label'"
@@ -44,6 +36,5 @@
                </span>
            </li>
        </ul>
-        <div ng-if="composition.length === 0">No contained elements</div>    
    </div>
 </div>
--- a/platform/commonUI/edit/res/templates/library.html
+++ b/platform/commonUI/edit/res/templates/library.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/topbar-edit.html
+++ b/platform/commonUI/edit/res/templates/topbar-edit.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/src/actions/CancelAction.js
+++ b/platform/commonUI/edit/src/actions/CancelAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Charles Hacskaylo	28a3ada6af	[Front-end] WIP Updates to widget styles Fixes #1644 Fixes #1668 Getting main layout in order; Renamed -wrapper classes to -w; Drag and re-order of rules is broken :(	2017-09-14 14:55:52 -07:00
Charles Hacskaylo	ce0f24c86f	[Front-end] Better arg naming Fixes #1644 Fixes #1668	2017-09-14 14:53:16 -07:00
Charles Hacskaylo	6ca2a755dc	[Front-end] Generalize .section-header Fixes #1644 Fixes #1668	2017-09-14 14:52:13 -07:00
Doubek-Kraft	f6c1488ccd	[Summary Widgets] Merge with style Merge remote-tracking branch 'origin/summary-widget-styling-2' into summary-widgets	2017-08-25 14:23:06 -07:00
Doubek-Kraft	26be1ecf37	[Summary Widgets] Merge with style Merge remote-tracking branch 'origin/summary-widget-styling-2' into summary-widgets Restore correct glyphs after merge with master	2017-08-25 14:19:50 -07:00
Charles Hacskaylo	38f0f072bb	[Merge] Ellipsize added to l-summary-widget Fixes #1669	2017-08-25 14:19:43 -07:00
Charles Hacskaylo	e5e969665f	[Merge] Merge latest master Fixes #1669 Merge + resolve conflicts;	2017-08-25 14:11:34 -07:00
Doubek-Kraft	ffbb662c99	[Summary Widgets] Unit tests	2017-08-25 14:09:22 -07:00
Doubek-Kraft	bd7b23f896	[Summary Widgets] Merge from style branch Merge remote-tracking branch 'origin/summary-widget-styling-2' into summary-widgets Resolve conflicts with divergent rule implementation	2017-08-25 12:43:29 -07:00
Doubek-Kraft	c238def902	[Summary Widgets] Unit tests	2017-08-25 11:57:29 -07:00
Charles Hacskaylo	2d430ece7f	[Merge] Thumbs now show icon and label text Fixes #1669 Updates to allow thumbs to show their associated icon and label text; minor CSS tweaks for icon size and ellipsizing; New rules now don't use first icon by default;	2017-08-25 11:40:46 -07:00
Doubek-Kraft	c92644a661	[Summary Widgets] Merge from master Merge remote-tracking branch 'origin/master' into summary-widgets Patch error with SineWave generators after merge	2017-08-25 10:04:32 -07:00
Doubek-Kraft	41ce3c04f7	[Summary Widgets] Unit Tests	2017-08-24 16:52:44 -07:00
Doubek-Kraft	fcf77f359f	[Summary Widgets] Unit tests	2017-08-24 12:06:31 -07:00
Doubek-Kraft	40a2737915	[Summary Widgets] Performance Improvements Remove unecessary re-initialization of Rule objects on certain user interactions, and cleanup related code	2017-08-24 10:12:55 -07:00
Doubek-Kraft	216489d67f	[Summary Widgets] Tests Add unit tests	2017-08-23 17:01:14 -07:00
Doubek-Kraft	418a393b26	[Sumamry Widgets] Destroy Implement destroy	2017-08-23 13:09:36 -07:00
Aaron Doubek-Kraft	1f3d744494	[Summary Widgets] Event Emitters Replace custom event handlers with EventEmitters, remove binds assoicated with old event handlers, and update documentation and callback functions	2017-08-22 23:31:45 -07:00
Doubek-Kraft	ff3f2dccba	[Summary Widget] Tests Add and update unit tests Fix style in markup Begin implementing destroy	2017-08-22 16:51:00 -07:00
Doubek-Kraft	e69973bd29	[Summary Widgets] Documentation Finished adding JSDoc comments Standardize usage of event handler callbacks Fix rule persistence bug	2017-08-22 11:13:26 -07:00
Doubek-Kraft	05b352cc36	[Summary Widgets] Documentation Add JSDoc style comments	2017-08-21 17:05:41 -07:00
Doubek-Kraft	9735548999	[Summary Widgets] Add documentation	2017-08-18 16:22:23 -07:00
Doubek-Kraft	f9529b1362	[Summary Widgets] UI for scripted conditions Add textfield input for JavaScript condition input, and modify the condition manager and condition evaluator to read JS conditions correctly from the data model. Currently, custom conditions are not actually executed and will always be evaluated as false.	2017-08-18 14:27:57 -07:00
Doubek-Kraft	c598cec702	[Summary Widgets] Unit Tests Add and update tests for select classes Stub specfiles for test data and DnD	2017-08-17 16:44:33 -07:00
Doubek-Kraft	e9ea1c4a0f	[Summary Widgets] Edit Mode Enable edit mode for summary widgets, and make configuration interface visible only when the user has entered edit mode Standardize usage of 'mutate' Fix collision between widget palettes and other interfaces where palettes would permanently hide other menus	2017-08-17 13:47:49 -07:00
Doubek-Kraft	e9238ff282	[Summary Widgets] Merge from View API Branch Merge remote-tracking branch 'origin/view-api-implementation' into summary-widgets	2017-08-17 09:31:36 -07:00
Doubek-Kraft	4cebd72cba	[Summary Widgets] Merge from style branch Issues #1644 #1669 Merge remote-tracking branch 'origin/summary-widget-styling-2' into summary-widgets Integrate new style for inputs	2017-08-16 14:57:29 -07:00
Doubek-Kraft	f8a44d6e71	[Summary Widget] Test Data Issue #1644 Add user-configurable mock data to test rules. Modify evaluator to gracefully handle uninitialzed test data points. Fix DnD bug where drag position was not tracked correctly	2017-08-16 14:37:03 -07:00
Pete Richards	d0745b300b	Allow views to be editable	2017-08-16 11:20:04 -07:00
Charles Hacskaylo	2a4e0a3081	[Frontend] Mods to custom selects Fixes #1669 line-height, context arrow positioning and color	2017-08-16 10:50:08 -07:00
Charles Hacskaylo	1ff19f9574	[Front-end] Refinements to palette .selected Fixes #1669 Unit tested in espresso and snow themes as well;	2017-08-15 16:04:07 -07:00
Charles Hacskaylo	7ef84cb50d	[Front-end] Fix palette menu when no icon is selected Fixes #1669	2017-08-15 15:51:32 -07:00
Charles Hacskaylo	cd05c70d64	[Front-end] Fixes to palette CSS Fixes #1669 Changed .selected to avoid icon collision when applying .selected to a an item in an icon palette; Moved color defs into theme constants files; TO-DO: fix custom select alignment issues, fix menu when no icon is selected, unit test in Snow theme.	2017-08-15 15:24:18 -07:00
Doubek-Kraft	568473b82f	[Summary Widgets] Rule Reorders Cleanup Widget DnD code and package it as a module	2017-08-14 16:24:38 -07:00
Doubek-Kraft	c61b074755	[Summary Widgets] Rule Reorders Re-implement drag and drop with a 'sortable list' style interface	2017-08-14 14:21:37 -07:00
Doubek-Kraft	8ed66ab4ab	[Summary Widgets] Rule Reorders Implement drag and drop rule reorders using the native HTML5 API	2017-08-11 16:57:40 -07:00
Doubek-Kraft	b2502dd998	[Summary Widgets] Selection classes for palettes Merge remote-tracking branch 'origin/summary-widget-styling-2' into summary-widgets. Issues #1669 #1644 Update palette classes to apply a visual indicator for selection to their items.	2017-08-10 10:39:15 -07:00
Doubek-Kraft	856eedbf9d	[Summary Widgets] 'Any/All Telemetry' in conditions Add UI and implemenetion for evaluating any telemetry or all telemetry in an individual condition. Add related unit tests.	2017-08-09 16:54:19 -07:00
Charles Hacskaylo	0c0ca6e6af	[Frontend] Colors for palette defined Fixes #1669	2017-08-09 16:00:33 -07:00
Doubek-Kraft	498b797e49	[Summary Widgets] Fix input issue Fix a bug in the compsosition object selector where it would not display its currently selected item on a composition add. Update names of modules to more accurately describe their function.	2017-08-09 10:44:41 -07:00
Doubek-Kraft	02c33388ba	[Summary Widgets] Generate Rule Descriptions Dynamically update the rule description based on the current state of the rules' conditions	2017-08-08 17:47:54 -07:00
Charles Hacskaylo	8a8e3cc055	[Front-end] WIP colors for Summary Widget palettes Fixes #1669	2017-08-08 16:11:52 -07:00
Charles Hacskaylo	36d60b16e9	[Front-end] Updated Style Guide Fixes #1669 Updated palette example in Style Guide to use `no-selection` and `selected` classes;	2017-08-08 15:35:41 -07:00
Charles Hacskaylo	de3114568b	[Front-end] Implemented `no-selection` class in widgets Fixes #1669 Added `no-selection` class to "None" selection choice in widgets palette;	2017-08-08 15:28:48 -07:00
Doubek-Kraft	eb5835faeb	[Summary Widgets] Fix color palettes Fix color palette bug where the 'none' option was not recognized as a selectable item Add ability to toggle 'none' option, and remove it from the text color control Remove 'grippy' element when only one user-defined rule exists Fix format of requirejs headers Add tooltips	2017-08-08 15:27:46 -07:00
Charles Hacskaylo	ff1ddb0b79	[Front-end] Added `.selected` class for palette items Fixes #1669 Added `.selected` in `.s-palette-item` class; Re-orged styles in palette.scss to place in .l-* and .s-* classes properly;	2017-08-08 15:16:20 -07:00
Charles Hacskaylo	15b127bb2e	[Front-end] Added 'no-selection' CSS class Fixes #1669 Added to _global.scss; implemented in color.html;	2017-08-08 15:09:56 -07:00
Doubek-Kraft	e4ed881f6d	[Summary Widgets] Code Style Fix code style issues Update plugin syntax to more closely match existing plugins	2017-08-08 12:06:20 -07:00
Doubek-Kraft	7b62cf130c	[Summary Widget] Add unit tests Add tests for input classes Fix code style errors	2017-08-07 17:07:21 -07:00
Doubek-Kraft	72fd2e531c	[Summary Widget] Assorted Cleanup Abstract palette behavior to superclass, and base new color and icon palette classes on it Add unit tests Move private event handler methods out of object prototypes	2017-08-04 16:15:47 -07:00
Doubek-Kraft	4a5392ef78	[Summary Widgets] Minor Fixes Update zepto in bower to enforce v1.2.0 Fix bug where summary widget conditions would modify appearance of other summary widgets Move code to plugins directory Stub for unit tests	2017-08-03 13:09:05 -07:00
Doubek-Kraft	0150a708ca	[Evaluation] Implement condition evaluation Issue #1644 Add telemetry subscription handling, and implement the execution of rules. Provide a toggle for 'any', 'all', or 'JavaScript' trigger Add documentation	2017-08-02 14:31:26 -07:00
Doubek-Kraft	eacc181d5e	[Inputs] Add value inputs for rule configuration Dynamically add value inputs when an operation is being configured. Cleanup code related to removed label caching feature	2017-08-01 16:03:08 -07:00
Doubek-Kraft	405bb55881	[Refactor] Cleanup old files	2017-08-01 13:51:20 -07:00
Doubek-Kraft	4a35508459	[Refactor] Overhaul of code structure Re-implement widgets in with a module-oriented structure. Fix issues related to asychronous loading of telemetry and composition. Package inputs as re-usable, Zepto-based modules.	2017-08-01 13:40:04 -07:00
Doubek-Kraft	98a9d71a2e	[Summary Widgets] Implementation for conditions Support configuring and persisting multiple conditions per rule	2017-07-26 09:33:27 -07:00
Doubek-Kraft	a1596d0b06	[Summary Widgets] Make conditions persistable Issue #1644 Add implementation and persistability for a single condition configuration field. Baseline for adding arbitrary numbers of rules	2017-07-25 14:21:53 -07:00
Doubek-Kraft	4b3be4c483	[Inputs] Add implementation for icon palette Issue #1644 Wire up icon palette inputs to widget, and make icon class a persistable property of a rule	2017-07-24 12:15:39 -07:00
Doubek-Kraft	0fa8472db1	[Bug Fix] Fix text input handlers Issue #1644 Fix merge issue related to inputs for label and message	2017-07-24 10:10:28 -07:00
Charles Hacskaylo	e1e2dca1d8	[Frontend] WIP summary widget styling Fixes #1654 Refactor .l-color-palette to .l-palette, includes file renaming; add icon-palette in WidgetView.js	2017-07-21 18:07:49 -07:00
Doubek-Kraft	755c013ec8	[Summary Widgets] Merge with style Issue #1644 Merge and resolve conflicts with style branch Fix rule indexing bug	2017-07-21 16:19:15 -07:00
Doubek-Kraft	eab702b763	[Summary Widgets] Link markup to implementation Add additional implemenation for new markup. Rules now store label and message, and label is applied to widget. Implementation for duplicate.	2017-07-21 15:59:53 -07:00
Charles Hacskaylo	d15446ac91	[Frontend] WIP summary widget styling Fixes #1654 Mod .grippy to point at new glyph class; Stubbed in icon palette control in markup;	2017-07-21 10:32:20 -07:00
Charles Hacskaylo	500733afb2	[Frontend] Add new icon-grippy Fixes #1654	2017-07-21 10:25:18 -07:00
Charles Hacskaylo	2aa04b0a56	Merge remote-tracking branch 'origin/summary-widgets' into summary-widgets-styling	2017-07-21 10:04:23 -07:00
Doubek-Kraft	c051f342af	[Style] Merge with style branch Merge remote-tracking branch 'origin/summary-widgets-styling' into summary-widgets Apply new style and wire up new markup for interaction	2017-07-21 09:58:23 -07:00
Charles Hacskaylo	8aeb365f5f	[Frontend] WIP summary widget styling Fixes #1654 Add condition duplicate and delete buttons	2017-07-21 09:56:57 -07:00
Charles Hacskaylo	827a28313d	[Frontend] WIP summary widget styling Fixes #1654 Fixes and tweaks post-merge	2017-07-21 09:48:54 -07:00
Doubek-Kraft	c83de8aad2	[Summary Widgets] Minor UI implementation	2017-07-21 09:24:27 -07:00
Charles Hacskaylo	b55f43b8df	[Frontend] WIP summary widget styling Fixes #1654 Merge latest from summary-widgets branch	2017-07-21 09:15:19 -07:00
Charles Hacskaylo	8466723a90	[Frontend] WIP summary widget styling Fixes #1654 Minor tweaks; class renaming; restructured main containers in ruleTemplate.html; minor updates for class names in WidgetView.js;	2017-07-20 19:01:13 -07:00
Charles Hacskaylo	a103b4dbff	[Frontend] WIP summary widget styling Fixes #1654 Significant mods to markup and SCSS;	2017-07-20 17:56:57 -07:00
Charles Hacskaylo	826ac3a947	[Frontend] WIP summary widget styling Fixes #1654 Ported .view-control SCSS out of tree context to allow more independent use;	2017-07-20 14:31:59 -07:00
Charles Hacskaylo	597327f138	[Frontend] WIP summary widget styling Fixes #1654 New SCSS for widgets; markup mods in progress	2017-07-20 14:09:17 -07:00
Charles Hacskaylo	bef79402ca	[Frontend] WIP summary widget styling Fixes #1654 Ported .inspector-config SCSS from _inspector.scss and renamed to .l-compact-form;	2017-07-20 14:08:49 -07:00
Doubek-Kraft	e68e0c381f	[Summary Widgets] Make Rules Deletable Add delete functionality and UI Improve process for indexing and rendering rules to support deletion, and eventually reordering Fix bug where default style was passed by reference and overwritten on style updates	2017-07-19 17:38:17 -07:00
Charles Hacskaylo	c73f7259c2	[Frontend] WIP summary widget styling Fixes #1654 Markup cleanups	2017-07-19 15:38:44 -07:00
Charles Hacskaylo	4c9235ba10	[Frontend] Apply new summary-widget glyph Fixes #1654	2017-07-19 15:01:04 -07:00
Charles Hacskaylo	55e2a77df8	[Frontend] Add new summary-widget glyph Fixes #1654 Updated font files and icomoon json file;	2017-07-19 15:00:46 -07:00
Doubek-Kraft	cfbff02e7f	[Summary Widgets] Populate rule config inputs Add rule configuration inputs, populated with domain objects, metadata, and appropriate operations for a given type	2017-07-18 16:19:46 -07:00
Doubek-Kraft	54980fb296	[Summary Widgets] Add summary widgets, WIP Add a summary widget domain object type Implement basic interface and style configuration for rules	2017-07-18 10:58:55 -07:00
Pete Richards	ba98d9315c	[ViewAPI] Update view API with more support Update view provider to allow metadata definitions and to play nicely with old style views. Spec out some updates to ViewProviders and ViewRegistry to support further use of views.	2017-07-05 13:56:32 -07:00